From 86301bd8e636e53667bc34c501b49149e663ec66 Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期一, 27 五月 2024 16:14:29 +0800
Subject: [PATCH] 机台监控界面效率和能耗对比优化

---
 src/views/dry/bigScreen/BigEqp.vue |   76 +++++++++++++++++++-------------------
 1 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/views/dry/bigScreen/BigEqp.vue b/src/views/dry/bigScreen/BigEqp.vue
index 1b22771..8361aaa 100644
--- a/src/views/dry/bigScreen/BigEqp.vue
+++ b/src/views/dry/bigScreen/BigEqp.vue
@@ -96,7 +96,7 @@
 								<div class="leftTop1">
 									<Icon icon="bi:fan" :size="50" />
 									<div>
-										<div class="mainInfo">{{ realData.trendVo?.fanFrequency | 0 }} Hz</div>
+										<div class="mainInfo">{{ realData?.trendVo?.fanFrequency | 0 }} Hz</div>
 										<div class="subhead">椋庢満棰戠巼</div>
 									</div>
 								</div>
@@ -170,7 +170,7 @@
 							<div class="chartTittle">瀹炴椂杩涘害</div>
 							<div id="efficiencyLine" style="width: 848px; height: 180px; margin-top: -10px"></div>
 							<div style="height: 10px; display: flex; width: 848px; padding: 0 60px; justify-content: space-between">
-								<div style="width: 100px; height: 20px">{{ realData.dryTime | 0 }} min</div>
+								<div style="width: 100px; height: 20px">{{ realData?.dryTime | 0 }} min</div>
 								<div style="width: 100px; height: 20px; text-align: right">{{ realData?.totalTime | 0 }} min</div>
 							</div>
 							<div id="progressBar" style="width: 848px; height: 80px"></div>
@@ -205,8 +205,8 @@
 								<div class="chartTittle">
 									骞茬嚗鏁堢巼(kg/h)
 									<div class="rightLabel">
-										<div class="label good">&gt;{{ eqp.dryEfficiency }} 浼� </div>
-										<div class="label bad">&lt;{{ eqp.dryEfficiency * 0.9.toFixed(2) }} 宸�</div>
+										<div class="label good">&gt;{{ realData?.efficAvg?.toFixed(2) }} 浼� </div>
+										<div class="label bad">&lt;{{ ((realData?.efficAvg|0) * 0.9)?.toFixed(2) }} 宸�</div>
 									</div>
 								</div>
 								<div class="outDiv" style="padding-top: 20px">
@@ -228,7 +228,7 @@
 									</div>
 									<div class="rightChart center">
 										<div class="center compareBar">
-											<div class="barTop">{{ eqp.dryEfficiency }}</div>
+											<div class="barTop">{{ realData?.efficAvg?.toFixed(2) }}</div>
 											<div class="barBack">
 												<div class="barDiv" :style="{ height: realData?.xlsHeight }"></div>
 											</div>
@@ -239,7 +239,7 @@
 											</div>
 										</div>
 										<div class="center compareBar">
-											<div class="barTop">{{ realData?.xiaolv || 0 }}</div>
+											<div class="barTop">{{ realData?.xiaolv?.toFixed(2) || 0 }}</div>
 											<div class="barBack">
 												<div
 													class="barDiv"
@@ -262,8 +262,8 @@
 								<div class="chartTittle"
 									>钂告苯娑堣��(m鲁/kg)
 									<div class="rightLabel">
-										<div class="label bad">&gt;{{ eqp.steamConsumption }} 宸�</div>
-										<div class="label good">&lt;{{ eqp.steamConsumption * 0.9.toFixed(2) }} 浼�</div>
+										<div class="label bad">&gt;{{ realData?.steamAvg?.toFixed(2) }} 宸�</div>
+										<div class="label good">&lt;{{ ((realData?.steamAvg|0) * 0.9).toFixed(2) }} 浼�</div>
 									</div>
 								</div>
 								<div class="outDiv" style="padding-top: 20px">
@@ -279,7 +279,7 @@
 									</div>
 									<div class="rightChart center">
 										<div class="center compareBar">
