From 300c187d293847c17bf18cefdfba8eb442367a34 Mon Sep 17 00:00:00 2001 From: zhoushihao <zsh19950802@163.com> Date: 星期二, 04 六月 2024 14:07:12 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- UI-Project/src/views/Caching/cachingun.vue | 34 +++++++++++++++++++++++++++++----- 1 files changed, 29 insertions(+), 5 deletions(-) diff --git a/UI-Project/src/views/Caching/cachingun.vue b/UI-Project/src/views/Caching/cachingun.vue index 8aed036..a22e37e 100644 --- a/UI-Project/src/views/Caching/cachingun.vue +++ b/UI-Project/src/views/Caching/cachingun.vue @@ -4,9 +4,10 @@ import {useRouter} from "vue-router" const router = useRouter() const adda = ref(false) - +import { WebSocketHost ,host} from '@/utils/constants' import request from "@/utils/request" -import { ref, onMounted } from "vue"; +import { ref, onMounted , onBeforeUnmount} from "vue"; +import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService'; // import { ref } from 'vue' import { ElMessage, ElMessageBox } from 'element-plus' // import LanguageMixin from './lang/LanguageMixin' @@ -67,6 +68,32 @@ console.error('鍙戠敓閿欒:', error); } }; + +const socketUrl = `ws://${WebSocketHost}:${host}/api/unLoadGlass/api/talk/unloadglass`; +// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺 +const handleMessage = (data) => { + // 鏇存柊 tableData 鐨勬暟鎹� + tableData.splice(0, tableData.length, ...data.params[0]); + // tableData.value = data.params[0] + // adjustedRects.value = data.EdgStorageCageinfos[0] + adjustedRects.value = data.params[0].map(rect => ({ + ...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬� + width: rect.width * 0.5 , + id: rect.id * 10, + })); + +}; +// 鍒濆鍖� WebSocket锛屽苟浼犻�掓秷鎭鐞嗗嚱鏁� +onMounted(() => { + // fetchFlowCardId(); + // fetchTableData(); // 鑾峰彇鏁版嵁 + initializeWebSocket(socketUrl, handleMessage); +}); + +onBeforeUnmount(() => { + console.log("鍏抽棴浜�") + closeWebSocket(); +}); </script> <template> @@ -113,9 +140,6 @@ > </div> </div> -<!-- <div style="width: 100px;height: 10px;background-color: #409EFF;margin-top: -124px;margin-left: 480px;"></div> -<div style="width: 100px;height: 10px;background-color: #409EFF;margin-top: -30px;margin-left: 850px;"></div> -<div style="width: 100px;height: 10px;background-color: #409EFF;margin-top: 30px;margin-left: 695px;"></div> --> </div> </template> -- Gitblit v1.8.0