签出调整

frontend/src/utils/webSocketClient.ts

@@ -57,9 +57,9 @@ export default class SocketService {
             this.connected = false;
             this.connectRetryCount++;
             this.clearHeartbeat();
-           /* setTimeout(() => {
+            /* setTimeout(() => {
-                this.connect();
+                 this.connect();
-            }, 500 * this.connectRetryCount);*/
+             }, 500 * this.connectRetryCount);*/
 
 
         };
@@ -121,7 +121,7 @@ export default class SocketService {
                 return;
             }
             _this.sendHeartbeat();
-		}
+        }
 
     }
     sendHeartbeat() {

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

@@ -159,14 +159,12 @@
 </template>
 <script setup lang='ts'>
 
-import IPAddress from '@/components/IpAddress/index.vue'
 import {dialogBig} from '@/utils/elementBind'
 import {type Device} from '@/api/device/interface/device'
 import {ElMessage, type FormItemRule} from 'element-plus'
 import {addPqDev, updatePqDev} from '@/api/device/device'
-import {computed, reactive, type Ref, ref} from 'vue'
+import {computed, ref} from 'vue'
 import {useDictStore} from '@/stores/modules/dict'
-import {CirclePlus, Delete, EditPen} from '@element-plus/icons-vue'
 // 使用 dayjs 库格式化
 import dayjs from 'dayjs'
 import MonitorTable from '@/views/machine/device/components/monitorTab.vue';
@@ -204,7 +202,7 @@ function useMetaInfo() {
     hardwareVersion: '',
     softwareVersion: '',
     protocol: 'MMS',
-    ip: '',
+    ip: '172.17.102.222',
     port: 102,
     encryptionFlag: 0,
     reCheckNum: 0,
@@ -213,7 +211,7 @@ function useMetaInfo() {
     icdId: '',
     power: '',
     preinvestmentPlan: '',
-    delegate:''
+    delegate: ''
   })
   return {dialogVisible, titleType, formContent}
 }
@@ -235,7 +233,7 @@ const resetFormContent = () => {
     hardwareVersion: '',
     softwareVersion: '',
     protocol: 'MMS',
-    ip: '',
+    ip: '172.17.102.222',
     port: 102,
     encryptionFlag: 0,
     reCheckNum: 0,
@@ -244,7 +242,7 @@ const resetFormContent = () => {
     icdId: '',
     power: '',
     preinvestmentPlan: '',
-    delegate:''
+    delegate: ''
   }
 }
 
@@ -446,15 +444,17 @@ const handleDevTypeChange = (value: string) => {
     formContent.value.devVolt = dev.devVolt; // 默认值为1
     formContent.value.icdId = dev.icd
     formContent.value.power = dev.power
-    // if (dev.name.includes('882B')) {
+    if(scene.value === '1'){
-    //   formContent.value.ip = '172.17.102.220'
+      if (dev.name.includes('NPQS-581') || dev.name.includes('NPQS-580') || dev.name.includes('PQ-COM')) {
-    // } else if (dev.name.includes('882A')) {
+        formContent.value.encryptionFlag = 1
-    //   formContent.value.ip = '172.17.102.221'
+        formContent.value.series = 'Pqs&cn870299'
-    // } else {
+        formContent.value.devKey = '!qaz@wsx3edc4rfv'
-    //   formContent.value.ip = '172.17.102.200'
+      } else {
-    // }
+        formContent.value.encryptionFlag = 0
-
+        formContent.value.series = null
-
+        formContent.value.devKey = null
+      }
+    }
   } else {
     formContent.value.devChns = 1; // 默认值为1
     formContent.value.devCurr = 1; // 默认值为1

frontend/src/views/machine/testScript/components/testScriptFlickerTab.vue

@@ -204,7 +204,11 @@ const waveList = [
             {
                 fchagFre: '2400',
                 fchagValue: '0.77'
-            }
+            },
+          {
+            fchagFre: '4000',
+            fchagValue: '2.4'
+          }
         ]
     },
     {