1
lzhe
2024-06-17 dea3bb3e1f644f5792446dca82044c8b698046fc
1
已修改2个文件
25 ■■■■■ 文件已修改
src/views/mdc/realtime-status/index.vue 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/station-live.vue 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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 13:46:52
 * @LastEditTime: 2024-06-17 14:19:22
 * @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/src/views/mdc/realtime-status/index.vue
 实时看板
-->
@@ -326,10 +326,12 @@
                                            }
                                        }else {
                                            if(item1.key == 'Alarm') {  //报警
                                                var v = JSON.parse(eventData.data[item1.key].v);
                                                item1.name = v.code;
                                                item1.code = v.msg;
                                                item1.color = "#370C0D";
                                                if(eventData.data[item1.key]) {
                                                    var v = JSON.parse(eventData.data[item1.key].v);
                                                    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 13:47:17
 * @LastEditTime: 2024-06-17 14:20:06
 * @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
-->
@@ -644,7 +644,6 @@
                }
            },
            getdmp(lastLevelId,machineId) {
                console.log(lastLevelId,machineId)
                this.$HTTP.get(`/api/blade-cps/workstation/get-dmp-variables?machineId=${machineId}&workstationId=${lastLevelId}`).then(res=> {
                    if(res.code == 200) {
                        this.dmpList = [];
@@ -676,10 +675,12 @@
                                    })
                                }else {
                                    if(item.name == 'Alarm') {  //报警
                                        var v = JSON.parse(eventData.data[item.name].v);
                                        item.description = v.code;
                                        item.codeName = v.msg;
                                        item.color = "#370C0D";
                                        if(eventData.data[item.name]) {
                                            var v = JSON.parse(eventData.data[item.name].v);
                                            item.description = v.code;
                                            item.codeName = v.msg;
                                            item.color = "#370C0D";
                                        }
                                    }else {
                                        if(eventData.data[item.name]) {
                                            item.codeName = eventData.data[item.name].v;