Merge remote-tracking branch 'origin/qr_branch' into qr_branch

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)

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;
 

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) {
+                // if (newValue.code == -1) {
-                  ElMessageBox.alert('源未知异常！', '初始化失败', {
+                //   ElMessageBox.alert('源未知异常！', '初始化失败', {
-                    confirmButtonText: '确定',
+                //     confirmButtonText: '确定',
-                    type: 'error',
+                //     type: 'error',
-                  })
+                //   })
-                  testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源未知异常！`})
+                //   testLogList.push({type: 'error', log: `${new Date().toLocaleString()}：源未知异常！`})
-                  emit('update:testStatus', 'test_init_fail')
+                //   emit('update:testStatus', 'test_init_fail')
-                }
+                // }
                 break;
             }
             break;

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'