From 36c8b97ef1d250e724696cae846a754d48a92512 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 04 六月 2024 12:33:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Identify/identify.vue | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index 2d500f6..b68dcbc 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -42,8 +42,10 @@
<script setup lang="ts">
import { Delete, Upload } from '@element-plus/icons-vue'
import { ElMessage, ElMessageBox } from 'element-plus'
-import { ref, onMounted } from 'vue';
+import { ref, onMounted, onBeforeUnmount } from 'vue';
import request from "@/utils/request"
+import { WebSocketHost } from '@/utils/constants'
+import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
const blind = ref(false)
const olWidth = ref();
const olHeight = ref();
@@ -83,8 +85,8 @@
height:( rect.height*100) * 0.004 ,
glass_state: rect.glass_state
}));
+ console.log(adjustedRects.value);
- console.log(rect);
// console.log( (rect.width*100) / 300 );
} else {
@@ -174,6 +176,38 @@
}
});
}
+const socketUrl = `ws://${WebSocketHost}:88/api/cacheGlass/api/talk/cacheGlass`;
+// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
+const handleMessage = (data) => {
+ // 鏇存柊 tableData 鐨勬暟鎹�
+
+ // adjustedRects.value = data.currentCutTerritory[0]
+ adjustedRects.value = data.currentCutTerritory[0].map(rect => ({
+ ...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
+ x_axis: (rect.x_axis*100) * 0.005, // 灏唜鍊奸櫎浠�3
+ y_axis: (rect.y_axis*100) * 0.005,
+ width: (rect.width*100) * 0.004 ,
+ widtha: rect.width ,
+ heighta: rect.height ,
+ height:( rect.height*100) * 0.004 ,
+ glass_state: rect.glass_state
+ }));
+ // console.log("鏇存柊鍚庢暟鎹�", tableData);
+
+};
+
+// 鍒濆鍖� WebSocket锛屽苟浼犻�掓秷鎭鐞嗗嚱鏁�
+
+onMounted(() => {
+ // fetchFlowCardId();
+ // fetchTableData(); // 鑾峰彇鏁版嵁
+ initializeWebSocket(socketUrl, handleMessage);
+});
+
+onBeforeUnmount(() => {
+ console.log("鍏抽棴浜�")
+ closeWebSocket();
+});
</script>
<style scoped>
--
Gitblit v1.8.0