1

lzhe

2024-06-17 3553dbd4c84a6e3556c2553c1fd9c47dda2754a3

1

 src/views/mdc/realtime-status/index.vue

@@ -1,7 +1,7 @@
<!--
 * @Date: 2024-04-09 22:11:21
 * @LastEditors: lzhe lzhe@example.com
 * @LastEditTime: 2024-06-17 16:34:25
 * @LastEditTime: 2024-06-17 17:01:03
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/realtime-status/index.vue
 实时看板
-->
@@ -328,10 +328,20 @@
                                            if(item1.key == 'Alarm') {  //报警
                                                if(eventData.data[item1.key]) {
                                                    var v = JSON.parse(eventData.data[item1.key].v);
                                                    if(Array.isArray(v)) {  //如果是数组，不赋值
                                                        if(v.length == 0) {
                                                            res.data.records[index].properties[index1].splice(index,1);
                                                        }else {
                                                            item1.name = v[0].code;
                                                            item1.code = v[0].msg;
                                                            item1.color = "#370C0D";
                                                        }
                                                    }else {
                                                    item1.name = v.code;
                                                    item1.code = v.msg;
                                                    item1.color = "#370C0D";
                                                }
                                                }
                                            }else {
                                                if(eventData.data[item1.key]) {
                                                    item1.code = eventData.data[item1.key].v;

 src/views/mdc/station-live.vue

@@ -2,7 +2,7 @@
 * @Author: lzhe lzhe@example.com
 * @Date: 2024-03-26 10:28:33
 * @LastEditors: lzhe lzhe@example.com
 * @LastEditTime: 2024-06-17 15:54:59
 * @LastEditTime: 2024-06-17 16:57:30
 * @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
-->
@@ -662,7 +662,9 @@
                            res.data.forEach((item,index)=> {  //第一步把v放到code里
                                var eventData = JSON.parse(event.data);
                                if(item.name == "DeviceStatus") {  //机器状态
                                    if(eventData.data[item.name]) {
                                    item.code = eventData.data[item.name].v;
                                    }
                                    that.allwcs.forEach(item1=> {
                                        if(item.code == item1.code) {
                                            item.codeName = item1.name;    //第二步把v的code和运行对应