From 831cfa4c439c6d073d706a82d2a439f8b1818498 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 18 十一月 2025 16:59:50 +0800
Subject: [PATCH] Merge branch 'new' of http://www.beijingsoft.cn:9090/r/smart-web into new
---
src/views/mdc/station-live.vue | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/src/views/mdc/station-live.vue b/src/views/mdc/station-live.vue
index 5852bba..04af844 100644
--- a/src/views/mdc/station-live.vue
+++ b/src/views/mdc/station-live.vue
@@ -2,7 +2,7 @@
* @Author: lzhe lzhe@example.com
* @Date: 2024-03-26 10:28:33
* @LastEditors: 鏉庡枂(寮�鍙戠粍) lzhe@yxqiche.com
- * @LastEditTime: 2025-03-27 14:50:26
+ * @LastEditTime: 2025-11-18 16:57:42
* @FilePath: /smart-web/src/views/master/person/main/index.vue
* @Description: 杩欐槸榛樿璁剧疆,璇疯缃甡customMade`, 鎵撳紑koroFileHeader鏌ョ湅閰嶇疆 杩涜璁剧疆: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -719,19 +719,18 @@
}, 500);
this.$TOOL.socket.websocket.onmessage = function(event) {
var JSONData = JSON.parse(res.data.dpConfig);
- var SpindleLoad = JSONData.some(obj => obj.dpName === 'SpindleLoad'); //鍒ゆ柇鏄惁鏈変富杞磋礋杞�(SpindleLoad)锛�
- var SpindleRate = JSONData.some(obj => obj.dpName === 'SpindleRate'); //鍒ゆ柇鏄惁鏈変富杞村�嶇巼(SpindleRate)锛�
- var FeedRate = JSONData.some(obj => obj.dpName === 'FeedRate'); //鍒ゆ柇鏄惁鏈夎繘缁欏�嶇巼(FeedRate)锛�
- if(!SpindleLoad) JSONData.push({dpName: "SpindleLoad",dpLabel: "涓昏酱璐熻浇"});
- if(!SpindleRate) JSONData.push({dpName: "SpindleRate",dpLabel: "涓昏酱鍊嶇巼"});
- if(!FeedRate) JSONData.push({dpName: "FeedRate",dpLabel: "杩涚粰鍊嶇巼"});
+ var SpindleLoad = JSONData.some(obj => obj.dpName === 'spindleLoad'); //鍒ゆ柇鏄惁鏈変富杞磋礋杞�(SpindleLoad)锛�
+ var SpindleRate = JSONData.some(obj => obj.dpName === 'spindleRate'); //鍒ゆ柇鏄惁鏈変富杞村�嶇巼(SpindleRate)锛�
+ var FeedRate = JSONData.some(obj => obj.dpName === 'feedRate'); //鍒ゆ柇鏄惁鏈夎繘缁欏�嶇巼(FeedRate)锛�
+ if(!SpindleLoad) JSONData.push({dpName: "spindleLoad",dpLabel: "涓昏酱璐熻浇"});
+ if(!SpindleRate) JSONData.push({dpName: "spindleRate",dpLabel: "涓昏酱鍊嶇巼"});
+ if(!FeedRate) JSONData.push({dpName: "feedRate",dpLabel: "杩涚粰鍊嶇巼"});
var eventData = JSON.parse(event.data);
JSONData.forEach((item,index)=> { //绗竴姝ユ妸v鏀惧埌code閲�
if(item.dpName == "DeviceStatus") { //鏈哄櫒鐘舵��
if(eventData.data[item.dpName]) {
item.code = eventData.data[item.dpName].v;
}
-
setTimeout(()=> {
console.log(that.allwcs,888)
},5000)
@@ -749,7 +748,7 @@
if(eventData.data[item.dpName]) {
item.codeName = eventData.data[item.dpName].v;
}else { //ws娌℃湁鐨勬儏鍐�
- if(item.dpName == "SpindleLoad" || item.dpName == "SpindleRate" || item.dpName == "FeedRate") {
+ if(item.dpName == "spindleLoad" || item.dpName == "spindleRate" || item.dpName == "feedRate") {
item.codeName = 0;
}else {
item.codeName = "";
--
Gitblit v1.9.3