-											<div class="barTop">{{ eqp.steamConsumption }}</div>
+											<div class="barTop">{{ realData?.steamAvg?.toFixed(2) }}</div>
 											<div class="barBack">
 												<div class="barDiv" :style="{ height: realData?.zqsHeight }"></div>
 											</div>
@@ -290,7 +290,7 @@
 											</div>
 										</div>
 										<div class="center compareBar">
-											<div class="barTop">{{ realData?.zhengqi || 0 }}</div>
+											<div class="barTop">{{ realData?.zhengqi?.toFixed(2) || 0 }}</div>
 											<div class="barBack">
 												<div
 													class="barDiv"
@@ -318,8 +318,8 @@
 								<div class="chartTittle">
 									<div> 鐢佃兘娑堣��(kWh/kg)</div>
 									<div class="rightLabel">
-										<div class="label bad">&gt;{{ eqp.powerConsumption }} 宸�</div>
-										<div class="label good">&lt;{{ eqp.powerConsumption * 0.9.toFixed(2) }} 浼�</div>
+										<div class="label bad">&gt;{{ realData?.wattAvg?.toFixed(3) }} 宸�</div>
+										<div class="label good">&lt;{{ ((realData?.wattAvg|0) * 0.9).toFixed(3) }} 浼�</div>
 									</div>
 								</div>
 								<div class="outDiv" style="padding-top: 20px">
@@ -335,7 +335,7 @@
 									</div>
 									<div class="rightChart center">
 										<div class="center compareBar">
-											<div class="barTop">{{ eqp.powerConsumption }}</div>
+											<div class="barTop">{{ realData?.wattAvg?.toFixed(3) }}</div>
 											<div class="barBack">
 												<div class="barDiv" :style="{ height: realData?.dnsHeight }"></div>
 											</div>
@@ -346,7 +346,7 @@
 											</div>
 										</div>
 										<div class="center compareBar">
-											<div class="barTop">{{ realData?.dian || 0 }}</div>
+											<div class="barTop">{{ realData?.dian?.toFixed(3) || 0 }}</div>
 											<div class="barBack">
 												<div
 													class="barDiv"
