From 00debf220201157e9f12ddc19e15bf3f1b0ef0ed Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 23 八月 2024 16:47:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Identify/identify.vue | 34 +++++-----------------------------
1 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index cfac9d0..590269c 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -215,34 +215,6 @@
}
});
}
-// const connectWebSocket = () => {
-// if (!webSocket) {
-// const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/cacheGlass`;
-// webSocket = new WebSocket(socketUrl);
-// webSocket.onmessage = (event) => {
-// const data = JSON.parse(event.data);
-// const scaleFactor = 1621.78/6000;
-// adjustedRects.value = data.currentCutTerritory[0].map(rect => ({
-// ...rect,
-// x_axis: (6000 -(rect.x_axis + rect.width)) * scaleFactor,
-// y_axis: rect.y_axis * 0.17,
-// width: rect.width * scaleFactor ,
-// widtha: rect.width ,
-// heighta: rect.height ,
-// height: rect.height * 0.165 ,
-// glass_state: rect.glass_state,
-// isActive: false
-// }));
-// };
-// webSocket.onerror = (error) => {
-// console.error('WebSocket Error:', error);
-// };
-// webSocket.onclose = () => {
-// console.log('WebSocket Connection Closed');
-// // 鍙互閫夋嫨閲嶆柊杩炴帴
-// };
-// }
-// };
const connectWebSocket = () => {
if (!webSocket) {
const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/cacheGlass`;
@@ -250,8 +222,10 @@
webSocket.onmessage = (event) => {
const data = JSON.parse(event.data);
const scaleFactor = 1621.78 / 6000;
+ if (data.currentCutTerritory && data.currentCutTerritory.length > 0) {
const newRects = data.currentCutTerritory[0].map(rect => {
const existingRect = adjustedRects.value.find(r => r.glass_id === rect.glass_id);
+
if (existingRect) {
return {
...existingRect,
@@ -281,10 +255,12 @@
}
});
adjustedRects.value = newRects;
+ } else if (data.currentCutTerritory == '') {
+ adjustedRects.value = [];
+ }
};
}
};
-
onMounted(() => {
// 鍒濆鏃讹紝濡傛灉杈撳叆妗嗕负绌猴紝鍒欒繛鎺ebSocket
if (!inputValue.value) {
--
Gitblit v1.8.0