diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue index 3853676..becdb91 100644 --- a/frontend/src/views/home/components/test.vue +++ b/frontend/src/views/home/components/test.vue @@ -9,11 +9,11 @@ 检测用时:{{ timeView }} -
+
@@ -662,7 +662,7 @@ const handleEndItem = (code: string, desc: string | undefined, devices: CheckDat } else { let result = getResult(devices) if (desc.length > 150) { - desc = desc.substring(0, 150) + '...' + desc = desc.substring(0,150) + '...' } if (result === 1) { testLogList.push({type: 'info', log: `${new Date().toLocaleString()}:${desc}检测结束:符合`}) @@ -1260,7 +1260,7 @@ const todoItem = (code: string) => { if (testStatus.value !== 'paused') { emit('update:webMsgSend', { requestId: `${code}_Start`, - desc: '输入:频率t=42.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° ' + desc: '输入:频率t=42.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0°,Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° ' }) } }, 1000) @@ -1268,7 +1268,7 @@ const todoItem = (code: string) => { if (testStatus.value !== 'paused') { emit('update:webMsgSend', { requestId: `${code}_End`, - desc: '输入:频率t=42.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° ', + desc: '输入:频率t=42.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0°,Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° ', data: [{ chnResult: [1, 1, 1, 1], deviceId: "3250a0ff180845cc8885da4ff628261e", @@ -1281,7 +1281,7 @@ const todoItem = (code: string) => { if (testStatus.value !== 'paused') { emit('update:webMsgSend', { requestId: `${code}_Start`, - desc: '输入:频率t=45.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° ' + desc: '输入:频率t=45.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0°,Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° ' }) } }, 3000) @@ -1289,7 +1289,7 @@ const todoItem = (code: string) => { if (testStatus.value !== 'paused') { emit('update:webMsgSend', { requestId: `${code}_End`, - desc: '输入:频率t=45.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° ', + desc: '输入:频率t=45.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0°,Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° ', data: [{ chnResult: [1, 1, 1, 1], deviceId: "3250a0ff180845cc8885da4ff628261e", @@ -1302,7 +1302,7 @@ const todoItem = (code: string) => { if (testStatus.value !== 'paused') { emit('update:webMsgSend', { requestId: `${code}_Start`, - desc: '输入:频率t=50.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° ' + desc: '输入:频率t=50.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0°,Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° ' }) } }, 6000) @@ -1310,7 +1310,7 @@ const todoItem = (code: string) => { if (testStatus.value !== 'paused') { emit('update:webMsgSend', { requestId: `${code}_End`, - desc: '输入:频率t=50.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° ', + desc: '输入:频率t=50.5Hz Ua=57.74%Un,相角=0.0° Ub=57.74%Un,相角=-120.0° Uc=57.74%Un,相角=120.0° Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0°,Ia=0.0%In,相角=0.0° Ib=0.0%In,相角=0.0° Ic=0.0%In,相角=0.0° ', data: [{ chnResult: [1, 1, 1, 1], deviceId: "3250a0ff180845cc8885da4ff628261e", diff --git a/frontend/src/views/home/components/testPopup.vue b/frontend/src/views/home/components/testPopup.vue index 1ce95e6..e4c1bdf 100644 --- a/frontend/src/views/home/components/testPopup.vue +++ b/frontend/src/views/home/components/testPopup.vue @@ -23,7 +23,7 @@ 跳过 开始检测 @@ -273,7 +273,7 @@ watch(ActiveStatue, function (newValue, oldValue) { // stepsActiveIndex.value = stepsTotalNum.value + 2 nextStepText.value = '检测失败' } - if (newValue === 'success' && stepsActive.value === stepsTotalNum.value-1) { + if (newValue === 'success' && stepsActiveIndex.value === stepsTotalNum.value-1) { stepsActiveIndex.value += 2 nextStepText.value = '检测完成' }