diff --git a/frontend/src/views/home/components/preTest.vue b/frontend/src/views/home/components/preTest.vue index 85a517e..d8d7004 100644 --- a/frontend/src/views/home/components/preTest.vue +++ b/frontend/src/views/home/components/preTest.vue @@ -254,6 +254,13 @@ watch(webMsgSend,function (newValue,oldValue){ ElMessage.error(newValue.code) step1.value = 'error' ts.value = 'error' + }else if(newValue.code == 10523){ + step1.value = 'error' + ts.value = 'error' + step1InitLog.value = [{ + type: 'error', + log: '源连接失败!', + }]; } break; @@ -503,6 +510,9 @@ watch(webMsgSend,function (newValue,oldValue){ ts.value = 'error' break; } + break; + case 'unknown_operate': + break; } diff --git a/frontend/src/views/home/components/testPopup.vue b/frontend/src/views/home/components/testPopup.vue index 3d59906..fe0473c 100644 --- a/frontend/src/views/home/components/testPopup.vue +++ b/frontend/src/views/home/components/testPopup.vue @@ -199,7 +199,7 @@ const detectionOptions = ref([ data.socketServe = socketClient.Instance; data.socketServe.registerCallBack('aaa', (res) => { // 处理来自服务器的消息 - console.log('Received message:', res); + // console.log('Received message:', res); // 根据需要在这里添加更多的处理逻辑 if(res.code === 20000){ @@ -236,10 +236,12 @@ const detectionOptions = ref([ background: 'rgb(255, 255, 255, 0)', })*/ startPreTest({ - userPageId: "cdf", + userPageId: "cdfee", devIds:deviceIds, planId:planId, - operateType:'0' // '0'为预检测、‘1‘为正式检测 + errorSysId:'cb407009f9894a8a8933b5d9b1e2f71d', + scriptId:"a303b2224845fcc6f60198b8ca23dca9", + operateType:'0' // '1'为预检测、‘2‘为正式检测 }).then(res=>{ @@ -253,22 +255,22 @@ const detectionOptions = ref([ // break; case 2: if (TestStatus.value == "waiting") { - // startPreTest({ - // userPageId: "cdf", - // devIds:deviceIds, - // planId:planId, - // errorSysId:'cb407009f9894a8a8933b5d9b1e2f71d', - // scriptId:"a303b2224845fcc6f60198b8ca23dca9", - // operateType:'1' // '0'为预检测、‘1‘为正式检测 - // }).then(res => { - // console.log(res) + startPreTest({ + userPageId: "cdfee", + devIds:deviceIds, + planId:planId, + errorSysId:'cb407009f9894a8a8933b5d9b1e2f71d', + scriptId:"a303b2224845fcc6f60198b8ca23dca9", + operateType:'2' // '1'为预检测、‘2‘为正式检测 + }).then(res => { + console.log(res) /* if (res.code === 20000) { TestStatus.value = 'start' webMsgSend.value = '' } else { ElMessage.error(res.message) }*/ - // }) + }) TestStatus.value = 'start' } else if (TestStatus.value == 'process') { // 发送暂停指令