bug修复

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

@@ -4,8 +4,7 @@
       <el-tab-pane label="预检测项目">
         <div class="form-grid">
           <el-checkbox v-for="(item, index) in detectionOptions" v-model="item.selected" :key="index"
-                       :label="item.name"></el-checkbox>
-          <!-- disabled="true" -->
+                       :label="item.name" disabled></el-checkbox>
         </div>
       </el-tab-pane>
     </el-tabs>
@@ -18,7 +17,7 @@
           <el-step :status="step2" title="设备通讯校验"/>
           <el-step :status="step3" title="协议校验"/>
           <el-step :status="step4" title="相序校验"/>
-          <el-step :status="step5" title="检测完成"/>
+          <el-step :status="step5" :title="ts === 'error'? '检测失败':ts === 'process'? '检测中':ts === 'success'? '检测成功':'待检测'"/>
         </el-steps>
       </div>
       <div class="dialog-right">
@@ -258,9 +257,11 @@ watch(webMsgSend, function (newValue, oldValue) {
             ElMessage.error(newValue.code)
             step1.value = 'error'
             ts.value = 'error'
+            step5.value = 'error'
           } else if (newValue.code == 10523) {
             step1.value = 'error'
             ts.value = 'error'
+            step5.value = 'error'
             step1InitLog.value = [{
               type: 'error',
               log: '源连接失败!',
@@ -268,6 +269,7 @@ watch(webMsgSend, function (newValue, oldValue) {
           } else if (newValue.code == -1) {
             step1.value = 'error'
             ts.value = 'error'
+            step5.value = 'error'
             step1InitLog.value = [{
               type: 'error',
               log: '源未知异常!',
@@ -301,6 +303,7 @@ watch(webMsgSend, function (newValue, oldValue) {
             })
             step2.value = 'error'
             // ts.value = 'error'
+            // step5.value = 'error'
           } else if (newValue.code == 10551) {
             step2InitLog.value.push({
               type: 'error',
@@ -308,6 +311,7 @@ watch(webMsgSend, function (newValue, oldValue) {
             })
             step2.value = 'error'
             ts.value = 'error'
+            step5.value = 'error'
           } else if (newValue.code == 10552) {
             //ElMessage.error("存在已经初始化步骤,已经自动关闭,请重新发起检测！")
             step2InitLog.value = [{
@@ -316,6 +320,7 @@ watch(webMsgSend, function (newValue, oldValue) {
             }];
             step2.value = 'error'
             ts.value = 'error'
+            step5.value = 'error'
           } else if (newValue.code == 25001) {
             activeIndex.value = 2
             step2.value = 'success'
@@ -347,6 +352,7 @@ watch(webMsgSend, function (newValue, oldValue) {
             })
             step3.value = 'error'
             // ts.value = 'error'
+            // step5.value = 'error'
           } else if (newValue.code == 10551) {
             step3InitLog.value.push({
               type: 'error',
@@ -354,6 +360,7 @@ watch(webMsgSend, function (newValue, oldValue) {
             })
             step3.value = 'error'
             ts.value = 'error'
+            step5.value = 'error'
           } else if (newValue.code == 10552) {
             step3.value = 'error'
             //ElMessage.error("存在已经初始化步骤,已经自动关闭,请重新发起检测！")
@@ -362,6 +369,7 @@ watch(webMsgSend, function (newValue, oldValue) {
               log: '存在已经初始化步骤,执行自动关闭,请重新发起检测！',
             }];
             ts.value = 'error'
+            step5.value = 'error'
           }
           break;
         case 'INIT_GATHER$02':
@@ -384,6 +392,7 @@ watch(webMsgSend, function (newValue, oldValue) {
             })
             step3.value = 'error'
             // ts.value = 'error'
+            // step5.value = 'error'
           } else if (newValue.code == 10551) {
             step3InitLog.value.push({
               type: 'error',
@@ -391,6 +400,7 @@ watch(webMsgSend, function (newValue, oldValue) {
             })
             step3.value = 'error'
             ts.value = 'error'
+            step5.value = 'error'
           } else if (newValue.code == 10552) {
             step3.value = 'error'
             //ElMessage.error("存在已经初始化步骤,已经自动关闭,请重新发起检测！")
@@ -399,6 +409,7 @@ watch(webMsgSend, function (newValue, oldValue) {
               log: '存在已经初始化步骤,执行自动关闭,请重新发起检测！',
             }];
             ts.value = 'error'
+            step5.value = 'error'
           }
           break;
         case 'INIT_GATHER$03':
@@ -417,6 +428,7 @@ watch(webMsgSend, function (newValue, oldValue) {
             })
             step3.value = 'error'
             // ts.value = 'error'
+            // step5.value = 'error'
           } else if (newValue.code == 10551) {
             step3InitLog.value.push({
               type: 'error',
@@ -424,6 +436,7 @@ watch(webMsgSend, function (newValue, oldValue) {
             })
             step3.value = 'error'
             ts.value = 'error'
+            step5.value = 'error'
           } else if (newValue.code == 10552) {
             //ElMessage.error("当前步骤已经初始化,执行自动关闭,请重新发起检测！")
             step3.value = 'error'
@@ -432,6 +445,7 @@ watch(webMsgSend, function (newValue, oldValue) {
               log: '存在已经初始化步骤,执行自动关闭,请重新发起检测！',
             }];
             ts.value = 'error'
+            step5.value = 'error'
           } else if (newValue.code == 25001) {
             activeIndex.value = 3
             step3.value = 'success'
@@ -460,6 +474,7 @@ watch(webMsgSend, function (newValue, oldValue) {
             ElMessage.error("存在已经初始化步骤,已经自动关闭,请重新发起检测！")
             step4.value = 'error'
             ts.value = 'error'
+            step5.value = 'error'
           } else if (newValue.code == 10520) {
             step4.value = 'error'
             step4InitLog.value.push({
@@ -467,6 +482,7 @@ watch(webMsgSend, function (newValue, oldValue) {
               log: '解析报文异常',
             })
             ts.value = 'error'
+            step5.value = 'error'
           }
           break;
 
@@ -496,6 +512,7 @@ watch(webMsgSend, function (newValue, oldValue) {
               log: '相序校验未通过!',
             })
             ts.value = 'error'
+            step5.value = 'error'
           } else if (newValue.code == 25001) {
             step4.value = 'success'
             step5.value = 'success'
@@ -522,6 +539,7 @@ watch(webMsgSend, function (newValue, oldValue) {
             log: '源服务端连接失败!',
           }];
           ts.value = 'error'
+          step5.value = 'error'
           break;
         case "Dev":
           step2.value = 'error'
@@ -530,6 +548,7 @@ watch(webMsgSend, function (newValue, oldValue) {
             log: '设备服务端连接失败!',
           }];
           ts.value = 'error'
+          step5.value = 'error'
           break;
       }
       break;
@@ -542,6 +561,7 @@ watch(webMsgSend, function (newValue, oldValue) {
         type: 'error',
       })
       ts.value = 'error'
+      step5.value = 'error'
       break;
   }
 

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

@@ -958,11 +958,14 @@ const handleTest = async (val: string) => {
               selectTestItemPopupRef.value?.open()
             })
             .catch((action: Action) => {
-              ElMessage.success('全部复检')
-              checkStore.setReCheckType(1)
-              selectTestItemPopupRef.value?.open()
+              if(action === 'cancel'){
+                ElMessage.success('全部复检')
+                checkStore.setReCheckType(1)
+                selectTestItemPopupRef.value?.open()
+              }
             })
       } else {
+        checkStore.setReCheckType(1)
         selectTestItemPopupRef.value?.open()
       }
     } else if (val === '系数校准') {

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

@@ -299,7 +299,7 @@ watch(TestStatus, function (newValue, oldValue) {
 
 watch(ActiveStatue, function (newValue, oldValue) {
   if (newValue === 'error') {
-    // stepsActiveIndex.value = stepsTotalNum.value + 2
+    stepsActiveIndex.value = stepsTotalNum.value + 1
     nextStepText.value = '检测失败'
   }
   if (newValue === 'success' && stepsActiveIndex.value === stepsTotalNum.value - 1) {