From 09a010c5dc11c68a866a6075a74bd1bbefb4a9a8 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期一, 24 六月 2024 16:38:23 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes --- UI-Project/src/views/Caching/cachingun.vue | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 50 insertions(+), 8 deletions(-) diff --git a/UI-Project/src/views/Caching/cachingun.vue b/UI-Project/src/views/Caching/cachingun.vue index 8aed036..d454956 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,42 @@ console.error('鍙戠敓閿欒:', error); } }; +const toggleEnableState = async (row) => { + const newState = row.enable_state === 1 ? 0 : 1; + // 鍙戦�佽姹傚埌鍚庣鏇存柊鐘舵�侊紙杩欓噷鐪佺暐浜嗗疄闄呯殑璇锋眰閫昏緫锛� + const response = await request.post('/unLoadGlass/downStorage/updateDownStorageCage', { id: row.id, enablestate: newState }); + if (response.code === 200) { + ElMessage.success(response.message); + } else { + ElMessage.error(response.message); + } + row.enable_state = newState; +}; +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> @@ -81,14 +118,22 @@ <el-table-column prop="width" align="center" label="瀹�" min-width="120" /> <el-table-column prop="height" align="center" label="楂�" min-width="120" /> <el-table-column - align="center" + align="center" label="鍚敤鐘舵��" min-width="80" prop="enable_state" > - <template #default="scope"> + <template #default="scope"> + <el-tag + :type="scope.row.enable_state === 1 ? 'success' : 'danger'" + @click="toggleEnableState(scope.row)" + > + {{ scope.row.enable_state === 1 ? '鍚敤' : '绂佺敤' }} + </el-tag> + </template> + <!-- <template #default="scope"> <el-tag type="success" >{{ scope.row.enable_state==1?"鍚敤":"鏈惎鐢�" }}</el-tag> - </template> + </template> --> </el-table-column> <el-table-column fixed="right" label="鎿嶄綔" align="center" width="200"> <template #default="scope"> @@ -113,9 +158,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