Merge branch 'qr_branch'

# 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

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

@@ -167,7 +167,7 @@ const ts = ref(''); // 内部测试状态，用于向父组件同步
 /**
  * 处理致命错误 - 会终止整个检测流程
  * @param stepRef 当前步骤状态引用
- * @param logRef 当前步骤日志引用  
+ * @param logRef 当前步骤日志引用
  * @param message 错误消息
  */
 function handleFatalError(stepRef: any, logRef: any, message: string) {
@@ -199,7 +199,7 @@ function handleWarningError(stepRef: any, logRef: any, message: string) {
  * 监听WebSocket消息，根据不同的requestId和operateCode处理各种检测状态
  * 主要消息类型：
  * - yjc_ytxjy: 源通讯校验
- * - yjc_sbtxjy: 设备通讯校验  
+ * - yjc_sbtxjy: 设备通讯校验
  * - yjc_xyjy: 协议校验
  * - YJC_xujy: 相序校验
  */
@@ -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':
@@ -389,7 +397,7 @@ watch(webMsgSend, function (newValue, oldValue) {
               ts.value = 'success'
             }
             activeIndex.value = 5
-       
+
             break
         }
         break;