From 40bfddca7ce650a636b016e8690db9623649b200 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期四, 25 七月 2024 14:30:42 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 UI-Project/src/views/Returns/returns.vue |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/UI-Project/src/views/Returns/returns.vue b/UI-Project/src/views/Returns/returns.vue
index 85ae736..26b1c91 100644
--- a/UI-Project/src/views/Returns/returns.vue
+++ b/UI-Project/src/views/Returns/returns.vue
@@ -594,11 +594,11 @@
     console.error('WebSocket杩炴帴寮傚父鍏抽棴');  
   }  
 };  
-  
 // 鐩戝惉WebSocket鐨勬秷鎭簨浠�  
 ws.onmessage = (event) => {  
   try {  
-    const data = JSON.parse(event.data); // 瑙f瀽娑堟伅涓篔SON  
+    
+    const data = JSON.parse(event.data.replace('<END>', '')); // 瑙f瀽娑堟伅涓篔SON  
   
     if (data && Array.isArray(data.InkageStatus) && data.InkageStatus.length > 0) {  
 if(data.InkageStatus!=null){
@@ -610,10 +610,10 @@
 }
     } else {  
       // 澶勭悊閿欒鎯呭喌鎴栨棤鏁堟暟鎹�  
-      console.error('鎺ユ敹鍒扮殑鏁版嵁鏃犳晥', data);  
+      // console.error('鎺ユ敹鍒扮殑鏁版嵁鏃犳晥', data);  
     }  
   } catch (error) {  
-    console.error('瑙f瀽WebSocket娑堟伅鏃跺彂鐢熼敊璇�', error);  
+    // console.error('瑙f瀽WebSocket娑堟伅鏃跺彂鐢熼敊璇�', error);  
   }  
 };  
 const confirmCutting = async () => {  

--
Gitblit v1.8.0