微调

frontend/src/views/home/components/table.vue

@@ -651,6 +651,7 @@ const handleSelectionChange = (selection: any[]) => {
       devVolt: item.devVolt,
       devCurr: item.devCurr,
       factorFlag: item.factorFlag,
+      checkResult: item.checkResult,
     }
   })
 
@@ -1022,23 +1023,25 @@ const handleTest = async (val: string) => {
               if(appSceneStore.currentScene === '0'){
                     writeTHPopupRef.value?.open()
                 }else{
-                    openTestDialog(false)
+                    openTestDialog()
                 }
             })
             .catch((action: Action) => {
-              ElMessage.success('全部复检')
-              checkStore.setReCheckType(1)
-              //openTestDialog(false)
-              if(appSceneStore.currentScene === '0'){
+              if (action === 'cancel') {
+                ElMessage.success('全部复检')
+                checkStore.setReCheckType(1)
+                //openTestDialog(false)
+                if (appSceneStore.currentScene === '0') {
                   writeTHPopupRef.value?.open()
-                }else{
-                    openTestDialog(false)
+                } else {
+                  openTestDialog()
                 }
+              }
             })
+        checkStore.setSelectTestItems({preTest: false, timeTest: false, channelsTest: false, test: true})
       } else {
+        openTestDialog()
       }
-
-        
     }
   }
   if (val === '批量下载') {
@@ -1081,14 +1084,12 @@ const handleTest = async (val: string) => {
   }
 }
 
-const openTestDialog = (test:boolean) => {
-  console.log('openTestDialog',test)
-  if(dialogTitle.value === '手动检测' && appSceneStore.currentScene === '0'  && test == true){
-     writeTHPopupRef.value?.open()
-  }else{
+const openTestDialog = () => {
+  if (appSceneStore.currentScene === '0') {
+    writeTHPopupRef.value?.open()
+  } else {
     testPopup.value?.open(dialogTitle.value)
   }
-
 }