From 1d044540ee1b7041c7e89bdfe6d1339c99e80a4e Mon Sep 17 00:00:00 2001 From: 刘磊 <1161824510@qq.com> Date: 星期三, 08 一月 2025 14:41:16 +0800 Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuLiKu --- Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/Volume.vue | 61 +++++++++++++++++++++++++++--- 1 files changed, 55 insertions(+), 6 deletions(-) diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/Volume.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/Volume.vue index 2effa57..e6efdac 100644 --- a/Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/Volume.vue +++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/Volume.vue @@ -1,9 +1,58 @@ <template> - <div> - 鍒嗗搴� - </div> + <el-row> + <el-col :span="3"> + <device-stacker v-for="stacker in Stackers" :key="stacker.deviceName" :Stacker="stacker"></device-stacker> + </el-col> + <el-col :span="21"> + <DeviceLineVo v-for="device in devices" :key="device.deviceName" :device="device" /> + </el-col> + </el-row> </template> <script setup> - - -</script> \ No newline at end of file +import { onMounted, ref, reactive, toRaw } from "vue"; +import eventBus from "@/uitils/eventBus"; +import DeviceLineVo from "@/components/DeviceLineVo.vue"; +import DeviceStacker from "@/components/DeviceStacker.vue"; +// 鍫嗗灈鏈� +const Stackers = reactive([]); +var i = 0; +// 璁惧鍒楄〃锛堜慨鏀归噸澶嶈澶囧悕绉帮級 +const devices = reactive([]); +const num = reactive([]) +onMounted(() => { + eventBus.on('locationData', eventData => { + if (eventData.deviceName.indexOf("鍒嗗") != -1) { + if (devices.length <= 0) { + devices.push({ deviceName: eventData.deviceName, data: eventData.data, childDeviceCode: eventData.data.childDeviceCode }); + } + else { + const device = devices.find(c => c.childDeviceCode == eventData.data.childDeviceCode) + if (device) { + device.data = eventData.data + } else { + devices.push({ deviceName: eventData.deviceName, data: eventData.data, childDeviceCode: eventData.data.childDeviceCode }); + } + } + } + }) + eventBus.on('stackerData', eventData => { + // if (eventData.deviceName == "鍒嗗3鍙峰爢鍨涙満"||eventData.deviceName == "鍒嗗2鍙峰爢鍨涙満") { + console.log(eventData.deviceName) + if (eventData.deviceName.indexOf("鍒嗗") != -1) { + if (Stackers.length == 0) { + Stackers.push({ deviceName: eventData.deviceName, data: eventData.data }); + } + else { + const Stacker = Stackers.find(c => c.deviceName == eventData.deviceName); + if (Stacker) { + Stacker.data = eventData.data + } + else { + Stackers.push({ deviceName: eventData.deviceName, data: eventData.data }); + } + } + } + }) +}) +</script> +<style scoped></style> \ No newline at end of file -- Gitblit v1.9.3