From 5ffc99f2550200d402e60fc4251aaa62a56e94f6 Mon Sep 17 00:00:00 2001
From: leohyper <leohyper@users.noreply.gitee.com>
Date: Wed, 15 Jul 2026 19:57:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pnpm-lock.yaml           |  8 ++++++++
 src/views/home/index.vue |  3 ---
 src/views/mes/index.vue  | 25 +++++++++++--------------
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d3c292b..726236d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -35,6 +35,9 @@ importers:
       vue-router:
         specifier: ^4.5.0
         version: 4.6.4(vue@3.5.38)
+      whammy:
+        specifier: ^0.0.1
+        version: 0.0.1
     devDependencies:
       '@vitejs/plugin-vue':
         specifier: ^6.0.7
@@ -1016,6 +1019,9 @@ packages:
   webpack-virtual-modules@0.6.2:
     resolution: {integrity: sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==}
 
+  whammy@0.0.1:
+    resolution: {integrity: sha512-H8J4+I5ISuOZXAZiNMZXD71+oZIM6szrgYG8wt4dCpDNEU8mogxPGvgMIFg/BhkuptOLbtW0X34E/YE6a75ujg==}
+
   zrender@6.1.0:
     resolution: {integrity: sha512-oEGMDB6pOP2S6OwRR4PdVv610zrjnA3Bh+JnSG12fYJlBKjtNAoEb5fSUoCOOINlH96I2fU38/A2UpRKs67xYQ==}
 
@@ -1907,6 +1913,8 @@ snapshots:
 
   webpack-virtual-modules@0.6.2: {}
 
+  whammy@0.0.1: {}
+
   zrender@6.1.0:
     dependencies:
       tslib: 2.3.0
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 3a16bd3..e4232d5 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -289,7 +289,6 @@ function connectDetectStream() {
 
       case 'webrtc_stream':
         webrtcUrl.value = msg.webrtc_url
-        webrtcUrl2.value = msg.webrtc_url2 || msg.webrtc_url
         addLog('已获取检测 WebRTC 流，开始播放', 'success')
         ElMessage.success('检测流已连接')
         break
@@ -451,7 +450,6 @@ async function toggleStream() {
     streamRunning.value = false
     videoMode.value = 'idle'
     webrtcUrl.value = ''
-    webrtcUrl2.value = ''
     paused.value = false
     ending.value = false
     ElMessage.info('视频流已关闭')
@@ -480,7 +478,6 @@ async function toggleStream() {
     streamRunning.value = true
     videoMode.value = 'live'
     webrtcUrl.value = ''
-    webrtcUrl2.value = ''
     clearAllLiveData()
     connectProcessWs()
     // 如果原始流还在运行（由"切换"启动），先关闭
diff --git a/src/views/mes/index.vue b/src/views/mes/index.vue
index 37e213b..871f43c 100644
--- a/src/views/mes/index.vue
+++ b/src/views/mes/index.vue
@@ -286,9 +286,9 @@ function classifyCode(code) {
   // 以 POS 开头 → B码
   if (code.startsWith('POS')) return 'B'
   // 以 4 开头 → C码
-  if (/^4/.test(code)) return 'C'
+  if (code.startsWith('4')) return 'C'
   // 以 620 开头 → 排除
-  if (code.startsWith('620')) return 'IGNORE'
+  if (code.startsWith('620') || code.startsWith('Z0') || code.startsWith('ZO')) return 'IGNORE'
   // 其余为 A码
   return 'A'
 }
@@ -310,30 +310,25 @@ function startScanner() {
   })
 
   wsClient.value.on('message', (data) => {
-    // 服务端返回的 data 可能为字符串或对象
-    const raw = typeof data === 'string' ? data : data.sn
-    if (!raw) return
+     // 服务端返回的 data 可能为字符串或对象
+    const code = data.data
+    console.log(typeof data,'code是什么')
+    if (!code) return
 
-    // 用分号分割成数组，取第一个值匹配
-    const codes = raw.split(';').map(s => s.trim()).filter(Boolean)
-    if (codes.length === 0) return
-
-    // 只取第一个码进行匹配
-    const code = codes[0]
     const type = classifyCode(code)
     switch (type) {
       case 'A':
         form.snCode = code
         form.serialNumber = code
-        // ElMessage.success(`识别到A码（SN码）: ${code}`)
+       // ElMessage.success(`识别到A码（SN码）: ${code}`)
         break
       case 'B':
         bCode.value = code
-        // ElMessage.success(`识别到B码: ${code}`)
+        //ElMessage.success(`识别到B码: ${code}`)
         break
       case 'C':
         cCode.value = code
-        // ElMessage.success(`识别到C码: ${code}`)
+        //ElMessage.success(`识别到C码: ${code}`)
         break
       case 'IGNORE':
         // 620 开头的码忽略
@@ -452,6 +447,7 @@ async function handleInvoke() {
 ${form.snCode}
 ${form.customerName}
 ${form.testerName}
+${form.processStep}
 BayE168
 P
 ${scanStartTime.value}
@@ -465,6 +461,7 @@ ${modelByC}`
     await saveReportApi({
       message: [ruleContent],
       sn: form.snCode,
+      sku: form.bCode
     })
 
     result.value = {