From 9caf7c886e9e9b7a535eb564c9a1395db07a0b4c Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期日, 05 一月 2025 10:57:32 +0800
Subject: [PATCH] 更新生产环境的基础URL，优化设备名称匹配逻辑，删除不再使用的文件
---
Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/Volume.vue | 2 +-
Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/hightemperature.vue | 25 +++++++++++--------------
/dev/null | 0
Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/roomtemperature.vue | 24 +++++++++++-------------
Code Management/WCS/WIDESEAWCS_Client/src/api/http.js | 2 +-
5 files changed, 24 insertions(+), 29 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/api/http.js b/Code Management/WCS/WIDESEAWCS_Client/src/api/http.js
index 77e3a74..e256aed 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/api/http.js
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/api/http.js
@@ -20,7 +20,7 @@
}
else if (process.env.NODE_ENV == 'production') {
- axios.defaults.baseURL = 'http://192.168.5.251:9291/';
+ axios.defaults.baseURL = 'http://192.168.20.251:9291/';
}
if (!axios.defaults.baseURL.endsWith('/')) {
axios.defaults.baseURL+="/";
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 9cd227d..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
@@ -21,7 +21,7 @@
const num = reactive([])
onMounted(() => {
eventBus.on('locationData', eventData => {
- if (eventData.deviceName === "鍒嗗3绾垮叆搴撹緭閫佺嚎" || eventData.deviceName === "鍒嗗鍑哄簱杈撻�佺嚎") {
+ if (eventData.deviceName.indexOf("鍒嗗") != -1) {
if (devices.length <= 0) {
devices.push({ deviceName: eventData.deviceName, data: eventData.data, childDeviceCode: eventData.data.childDeviceCode });
}
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/hightemperature.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/hightemperature.vue
index cf09620..fa614eb 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/hightemperature.vue
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/hightemperature.vue
@@ -15,33 +15,32 @@
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 => {
+ eventBus.on('locationData', eventData => {
// console.log(eventData)
-
- console.log(eventData)
-
- if (eventData.deviceName === "鑰佸寲鍏ュ簱杈撻�佺嚎") {
- if (devices.length <= 0) {
+ console.log(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 == "鑰佸寲1鍙峰爢鍨涙満") {
+ if (eventData.deviceName.indexOf("鑰佸寲") != -1) {
if (Stackers.length == 0) {
Stackers.push({ deviceName: eventData.deviceName, data: eventData.data });
}
@@ -58,6 +57,4 @@
})
})
</script>
-<style scoped>
-
-</style>
\ No newline at end of file
+<style scoped></style>
\ No newline at end of file
diff --git a/Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/roomtemperature.vue b/Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/roomtemperature.vue
index 66c4a4b..2e660c2 100644
--- a/Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/roomtemperature.vue
+++ b/Code Management/WCS/WIDESEAWCS_Client/src/views/Devicestatus/Craftlibrary/roomtemperature.vue
@@ -15,33 +15,33 @@
import DeviceStacker from "@/components/DeviceStacker.vue";
// 鍫嗗灈鏈�
const Stackers = reactive([]);
-var i=0;
+var i = 0;
// 璁惧鍒楄〃锛堜慨鏀归噸澶嶈澶囧悕绉帮級
const devices = reactive([]);
const num = reactive([])
onMounted(() => {
eventBus.on('locationData', eventData => {
// console.log(eventData)
-
- console.log(eventData)
-
- if (eventData.deviceName === "甯告俯鍏ュ簱杈撻�佺嚎") {
- if (devices.length <= 0) {
+
+ console.log(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.indexOf("甯告俯")) {
+ if (eventData.deviceName.indexOf("甯告俯") != -1) {
if (Stackers.length == 0) {
Stackers.push({ deviceName: eventData.deviceName, data: eventData.data });
}
@@ -58,6 +58,4 @@
})
})
</script>
-<style scoped>
-
-</style>
\ No newline at end of file
+<style scoped></style>
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\347\224\265\350\212\2572F\345\233\276\347\272\270\344\270\216\347\224\265\346\260\224\347\274\226\345\217\267\345\257\271\347\205\247\357\274\21008\351\241\271\347\233\256\357\274\211/08\344\272\214\346\245\274\350\276\223\351\200\201\345\270\203\345\261\200\347\202\271\344\275\215\345\233\2761106\0504\051.dwg.bak" "b/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\347\224\265\350\212\2572F\345\233\276\347\272\270\344\270\216\347\224\265\346\260\224\347\274\226\345\217\267\345\257\271\347\205\247\357\274\21008\351\241\271\347\233\256\357\274\211/08\344\272\214\346\245\274\350\276\223\351\200\201\345\270\203\345\261\200\347\202\271\344\275\215\345\233\2761106\0504\051.dwg.bak"
deleted file mode 100644
index e5cc257..0000000
--- "a/\351\241\271\347\233\256\350\265\204\346\226\231/\351\241\271\347\233\256\345\233\276\347\272\270/\347\224\265\350\212\2572F\345\233\276\347\272\270\344\270\216\347\224\265\346\260\224\347\274\226\345\217\267\345\257\271\347\205\247\357\274\21008\351\241\271\347\233\256\357\274\211/08\344\272\214\346\245\274\350\276\223\351\200\201\345\270\203\345\261\200\347\202\271\344\275\215\345\233\2761106\0504\051.dwg.bak"
+++ /dev/null
Binary files differ
--
Gitblit v1.9.3