From 33b5c107130f7aeb63663d404ce81a8e32b4aaa3 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 24 七月 2024 19:03:46 +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 3dc5d78..6d0153a 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); // 瑙ｆ瀽娑堟伅涓篔SON
+
+ const data = JSON.parse(event.data.replace('<END>', '')); // 瑙ｆ瀽娑堟伅涓篔SON
if (data && Array.isArray(data.InkageStatus) && data.InkageStatus.length > 0) {
if(data.InkageStatus!=null){
@@ -610,7 +610,7 @@
}
} else {
// 澶勭悊閿欒鎯呭喌鎴栨棤鏁堟暟鎹�
- console.error('鎺ユ敹鍒扮殑鏁版嵁鏃犳晥', data);
+ // console.error('鎺ユ敹鍒扮殑鏁版嵁鏃犳晥', data);
}
} catch (error) {
console.error('瑙ｆ瀽WebSocket娑堟伅鏃跺彂鐢熼敊璇�', error);
@@ -676,7 +676,7 @@
<span>{{ 1 }}</span>
</template>
</el-table-column>
- <el-table-column prop="thickness" :label="$t('basicData.quantity')" align="center"/>
+ <el-table-column prop="thickness" :label="$t('basicData.thickness')" align="center"/>
<!-- <el-table-column
align="center"
label="鐘舵��"
--
Gitblit v1.8.0