From 6300eb2f432ce76554ed15cd52cf0e88d27a3616 Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Tue, 25 Feb 2025 14:13:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/home/components/test.vue   | 89 ++++++++++---------
 .../src/views/home/components/testPopup.vue   | 48 +++++-----
 2 files changed, 73 insertions(+), 64 deletions(-)

diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue
index 2a66bc4..399f325 100644
--- a/frontend/src/views/home/components/test.vue
+++ b/frontend/src/views/home/components/test.vue
@@ -473,25 +473,25 @@ watch(webMsgSend, function (newValue, oldValue) {
             break;
         }
         break;
-        // case 'connect':
-        //   switch (newValue.operateCode) {
-        //     case "Source":
-        //       ElMessageBox.alert('源通讯失败，请检查源连接情况！', '初始化失败', {
-        //         confirmButtonText: '确定',
-        //         type: 'error',
-        //       })
-        //       testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源通讯失败！`})
-        //       break;
-        //     case "Dev":
-        //       ElMessageBox.alert('设备通讯失败，请检查设备连接情况！', '初始化失败', {
-        //         confirmButtonText: '确定',
-        //         type: 'error',
-        //       })
-        //       testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：设备通讯失败！`})
-        //       break;
-        //   }
-        //   emit('update:testStatus', 'test_init_fail')
-        //   break;
+        case 'connect':
+          switch (newValue.operateCode) {
+            case "Source":
+              ElMessageBox.alert('源通讯失败，请检查源连接情况！', '初始化失败', {
+                confirmButtonText: '确定',
+                type: 'error',
+              })
+              testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源通讯失败！`})
+              break;
+            case "Dev":
+              ElMessageBox.alert('设备通讯失败，请检查设备连接情况！', '初始化失败', {
+                confirmButtonText: '确定',
+                type: 'error',
+              })
+              testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：设备通讯失败！`})
+              break;
+          }
+          emit('update:testStatus', 'test_init_fail')
+          break;
       case 'yjc_ytxjy':
         switch (newValue.operateCode) {
           case 'INIT_GATHER':
@@ -914,6 +914,11 @@ const setErrorCheckItem = (scriptType: string, devices: CheckData.DeviceCheckRes
           type: 'warning',
           log: `${new Date().toLocaleString()} ：${devices[i].deviceName}连接超时`,
         })
+        ElMessageBox.alert('连接超时！', '连接超时', {
+          confirmButtonText: '确定',
+          type: 'error',
+        })
+        emit('update:testStatus', 'connect_timeout')
       }
     }
   }
