手动检测根据检测内容不同动态决定是否进行初始化操作

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

@@ -233,7 +233,7 @@
     <SelectTestItemPopup ref="selectTestItemPopupRef" @openTestDialog="openTestDialog"></SelectTestItemPopup>
      <!--  省平台-填写温度湿度弹窗  -->
     <WriteTHPopup ref="writeTHPopupRef" @openTestDialog2="openTestDialog2"></WriteTHPopup>
-    
+
   </div>
 </template>
 
@@ -945,7 +945,7 @@ const handleTest = async (val: string) => {
     dialogTitle.value = val
     if (val === '手动检测') {
       checkStore.setShowDetailType(2)
-    
+
       if (testType === 'reTest') {
         ElMessageBox.confirm('请选择复检检测方式', '设备复检',
             {
@@ -965,7 +965,8 @@ const handleTest = async (val: string) => {
               if(appSceneStore.currentScene === '0'){
                 writeTHPopupRef.value?.open()
               }else{
-                openTestDialog(true)
+                selectTestItemPopupRef.value?.open()
+                //openTestDialog(true)
               }
             })
             .catch((action: Action) => {
@@ -976,17 +977,16 @@ const handleTest = async (val: string) => {
                 if(appSceneStore.currentScene === '0'){
                   writeTHPopupRef.value?.open()
                 }else{
-                  openTestDialog(true)
+                  selectTestItemPopupRef.value?.open()
+                  //openTestDialog(true)
                 }
               }
             })
+
         checkStore.setSelectTestItems({preTest: false, timeTest: false, channelsTest: false, test: true})
       } else {
-         
         checkStore.setReCheckType(1)
-        selectTestItemPopupRef.value?.open()
       }
- 
     } else if (val === '系数校准') {
       // 检查 socketClient.Instance 是否存在
       if (!socketClient.Instance) {
@@ -1190,7 +1190,7 @@ watch(
 )
 
 onBeforeMount(async () => {
- 
+
   const response = await getPqDev()
   devTypeOptions.value = response.data.map(item => ({
     id: item.id,

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

@@ -281,6 +281,8 @@ watch(testStatus, function (newValue, oldValue) {
       ElMessage.success('初始化开始!')
       emit('update:testStatus', 'test_init')
       testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：初始化开始！`})
+    } else {
+      emit('update:testStatus', 'process')
     }
     startTimeCount()
 

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

@@ -71,7 +71,7 @@
 <script lang="tsx" setup name="testPopup">
 import {reactive, ref, watch} from 'vue';
 import {ElMessage, ElMessageBox} from 'element-plus'
-import {Coin, DArrowRight, Edit, Key, Odometer, Refresh, Right, SuccessFilled, UploadFilled, VideoPlay,VideoPause} from '@element-plus/icons-vue'
+import {Coin, Edit, Key, Odometer, Refresh, Right, SuccessFilled, UploadFilled, VideoPause, VideoPlay} from '@element-plus/icons-vue'
 import preTest from './preTest.vue'
 import timeTest from './timeTest.vue'
 import factorTest from './factorTest.vue'
@@ -194,48 +194,72 @@ const handleSubmitFast = () => {
   console.log("handleSubmit", stepsActive.value, TestStatus.value)
   switch (stepsActive.value) {
     case 1:
-      startPreTest({
+      if (preTestStatus.value == 'waiting') {
-        userPageId: "cdf",
+        if (checkStore.selectTestItems.preTest) {
-        devIds: deviceIds,
+          startPreTest({
-        planId: planId,
+            userPageId: "cdf",
-        operateType: '10', // '1'为预检测、‘2‘为正式检测、'8'为不合格项复检
+            devIds: deviceIds,
-        userId: userStore.userInfo.id,
+            planId: planId,
-        temperature: checkStore.temperature,
+            operateType: checkStore.reCheckType == 1 ? '1' : '2',
-        humidity: checkStore.humidity
+            userId: userStore.userInfo.id,
-      }).then(res => {
+            temperature: checkStore.temperature,
-        if (res.code === 'A001014') {
+            humidity: checkStore.humidity,
-          ElMessageBox.alert('装置配置异常', '检测失败', {
+            testItemList: [checkStore.selectTestItems.preTest, checkStore.selectTestItems.channelsTest, checkStore.selectTestItems.test]
-            confirmButtonText: '确定',
+          }).then(res => {
-            type: 'error',
+            if (res.code === 'A001014') {
+              ElMessageBox.alert('装置配置异常', '检测失败', {
+                confirmButtonText: '确定',
+                type: 'error',
+              })
+              preTestStatus.value = 'error'
+            }
           })
-          preTestStatus.value = 'error'
+          preTestStatus.value = 'start'
         }
-      })
+      }
-      preTestStatus.value = 'start'
-      // setTimeout(() => {
-      //   preTestStatus.value = 'success'
-      // }, 5000)
       break;
     case 2:
       timeTestStatus.value = 'start'
       break;
     case 3:
-      // 调用系数校准组件的handleSubmit方法
+      if (channelsTestStatus.value == 'waiting') {
-      channelsTestStatus.value = 'start'
+        if (!checkStore.selectTestItems.preTest && checkStore.selectTestItems.channelsTest) {
-      break;
-    case 4:
-      if (TestStatus.value == "waiting") {
-        if (!checkStore.selectTestItems.preTest && !checkStore.selectTestItems.timeTest && !checkStore.selectTestItems.channelsTest && checkStore.selectTestItems.test) {
           startPreTest({
             userPageId: "cdf",
             devIds: deviceIds,
             planId: planId,
-            operateType: checkStore.reCheckType == 1 ? '2' : '8', // '1'为预检测、‘2‘为正式检测、'8'为不合格项复检
+            operateType: checkStore.reCheckType == 1 ? '1' : '2',
             userId: userStore.userInfo.id,
             temperature: checkStore.temperature,
-            humidity: checkStore.humidity
+            humidity: checkStore.humidity,
+            testItemList: [checkStore.selectTestItems.preTest, checkStore.selectTestItems.channelsTest, checkStore.selectTestItems.test]
+          }).then(res => {
+            if (res.code === 'A001014') {
+              ElMessageBox.alert('装置配置异常', '初始化失败', {
+                confirmButtonText: '确定',
+                type: 'error',
+              })
+              channelsTestStatus.value = 'test_init_fail'
+            }
+          })
+          // 调用系数校准组件的handleSubmit方法
+        }
+        channelsTestStatus.value = 'start'
+      }
+      break;
+    case 4:
+      if (TestStatus.value == "waiting") {
+        if (!checkStore.selectTestItems.preTest && !checkStore.selectTestItems.channelsTest && checkStore.selectTestItems.test) {
+          startPreTest({
+            userPageId: "cdf",
+            devIds: deviceIds,
+            planId: planId,
+            operateType: checkStore.reCheckType == 1 ? '1' : '2',
+            userId: userStore.userInfo.id,
+            temperature: checkStore.temperature,
+            humidity: checkStore.humidity,
+            testItemList: [checkStore.selectTestItems.preTest, checkStore.selectTestItems.channelsTest, checkStore.selectTestItems.test]
           }).then(res => {
-            console.log(res)
             if (res.code === 'A001014') {
               ElMessageBox.alert('装置配置异常', '初始化失败', {
                 confirmButtonText: '确定',
@@ -264,86 +288,6 @@ const handleSubmitFast = () => {
 }
 
 
-// let loading;
-// const handleSubmit = () => {
-//   let deviceIds = checkStore.devices.map((item) => item.deviceId)
-//   let planId = checkStore.plan.id
-//
-//   if (!dataSocket.socketServe.connected) {
-//     ElMessage.error('webSocket连接中断！')
-//     return
-//   }
-//   console.log("handleSubmit", stepsActive.value, TestStatus.value)
-//   switch (stepsActive.value) {
-//     case 1:
-//       startPreTest({
-//         userPageId: "cdf",
-//         devIds: deviceIds,
-//         planId: planId,
-//         operateType: '1', // '1'为预检测、‘2‘为正式检测、'8'为不合格项复检
-//         userId: userStore.userInfo.id,
-//         temperature: checkStore.temperature,
-//         humidity: checkStore.humidity
-//       }).then(res => {
-//         if (res.code === 'A001014') {
-//           ElMessageBox.alert('装置配置异常', '检测失败', {
-//             confirmButtonText: '确定',
-//             type: 'error',
-//           })
-//           preTestStatus.value = 'error'
-//         }
-//       })
-//       preTestStatus.value = 'start'
-//       // setTimeout(() => {
-//       //   preTestStatus.value = 'success'
-//       // }, 5000)
-//       break;
-//     case 2:
-//       timeTestStatus.value = 'start'
-//       break;
-//     case 3:
-//       // 调用系数校准组件的handleSubmit方法
-//       channelsTestStatus.value = 'start'
-//       break;
-//     case 4:
-//       if (TestStatus.value == "waiting") {
-//         startPreTest({
-//           userPageId: "cdf",
-//           devIds: deviceIds,
-//           planId: planId,
-//           operateType: checkStore.reCheckType == 1 ? '2' : '8', // '1'为预检测、‘2‘为正式检测、'8'为不合格项复检
-//           userId: userStore.userInfo.id,
-//           temperature: checkStore.temperature,
-//           humidity: checkStore.humidity
-//         }).then(res => {
-//           console.log(res)
-//           if (res.code === 'A001014') {
-//             ElMessageBox.alert('装置配置异常', '初始化失败', {
-//               confirmButtonText: '确定',
-//               type: 'error',
-//             })
-//             TestStatus.value = 'test_init_fail'
-//           }
-//         })
-//         TestStatus.value = 'start'
-//       } else if (TestStatus.value == 'paused') {
-//         // 发送继续指令
-//         sendResume()
-//       }
-//       // else if (TestStatus.value == 'recheck') {
-//       //   // 发送重新检测指令
-//       //   sendReCheck()
-//       // }
-//       // else if (TestStatus.value == 'success') {
-//       //   handleClose()
-//       // }
-//       break;
-//     default:
-//       break;
-//   }
-// };
-
-
 const emit = defineEmits<{
   (e: 'quitClicked'): void;
 }>();
@@ -452,7 +396,8 @@ const sendReCheck = () => {
     operateType: '2', // 0:'系数校验'，'1'为预检测、‘2‘为正式检测、'8'为不合格项复检
     userId: userStore.userInfo.id,
     temperature: checkStore.temperature,
-    humidity: checkStore.humidity
+    humidity: checkStore.humidity,
+    testItemList: [checkStore.selectTestItems.preTest, checkStore.selectTestItems.channelsTest, checkStore.selectTestItems.test]
   }).then(res => {
     console.log(res)
     if (res.code === 'A001014') {