Merge branch 'new' of http://www.beijingsoft.cn:9090/r/smart-web into new

yangys

2025-11-18 831cfa4c439c6d073d706a82d2a439f8b1818498

 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 = "";