From a5177860de3cc759b04fae6f9443d0b5d55bd9d0 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Wed, 3 Sep 2025 14:23:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/machine/device/components/devicePopup.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/views/machine/device/components/devicePopup.vue b/frontend/src/views/machine/device/components/devicePopup.vue index da3ca17..53a90a7 100644 --- a/frontend/src/views/machine/device/components/devicePopup.vue +++ b/frontend/src/views/machine/device/components/devicePopup.vue @@ -202,7 +202,7 @@ function useMetaInfo() { hardwareVersion: '', softwareVersion: '', protocol: 'MMS', - ip: '', + ip: '172.17.102.222', port: 102, encryptionFlag: 0, reCheckNum: 0, @@ -233,7 +233,7 @@ const resetFormContent = () => { hardwareVersion: '', softwareVersion: '', protocol: 'MMS', - ip: '', + ip: '172.17.102.222', port: 102, encryptionFlag: 0, reCheckNum: 0, @@ -445,7 +445,7 @@ const handleDevTypeChange = (value: string) => { formContent.value.icdId = dev.icd formContent.value.power = dev.power if(scene.value === '1'){ - if (dev.name.includes('NPQS-581') || dev.name.includes('NPQS-580')) { + if (dev.name.includes('NPQS-581') || dev.name.includes('NPQS-580') || dev.name.includes('PQ-COM')) { formContent.value.encryptionFlag = 1 formContent.value.series = 'Pqs&cn870299' formContent.value.devKey = '!qaz@wsx3edc4rfv' From 29efbae717f5882556e4de8d3e44e29c2222d929 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Thu, 6 Nov 2025 08:42:04 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=BA=90=E6=9C=AA=E7=9F=A5=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/home/components/factorTest.vue | 6 +++++ .../src/views/home/components/preTest.vue | 8 ++++++ frontend/src/views/home/components/test.vue | 26 +++++++++++++------ 3 files changed, 32 insertions(+), 8 deletions(-) diff --git a/frontend/src/views/home/components/factorTest.vue b/frontend/src/views/home/components/factorTest.vue index 789ab19..53a62d2 100644 --- a/frontend/src/views/home/components/factorTest.vue +++ b/frontend/src/views/home/components/factorTest.vue @@ -262,6 +262,12 @@ watch(webMsgSend, function (newValue, oldValue) { type: 'error', }) TableInit(); + } else if (newValue.code == -1) { //todo 10552之后还会发送消息吗？ + ElMessageBox.alert('源未知异常', '检测失败', { + confirmButtonText: '确定', + type: 'error', + }) + TableInit(); } else { console.log('显示东西code', newValue.code) console.log('显示东西requestId', newValue.requestId) diff --git a/frontend/src/views/home/components/preTest.vue b/frontend/src/views/home/components/preTest.vue index 3b8b82b..12984ef 100644 --- a/frontend/src/views/home/components/preTest.vue +++ b/frontend/src/views/home/components/preTest.vue @@ -501,6 +501,14 @@ watch(webMsgSend, function (newValue, oldValue) { }) ts.value = 'error' step5.value = 'error' + }else if (newValue.code == -1) { + step4.value = 'error' + step4InitLog.value = [{ + type: 'error', + log: '源未知异常!', + }]; + ts.value = 'error' + step5.value = 'error' } break; diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue index 2a45164..bbd2977 100644 --- a/frontend/src/views/home/components/test.vue +++ b/frontend/src/views/home/components/test.vue @@ -390,6 +390,16 @@ watch(webMsgSend, function (newValue, oldValue) { }) // emit('update:testStatus', 'recheck') emit('update:testStatus', 'test_init_fail') + } else if (newValue.code == -1) { + ElMessageBox.alert('源未知异常！', '检测失败！', { + confirmButtonText: '确定', + type: 'error', + }) + testLogList.push({ + type: 'error', + log: `${new Date().toLocaleString()}：源未知异常！` + }) + emit('update:testStatus', 'error') } else { switch (newValue.requestId) { case 'server_error': @@ -470,14 +480,14 @@ watch(webMsgSend, function (newValue, oldValue) { testLogList.push({type: 'info', log: `${new Date().toLocaleString()}：源初始化成功！`}) percentage.value = 1 } - if (newValue.code == -1) { - ElMessageBox.alert('源未知异常！', '初始化失败', { - confirmButtonText: '确定', - type: 'error', - }) - testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源未知异常！`}) - emit('update:testStatus', 'test_init_fail') - } + // if (newValue.code == -1) { + // ElMessageBox.alert('源未知异常！', '初始化失败', { + // confirmButtonText: '确定', + // type: 'error', + // }) + // testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源未知异常！`}) + // emit('update:testStatus', 'test_init_fail') + // } break; } break;