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 | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 cf2b85a..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
@@ -15,28 +15,30 @@
import DeviceStacker from "@/components/DeviceStacker.vue";
// 鍫嗗灈鏈�
const Stackers = reactive([]);
-var i=0;
+var i = 0;
// 璁惧鍒楄〃锛堜慨鏀归噸澶嶈澶囧悕绉帮級
const devices = reactive([]);
const num = reactive([])
onMounted(() => {
- eventBus.on('stackerData', eventData => {
- if (eventData.deviceName === "鍒嗗3绾垮叆搴撹緭閫佺嚎"||eventData.deviceName === "鍒嗗鍑哄簱杈撻�佺嚎") {
- if (devices.length <= 0) {
+ 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){
+ if (device) {
device.data = eventData.data
- }else{
+ } else {
devices.push({ deviceName: eventData.deviceName, data: eventData.data, childDeviceCode: eventData.data.childDeviceCode });
}
}
}
})
eventBus.on('stackerData', eventData => {
- if (eventData.deviceName == "鍒嗗3鍙峰爢鍨涙満"||eventData.deviceName == "鍒嗗2鍙峰爢鍨涙満") {
+ // 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 });
}
@@ -53,6 +55,4 @@
})
})
</script>
-<style scoped>
-
-</style>
\ No newline at end of file
+<style scoped></style>
\ No newline at end of file
--
Gitblit v1.9.3