Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client

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

@@ -296,6 +296,7 @@ watch(testStatus, function (newValue, oldValue) {
   if (newValue == 'start') {
     ElMessage.success('初始化开始!')
 
+    startData.value = new Date();
     showTestLog()
 
     if (oldValue == 'error') {
@@ -423,16 +424,16 @@ watch(webMsgSend, function (newValue, oldValue) {
         break;
       case 'Pause_Success':
         ElMessage.success('暂停成功')
-        emit('update:testStatus', 'paused')
         handlePauseTest()
+        emit('update:testStatus', 'paused')
         break;
         // case 'Pause_Fail':
         //   ElMessage.error('暂停失败')
         //   break;
       case 'Resume_Success':
         ElMessage.success('开始继续检测')
-        emit('update:testStatus', 'process')
         handleResumeTest()
+        emit('update:testStatus', 'process')
         break;
         // case 'Resume_Fail':
         //   ElMessage.error('无法继续检测')
@@ -606,8 +607,6 @@ watch(webMsgSend, function (newValue, oldValue) {
         }
         break;
       case 'Quit':
-        //updatePercentage()
-        //updateLog(false)
         console.log('检测结束')
         break;
     }
@@ -750,6 +749,9 @@ function getTimeDifference(timeDifference: number): string {
     return `: ${minutes} 分钟, ${seconds} 秒`
   }
 }
+watch(testLogList, () => {
+  scrollToBottom();
+}, {deep: true})
 
 // 更新日志
 const updateLog = (isStart: boolean) => {
@@ -763,7 +765,6 @@ const updateLog = (isStart: boolean) => {
   // debugger
   if (activeIndex <= checkTotal) {
     if (isStart) {
-      startData.value = new Date();
       testLogList.push({
         type: 'info',
         log: currentTime.value + ` ：${scriptData[activeIndex - 1].scriptName}准确度检测：开始`,
@@ -809,8 +810,6 @@ const updateLog = (isStart: boolean) => {
       }
     }
   }
-
-  scrollToBottom();
 }
 
 // 动态获取表格单元格样式
@@ -885,7 +884,7 @@ const updateCheckResultView = (scriptCode: string, isStart: boolean, devices: Ch
   //     chnResult: [1, 1, 1, 1],
   //     deviceId: "2957b271f39d4240a1c5e275c453676c",
   //     deviceName: "测试003"
-  //   },
+  //   }
   //   ]
   let temp = null
   if (isStart) {
@@ -1019,12 +1018,6 @@ const handleClick = (item: any, chnNum: number, scriptType: string) => {
       type: 'warning',
     })
   }
-  // if (flag === 1) {
-  //   ElMessageBox.alert('该测试项数据异常', '数据异常', {
-  //     confirmButtonText: '确定',
-  //     type: 'warning',
-  //   })
-  // }
   if (flag === -1 || flag === 1) {
     dataCheckSingleChannelSingleTestPopupRef.value?.open(item.deviceId, chnNum + '', scriptType);
   }

frontend/src/views/machine/device/components/devicePopup.vue

@@ -21,16 +21,16 @@
                                     />
                                 </el-select>
                                 </el-form-item>           
-                                <el-form-item label='设备模式'  prop='pattern' >
-                                    <el-select v-model="formContent.pattern"  clearable placeholder="请选择设备模式" disabled>
-                                    <el-option 
-                                    v-for="item in dictStore.getDictData('Pattern')"
-                                    :key="item.id"
-                                    :label="item.name"
-                                    :value="item.id"
-                                    />
-                                </el-select>
-                                </el-form-item>           
+<!--                                <el-form-item label='设备模式'  prop='pattern' >-->
+<!--                                    <el-select v-model="formContent.pattern"  clearable placeholder="请选择设备模式" disabled>-->
+<!--                                    <el-option -->
+<!--                                    v-for="item in dictStore.getDictData('Pattern')"-->
+<!--                                    :key="item.id"-->
+<!--                                    :label="item.name"-->
+<!--                                    :value="item.id"-->
+<!--                                    />-->
+<!--                                </el-select>-->
+<!--                                </el-form-item>           -->
                                 <el-form-item label='设备厂家'  prop='manufacturer' v-if="scene != '1'">
                                     <el-select v-model="formContent.manufacturer"  clearable placeholder="请选择设备厂家">
                                     <el-option