历史趋势图颜色调整

# Conflicts:
#	frontend/src/views/home/components/preTest.vue
#	frontend/src/views/home/components/test.vue
#	frontend/src/views/machine/device/components/devicePopup.vue
#	frontend/src/views/machine/testScript/components/testScriptFlickerTab.vue

build/extraResources/java/application.yml.template

@@ -76,6 +76,7 @@ log:
 report:
   template: {{APP_DATA_PATH}}\template
   reportDir: {{APP_DATA_PATH}}\report
+  dateFormat: yyyy年MM月dd日
 data:
   homeDir: {{APP_DATA_PATH}}\data
 qr:

frontend/src/views/home/components/compareDataCheckChart.vue

@@ -234,7 +234,7 @@ const setEchart = () => {
                     type: 'line',
                     smooth: true,
                     color:
-                        colorName == 'A' ? '#DAA520' : colorName == 'B' ? '#2E8B57' : colorName == 'C' ? '#A52a2a' : '',
+                        colorName == 'A' ? '#DAA520' : colorName == 'B' ? '#2E8B57' : colorName == 'C' ? '#A52a2a' : '#DAA520',
                     symbol: 'none',
                     data: seriesList,
                     lineStyle: lineStyle[lineS],

frontend/src/views/home/components/factorTest.vue

@@ -322,6 +322,12 @@ watch(webMsgSend, function (newValue, oldValue) {
         type: 'error',
       })
       TableInit();
+    } else if (newValue.code == -1) { //todo 10552之后还会发送消息吗？
+      ElMessageBox.alert('源未知异常', '检测失败', {
+        confirmButtonText: '确定',
+        type: 'error',
+      })
+      TableInit();
     } else {
       // ==================== 特定业务消息处理 ====================
 

frontend/src/views/home/components/preTest.vue

@@ -358,6 +358,14 @@ watch(webMsgSend, function (newValue, oldValue) {
               handleFatalError(step4, step4InitLog, '存在已经初始化步骤,执行自动关闭,请重新发起检测！')
             } else if (newValue.code == 10520) {
               handleFatalError(step4, step4InitLog, '解析报文异常')
+            }else if (newValue.code == -1) {
+              step4.value = 'error'
+              step4InitLog.value = [{
+                type: 'error',
+                log: '源未知异常!',
+              }];
+              ts.value = 'error'
+              step5.value = 'error'
             }
             break;
           case 'DATA_REQUEST$02':

frontend/src/views/home/components/test.vue

@@ -260,7 +260,7 @@ const checkResultView: ComputedRef<CheckData.ScriptChnViewItem[]> = computed(()
       temp.devices.push({
         deviceId: device.deviceId,
         deviceName: device.deviceName,
-        chnResult: tempChnBtnResult,
+        chnResult: tempChnBtnResult
       })
     })
     return temp
@@ -401,6 +401,16 @@ watch(webMsgSend, function(newValue, oldValue) {
           log: `${new Date().toLocaleString()}：存在已经初始化步骤,执行自动关闭,请重新发起检测！`,
         })
         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 {
         // ========== 根据请求ID处理不同类型的消息 ==========
         switch (newValue.requestId) {

frontend/src/views/machine/device/components/devicePopup.vue

@@ -649,6 +649,17 @@ const updateDeviceByType = (devTypeId: string) => {
             value: String(i + 1),
             label: String(i + 1)
         }))
+      if(scene.value === '1'){
+        if (dev.name.includes('NPQS-581') || dev.name.includes('NPQS-580') || dev.name.includes('PQ-COM')) {
+          formContent.encryptionFlag = 1
+          formContent.series = 'Pqs&cn870299'
+          formContent.devKey = '!qaz@wsx3edc4rfv'
+        } else {
+          formContent.encryptionFlag = 0
+          formContent.series = null
+          formContent.devKey = null
+        }
+      }
     } else {
         // 默认值处理
         formContent.devChns = 1