From ba7747dfe92e61c8bab28a61cc622f7a1172e4b8 Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Thu, 16 Jan 2025 08:51:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=81=9C=E6=97=B6=E9=97=B4=E8=BF=87?=
 =?UTF-8?q?=E9=95=BF=E9=A1=B5=E9=9D=A2=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/home/components/test.vue      | 14 +++++++++++++-
 frontend/src/views/home/components/testPopup.vue |  7 ++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue
index 3b0a71b..2352d43 100644
--- a/frontend/src/views/home/components/test.vue
+++ b/frontend/src/views/home/components/test.vue
@@ -48,8 +48,9 @@
 
       <el-button
           type="warning"
-          v-if="testStatus=='paused' && percentage < 100"
+          v-if="(testStatus=='paused' || testStatus === 'pause_timeout') && percentage < 100"
           :icon="VideoPlay"
+          :disabled="testStatus === 'pause_timeout'"
           @click="emit('sendResume')"
       >继续检测
       </el-button>
@@ -347,6 +348,17 @@ watch(webMsgSend, function (newValue, oldValue) {
     emit('update:testStatus', 'test_recheck')
   } else {
     switch (newValue.requestId) {
+      case 'formal_real': // 正式测试
+        switch (newValue.operateCode) {
+          case "stop_timeout":
+            ElMessageBox.alert(`暂停时间已过10分钟，本次检测已失效，请重新发起检测！`, '暂停时间过长', {
+              confirmButtonText: '确定',
+              type: 'error',
+            })
+            emit('update:testStatus', 'pause_timeout')
+            break;
+        }
+        break;
       case 'error_flow_end':
         ElMessageBox.alert(`设备连接异常，请检查设备连接情况！`, '初始化失败', {
           confirmButtonText: '确定',
diff --git a/frontend/src/views/home/components/testPopup.vue b/frontend/src/views/home/components/testPopup.vue
index 792f021..9aab531 100644
--- a/frontend/src/views/home/components/testPopup.vue
+++ b/frontend/src/views/home/components/testPopup.vue
@@ -49,7 +49,7 @@
           暂停中
         </el-button>
         <el-button :type="ActiveStatue==='success'?'primary':'danger'" :icon="Right"
-                   v-if="ActiveStatue === 'success'||ActiveStatue==='error'||ActiveStatue==='test_init_fail'||ActiveStatue==='connect_timeout'"
+                   v-if="ActiveStatue === 'success'||ActiveStatue==='error'||ActiveStatue==='test_init_fail'||ActiveStatue==='connect_timeout'||ActiveStatue==='pause_timeout'"
                    @click="nextStep">
           {{ nextStepText }}
         </el-button>
@@ -372,6 +372,11 @@ watch(ActiveStatue, function (newValue, oldValue) {
     stepsActiveIndex.value++;
     nextStepText.value = '连接超时'
   }
+  if (newValue === 'pause_timeout' && stepsActiveIndex.value === stepsTotalNum.value - 2) {
+    stepsActiveIndex.value++;
+    stepsActiveIndex.value++;
+    nextStepText.value = '结束测试'
+  }
 })
 
 const sendPause = () => {