1
lzhe
2024-10-06 cf9188af8fa9359e432bfb8769e9456ec3d8c059
1
已修改3个文件
35 ■■■■ 文件已修改
.env.development 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/realtime-status/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/station-live.vue 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.env.development
@@ -1,7 +1,7 @@
###
 # @Date: 2024-03-23 09:49:06
 # @LastEditors: lzhe lzhe@example.com
 # @LastEditTime: 2024-06-17 13:02:52
 # @LastEditTime: 2024-10-06 21:10:14
 # @FilePath: /belleson-frontend/Users/mache/Documents/demo/cps-web/.env.development
### 
# 本地环境
@@ -11,7 +11,7 @@
VUE_APP_TITLE = 制造信息管理系统
# 接口地址
VUE_APP_API_BASEURL = http://120.46.212.231:84
VUE_APP_API_BASEURL =  http://120.46.212.231:85
# 本地端口
VUE_APP_PORT = 2800
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-09-09 11:23:54
 * @LastEditTime: 2024-10-06 22:31:43
 * @FilePath: /mdc/Users/mache/Documents/demo/cps-web/src/views/mdc/realtime-status/index.vue
 实时看板
-->
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-09-12 11:28:21
 * @LastEditTime: 2024-10-06 22:33:59
 * @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,7 @@
                }
            },
            getdmp(lastLevelId,machineId) {
                this.$HTTP.get(`/api/blade-cps/workstation/get-dmp-variables?machineId=${machineId}&workstationId=${lastLevelId}`).then(res=> {
                this.$HTTP.get(`/api/blade-cps/workstation/listDatapointsByWorkstationId?machineId=${machineId}&workstationId=${lastLevelId}`).then(res=> {
                    if(res.code == 200) {
                        this.dmpList = [];
                        var that = this;
@@ -653,17 +653,18 @@
                            type: "realTimeData",
                            workstationIdList: [lastLevelId]
                        }
                        if(res.data.dpConfig == null || res.data.dpConfig.length == 0) return;  //没值不用循环
                        if(this.$TOOL.socket.websocket == null) {  //没有建立先建立
                            this.$TOOL.socket.connectToWebSocket(this.$TOOL.cookie.get("TOKEN")); 
                        }
                        this.$TOOL.socket.sendDataToWebSocket(obj);  //发送
                        this.$TOOL.socket.websocket.onmessage = function(event) {  
                            if(res.data.length == 0) return;  //没值不用循环
                            res.data.forEach((item,index)=> {  //第一步把v放到code里
                            var JSONData = JSON.parse(res.data.dpConfig);
                            JSONData.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;
                                if(item.dpName == "DeviceStatus") {  //机器状态
                                    if(eventData.data[item.dpName]) {
                                        item.code = eventData.data[item.dpName].v;
                                    }
                                    that.allwcs.forEach((item1)=> {
                                        if(item.code == item1.code) {
@@ -676,12 +677,12 @@
                                        }
                                    })
                                }else {
                                    if(item.name == 'Alarm') {  //报警
                                        if(eventData.data[item.name]) {
                                            var v = JSON.parse(eventData.data[item.name].v);
                                    if(item.dpName == 'Alarm') {  //报警
                                        if(eventData.data[item.dpName]) {
                                            var v = JSON.parse(eventData.data[item.dpName].v);
                                            if(Array.isArray(v)) {  //如果是数组,不赋值
                                                if(v.length == 0) {
                                                    res.data.splice(index,1);
                                                    JSONData.splice(index,1);
                                                }else {
                                                    item.description = v[0].code;
                                                    item.codeName = v[0].msg;
@@ -694,14 +695,14 @@
                                            }
                                        }
                                    }else {
                                        if(eventData.data[item.name]) {
                                            item.codeName = eventData.data[item.name].v;
                                        if(eventData.data[item.dpName]) {
                                            item.codeName = eventData.data[item.dpName].v;
                                        }
                                        item.color = "#75C0C0";
                                    }
                                }
                            });
                            that.dmpList = res.data;
                            that.dmpList = JSONData;
                        };
                    }
                })