diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue index 0583dbe..38caea4 100644 --- a/frontend/src/views/home/components/test.vue +++ b/frontend/src/views/home/components/test.vue @@ -10,10 +10,10 @@ type="primary" v-if="testStatus=='process' && percentage < 100" :icon="VideoPause" - @click="emit('sendPause')">停止检测 + @click="handlePause()">停止检测 - - + + 暂停中 @@ -433,7 +433,7 @@ watch(webMsgSend, function (newValue, oldValue) { if(newValue.operateCode == 'stop'){ ElMessage.success('暂停成功') emit('update:testStatus', 'paused') - handlePauseTest() + pauseSuccessCallback() } break; // case 'Pause_Fail': @@ -1276,8 +1276,12 @@ const startTimer = () => { break; } }; +const handlePause = () => { + emit('sendPause') + testLogList.push({type: 'error', log: `${new Date().toLocaleString()}:当前测试小项正在执行中,将在该小项执行结束后暂停...`}) +} -const handlePauseTest = () => { +const pauseSuccessCallback = () => { endData.value = new Date(); let diffTime = endData.value.getTime() - startData.value.getTime(); timeDifference.value += diffTime diff --git a/frontend/src/views/home/components/testPopup.vue b/frontend/src/views/home/components/testPopup.vue index 4fb77e6..792f021 100644 --- a/frontend/src/views/home/components/testPopup.vue +++ b/frontend/src/views/home/components/testPopup.vue @@ -28,21 +28,21 @@ @click="nextStep">跳过 开始检测 - + 检测中 - 继续检测 - 重新检测 - + 继续检测 + 重新检测 + 初始化中 - + @@ -377,7 +377,7 @@ watch(ActiveStatue, function (newValue, oldValue) { const sendPause = () => { console.log('发起暂停请求') - ActiveStatue.value = 'paused_ing' + TestStatus.value = 'paused_ing' pauseTest() } const sendResume = () => {