From 5bec62ee89b4beb9d631670fe436fd3de2887317 Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期六, 05 八月 2023 09:34:44 +0800
Subject: [PATCH] 优化车间大屏和机台大屏

---
 src/views/dry/bigScreen/BigEqp.vue |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/dry/bigScreen/BigEqp.vue b/src/views/dry/bigScreen/BigEqp.vue
index c609eae..aa27b60 100644
--- a/src/views/dry/bigScreen/BigEqp.vue
+++ b/src/views/dry/bigScreen/BigEqp.vue
@@ -27,7 +27,7 @@
 									</div>
 									<div class="formula">
 										<div class="formulaItem">
-											<Icon style="color: powderblue" icon="icon-park-twotone:box" :size="35" />
+											<Icon style="color: powderblue" icon="la:box" :size="38" />
 											<div>
 												<div class="mainInfo2">{{ realData?.feed }} 绛�</div>
 												<div class="subhead2">鎶曟枡閲�</div>
@@ -154,7 +154,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">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>
@@ -1434,7 +1434,10 @@
 							}
 
 							// ganZaoXiaoLv.push([totalTime + res.remain,standard.value.xiaolv])
-
+							// console.log(`output->res.remain`, res.remain)
+							// console.log(`output->res.dryTime`, res.dryTime)
+							// console.log(`output->totalTime`, totalTime)
+							// 骞茬嚗鍓╀綑鏃堕棿=宸ュ崟棰勮鍓╀綑-锛堝綋鍓嶅共鐕ユ椂闂�-鏈�鍚庝竴娆¤褰曞共鐕ユ椂闂达級
 							res.totalRemain = res.remain - (res.dryTime - totalTime) > 0 ? res.remain - (res.dryTime - totalTime) : 0
 							progressSeries.push({
 								name: '鍓╀綑',

--
Gitblit v1.9.3