微调

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

@@ -23,7 +23,7 @@
         <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 !== 'test_init' && ActiveStatue !=='paused_ing' && ActiveStatue !=='paused' && ActiveStatue !== 'waiting' && ActiveStatue !== 'error' && ActiveStatue !== 'test_init_fail' && ActiveStatue !== 'connect_timeout' && ActiveStatue!=='pause_timeout'"
+                   v-if="(stepsActive != stepsTotalNum-1) && (ActiveStatue !== 'test_init' && ActiveStatue !=='paused_ing' && ActiveStatue !=='paused' && ActiveStatue !== 'waiting' && ActiveStatue !== 'error' && ActiveStatue !== 'test_init_fail' && ActiveStatue !== 'connect_timeout' && ActiveStatue!=='pause_timeout')"
                    disabled>
           <el-icon class="loading-box" style="color: #fff;margin-right: 8px;">
             <component :is="Refresh"/>
@@ -175,8 +175,6 @@ const open = (title: string) => {
 
 // let loading;
 const handleSubmit = () => {
-  console.log('=============', stepsActiveIndex.value)
-
   let deviceIds = checkStore.devices.map((item) => item.deviceId)
   let planId = checkStore.plan.id
 
@@ -243,6 +241,7 @@ const handleSubmit = () => {
   }
 };
 
+
 const emit = defineEmits<{
   (e: 'quitClicked'): void;
 }>();
@@ -269,7 +268,7 @@ watch(TestStatus, function (newValue, oldValue) {
 })
 
 watch(ActiveStatue, function (newValue, oldValue) {
-  if (newValue === 'error' && stepsActive.value === 1) {
+  if (newValue === 'error') {
     // stepsActiveIndex.value = stepsTotalNum.value + 2
     nextStepText.value = '检测失败'
   }
@@ -277,15 +276,15 @@ watch(ActiveStatue, function (newValue, oldValue) {
     stepsActiveIndex.value += 2
     nextStepText.value = '检测完成'
   }
-  if (newValue === 'test_init_fail' && stepsActive.value === 4) {
+  if (newValue === 'test_init_fail' ) {
     stepsActiveIndex.value += 2
     nextStepText.value = '初始化失败'
   }
-  if (newValue === 'connect_timeout' && stepsActive.value === 4) {
+  if (newValue === 'connect_timeout' ) {
     stepsActiveIndex.value += 2
     nextStepText.value = '连接超时'
   }
-  if (newValue === 'pause_timeout' && stepsActive.value === 4) {
+  if (newValue === 'pause_timeout' ) {
     stepsActiveIndex.value += 2
     nextStepText.value = '结束测试'
   }