From 55900c9b6519dbe3d0f02f914a1cb2b2be22a6a9 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期三, 15 五月 2024 09:45:21 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web
---
src/views/mdc/realtime-status/index.vue | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/views/mdc/realtime-status/index.vue b/src/views/mdc/realtime-status/index.vue
index 3f9f793..3aa324f 100644
--- a/src/views/mdc/realtime-status/index.vue
+++ b/src/views/mdc/realtime-status/index.vue
@@ -37,16 +37,16 @@
<el-icon><ArrowRight /></el-icon>
</div>
<div class="status-content-cardp" v-for="item in timestatus" style="width: 33.3333%; height: 50%;">
- <div class="status-card-box" style="border-color: rgb(89, 89, 89);">
+ <div class="status-card-box" style="border-color: #ccc;">
<div class="status-card-top">
<div class="status-card-detail">
<div title="461" class="status-card-detail-name">{{item.code}}</div>
<div class="status-card-detail-status">
- <div class="status-card-detail-point" style="background-color: rgb(89, 89, 89);"></div>{{item.statusName}}
- <div class="status-card-detail-time" style="color: rgb(89, 89, 89);">---</div>
+ <div class="status-card-detail-point" :style="{'background-color': item.statusStyle}"></div>{{item.statusName}}
+ <div class="status-card-detail-time" style="color: #ccc;">---</div>
</div>
</div>
- <div class="status-card-machine" style="border-color: rgb(89, 89, 89);">
+ <div class="status-card-machine" style="border-color: #ccc;">
<div class="status-card-machine-img">
<img src="./station.png" width="68" height="68">
</div>
@@ -92,6 +92,7 @@
},
data() {
return {
+ statusStyle: "#ccc",
titleMap: "",
visible: false,
visibleList: [],
@@ -149,7 +150,7 @@
var visibleList = JSON.parse(JSON.stringify(item.properties));
visibleList.forEach(item=> {
if(item.statusName) {
- item.namecolor = "rgb(89, 89, 89)";
+ item.namecolor = "#ccc";
item.statuscolor = "rgba(89, 89, 89, 0.14)";
}else {
item.namecolor = "rgb(127, 192, 192)";
@@ -195,12 +196,14 @@
var records = JSON.parse(JSON.stringify(res.data.records));
records.forEach(item=> {
item.statusName = "鏈煡";
+ item.statusStyle = '#ccc';
if(item.properties != null) {
item.properties.forEach(item1=> {
this.devicestatus.forEach(item2=> {
if(item2.status == item1.value) {
item.statusName = item2.statusName;
item1.statusName = item2.statusName;
+ item.statusStyle = item2.color;
}
})
})
@@ -389,7 +392,7 @@
.status-card-bottom {
font-weight: 700;
font-size: 14px;
- color: #3b8e8e;
+ color: #409eff;
display: flex;
align-items: center;
justify-content: flex-start;
--
Gitblit v1.9.3