From 9ccaa7a607481405ee22519aa49c786a46b95e22 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期三, 09 十月 2024 23:01:52 +0800
Subject: [PATCH] 优先
---
src/views/mdc/realtime-status/index.vue | 106 ++++++++++++++++++++++++++--------------------------
1 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/src/views/mdc/realtime-status/index.vue b/src/views/mdc/realtime-status/index.vue
index 2c66d48..9b729ca 100644
--- a/src/views/mdc/realtime-status/index.vue
+++ b/src/views/mdc/realtime-status/index.vue
@@ -1,8 +1,8 @@
<!--
* @Date: 2024-04-09 22:11:21
- * @LastEditors: lzhe lzhe@example.com
- * @LastEditTime: 2024-10-06 22:31:43
- * @FilePath: /mdc/Users/mache/Documents/demo/cps-web/src/views/mdc/realtime-status/index.vue
+ * @LastEditors: gaoshp
+ * @LastEditTime: 2024-10-09 20:40:22
+ * @FilePath: /cps-web/src/views/mdc/realtime-status/index.vue
瀹炴椂鐪嬫澘
-->
<template>
@@ -16,7 +16,7 @@
<el-icon class="setIcon">
<Setting />
</el-icon>
- <span class="setBtn" @click="goSet">璁剧疆</span>
+ <span class="setBtn" @click="goSet">鍒嗘瀽璁剧疆</span>
</span>
</div>
<ul class="status-view-box" v-if="station == '鐘舵�佽鍥�'">
@@ -44,7 +44,8 @@
<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">
@@ -59,22 +60,19 @@
</div>
<div class="status-card-machine" style="border-color: #ccc;">
<div class="status-card-machine-img">
- <img src="./station.png" width="68" height="68">
+ <img src="./station1.jpg" width="68" height="68">
+
</div>
<div class="status-card-machine-mesg">
<div class="status-card-machine-mesg-form">
<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 +82,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 +106,7 @@
},
data() {
return {
+ clickIndex: 0,
allwcs: [],
statusStyle: "#ccc",
titleMap: "",
@@ -127,9 +126,8 @@
}
},
mounted() {
- this.deviceStatus = this.$route.query.currentTag?[...this.$route.query.currentTag]:[];
+ this.deviceStatus = this.$route.query.currentTag ? [...this.$route.query.currentTag] : [];
this.getstationlabelList(); //鑾峰彇鏍囩瑙嗗浘涓嬬殑list
- this.setIntervalTime(); //鍗佺澧炲姞鏃堕棿
this.getprocess(); //鑾峰彇棰滆壊==銆嬭幏鍙栭《閮╰itle==銆嬭缃嚑琛屽嚑鍒�==銆媤s
},
methods: {
@@ -194,11 +192,18 @@
this.$HTTP.get("/api/blade-cps/group/get-mdc-group").then(res => {
if (res.code == 200) {
this.stationlabelList = res.data;
- this.stationlabel = res.data[0].groupName;
+ if (res.data.length != 0) {
+ this.stationlabel = res.data[0].groupName;
+ }
}
})
},
changestatus(name) {
+ if (this.stationlabelList.length == 0) {
+ this.station = "鐘舵�佽鍥�";
+ this.$message.error('鏈�夊畾瀹炴椂鐪嬫澘鏌ヨ缁勶紝璇峰埌"鍒嗘瀽璁剧疆 -> 瀹炴椂鐪嬫澘鏌ヨ缁勮缃�"涓�夋嫨宸ヤ綅缁�');
+ return;
+ }
this.station = name;
if (this.station == '鐘舵�佽鍥�') {
this.workStationGroupIdList = [];
@@ -208,17 +213,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) {
@@ -241,7 +248,8 @@
}
},
goSet() {
- this.$router.push('/mdc/configuration');
+ //console.log(this.$TOOL.data.get("MENU"));name == "閰嶇疆涓績"
+ this.$router.push('/mdc/configuration'); //鍒嗘瀽璁剧疆
},
gostatus(item) {
this.$router.push('/mdc/station-live?code=' + item.id);
@@ -281,7 +289,6 @@
this.$HTTP.post(`/api/blade-cps/workstation/real-time-status?current=${this.current || 0}&size=${this.size || 6}`, obj).then(res => {
if (res.code == 200) {
var ids = [];
- console.log(this.allwcs, res.data)
res.data.records.forEach(item => {
ids.push(item.id);
if (item.properties != null && item.properties.length != 0) {
@@ -315,11 +322,12 @@
that.$TOOL.socket.sendDataToWebSocket(obj); //鍙戦��
}
}, 500);
- var num = 0;
+ //var num = 0;
var intervalId;
this.$TOOL.socket.websocket.onmessage = function (event) {
- num++;
+ //num++;
var eventData = JSON.parse(event.data);
+ if (Object.keys(eventData.data).length == 0) return;
if (that.timestatus.length == 0) return; //娌″�间笉鐢ㄥ惊鐜�
that.timestatus.forEach((item, index) => { //绗竴姝ユ妸v鏀惧埌code閲�
if (eventData.id == item.id) {
@@ -330,6 +338,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) {
@@ -345,16 +354,13 @@
}
item.properties.forEach((item1, index1) => {
if (item1.key == "DeviceStatus") { //鏈哄櫒鐘舵��
- if (item1.value == "2") {
- that.allwcs.forEach(item2 => {
- if (item2.code == item1.value) {
- item1.color = item2.color;
- item1.code = item2.name;
- }
- })
- } else {
- item1.color = "#75C0C0";
- }
+ that.allwcs.forEach(item2 => {
+ if (item2.code == eventData.data.DeviceStatus.v) {
+ item1.value = item2.code;
+ item1.color = item2.color;
+ item1.code = item2.name;
+ }
+ })
} else {
if (item1.key == 'Alarm') { //鎶ヨ
if (eventData.data[item1.key]) {
@@ -365,28 +371,22 @@
} else {
item1.name = v[0].code;
item1.code = v[0].msg;
- that.allwcs.forEach(item2 => {
- if (item2.name == "鎶ヨ") {
- item1.color = item2.color;
- }
- })
}
} else {
item1.name = v.code;
item1.code = v.msg;
- that.allwcs.forEach(item2 => {
- if (item2.name == "鎶ヨ") {
- item1.color = item2.color;
- }
- })
}
}
} else {
if (eventData.data[item1.key]) {
item1.code = eventData.data[item1.key].v;
- item1.color = "#75C0C0";
}
}
+ that.allwcs.forEach(item2 => {
+ if (item2.name == "鎶ヨ") {
+ item1.color = item2.color;
+ }
+ })
}
})
}
@@ -425,7 +425,7 @@
}
})
}
- }
+ },
}
</script>
@@ -534,7 +534,7 @@
font-weight: 700;
font-size: 16px;
color: #333;
- width: 33%;
+ width: 26%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
--
Gitblit v1.9.3