测试小项日志展示

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

@@ -451,172 +451,76 @@ watch(webMsgSend, function (newValue, oldValue) {
         //   ElMessage.error('无法继续检测')
         //   break;
       case 'FREQ_Start':
-        activeIndex = getActiveIndex('FREQ')
+        handleStartItem('FREQ', newValue.desc)
-        updateCheckResultView("FREQ", true)
-        updateLog(true)
         break;
       case 'FREQ_End':
-        updatePercentage()
+        handleEndItem('FREQ', newValue.desc, newValue.data)
-        updateCheckResultView("FREQ", false, newValue.data)
-        updateLog(false)
-        if (testStatus.value != 'paused') {
-          activeIndex = getNextActiveIndex('FREQ')
-          //startTimer()
-        }
         break;
       case 'V_Start':
-        activeIndex = getActiveIndex('V')
+        handleStartItem('V', newValue.desc)
-        updateCheckResultView("V", true)
-        updateLog(true)
         break;
       case 'V_End':
-        updatePercentage()
+        handleEndItem('V', newValue.desc, newValue.data)
-        updateCheckResultView("V", false, newValue.data)
-        updateLog(false)
-        if (testStatus.value != 'paused') {
-          activeIndex = getNextActiveIndex('V')
-          //startTimer()
-        }
         break;
       case 'HV_Start':
-        activeIndex = getActiveIndex('HV')
+        handleStartItem('HV', newValue.desc)
-        updateCheckResultView("HV", true)
-        updateLog(true)
         break;
       case 'HV_End':
-        updatePercentage()
+        handleEndItem('HV', newValue.desc, newValue.data)
-        updateCheckResultView("HV", false, newValue.data)
-        updateLog(false)
-        if (testStatus.value != 'paused') {
-          activeIndex = getNextActiveIndex('HV')
-          //startTimer()
-        }
         break;
       case 'HI_Start':
-        activeIndex = getActiveIndex('HI')
+        handleStartItem('HI', newValue.desc)
-        updateCheckResultView("HI", true)
-        updateLog(true)
         break;
       case 'HI_End':
-        updatePercentage()
+        handleEndItem('HI', newValue.desc, newValue.data)
-        updateCheckResultView("HI", false, newValue.data)
-        updateLog(false)
-        if (testStatus.value != 'paused') {
-          activeIndex = getNextActiveIndex('HI')
-          //startTimer()
-        }
         break;
       case 'HP_Start':
-        activeIndex = getActiveIndex('HP')
+        handleStartItem('HP', newValue.desc)
-        updateCheckResultView("HP", true)
-        updateLog(true)
         break;
       case 'HP_End':
-        updatePercentage()
+        handleEndItem('HP', newValue.desc, newValue.data)
-        updateCheckResultView("HP", false, newValue.data)
-        updateLog(false)
-        if (testStatus.value != 'paused') {
-          activeIndex = getNextActiveIndex('HP')
-          //startTimer()
-        }
         break;
       case 'HSV_Start':
-        activeIndex = getActiveIndex('HSV')
+        handleStartItem('HSV', newValue.desc)
-        updateCheckResultView("HSV", true)
-        updateLog(true)
         break;
       case 'HSV_End':
-        updatePercentage()
+        handleEndItem('HSV', newValue.desc, newValue.data)
-        updateCheckResultView("HSV", false, newValue.data)
-        updateLog(false)
-        if (testStatus.value != 'paused') {
-          activeIndex = getNextActiveIndex('HSV')
-          //startTimer()
-        }
         break;
       case 'HSI_Start':
-        activeIndex = getActiveIndex('HSI')
+        handleStartItem('HSI', newValue.desc)
-        updateCheckResultView("HSI", true)
-        updateLog(true)
         break;
       case 'HSI_End':
-        updatePercentage()
+        handleEndItem('HSI', newValue.desc, newValue.data)
-        updateCheckResultView("HSI", false, newValue.data)
-        updateLog(false)
-        if (testStatus.value != 'paused') {
-          activeIndex = getNextActiveIndex('HSI')
-          //startTimer()
-        }
         break;
       case 'VOLTAGE_Start':
-        activeIndex = getActiveIndex('VOLTAGE')
+        handleStartItem('VOLTAGE', newValue.desc)
-        updateCheckResultView("VOLTAGE", true)
-        updateLog(true)
         break;
       case 'VOLTAGE_End':
-        updatePercentage()
+        handleEndItem('VOLTAGE', newValue.desc, newValue.data)
-        updateCheckResultView("VOLTAGE", false, newValue.data)
-        updateLog(false)
-        if (testStatus.value != 'paused') {
-          activeIndex = getNextActiveIndex('VOLTAGE')
-          //startTimer()
-        }
         break;
       case 'I_Start':
-        activeIndex = getActiveIndex('I')
+        handleStartItem('I', newValue.desc)
-        updateCheckResultView("I", true)
-        updateLog(true)
         break;
       case 'I_End':
-        updatePercentage()
+        handleEndItem('I', newValue.desc, newValue.data)
-        updateCheckResultView("I", false, newValue.data)
-        updateLog(false)
-        if (testStatus.value != 'paused') {
-          activeIndex = getNextActiveIndex('I')
-          //startTimer()
-        }
         break;
       case 'IMBV_Start':
-        activeIndex = getActiveIndex('IMBV')
+        handleStartItem('IMBV', newValue.desc)
-        updateCheckResultView("IMBV", true)
-        updateLog(true)
         break;
       case 'IMBV_End':
-        updatePercentage()
+        handleEndItem('IMBV', newValue.desc, newValue.data)
-        updateCheckResultView("IMBV", false, newValue.data)
-        updateLog(false)
-        if (testStatus.value != 'paused') {
-          activeIndex = getNextActiveIndex('IMBV')
-          //startTimer()
-        }
         break;
       case 'IMBA_Start':
-        activeIndex = getActiveIndex('IMBA')
+        handleStartItem('IMBA', newValue.desc)
-        updateCheckResultView("IMBA", true)
-        updateLog(true)
         break;
       case 'IMBA_End':
-        updatePercentage()
+        handleEndItem('IMBA', newValue.desc, newValue.data)
-        updateCheckResultView("IMBA", false, newValue.data)
-        updateLog(false)
-        if (testStatus.value != 'paused') {
-          activeIndex = getNextActiveIndex('IMBA')
-          //startTimer()
-        }
         break;
       case 'F_Start':
-        activeIndex = getActiveIndex('F')
+        handleStartItem('F', newValue.desc)
-        updateCheckResultView("F", true)
-        updateLog(true)
         break;
       case 'F_End':
-        updatePercentage()
+        handleEndItem('F', newValue.desc, newValue.data)
-        updateCheckResultView("F", false, newValue.data)
-        updateLog(false)
-        if (testStatus.value != 'paused') {
-          activeIndex = getNextActiveIndex('F')
-          //startTimer()
-        }
         break;
       case 'Quit':
         console.log('检测结束')
@@ -626,6 +530,44 @@ watch(webMsgSend, function (newValue, oldValue) {
 
 }, {deep: true})
 
+const handleStartItem = (code: string, desc: string|undefined) => {
+  if (desc === undefined) {
+    activeIndex = getActiveIndex(code)
+    updateCheckResultView(code, true)
+    updateLog(true)
+  } else {
+    if(desc.length>60){
+      desc = desc.substring(0,60) + '...'
+    }
+    testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：${desc}准确度检测：开始`})
+  }
+}
+
+const handleEndItem = (code: string, desc: string|undefined, devices: CheckData.DeviceCheckResult[] = []) => {
+  if (desc === undefined) {
+    updatePercentage()
+    updateCheckResultView(code, false, devices)
+    updateLog(false)
+    if (testStatus.value != 'paused') {
+      activeIndex = getNextActiveIndex(code)
+      //startTimer()
+    }
+  } else {
+    let result = getResult(devices)
+    if(desc.length>60){
+      desc = desc.substring(0,60) + '...'
+    }
+    if(result === 1){
+      testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：${desc}检测结束：符合`})
+    }
+    if(result === 2){
+      testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：${desc}检测结束：不符合`})
+    }
+    if(result === 4){
+      testLogList.push({type: 'warning', log: `${new Date().toLocaleString()}：${desc}检测结束：数据异常`})
+    }
+  }
+}
 
 // 更新进度条
 const updatePercentage = () => {
@@ -1003,6 +945,23 @@ const getCheckResult = (scriptType: string) => {
   return tempScriptChnItem
 }
 
+const getResult=(devices: CheckData.DeviceCheckResult[] = [])=>{
+  let type = 1
+  let tempChnResult: CheckData.ChnCheckResultEnum[] = []
+  for (let i = 0; i < devices.length; i++) {
+    tempChnResult.push(...devices[i].chnResult)
+  }
+
+  if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.ERRORDATA)) {
+    type = CheckData.ChnCheckResultEnum.ERRORDATA
+  }
+  if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.FAIL)) {
+    type = CheckData.ChnCheckResultEnum.FAIL
+  }
+  return type
+}
+
+
 // 点击查看（设备）通道检测详情。参数1：设备信息，参数2：通道号，-1：代表查看全部通道
 const handleClick = (item: any, chnNum: number, scriptType: string) => {
   let checkResultItem = checkResult.find(obj => obj.scriptType === scriptType)
@@ -1090,14 +1049,7 @@ const startTimer = () => {
       }, 6000)
       break;
     case 1:
-      emit('update:webMsgSend', {
+      todoItem('V')
-        requestId: 'V_Start'
-      })
-      setTimeout(() => {
-        emit('update:webMsgSend', {
-          requestId: 'V_End'
-        })
-      }, 2000);
       // setTimeout(() => {
       //   emit('update:webMsgSend', {
       //     requestId: 'FREQ_Start'
@@ -1110,14 +1062,7 @@ const startTimer = () => {
       // }, 2000);
       break;
     case 2:
-      emit('update:webMsgSend', {
+      todoItem('I')
-        requestId: 'I_Start'
-      })
-      setTimeout(() => {
-        emit('update:webMsgSend', {
-          requestId: 'I_End'
-        })
-      }, 2000)
       // emit('update:webMsgSend', {
       //   requestId: 'V_Start'
       // })
@@ -1128,14 +1073,7 @@ const startTimer = () => {
       // }, 2000);
       break;
     case 3:
-      emit('update:webMsgSend', {
+      todoItem('IMBV')
-        requestId: 'IMBV_Start'
-      })
-      setTimeout(() => {
-        emit('update:webMsgSend', {
-          requestId: 'IMBV_End'
-        })
-      }, 2000)
       // emit('update:webMsgSend', {
       //   requestId: 'HV_Start',
       // })
@@ -1146,16 +1084,7 @@ const startTimer = () => {
       // }, 2000)
       break;
     case 4:
-      setTimeout(() => {
+      todoItem('FREQ')
-        emit('update:webMsgSend', {
-          requestId: 'FREQ_Start'
-        })
-      }, 1000)
-      setTimeout(() => {
-        emit('update:webMsgSend', {
-          requestId: 'FREQ_End'
-        })
-      }, 2000);
       // emit('update:webMsgSend', {
       //   requestId: 'HI_Start'
       // })
@@ -1166,14 +1095,7 @@ const startTimer = () => {
       // }, 2000)
       break;
     case 5:
-      emit('update:webMsgSend', {
+      todoItem('HV')
-        requestId: 'HV_Start',
-      })
-      setTimeout(() => {
-        emit('update:webMsgSend', {
-          requestId: 'HV_End'
-        })
-      }, 2000)
       // emit('update:webMsgSend', {
       //   requestId: 'HP_Start',
       // })
@@ -1184,14 +1106,7 @@ const startTimer = () => {
       // }, 2000)
       break;
     case 6:
-      emit('update:webMsgSend', {
+      todoItem('HI')
-        requestId: 'HI_Start'
-      })
-      setTimeout(() => {
-        emit('update:webMsgSend', {
-          requestId: 'HI_End'
-        })
-      }, 2000)
       // emit('update:webMsgSend', {
       //   requestId: 'HSV_Start'
       // })
@@ -1202,14 +1117,7 @@ const startTimer = () => {
       // }, 2000)
       break;
     case 7:
-      emit('update:webMsgSend', {
+      todoItem('HSV')
-        requestId: 'HSV_Start'
-      })
-      setTimeout(() => {
-        emit('update:webMsgSend', {
-          requestId: 'HSV_End'
-        })
-      }, 2000)
       // emit('update:webMsgSend', {
       //   requestId: 'HSI_Start'
       // })
@@ -1220,14 +1128,7 @@ const startTimer = () => {
       // }, 2000)
       break;
     case 8:
-      emit('update:webMsgSend', {
+      todoItem('HSI')
-        requestId: 'HSI_Start'
-      })
-      setTimeout(() => {
-        emit('update:webMsgSend', {
-          requestId: 'HSI_End'
-        })
-      }, 2000)
       // emit('update:webMsgSend', {
       //   requestId: 'VOLTAGE_Start'
       // })
@@ -1277,7 +1178,7 @@ const startTimer = () => {
     //     })
     //   }, 2000)
     //   break;
-    case 13:
+    case 9:
       emit('update:webMsgSend', {
         requestId: 'Quit'
       })
@@ -1301,6 +1202,87 @@ const pauseSuccessCallback = () => {
   console.log('暂停中')
 };
 
+const todoItem = (code:string) => {
+  emit('update:webMsgSend', {
+    requestId: `${code}_Start`
+  })
+  setTimeout(() => {
+    if(testStatus.value !== 'paused'){
+      emit('update:webMsgSend', {
+        requestId: `${code}_Start`,
+        desc: '输入：频率t=42.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° '
+      })
+    }
+  }, 1000)
+  setTimeout(() => {
+    if (testStatus.value !== 'paused') {
+      emit('update:webMsgSend', {
+        requestId: `${code}_End`,
+        desc: '输入：频率t=42.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° ',
+        data: [{
+          chnResult: [1, 1, 1, 1],
+          deviceId: "461813a4f30f4a34a1a273ecd0379458",
+          deviceName: "25011407"
+        }]
+      })
+    }
+  }, 2000)
+  setTimeout(() => {
+    if (testStatus.value !== 'paused') {
+      emit('update:webMsgSend', {
+        requestId: `${code}_Start`,
+        desc: '输入：频率t=45.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° '
+      })
+    }
+  }, 3000)
+  setTimeout(() => {
+    if (testStatus.value !== 'paused') {
+      emit('update:webMsgSend', {
+        requestId: `${code}_End`,
+        desc: '输入：频率t=45.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° ',
+        data: [{
+          chnResult: [1, 1, 1, 1],
+          deviceId: "461813a4f30f4a34a1a273ecd0379458",
+          deviceName: "25011407"
+        }]
+      })
+    }
+  }, 5000)
+  setTimeout(() => {
+    if(testStatus.value !== 'paused'){
+      emit('update:webMsgSend', {
+        requestId: `${code}_Start`,
+        desc: '输入：频率t=50.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° '
+      })
+    }
+  }, 6000)
+  setTimeout(() => {
+    if(testStatus.value !== 'paused'){
+      emit('update:webMsgSend', {
+        requestId: `${code}_End`,
+        desc: '输入：频率t=50.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° ',
+        data: [{
+          chnResult: [1, 2, 1, 1],
+          deviceId: "461813a4f30f4a34a1a273ecd0379458",
+          deviceName: "25011407"
+        }]
+      })
+    }
+  }, 8000)
+  setTimeout(() => {
+    if(testStatus.value !== 'paused'){
+      emit('update:webMsgSend', {
+        requestId: `${code}_End`,
+        data: [{
+          chnResult: [1, 2, 1, 1],
+          deviceId: "461813a4f30f4a34a1a273ecd0379458",
+          deviceName: "25011407"
+        }]
+      })
+    }
+  }, 9000)
+}
+
 const handleResumeTest = () => {
   //activeIndex++
   startData.value = new Date();