From b1d02b024d353597483b4bb32e24ebd776008e0e Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 09 一月 2025 15:21:58 +0800
Subject: [PATCH] 修改报警解除后界面仍显示问题
---
src/views/dry/bigScreen/BigEqp.vue | 130 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 123 insertions(+), 7 deletions(-)
diff --git a/src/views/dry/bigScreen/BigEqp.vue b/src/views/dry/bigScreen/BigEqp.vue
index 97b590d..37c7b7b 100644
--- a/src/views/dry/bigScreen/BigEqp.vue
+++ b/src/views/dry/bigScreen/BigEqp.vue
@@ -131,8 +131,8 @@
<!-- {{ realData?.warnMsg }}-->
<!-- </div>-->
<!-- -->
-
-
+
+
<!-- <div-->
<!-- v-if="realData?.isError"-->
<!-- class="eqpInfoText blingbling outDiv"-->
@@ -1392,9 +1392,7 @@
width: 1,
},
// [[15,10], [15,11], [10,6], [7.5,12], [5,12], [2.5,5], [2.5,9], [1,7]]
- data: [
-
- ],
+ data: [],
markPoint: {
data: [
{ type: 'max', name: 'Max' },
@@ -1735,6 +1733,7 @@
},
series: [
{
+ name: '骞茬嚗鏁堢巼',
data: ganZaoXiaoLv,
markLine: {
symbol: 'none',
@@ -1750,8 +1749,8 @@
},
},
},
- { data: zhengQiXiaoHao },
- { data: dianNengXiaoHao },
+ // { data: zhengQiXiaoHao },
+ // { data: dianNengXiaoHao },
],
})
}
@@ -1960,37 +1959,72 @@
console.log('errorMsg:', res.fault)
if (faults.includes('鎬ュ仠鎶ヨ')) {
shebeijiting.value = true;
+ } else {
+ shebeijiting.value = false;
}
if (faults.includes('宸﹀墠鎬ュ仠')) {
zuoqianjiting.value = true;
+ } else {
+ zuoqianjiting.value = false;
}
if (faults.includes('闈㈡澘鎬ュ仠')) {
mianbanjiting.value = true;
+ } else {
+ mianbanjiting.value = false;
}
if (faults.includes('鍑烘枡鎬ュ仠')) {
chuliaojiting.value = true;
+ } else {
+ chuliaojiting.value = false;
}
if (faults.includes('娓╁害澶辨帶')) {
wendubaojing.value = true;
+ } else {
+ wendubaojing.value = false;
}
if (faults.includes('婊氱瓛鍗�')) {
guntongsheng.value = true;
+ } else {
+ guntongjiang.value = false;
}
if (faults.includes('婊氱瓛闄�')) {
guntongjiang.value = true;
+ } else {
+ guntongjiang.value = false;
}
if (faults.includes('婊氱瓛鐢垫満杩囨祦')) {
guntongguoliu.value = true;
+ } else {
+ guntongguoliu.value = false;
}
if (faults.includes('椋庣鍗�')) {
fengxiangsheng.value = true;
+ } else {
+ fengxiangsheng.value = false;
}
if (faults.includes('椋庣闄�')) {
fengxiangjiang.value = true;
+ } else {
+ fengxiangjiang.value = false;
}
if (faults.includes('椋庣椋庢満杩囨祦')) {
fengjiguoliu.value = true;
+ } else {
+ fengjiguoliu.value = false;
}
+ }
+ else {
+ shebeijiting.value = false
+ chuliaojiting.value = false
+ zuoqianjiting.value = false
+ mianbanjiting.value = false
+ fengxiangsheng.value = false
+ fengxiangjiang.value = false
+ fengjiguoliu.value = false
+ guntongsheng.value = false
+ guntongjiang.value = false
+ guntongguoliu.value = false
+ wendubaojing.value = false
}
if (res.warning) {
@@ -2000,64 +2034,126 @@
console.log('warnMsg:', res.warning)
if (warnings.includes('宸﹀墠闂�')) {
zuoqianmen.value = true;
+ } else {
+ zuoqianmen.value = false;
}
if (warnings.includes('鍙冲墠闂�')) {
youqianmen.value = true;
+ } else {
+ youqianmen.value = false;
}
if (warnings.includes('宸﹀悗闂�')) {
zuohoumen.value = true;
+ } else {
+ zuohoumen.value = false;
}
if (warnings.includes('鍙冲悗闂�')) {
youhoumen.value = true;
+ } else {
+ youhoumen.value = false;
}
if (warnings.includes('婊氱瓛涓嶅湪楂樹綅')) {
guntongbuzaigaowei.value = true;
+ } else {
+ guntongbuzaigaowei.value = false;
}
if (warnings.includes('椋庣涓嶅湪浣庝綅')) {
fengxiangbuzaidiwei.value = true;
+ } else {
+ fengxiangbuzaidiwei.value = false;
}
if (warnings.includes('椋庣涓嶅湪楂樹綅')) {
fengxiangbuzaigaowei.value = true;
+ } else {
+ fengxiangbuzaigaowei.value = false;
}
if (warnings.includes('鍔犵儹浣嶄紶鎰熷櫒')) {
jiareweichuanganqi.value = true;
+ } else {
+ jiareweichuanganqi.value = false;
}
if (warnings.includes('宸﹀墠椋庣楂樹綅浼犳劅鍣�')) {
zuoqianfengxianggaowei.value = true;
+ } else {
+ zuoqianfengxianggaowei.value = false;
}
if (warnings.includes('鍙冲墠椋庣楂樹綅浼犳劅鍣�')) {
youqianfengxianggaowei.value = true;
+ } else {
+ youqianfengxianggaowei.value = false;
}
if (warnings.includes('宸﹀悗椋庣楂樹綅浼犳劅鍣�')) {
zuohoufengxianggaowei.value = true;
+ } else {
+ zuohoufengxianggaowei.value = false;
}
if (warnings.includes('鍙冲悗椋庣楂樹綅浼犳劅鍣�')) {
youhoufengxianggaowei.value = true;
+ } else {
+ youhoufengxianggaowei.value = false;
}
if (warnings.includes('宸﹀墠椋庣浣庝綅浼犳劅鍣�')) {
zuoqianfengxiangdiwei.value = true;
+ } else {
+ zuoqianfengxiangdiwei.value = false;
}
if (warnings.includes('鍙冲墠椋庣浣庝綅浼犳劅鍣�')) {
youqianfengxiangdiwei.value = true;
+ } else {
+ youqianfengxiangdiwei.value = false;
}
if (warnings.includes('宸﹀悗椋庣浣庝綅浼犳劅鍣�')) {
zuohoufengxiangdiwei.value = true;
+ } else {
+ zuohoufengxiangdiwei.value = false;
}
if (warnings.includes('鍙冲悗椋庣浣庝綅浼犳劅鍣�')) {
youhoufengxiangdiwei.value = true;
+ } else {
+ youhoufengxiangdiwei.value = false;
}
if (warnings.includes('宸﹀墠婊氱瓛浣庝綅浼犳劅鍣�')) {
zuoqianguntongdiwei.value = true;
+ } else {
+ zuoqianguntongdiwei.value = false;
}
if (warnings.includes('鍙冲墠婊氱瓛浣庝綅浼犳劅鍣�')) {
youqianguntongdiwei.value = true;
+ } else {
+ youqianguntongdiwei.value = false;
}
if (warnings.includes('宸﹀悗婊氱瓛浣庝綅浼犳劅鍣�')) {
zuohouguntongdiwei.value = true;
+ } else {
+ zuohouguntongdiwei.value = false;
}
if (warnings.includes('鍙冲悗婊氱瓛浣庝綅浼犳劅鍣�')) {
youhouguntongdiwei.value = true;
+ } else {
+ youhouguntongdiwei.value = false;
}
+ }
+ else {
+ zuoqianmen.value = false;
+ zuohoumen.value = false;
+ youqianmen.value = false;
+ youhoumen.value = false;
+ guntongbuzaigaowei.value = false;
+ fengxiangbuzaigaowei.value = false;
+ fengxiangbuzaidiwei.value = false;
+ jiareweichuanganqi.value = false;
+ zuoqianfengxianggaowei.value = false;
+ zuohoufengxianggaowei.value = false;
+ youqianfengxianggaowei.value = false;
+ youhoufengxianggaowei.value = false;
+ zuoqianfengxiangdiwei.value = false;
+ zuohoufengxiangdiwei.value = false;
+ youqianfengxiangdiwei.value = false;
+ youhoufengxiangdiwei.value = false;
+ zuoqianguntongdiwei.value = false;
+ zuohouguntongdiwei.value = false;
+ youqianguntongdiwei.value = false;
+ youhouguntongdiwei.value = false;
}
} else {
res = {
@@ -2578,4 +2674,24 @@
opacity: 0;
}
}
+
+ .error-div {
+ position: absolute; display: flex; align-items: center;
+ }
+ .error-marker {
+ width: 18px; height: 18px; background: red; border-radius: 50%;
+ }
+ .error-msg {
+ margin-left: 6px;
+ height: 24px;
+ background: gray; border-radius: 5px; font-weight: bold; color: red
+ }
+ .warn-marker {
+ width: 18px; height: 18px; background: orange; border-radius: 50%;
+ }
+ .warn-msg {
+ margin-left: 6px;
+ height: 24px;
+ background: gray; border-radius: 5px; font-weight: bold; color: orange;
+ }
</style>
--
Gitblit v1.9.3