From c2b1f33ad95f77d676eb8de187875ad1d9aed61d Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期二, 13 八月 2024 08:40:23 +0800 Subject: [PATCH] 修改磨边队列调用接口的参数 --- UI-Project/src/views/Caching/cachingun.vue | 42 ++++++++++++++++++++++++------------------ 1 files changed, 24 insertions(+), 18 deletions(-) diff --git a/UI-Project/src/views/Caching/cachingun.vue b/UI-Project/src/views/Caching/cachingun.vue index cf17b1f..d7676bf 100644 --- a/UI-Project/src/views/Caching/cachingun.vue +++ b/UI-Project/src/views/Caching/cachingun.vue @@ -1,5 +1,5 @@ <template> - <div> + <div style="height: 500px;"> <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading"> <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;"> <el-table height="240" ref="table" @@ -10,7 +10,7 @@ <el-table-column prop="width" align="center" :label="$t('sorter.width')" min-width="120" /> <el-table-column prop="height" align="center" :label="$t('sorter.height')" min-width="120" /> <el-table-column - align="center" + align="center" :label="$t('sorter.startstatus')" min-width="80" prop="enable_state" @@ -36,10 +36,9 @@ </el-table> </div> </el-card> - </div> - <div id="awatch"> - <img src="../../assets/woshihuancun.png" alt="" style="width: 60%;height: 90%;margin-left: 260px;margin-top: 20px;position: relative;"> - <div style="position: absolute; width: 500px;height: 95px;margin-top: -165px;margin-left: 450px;"> + <div class="awatch"> + <img src="../../assets/woshihuancun.png" alt="" style="width: 70%;height: 90%;margin-left: 200px;margin-top: 20px;position: relative;"> + <div style="position: relative; width: 500px;height: 95px;margin-top: -165px;margin-left: 450px;"> <div v-for="(rect, index) in adjustedRects" :key="rect" @@ -51,6 +50,7 @@ </div> </div> </div> +</div> </template> <script setup> import {Search,Lock,Avatar} from "@element-plus/icons-vue"; @@ -60,7 +60,7 @@ const adda = ref(false) import { WebSocketHost ,host} from '@/utils/constants' import request from "@/utils/request" -import { ref, onMounted , onBeforeUnmount} from "vue"; +import { ref, onMounted , onBeforeUnmount,onUnmounted} from "vue"; import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService'; // import { ref } from 'vue' import { ElMessage, ElMessageBox } from 'element-plus' @@ -69,7 +69,7 @@ import { useI18n } from 'vue-i18n' const { t } = useI18n() // import i18n from '@/i18n'; -const tableData = ref([]) +const tableData = reactive([]); const slot = ref('') const adjustedRects = ref([]); @@ -194,7 +194,7 @@ 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 }); + const response = await request.post('/unLoadGlass/downStorage/updateDownStorageCage', { id: row.id, enableState: newState }); if (response.code === 200) { ElMessage.success(response.message); } else { @@ -202,27 +202,32 @@ } row.enable_state = newState; }; -const socketUrl = `ws://${WebSocketHost}:${host}/api/unLoadGlass/api/talk/unloadglass`; + + + +let socket = null; +const socketUrl = `ws://${WebSocketHost}:${host}/api/unLoadGlass/api/talk/downcache`; // 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺 const handleMessage = (data) => { // 鏇存柊 tableData 鐨勬暟鎹� - tableData.splice(0, tableData.length, ...data.params[0]); + tableData.splice(0, tableData.length, ...data.params2[0]); // tableData.value = data.params[0] // adjustedRects.value = data.EdgStorageCageinfos[0] - adjustedRects.value = data.params[0].map(rect => ({ + adjustedRects.value = data.params2[0].map(rect => ({ ...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬� width: rect.width * 0.5 , id: rect.id * 10, })); }; -// 鍒濆鍖� WebSocket锛屽苟浼犻�掓秷鎭鐞嗗嚱鏁� onMounted(() => { - // fetchFlowCardId(); - // fetchTableData(); // 鑾峰彇鏁版嵁 - initializeWebSocket(socketUrl, handleMessage); + socket = initializeWebSocket(socketUrl, handleMessage); }); - + onUnmounted(() => { + if (socket) { + closeWebSocket(socket); + } + }); onBeforeUnmount(() => { console.log("鍏抽棴浜�") closeWebSocket(); @@ -245,9 +250,10 @@ background-color: #337ecc; margin-left: 28%; } -#awatch{ +.awatch{ height: 460px; width: 1500px; + max-width: 100%; /* margin-top: -60px; */ } </style> \ No newline at end of file -- Gitblit v1.8.0