From d5b77e6f03d8477cbae9bc097f888caf939de00f Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期二, 24 十二月 2024 13:48:52 +0800
Subject: [PATCH] 修改报警解除后界面仍显示问题
---
src/views/dry/bigScreen/BigEqp.vue | 162 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 130 insertions(+), 32 deletions(-)
diff --git a/src/views/dry/bigScreen/BigEqp.vue b/src/views/dry/bigScreen/BigEqp.vue
index b681b6b..584a7c7 100644
--- a/src/views/dry/bigScreen/BigEqp.vue
+++ b/src/views/dry/bigScreen/BigEqp.vue
@@ -158,189 +158,189 @@
</div>
</div>
<div style="width: 848px; height: 485px; position: absolute;" @click="showFault">
- <div v-if="zuoqianjiting" class="error-div" style=" top:309px; left:418px">
+ <div v-show="zuoqianjiting" class="error-div" style=" top:309px; left:418px">
<div class="blingbling error-marker" ></div>
<div class="error-msg" style="width: 70px;">
宸﹀墠鎬ュ仠
</div>
</div>
- <div v-if="shebeijiting" class="error-div" style=" top:111px; left:484px">
+ <div v-show="shebeijiting" class="error-div" style=" top:111px; left:484px">
<div class="blingbling error-marker" ></div>
<div class="error-msg" style=" width: 106px;">
璁惧鎬ュ仠锛堟�伙級
</div>
</div>
- <div v-if="chuliaojiting" class="error-div" style=" top:300px; left:129px">
+ <div v-show="chuliaojiting" class="error-div" style=" top:300px; left:129px">
<div class="blingbling error-marker" ></div>
<div class="error-msg" style=" width: 70px;">
鍑烘枡鎬ュ仠
</div>
</div>
- <div v-if="mianbanjiting" class="error-div" style=" top:258px; left:659px">
+ <div v-show="mianbanjiting" class="error-div" style=" top:258px; left:659px">
<div class="blingbling error-marker" ></div>
<div class="error-msg" style=" width: 70px;">
闈㈡澘鎬ュ仠
</div>
</div>
- <div v-if="fengxiangsheng" class="error-div" style=" top:294px; left:517px">
+ <div v-show="fengxiangsheng" class="error-div" style=" top:294px; left:517px">
<div class="blingbling error-marker" ></div>
<div class="error-msg" style=" width: 86px;">
椋庣鍗囧紓甯�
</div>
</div>
- <div v-if="fengxiangjiang" class="error-div" style=" top:319px; left:517px">
+ <div v-show="fengxiangjiang" class="error-div" style=" top:319px; left:517px">
<div class="blingbling error-marker" ></div>
<div class="error-msg" style=" width: 86px;">
椋庣闄嶅紓甯�
</div>
</div>
- <div v-if="fengjiguoliu" class="error-div" style=" top:335px; left:655px">
+ <div v-show="fengjiguoliu" class="error-div" style=" top:335px; left:655px">
<div class="blingbling error-marker" ></div>
<div class="error-msg" style=" width: 70px;">
椋庢満杩囨祦
</div>
</div>
- <div v-if="guntongsheng" class="error-div" style=" top:198px; left:517px">
+ <div v-show="guntongsheng" class="error-div" style=" top:198px; left:517px">
<div class="blingbling error-marker" ></div>
<div class="error-msg" style=" width: 86px;">
婊氱瓛鍗囧紓甯�
</div>
</div>
- <div v-if="guntongjiang" class="error-div" style=" top:223px; left:517px">
+ <div v-show="guntongjiang" class="error-div" style=" top:223px; left:517px">
<div class="blingbling error-marker" ></div>
<div class="error-msg" style=" width: 86px;">
婊氱瓛闄嶅紓甯�
</div>
</div>
- <div v-if="guntongguoliu" class="error-div" style=" top:209px; left:642px">
+ <div v-show="guntongguoliu" class="error-div" style=" top:209px; left:642px">
<div class="blingbling error-marker" ></div>
<div class="error-msg" style=" width: 70px;">
婊氱瓛杩囨祦
</div>
</div>
- <div v-if="wendubaojing" class="error-div" style=" top:234px; left:659px">
+ <div v-show="wendubaojing" class="error-div" style=" top:234px; left:659px">
<div class="blingbling error-marker" ></div>
<div class="error-msg" style=" width: 70px;">
娓╁害鎶ヨ
</div>
</div>
- <div v-if="zuoqianmen" class="error-div" style=" top:388px; left:415px">
+ <div v-show="zuoqianmen" class="error-div" style=" top:388px; left:415px">
<div class="blingbling warn-marker" ></div>
<div class="warn-msg" style=" width: 80px;">
宸﹀墠闂ㄦ姤璀�
</div>
</div>
- <div v-if="zuohoumen" class="error-div" style=" top:367px; left:587px">
+ <div v-show="zuohoumen" class="error-div" style=" top:367px; left:587px">
<div class="blingbling warn-marker" ></div>
<div class="warn-msg" style=" width: 80px;">
宸﹀悗闂ㄦ姤璀�
</div>
</div>
- <div v-if="youqianmen" class="error-div" style=" top:388px; left:284px">
+ <div v-show="youqianmen" class="error-div" style=" top:388px; left:284px">
<div class="blingbling warn-marker" ></div>
<div class="warn-msg" style=" width: 80px;">
鍙冲墠闂ㄦ姤璀�
</div>
</div>
- <div v-if="youhoumen" class="error-div" style=" top:367px; left:478px">
+ <div v-show="youhoumen" class="error-div" style=" top:367px; left:478px">
<div class="blingbling warn-marker" ></div>
<div class="warn-msg" style=" width: 80px;">
鍙冲悗闂ㄦ姤璀�
</div>
</div>
- <div v-if="guntongbuzaigaowei" class="error-div" style=" top:173px; left:517px">
+ <div v-show="guntongbuzaigaowei" class="error-div" style=" top:173px; left:517px">
<div class="blingbling warn-marker" ></div>
<div class="warn-msg" style=" width: 100px;">
婊氱瓛涓嶅湪楂樹綅
</div>
</div>
- <div v-if="fengxiangbuzaigaowei" class="error-div" style=" top:269px; left:517px">
+ <div v-show="fengxiangbuzaigaowei" class="error-div" style=" top:269px; left:517px">
<div class="blingbling warn-marker" ></div>
<div class="warn-msg" style=" width: 100px;">
椋庣涓嶅湪楂樹綅
</div>
</div>
- <div v-if="fengxiangbuzaidiwei" class="error-div" style=" top:343px; left:517px">
+ <div v-show="fengxiangbuzaidiwei" class="error-div" style=" top:343px; left:517px">
<div class="blingbling warn-marker" ></div>
<div class="warn-msg" style=" width: 100px;">
椋庣涓嶅湪浣庝綅
</div>
</div>
- <div v-if="jiareweichuanganqi" class="error-div" style=" top:283px; left:642px">
+ <div v-show="jiareweichuanganqi" class="error-div" style=" top:283px; left:642px">
<div class="blingbling warn-marker" ></div>
<div class="warn-msg" style=" width: 126px;">
鍔犵儹浣嶄紶鎰熷櫒鎶ヨ
</div>
</div>
- <div v-if="zuoqianfengxianggaowei" class="error-div" style=" top:334px; left:362px">
+ <div v-show="zuoqianfengxianggaowei" class="error-div" style=" top:334px; left:362px">
<div class="blingbling warn-marker" ></div>
<div class="warn-msg" style=" width: 126px;">
宸﹀墠椋庣涓嶅湪楂樹綅
</div>
</div>
- <div v-if="zuoqianfengxiangdiwei" class="error-div" style=" top:334px; left:362px">
+ <div v-show="zuoqianfengxiangdiwei" class="error-div" style=" top:334px; left:362px">
<div class="blingbling warn-marker" ></div>
<div class="warn-msg" style=" width: 126px;">
宸﹀墠椋庣涓嶅湪浣庝綅
</div>
</div>
- <div v-if="zuohoufengxianggaowei" class="error-div" style=" top:309px; left:642px">
+ <div v-show="zuohoufengxianggaowei" class="error-div" style=" top:309px; left:642px">
<div class="blingbling warn-marker" ></div>
<div class="warn-msg" style=" width: 126px;">
宸﹀悗椋庣涓嶅湪楂樹綅
</div>
</div>
- <div v-if="zuohoufengxiangdiwei" class="error-div" style=" top:309px; left:642px">
+ <div v-show="zuohoufengxiangdiwei" class="error-div" style=" top:309px; left:642px">
<div class="blingbling warn-marker" ></div>
<div class="warn-msg" style=" width: 126px;">
宸﹀悗椋庣涓嶅湪浣庝綅
</div>
</div>
- <div v-if="youqianfengxianggaowei" class="error-div" style=" top:272px; left:300px">
+ <div v-show="youqianfengxianggaowei" class="error-div" style=" top:272px; left:300px">
<div class="blingbling warn-marker" ></div>
<div class="warn-msg" style=" width: 126px;">
鍙冲墠椋庣涓嶅湪楂樹綅
</div>
</div>
- <div v-if="youqianfengxiangdiwei" class="error-div" style=" top:272px; left:300px">
+ <div v-show="youqianfengxiangdiwei" class="error-div" style=" top:272px; left:300px">
<div class="blingbling warn-marker" ></div>
<div class="warn-msg" style=" width: 126px;">
鍙冲墠椋庣涓嶅湪浣庝綅
</div>
</div>
- <div v-if="youhoufengxianggaowei" class="error-div" style=" top:246px; left:506px">
+ <div v-show="youhoufengxianggaowei" class="error-div" style=" top:246px; left:506px">
<div class="blingbling warn-marker" ></div>
<div class="warn-msg" style=" width: 126px;">
鍙冲悗椋庣涓嶅湪楂樹綅
</div>
</div>
- <div v-if="youhoufengxiangdiwei" class="error-div" style=" top:246px; left:506px">
+ <div v-show="youhoufengxiangdiwei" class="error-div" style=" top:246px; left:506px">
<div class="blingbling warn-marker" ></div>
<div class="warn-msg" style=" width: 126px;">
鍙冲悗椋庣涓嶅湪浣庝綅
</div>
</div>
- <div v-if="zuoqianguntongdiwei" class="error-div" style=" top:175px; left:358px">
+ <div v-show="zuoqianguntongdiwei" class="error-div" style=" top:175px; left:358px">
<div class="blingbling warn-marker" ></div>
<div class="warn-msg" style=" width: 126px;">
宸﹀墠婊氱瓛涓嶅湪浣庝綅
</div>
</div>
- <div v-if="zuohouguntongdiwei" class="error-div" style=" top:158px; left:643px">
+ <div v-show="zuohouguntongdiwei" class="error-div" style=" top:158px; left:643px">
<div class="blingbling warn-marker" ></div>
<div class="warn-msg" style=" width: 126px;">
宸﹀悗婊氱瓛涓嶅湪浣庝綅
</div>
</div>
- <div v-if="youqianguntongdiwei" class="error-div" style=" top:150px; left:268px">
+ <div v-show="youqianguntongdiwei" class="error-div" style=" top:150px; left:268px">
<div class="blingbling warn-marker" ></div>
<div class="warn-msg" style=" width: 126px;">
鍙冲墠婊氱瓛涓嶅湪浣庝綅
</div>
</div>
- <div v-if="youhouguntongdiwei" class="error-div" style=" top:135px; left:506px">
+ <div v-show="youhouguntongdiwei" class="error-div" style=" top:135px; left:506px">
<div class="blingbling warn-marker" ></div>
<div class="warn-msg" style=" width: 126px;">
鍙冲悗婊氱瓛涓嶅湪浣庝綅
@@ -1473,7 +1473,8 @@
// 鍔ㄦ�佽鍙栧浘鐗�
function getHerbImageUrl(name: string) {
- return new URL(`/src/assets/images/dry/yaocai/${name}`, import.meta.url).href
+ //return new URL(`/src/assets/images/dry/yaocai/${name}`, import.meta.url).href
+ return "";
}
// 鍔ㄦ�佽鍙栧浘鐗�
@@ -1959,37 +1960,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) {
@@ -1999,65 +2035,127 @@
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 = {
mois: [],
--
Gitblit v1.9.3