@@ -933,28 +938,28 @@ function getErrorCheckItem(scriptType: string) {
 
 const updateCheckResultView = (scriptCode: string, isStart: boolean, devices: CheckData.DeviceCheckResult[] = []) => {
   let scriptType = scriptData.filter(item => item.code === scriptCode)[0]?.id
-  devices = [
-    {
-      chnResult: [1, 1, 1, 1],
-      deviceId: "3250a0ff180845cc8885da4ff628261e",
-      deviceName: "测试装置-0122-02"
-    },
-    // {
-    //   chnResult: [1, 1, 1, 1],
-    //   deviceId: "df23a4178d194467a432ddf45e835e48",
-    //   deviceName: "240003"
-    // },
-    // {
-    //   chnResult: [1, 1, 1, 1],
-    //   deviceId: "ae5a7628260349c0a5e7c86c81fbd417",
-    //   deviceName: "240004"
-    // }
-    //   {
-    //     chnResult: [1, 1, 1, 1],
-    //     deviceId: "461813a4f30f4a34a1a273ecd0379458",
-    //     deviceName: "25011407"
-    //   }
-  ]
+  // devices = [
+  //   {
+  //     chnResult: [1, 1, 1, 1],
+  //     deviceId: "3250a0ff180845cc8885da4ff628261e",
+  //     deviceName: "测试装置-0122-02"
+  //   },
+  //   {
+  //     chnResult: [1, 1, 1, 1],
+  //     deviceId: "df23a4178d194467a432ddf45e835e48",
+  //     deviceName: "240003"
+  //   },
+  //   {
+  //     chnResult: [1, 1, 1, 1],
+  //     deviceId: "ae5a7628260349c0a5e7c86c81fbd417",
+  //     deviceName: "240004"
+  //   },
+  //     {
+  //       chnResult: [1, 1, 1, 1],
+  //       deviceId: "461813a4f30f4a34a1a273ecd0379458",
+  //       deviceName: "25011407"
+  //     }
+  // ]
   let temp = null
   if (isStart) {
     temp = getLoadingResult(scriptType)
@@ -1335,7 +1340,7 @@ const handleResumeTest = () => {
     type: 'info',
     log: `${new Date().toLocaleString()}：继续检测`,
   })
-  startTimer()
+  //startTimer()
   resumeTimeCount()
   console.log('开始继续检测')
 };
diff --git a/frontend/src/views/home/components/testPopup.vue b/frontend/src/views/home/components/testPopup.vue
index 910e2ad..db3a50e 100644
--- a/frontend/src/views/home/components/testPopup.vue
+++ b/frontend/src/views/home/components/testPopup.vue
@@ -20,7 +20,7 @@
 
     <template #footer>
       <div>
-        <el-button type="primary" :icon="DArrowRight" v-if="stepsActiveIndex < stepsTotalNum && ActiveStatue != 'success'" @click="nextStep">跳过</el-button>
+<!--        <el-button type="primary" :icon="DArrowRight" v-if="stepsActiveIndex < stepsTotalNum && ActiveStatue != 'success'" @click="nextStep">跳过</el-button>-->
         <el-button type="primary" :icon="VideoPlay" v-if="ActiveStatue === 'waiting'" @click="handleSubmit">开始检测</el-button>
         <el-button type="primary"
                    v-if="ActiveStatue !== 'waiting' && ActiveStatue !== 'error' && ActiveStatue !== 'test_init_fail' && ActiveStatue !== 'connect_timeout' && ActiveStatue!=='pause_timeout'"
@@ -70,7 +70,6 @@ import preTest from './preTest.vue'
 import timeTest from './timeTest.vue'
 import factorTest from './factorTest.vue'
 import test from './test.vue'
-import {Device} from '@/api/device/interface/device';
 import socketClient from '@/utils/webSocketClient';
 import {useCheckStore} from "@/stores/modules/check";
 import {pauseTest, resumeTest, startPreTest} from '@/api/socket/socket'
@@ -211,21 +210,21 @@ const handleSubmit = () => {
       break;
     case 4:
       if (TestStatus.value == "waiting") {
-          startPreTest({
-            userPageId: "cdf",
-            devIds: deviceIds,
-            planId: planId,
-            operateType: '2' // '1'为预检测、‘2‘为正式检测
-          }).then(res => {
-            console.log(res)
-            if (res.code === 'A001014') {
-              ElMessageBox.alert('装置配置异常', '初始化失败', {
-                confirmButtonText: '确定',
-                type: 'error',
-              })
-              TestStatus.value = 'test_init_fail'
-            }
-          })
+        startPreTest({
+          userPageId: "cdf",
+          devIds: deviceIds,
+          planId: planId,
+          operateType: '2' // '1'为预检测、‘2‘为正式检测
+        }).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') {
         // 发送继续指令
@@ -234,7 +233,7 @@ const handleSubmit = () => {
         // 发送重新检测指令
         sendReCheck()
       }
-        // else if (TestStatus.value == 'success') {
+      // else if (TestStatus.value == 'success') {
       //   handleClose()
       // }
       break;
@@ -290,7 +289,7 @@ watch(ActiveStatue, function (newValue, oldValue) {
     nextStepText.value = '结束测试'
   }
   if (newValue === 'success' && nextStepText.value === '下一步') {
-    nextStep()
+    nextStep() // 实现自动点击，进入下一个测试内容
     handleSubmit()
   }
 })
@@ -299,13 +298,18 @@ const sendPause = () => {
   console.log('发起暂停请求')
 
   TestStatus.value = 'paused_ing'
-  pauseTest()
-  setTimeout(() => {
+  pauseTest().then(res => {
     Object.assign(webMsgSend.value, {
       requestId: 'preStopTest',
       operateCode: 'stop'
     })
-  }, 5000)
+  })
+  // setTimeout(() => {
+  //   Object.assign(webMsgSend.value, {
+  //     requestId: 'preStopTest',
+  //     operateCode: 'stop'
+  //   })
+  // }, 5000)
 }
 const sendResume = () => {
   console.log('发起继续检测请求')