From bd11d32a4e0fab6e4e6c4a32d5e7e3fe26abb271 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 06 十二月 2024 16:15:11 +0800
Subject: [PATCH] 完成设备大屏，新增报警大屏
---
src/views/dry/bigScreen/BigEqpCloud.vue | 187 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 144 insertions(+), 43 deletions(-)
diff --git a/src/views/dry/bigScreen/BigEqpCloud.vue b/src/views/dry/bigScreen/BigEqpCloud.vue
index f87b9a6..4c97ddb 100644
--- a/src/views/dry/bigScreen/BigEqpCloud.vue
+++ b/src/views/dry/bigScreen/BigEqpCloud.vue
@@ -158,189 +158,189 @@
</div>
</div>
<div style="width: 848px; height: 485px; position: absolute;" @click="showFault">
- <div v-if="true | zuoqianjiting" class="error-div" style=" top:309px; left:418px">
+ <div v-if="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="true | shebeijiting" class="error-div" style=" top:111px; left:484px">
+ <div v-if="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="true | chuliaojiting" class="error-div" style=" top:300px; left:129px">
+ <div v-if="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="true | mianbanjiting" class="error-div" style=" top:258px; left:659px">
+ <div v-if="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="true | fengxiangsheng" class="error-div" style=" top:294px; left:517px">
+ <div v-if="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="true | fengxiangjiang" class="error-div" style=" top:319px; left:517px">
+ <div v-if="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="true | fengjiguoliu" class="error-div" style=" top:335px; left:655px">
+ <div v-if="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="true | guntongsheng" class="error-div" style=" top:198px; left:517px">
+ <div v-if="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="true | guntongjiang" class="error-div" style=" top:223px; left:517px">
+ <div v-if="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="true | guntongguoliu" class="error-div" style=" top:209px; left:642px">
+ <div v-if="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="true | wendubaojing" class="error-div" style=" top:234px; left:659px">
+ <div v-if="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="true | zuoqianmen" class="error-div" style=" top:388px; left:415px">
+ <div v-if="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="true | zuohoumen" class="error-div" style=" top:367px; left:587px">
+ <div v-if="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="true | youqianmen" class="error-div" style=" top:388px; left:284px">
+ <div v-if="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="true | youhoumen" class="error-div" style=" top:367px; left:478px">
+ <div v-if="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="true | guntongbuzaigaowei" class="error-div" style=" top:173px; left:517px">
+ <div v-if="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="true | fengxiangbuzaigaowei" class="error-div" style=" top:269px; left:517px">
+ <div v-if="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="true | fengxiangbuzaidiwei" class="error-div" style=" top:343px; left:517px">
+ <div v-if="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="true | jiareweichuanganqi" class="error-div" style=" top:283px; left:642px">
+ <div v-if="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="true | zuoqianfengxianggaowei" class="error-div" style=" top:334px; left:362px">
+ <div v-if="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="true | zuoqianfengxiangdiwei" class="error-div" style=" top:334px; left:362px">
+ <div v-if="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="true | zuohoufengxianggaowei" class="error-div" style=" top:309px; left:642px">
+ <div v-if="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="true | zuohoufengxiangdiwei" class="error-div" style=" top:309px; left:642px">
+ <div v-if="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="true | youqianfengxianggaowei" class="error-div" style=" top:272px; left:300px">
+ <div v-if="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="true | youqianfengxiangdiwei" class="error-div" style=" top:272px; left:300px">
+ <div v-if="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="true | youhoufengxianggaowei" class="error-div" style=" top:246px; left:506px">
+ <div v-if="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="true | youhoufengxiangdiwei" class="error-div" style=" top:246px; left:506px">
+ <div v-if="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="true | zuoqianguntongdiwei" class="error-div" style=" top:175px; left:358px">
+ <div v-if="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="true | zuohouguntongdiwei" class="error-div" style=" top:158px; left:643px">
+ <div v-if="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="true | youqianguntongdiwei" class="error-div" style=" top:150px; left:268px">
+ <div v-if="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="true | youhouguntongdiwei" class="error-div" style=" top:135px; left:506px">
+ <div v-if="youhouguntongdiwei" class="error-div" style=" top:135px; left:506px">
<div class="blingbling warn-marker" ></div>
<div class="warn-msg" style=" width: 126px;">
鍙冲悗婊氱瓛涓嶅湪浣庝綅
@@ -713,7 +713,7 @@
var progressBarChart: echarts.ECharts
var efficiencyLineChart: echarts.ECharts
- var compareChart: echarts.ECharts
+ var compareChart : echarts.ECharts
//----------------error----------------
const shebeijiting = ref(false)
@@ -1826,6 +1826,9 @@
res.zhengqi = lastTrend.steam / (res.originWeight - lastTrend.weight)
}
res.zhengqi = Number(res.zhengqi)
+ if (res.zhengqi < 0) {
+ res.zhengqi = 0
+ }
//eqp.value.steamConsumption = Number(eqp.value.steamConsumption)
// res.zhengqi = eqp.value.steamConsumption - 3
// console.log(res);
@@ -1850,7 +1853,10 @@
res.dian = lastTrend.watt / (res.originWeight - lastTrend.weight)
}
// res.dian = eqp.value.powerConsumption - 1.5
- res.dian = Number(res.dian)
+ res.dian = Number(res.dian)
+ if (res.dian < 0) {
+ res.dian = 0
+ }
//eqp.value.powerConsumption = Number(eqp.value.powerConsumption)
if (res.dian > res.wattAvg) {
console.log("dian::", res.dian,res.wattAvg )
@@ -1950,17 +1956,112 @@
}
res.isError = false
- if (res.fault) {
- res.isError = true
- res.errorMsg = res.fault
- console.log("errorMsg:",res.fault)
- }
+ if (res.fault) {
+ res.isError = true
+ res.errorMsg = res.fault;
+ const faults = res.fault;
+ console.log('errorMsg:', res.fault)
+ if (faults.includes('鎬ュ仠鎶ヨ')) {
+ shebeijiting.value = true;
+ }
+ if (faults.includes('宸﹀墠鎬ュ仠')) {
+ zuoqianjiting.value = true;
+ }
+ if (faults.includes('闈㈡澘鎬ュ仠')) {
+ mianbanjiting.value = true;
+ }
+ if (faults.includes('鍑烘枡鎬ュ仠')) {
+ chuliaojiting.value = true;
+ }
+ if (faults.includes('娓╁害澶辨帶')) {
+ wendubaojing.value = true;
+ }
+ if (faults.includes('婊氱瓛鍗�')) {
+ guntongsheng.value = true;
+ }
+ if (faults.includes('婊氱瓛闄�')) {
+ guntongjiang.value = true;
+ }
+ if (faults.includes('婊氱瓛鐢垫満杩囨祦')) {
+ guntongguoliu.value = true;
+ }
+ if (faults.includes('椋庣鍗�')) {
+ fengxiangsheng.value = true;
+ }
+ if (faults.includes('椋庣闄�')) {
+ fengxiangjiang.value = true;
+ }
+ if (faults.includes('椋庣椋庢満杩囨祦')) {
+ fengjiguoliu.value = true;
+ }
+ }
- if (res.warning) {
- res.isWarning = true
- res.warnMsg = res.warning
- console.log("warnMsg:",res.warning)
- }
+ if (res.warning) {
+ res.isWarning = true
+ res.warnMsg = res.warning
+ const warnings = res.warning;
+ console.log('warnMsg:', res.warning)
+ if (warnings.includes('宸﹀墠闂�')) {
+ zuoqianmen.value = true;
+ }
+ if (warnings.includes('鍙冲墠闂�')) {
+ youqianmen.value = true;
+ }
+ if (warnings.includes('宸﹀悗闂�')) {
+ zuohoumen.value = true;
+ }
+ if (warnings.includes('鍙冲悗闂�')) {
+ youhoumen.value = true;
+ }
+ if (warnings.includes('婊氱瓛涓嶅湪楂樹綅')) {
+ guntongbuzaigaowei.value = true;
+ }
+ if (warnings.includes('椋庣涓嶅湪浣庝綅')) {
+ fengxiangbuzaidiwei.value = true;
+ }
+ if (warnings.includes('椋庣涓嶅湪楂樹綅')) {
+ fengxiangbuzaigaowei.value = true;
+ }
+ if (warnings.includes('鍔犵儹浣嶄紶鎰熷櫒')) {
+ jiareweichuanganqi.value = true;
+ }
+ if (warnings.includes('宸﹀墠椋庣楂樹綅浼犳劅鍣�')) {
+ zuoqianfengxianggaowei.value = true;
+ }
+ if (warnings.includes('鍙冲墠椋庣楂樹綅浼犳劅鍣�')) {
+ youqianfengxianggaowei.value = true;
+ }
+ if (warnings.includes('宸﹀悗椋庣楂樹綅浼犳劅鍣�')) {
+ zuohoufengxianggaowei.value = true;
+ }
+ if (warnings.includes('鍙冲悗椋庣楂樹綅浼犳劅鍣�')) {
+ youhoufengxianggaowei.value = true;
+ }
+ if (warnings.includes('宸﹀墠椋庣浣庝綅浼犳劅鍣�')) {
+ zuoqianfengxiangdiwei.value = true;
+ }
+ if (warnings.includes('鍙冲墠椋庣浣庝綅浼犳劅鍣�')) {
+ youqianfengxiangdiwei.value = true;
+ }
+ if (warnings.includes('宸﹀悗椋庣浣庝綅浼犳劅鍣�')) {
+ zuohoufengxiangdiwei.value = true;
+ }
+ if (warnings.includes('鍙冲悗椋庣浣庝綅浼犳劅鍣�')) {
+ youhoufengxiangdiwei.value = true;
+ }
+ if (warnings.includes('宸﹀墠婊氱瓛浣庝綅浼犳劅鍣�')) {
+ zuoqianguntongdiwei.value = true;
+ }
+ if (warnings.includes('鍙冲墠婊氱瓛浣庝綅浼犳劅鍣�')) {
+ youqianguntongdiwei.value = true;
+ }
+ if (warnings.includes('宸﹀悗婊氱瓛浣庝綅浼犳劅鍣�')) {
+ zuohouguntongdiwei.value = true;
+ }
+ if (warnings.includes('鍙冲悗婊氱瓛浣庝綅浼犳劅鍣�')) {
+ youhouguntongdiwei.value = true;
+ }
+ }
} else {
res = {
mois: [],
--
Gitblit v1.9.3