From 4840673314921235a3abb6b2485383ff9c6fc72c Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 08 八月 2025 16:18:08 +0800
Subject: [PATCH] refactor(dry): 调整车间大屏和机台大屏的尺寸，更换设备模型图片

---
 src/views/dry/bigScreen/BigWorkShop-tjt.vue |   53 +++++++++++++++++++++++++++--------------------------
 1 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/src/views/dry/bigScreen/BigWorkShop-tjt.vue b/src/views/dry/bigScreen/BigWorkShop-tjt.vue
index dc34a58..edb0f51 100644
--- a/src/views/dry/bigScreen/BigWorkShop-tjt.vue
+++ b/src/views/dry/bigScreen/BigWorkShop-tjt.vue
@@ -16,16 +16,16 @@
 				</div>
 				<div class="body">
 					<div class="humiture">
-						<div style="display: flex; width: 120px">
-							<Icon style="color: #ba9853" icon="mdi:home-temperature-outline" :size="28" />
-							&nbsp;
-							<div style="font-size: 20px; line-height: 26px"> {{ envTemp }} 鈩� </div>
-						</div>
-						<div style="display: flex">
-							<Icon style="color: #ba9853" icon="wi:humidity" :size="28" />
-							&nbsp;
-							<div style="font-size: 20px; line-height: 26px"> {{ envHum }} %rh </div>
-						</div>
+<!--						<div style="display: flex; width: 120px">-->
+<!--							<Icon style="color: #ba9853" icon="mdi:home-temperature-outline" :size="28" />-->
+<!--							&nbsp;-->
+<!--							<div style="font-size: 20px; line-height: 26px"> {{ envTemp }} 鈩� </div>-->
+<!--						</div>-->
+<!--						<div style="display: flex">-->
+<!--							<Icon style="color: #ba9853" icon="wi:humidity" :size="28" />-->
+<!--							&nbsp;-->
+<!--							<div style="font-size: 20px; line-height: 26px"> {{ envHum }} %rh </div>-->
+<!--						</div>-->
 					</div>
 					<div class="feed">
 						<div style="width: 700px; margin-left: 50px; display: flex; flex-direction: column; height: 950px; justify-content: space-between">
@@ -373,7 +373,7 @@
 			if (res && res.trendVo) {
 				res.tempValue = [res.windTemp, 100]
 				res.totalRemain = res.remain
-				if (res.detailList && res.detailList.length > 0) {
+				if (res.detailList && res.detailList.length > 0 && res.remain > 0 && res.dryTime > 0) {
 					// 骞茬嚗鍓╀綑鏃堕棿=宸ュ崟棰勮鍓╀綑-锛堝綋鍓嶅共鐕ユ椂闂�-鏈�鍚庝竴娆¤褰曞共鐕ユ椂闂达級
 					res.totalRemain = res.remain - (res.dryTime - res.detailList[res.detailList.length - 1].totalTime)
 				} else {
@@ -437,13 +437,14 @@
 <style scoped>
 	.fbg {
 		height: 1080px;
-		width: 1920px;
+		width: 2048px;
 		background-image: url(/src/assets/images/dry/bg/bg5.png);
 		background-repeat: no-repeat;
+    background-size: 100%;
 	}
 	.bgImage {
 		height: 1080px;
-		width: 1920px;
+		width: 2048px;
 		background-image: url(/src/assets/images/dry/bg/tjtbg@0.5x.png);
 		background-repeat: no-repeat;
 		background-size: 104%;
@@ -493,8 +494,8 @@
 		justify-content: flex-start;
 	}
 	.down {
-		padding-left: 640px;
-		margin-top: -760px;
+		padding-left: 683px;
+		margin-top: -823px;
 		display: flex;
 
 		align-content: center;
@@ -509,8 +510,8 @@
 	}
 
 	.eqpInfodown {
-		width: 300px;
-		height: 430px;
+		width: 313px;
+		height: 490px;
     position: relative;
 		display: flex;
 		flex-direction: column;
@@ -518,19 +519,19 @@
 	}
 
 	.one {
-		margin: 282px 37px;
+		margin: 310px 52px;
 	}
 
 	.two {
-		margin: 227px -49px;
+		margin: 248px -45px;
 	}
 
 	.three {
-		margin: 118px 197px;
+		margin: 129px 222px;
 	}
 
 	.four {
-		margin: 0px -5px;
+		margin: 3px 4px;
 	}
 
 	.four_down {
@@ -584,7 +585,7 @@
 	.weight {
 		flex: 1;
 		display: flex;
-		margin-left: 46px;
+		margin-left: 36px;
 		font-size: 20px;
 	}
 
@@ -686,13 +687,13 @@
   }
 
   .eqp_num_down_one {
-    margin: -16px -82px;
+    margin: -53px -82px;
   }
   .eqp_num_down_two {
-    margin: -23px -61px;
+    margin: -54px -71px;
   }
   .eqp_num_down_three {
-    margin: -24px -69px;
+    margin: -55px -85px;
   }
 
 	.putincolor {
@@ -745,7 +746,7 @@
     content: "";
     position: absolute;
     left: 99px;
-    top: 57%;
+    top: 59%;
     width: 128px;
     height: 6px;
     background: repeating-linear-gradient(90deg, #5596c7 0 5px, transparent 5px 10px);

--
Gitblit v1.9.3