@@ -1181,7 +1181,7 @@
 						data: [
 							{
 								name: '棰濆畾',
-								yAxis: eqp.value.dryEfficiency,
+								yAxis: 100,
 							},
 						],
 						label: {
@@ -1510,7 +1510,7 @@
 											data: [
 												{
 													name: '棰濆畾',
-													yAxis: eqp.value.dryEfficiency,
+													yAxis: res.efficAvg|eqp.value.dryEfficiency,
 												},
 											],
 											label: {
@@ -1574,69 +1574,69 @@
 					if (res.originWeight - lastTrend.weight <= 0) {
 						res.xiaolv = 0
 					} else {
-						res.xiaolv = (((res.originWeight - lastTrend.weight) / lastTrend.totalTime) * 60).toFixed(2)
+						res.xiaolv = ((res.originWeight - lastTrend.weight) / lastTrend.totalTime) * 60
 					}
 					res.xiaolv = Number(res.xiaolv) 
-					eqp.value.dryEfficiency = Number(eqp.value.dryEfficiency)
-					if (res.xiaolv > eqp.value.dryEfficiency) {
+					//eqp.value.dryEfficiency = Number(eqp.value.dryEfficiency)
+					if (res.xiaolv > res.efficAvg) {
 						console.log("xiaolv:",res , eqp);
 						res.xlgood = true
-						res.xlsHeight = (eqp.value.dryEfficiency / res.xiaolv) * 100 + '%'
+						res.xlsHeight = (res.efficAvg / res.xiaolv) * 100 + '%'
 						res.xlrHeight = '100%'
-					} else if (res.xiaolv < eqp.value.dryEfficiency * 0.9) {
+					} else if (res.xiaolv < res.efficAvg * 0.9) {
 						res.xlbad = true
 						res.xlsHeight = '100%'
-						res.xlrHeight = (res.xiaolv / eqp.value.dryEfficiency) * 100 + '%'
+						res.xlrHeight = (res.xiaolv / res.efficAvg) * 100 + '%'
 					} else {
 						res.xlsHeight = '100%'
-						res.xlrHeight = (res.xiaolv / eqp.value.dryEfficiency) * 100 + '%'
+						res.xlrHeight = (res.xiaolv / res.efficAvg) * 100 + '%'
 					}
 
 					/** 钂告苯娑堣�� */
 					if (res.originWeight - lastTrend.weight <= 0) {
 						res.zhengqi = 0
 					} else {
-						res.zhengqi = (lastTrend.steam / (res.originWeight - lastTrend.weight)).toFixed(2)
+						res.zhengqi = lastTrend.steam / (res.originWeight - lastTrend.weight)
 					}
 					res.zhengqi = Number(res.zhengqi) 
-					eqp.value.steamConsumption = Number(eqp.value.steamConsumption)
+					//eqp.value.steamConsumption = Number(eqp.value.steamConsumption)
 					// res.zhengqi = eqp.value.steamConsumption - 3
 					// console.log(res);
 					// console.log('zhengqi:', res.zhengqi);
-					if (res.zhengqi > eqp.value.steamConsumption) {
+					if (res.zhengqi > res.steamAvg) {
 						res.zqbad = true
-						res.zqsHeight = (eqp.value.steamConsumption / res.zhengqi) * 100 + '%'
+						res.zqsHeight = (res.steamAvg / res.zhengqi) * 100 + '%'
 						res.zqrHeight = '100%'
-					} else if (res.zhengqi < eqp.value.steamConsumption * 0.9) {
+					} else if (res.zhengqi < res.steamAvg * 0.9) {
 						res.zqgood = true
 						res.zqsHeight = '100%'
-						res.zqrHeight = (res.zhengqi / eqp.value.steamConsumption) * 100 + '%'
+						res.zqrHeight = (res.zhengqi / res.steamAvg) * 100 + '%'
 					} else {
 						res.zqsHeight = '100%'
-						res.zqrHeight = (res.zhengqi / eqp.value.steamConsumption) * 100 + '%'
+						res.zqrHeight = (res.zhengqi / res.steamAvg) * 100 + '%'
 					}
 
 					/** 鐢佃兘娑堣�� */
 					if (res.originWeight - lastTrend.weight <= 0) {
 						res.dian = 0
 					} else {
-						res.dian = (lastTrend.watt / (res.originWeight - lastTrend.weight)).toFixed(2)
+						res.dian = lastTrend.watt / (res.originWeight - lastTrend.weight)
 					}
 					// res.dian = eqp.value.powerConsumption - 1.5
 					res.dian = Number(res.dian) 
-					eqp.value.powerConsumption = Number(eqp.value.powerConsumption)
-					if (res.dian > eqp.value.powerConsumption) {
-						console.log("dian::", res.dian,eqp.value.powerConsumption )
+					//eqp.value.powerConsumption = Number(eqp.value.powerConsumption)
+					if (res.dian > res.wattAvg) {
+						console.log("dian::", res.dian,res.wattAvg )
 						res.dnbad = true
-						res.dnsHeight = (eqp.value.powerConsumption / res.dian) * 100 + '%'
+						res.dnsHeight = (res.wattAvg / res.dian) * 100 + '%'
 						res.dnrHeight = '100%'
-					} else if (res.dian < eqp.value.powerConsumption * 0.9) {
+					} else if (res.dian < res.wattAvg * 0.9) {
 						res.dngood = true
 						res.dnsHeight = '100%'
-						res.dnrHeight = (res.dian / eqp.value.powerConsumption) * 100 + '%'
+						res.dnrHeight = (res.dian / res.wattAvg) * 100 + '%'
 					} else {
 						res.dnsHeight = '100%'
-						res.dnrHeight = (res.dian / eqp.value.powerConsumption) * 100 + '%'
+						res.dnrHeight = (res.dian / res.wattAvg) * 100 + '%'
 					}
 
 					//console.log('state:::fan::', res.state_fan, 'roller::', res.state_roller, 'windbox::', res.state_windbox)

--
Gitblit v1.9.3