diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue index 26f72a9..f64c964 100644 --- a/frontend/src/views/home/components/test.vue +++ b/frontend/src/views/home/components/test.vue @@ -325,7 +325,6 @@ watch(testStatus, function (newValue, oldValue) { showTestLog() if (oldValue == 'error') { - testLogList.push({type: 'info', log: `${new Date().toLocaleString()}:开始重新检测!`}) handleReCheck() } emit('update:testStatus', 'test_init') @@ -334,7 +333,7 @@ watch(testStatus, function (newValue, oldValue) { timeDifference.value = 0; testLogList.push({type: 'info', log: `${new Date().toLocaleString()}:初始化开始!`}) } - if (newValue == 'test_init_fail' || newValue == 'connect_timeout' || newValue == 'error' || newValue == 'pause_timeout' || newValue == 'recheck') { + if (newValue == 'recheck' || newValue == 'error' || newValue == 'test_init_fail' || newValue == 'connect_timeout' || newValue == 'pause_timeout' || oldValue == 'error_flow_end') { stopTimeCount() } }) @@ -551,7 +550,7 @@ watch(webMsgSend, function (newValue, oldValue) { case 'Resume_Success': ElMessage.success('开始继续检测') emit('update:testStatus', 'process') - handleResumeTest() + //handleResumeTest() break; // case 'Resume_Fail': // ElMessage.error('无法继续检测') @@ -1336,10 +1335,7 @@ const todoItem = (code: string) => { const handleResumeTest = () => { //activeIndex++ startData.value = new Date(); - testLogList.push({ - type: 'info', - log: `${new Date().toLocaleString()}:继续检测`, - }) + testLogList.push({type: 'info', log: `${new Date().toLocaleString()}:开始重新检测!`}) //startTimer() resumeTimeCount() console.log('开始继续检测') @@ -1353,10 +1349,12 @@ const handleReCheck = () => { timeView.value = '00:00:00' timeDifference.value = 0 testLogList.length = 0 + errorCheckItem.length = 0 count = 0 showTestLog() + handleResumeTest() } // 获取当前执行的大测试项序号 @@ -1382,10 +1380,12 @@ const getNextActiveIndex = (code: string = ''): number => { return -1 } const startTimeCount = () => { - timer = setInterval(() => { - timeCount.value = timeCount.value + 1 - timeView.value = secondToTime(timeCount.value) - }, 1000) + if(!timer){ + timer = setInterval(() => { + timeCount.value = timeCount.value + 1 + timeView.value = secondToTime(timeCount.value) + }, 1000) + } } const stopTimeCount = () => {