1
lzhe
2024-10-08 4652987d6b2e88f61984600a030876a99d975ba5
1
已修改3个文件
58 ■■■■ 文件已修改
src/utils/tool.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/realtime-status/index.vue 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/station-live.vue 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/utils/tool.js
@@ -2,7 +2,7 @@
 * @Descripttion: 工具集
 * @version: 1.2
 * @LastEditors: lzhe lzhe@example.com
 * @LastEditTime: 2024-10-07 22:35:14
 * @LastEditTime: 2024-10-08 18:04:17
 */
import CryptoJS from 'crypto-js';
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-10-07 21:48:45
 * @LastEditTime: 2024-10-08 17:50:00
 * @FilePath: /mdc/Users/mache/Documents/demo/cps-web/src/views/mdc/realtime-status/index.vue
 实时看板
-->
@@ -44,7 +44,7 @@
                    <ArrowRight />
                </el-icon>
            </div>
            <div class="status-content-cardp" v-for="item in timestatus" :style="{ 'width': (100 / column) + '%' }">
            <div class="status-content-cardp" v-for="(item,index) in timestatus" :style="{ 'width': (100 / column) + '%' }">
                <div class="status-card-box" style="border-color: #ccc;">
                    <div class="status-card-top">
                        <div class="status-card-detail">
@@ -66,15 +66,11 @@
                                    <div class="status-card-machine-mesg-label">工位编号</div>
                                    <div class="status-card-machine-mesg-value">{{ item.code }}</div>
                                </div>
                                <div class="status-card-machine-mesg-form">
                                    <div class="status-card-machine-mesg-label">工单</div>
                                    <div class="status-card-machine-mesg-value">-</div>
                                </div>
                            </div>
                        </div>
                    </div>
                    <div class="status-card-bottom">
                        <div class="status-card-bottom-realtime" @click="showvisible(item)"><i
                        <div class="status-card-bottom-realtime" @click="showvisible(item,index)"><i
                                class="iconfont saber-xiangqing status-card-bottom-icon"></i> 实时数据</div>
                        <div class="status-card-bottom-detail" @click="gostatus(item)"><i
                                class="iconfont saber-shuju status-card-bottom-icon"></i> 工位详情</div>
@@ -84,7 +80,7 @@
        </div>
        <el-dialog :title="titleMap" v-model="visible" :width="740">
            <div class="dialogstyle">
                <div class="realtime-analysis-card" v-for="item in visibleList">
                <div class="realtime-analysis-card" v-for="item in timestatus[clickIndex].properties">
                    <div class="card-name" :style="{ 'background-color': item.color }">{{ item.name }}</div>
                    <div class="card-value"
                        :class="{ 'card-value': true, 'card-value-bg1': item.key != 'Alarm', 'card-value-bg2': item.key == 'Alarm' }">
@@ -108,6 +104,7 @@
    },
    data() {
        return {
            clickIndex: 0,
            allwcs: [],
            statusStyle: "#ccc",
            titleMap: "",
@@ -129,7 +126,6 @@
    mounted() {
        this.deviceStatus = this.$route.query.currentTag?[...this.$route.query.currentTag]:[];
        this.getstationlabelList();  //获取标签视图下的list
        this.setIntervalTime();   //十秒增加时间
        this.getprocess(); //获取颜色==》获取顶部title==》设置几行几列==》ws
    },
    methods: {
@@ -215,17 +211,19 @@
            }
            this.gettimestatus();  //查询列表
        },
        showvisible(item) {
            if (item.properties == null || item.properties.length == 0) {
                this.$message({
                    message: '请配置采集项',
                    type: 'warning'
                });
                return;
            }
            var visibleList = JSON.parse(JSON.stringify(item.properties));
            this.titleMap = "实时数据(" + item.code + ")";
            this.visibleList = visibleList;
        showvisible(item,index) {
            //clickIndex
            this.clickIndex = index;
            // if (item.properties == null || item.properties.length == 0) {
            //     this.$message({
            //         message: '请配置采集项',
            //         type: 'warning'
            //     });
            //     return;
            // }
            // var visibleList = JSON.parse(JSON.stringify(item.properties));
            // this.titleMap = "实时数据(" + item.code + ")";
            // this.visibleList = visibleList;
            this.visible = true;
        },
        searchstatus(item, index) {
@@ -338,6 +336,7 @@
                                if (eventData.data.DeviceStatus) {
                                    var time = moment(eventData.data.DeviceStatus.t).format('YYYY-MM-DD HH:mm:ss');
                                    var diffTime = that.changeTime(time);  //转换成差值(时分秒)
                                    that.setIntervalTime();   //十秒增加时间
                                    item.time = diffTime;
                                    that.allwcs.forEach(item1 => {
                                        if (item1.code == eventData.data.DeviceStatus.v) {
@@ -354,7 +353,8 @@
                                item.properties.forEach((item1, index1) => {
                                    if (item1.key == "DeviceStatus") {  //机器状态
                                        that.allwcs.forEach(item2 => {
                                            if (item2.code == item1.value) {
                                            if (item2.code == eventData.data.DeviceStatus.v) {
                                                item1.value = item2.code;
                                                item1.color = item2.color;
                                                item1.code = item2.name;
                                            }
@@ -423,7 +423,7 @@
                }
            })
        }
    }
    },
}
</script>
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-10-07 00:49:07
 * @LastEditTime: 2024-10-08 18:03:09
 * @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
-->
@@ -46,7 +46,7 @@
                        </div>
                    </div>
                    <div class="fact-analysis-card" v-for="item in dmpList" v-if="dmpList.length != 0">
                        <div class="card-name" :style="{'background-color': item.color}">{{item.description}}</div>
                        <div class="card-name" :style="{'background-color': item.color}">{{item.dplabel}}</div>
                        <div :class="{'card-value': true,'card-value-bg1':item.name != 'Alarm','card-value-bg2':item.name == 'Alarm'}">{{item.codeName}}</div>
                    </div>
                </div>
@@ -673,7 +673,6 @@
                                            item.color = item1.color;
                                        }
                                    })
                                    item.description = item.dpLabel;
                                }else {
                                    if(item.dpName == 'Alarm') {  //报警
                                        if(eventData.data[item.dpName]) {
@@ -682,24 +681,23 @@
                                                if(v.length == 0) {
                                                    JSONData.splice(index,1);
                                                }else {
                                                    item.description = v[0].code;
                                                    item.codeName = v[0].msg;
                                                }
                                            }else {
                                                item.description = v.code;
                                                item.codeName = v.msg;
                                            }
                                        }
                                    }else {
                                        if(eventData.data[item.dpName]) {
                                            item.description = item.dpLabel;
                                            item.codeName = eventData.data[item.dpName].v;
                                        }
                                    }
                                    that.allwcs.forEach((item1)=> {
                                        if(item.code == item1.code) {
                                            item.color = item1.color;
                                        }
                                        }else {
                                            item.color = "#7FC0C0";
                                        }
                                    })
                                }
                            });