微调

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

@@ -51,12 +51,12 @@
           <!--          :icon="Failed"-->
           <!--          disabled>连接超时-->
           <!--      </el-button>-->
-<!--          <el-button-->
+          <!--          <el-button-->
-<!--              type="primary"-->
+          <!--              type="primary"-->
-<!--              :icon="RefreshLeft"-->
+          <!--              :icon="RefreshLeft"-->
-<!--              v-if="testStatus === 'recheck'"-->
+          <!--              v-if="testStatus === 'recheck'"-->
-<!--              @click="emit('sendReCheck')">重新检测-->
+          <!--              @click="emit('sendReCheck')">重新检测-->
-<!--          </el-button>-->
+          <!--          </el-button>-->
 
 
           <el-button type="success" v-if="percentage >= 100" :icon="Check" disabled>检测完成</el-button>
@@ -183,6 +183,9 @@ const props = defineProps({
     type: String,
     default: 'waiting'
   },
+  stepsActive: {
+    type: Number,
+  },
   webMsgSend: {
     type: Object,
     default: () => ({})
@@ -347,6 +350,7 @@ watch(testStatus, function (newValue, oldValue) {
 let count = 0
 
 watch(webMsgSend, function (newValue, oldValue) {
+  if (props.stepsActive === 4) {
     if (newValue.code == 10520) {
       ElMessageBox.alert('报文解析异常！', '初始化失败', {
         confirmButtonText: '确定',
@@ -638,6 +642,7 @@ watch(webMsgSend, function (newValue, oldValue) {
           break;
       }
     }
+  }
 
 }, {deep: true})
 
@@ -666,7 +671,7 @@ const handleEndItem = (code: string, desc: string | undefined, devices: CheckDat
   } else {
     let result = getResult(devices)
     if (desc.length > 150) {
-      desc = desc.substring(0,150) + '...'
+      desc = desc.substring(0, 150) + '...'
     }
     if (result === 1) {
       testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：${desc}检测结束：符合`})
@@ -1385,7 +1390,7 @@ const getNextActiveIndex = (code: string = ''): number => {
   return -1
 }
 const startTimeCount = () => {
-  if(!timer){
+  if (!timer) {
     timer = setInterval(() => {
       timeCount.value = timeCount.value + 1
       timeView.value = secondToTime(timeCount.value)

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

@@ -17,7 +17,7 @@
     <!--     <channelsTest v-if="stepsActiveIndex === 3" v-model:testStatus="channelsTestStatus"></channelsTest>-->
     <factorTest v-if="showComponent&&channelsTestSelected" v-show="channelsTestSelected && stepsActiveView==3" v-model:testStatus="channelsTestStatus"/>
     <test v-if="showComponent&&testSelected" v-show="testSelected && stepsActiveView==4" v-model:testStatus="TestStatus" :webMsgSend="webMsgSend"
-          @update:webMsgSend="webMsgSend=$event" @sendPause="sendPause" @sendResume="sendResume" @sendReCheck="sendReCheck"/>
+          @update:webMsgSend="webMsgSend=$event" @sendPause="sendPause" @sendResume="sendResume" @sendReCheck="sendReCheck" :stepsActive="stepsActive"/>
 
     <template #footer>
       <div>
@@ -183,6 +183,7 @@ const handleSubmit = () => {
     ElMessage.error('webSocket连接中断！')
     return
   }
+  console.log("handleSubmit",stepsActive.value,TestStatus.value)
   switch (stepsActive.value) {
     case 1:
       startPreTest({