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/monitor/WorkShop.vue | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/src/views/dry/monitor/WorkShop.vue b/src/views/dry/monitor/WorkShop.vue
index 3781483..5d7f2c1 100644
--- a/src/views/dry/monitor/WorkShop.vue
+++ b/src/views/dry/monitor/WorkShop.vue
@@ -12,7 +12,7 @@
<span class="info-text">{{ realTime.get(item.id)?.dryTime | 0 }}</span> 鍒嗛挓
</div>
- <div style="padding: 0 10px; width: 200px; height: 40px">
+ <div style="padding: 0 10px; width: 195px; height: 40px">
<div style="padding-top: 10px">
<Progress
:stroke-color="{
@@ -21,6 +21,7 @@
}"
:percent="realTime.get(item.id)?.percent"
status="active"
+ trailColor="#2b2b2b2b"
:show-info="false"
/>
</div>
@@ -54,18 +55,18 @@
</div>
<div class="eqpStatus">
- <div> <span class="info-text">缈绘枡</span> </div>
+ <div> <span class="info-text">姝ｅ湪骞茬嚗</span> </div>
</div>
</div>
<!-- <div :id="'chartDom' + item.id" class="chart"> </div> -->
<div class="info">
<div class="leftInfo">
<div style="width: 120px">
- <div style="height: 1px; font-size: 10px; text-align: center; margin-top: 10px; margin-bottom: -10px"
+ <div style="height: 1px; font-size: 14px; text-align: center; margin-top: 10px; margin-bottom: -10px"
>鍒濆锛歿{ realTime.get(item.id)?.initial }}%</div
>
<div :id="'moisture' + item.id" style="width: 110px; height: 187px"></div>
- <div style="height: 1px; font-size: 10px; text-align: center; margin-top: -25px">鐩爣锛歿{ realTime.get(item.id)?.target }}%</div>
+ <div style="height: 1px; font-size: 14px; text-align: center; margin-top: -25px">鐩爣锛歿{ realTime.get(item.id)?.target }}%</div>
<div style="width: 110px; text-align: center; margin-top: 23px">鍚按鐜�</div>
</div>
<!-- <div class="herbName"> 褰撳綊 </div> -->
@@ -84,8 +85,8 @@
:marks="marks"
vertical
/>
- <div
- >鐑锛�<span class="info-text">{{ realTime.get(item.id)?.windTemp | 0 }}</span> 掳C</div
+ <div class="info-text"
+ >鐑锛�<span>{{ realTime.get(item.id)?.trendVo?.bellowsTemp | 0 }}</span> 掳C</div
>
</div>
</div>
@@ -356,7 +357,7 @@
// + '\n\n\n鐩爣'+(mois.value[2]*100).toFixed(2) + '%'
)
},
- fontSize: 10,
+ fontSize: 14,
//position: ['50%',(100-mois.value[1]*100).toFixed(2) + '%'],
},
},
@@ -386,8 +387,8 @@
defHttp.get({ url: queryRealTimeUrl, params: { tenantid: tenantId, machineid: eqpCode } }).then((res) => {
console.log(`output->res`, res)
if (res && res.trendVo) {
- res.tempValue = [res.windTemp, 100]
- res.percent = ((res.dryTime / res.et) * 100).toFixed(2)
+ res.tempValue = [res.trendVo.bellowsTemp, 100]
+ res.percent = ((res.dryTime / (res.dryTime + res.remain)) * 100).toFixed(2)
res.mois = [
(res.trendVo.moisture / 100).toFixed(2),
(res.trendVo.moisture / 100 / 1.5).toFixed(2),
@@ -401,7 +402,7 @@
formatter: function () {
return res.trendVo.moisture + '%'
},
- fontSize: 10,
+ fontSize: 14,
//position: ['50%',(100- res.trendVo.moisture)+ '%'],
},
},
@@ -449,11 +450,12 @@
.eqp-content {
height: 100%;
- background-color: white;
- background-image: url('../../../assets/images/dry/ganzaoji-x.png');
+ background-color: #fdfdfd;
+ box-shadow: 0px 0px 23px #72727278;
+ background-image: url(/src/assets/images/dry/ganzaoji-x.png);
background-repeat: no-repeat;
background-size: 60% 60%;
- background-position: 105px 150px;
+ background-position: 105px 127px;
border-radius: 8px;
}
@@ -475,9 +477,9 @@
}
.eqpStatus {
width: 170px;
- background-position: 0 0px;
- background-image: url('../../../assets/images/dry/refeng2.gif');
- background-size: 180px;
+ background-position: -21px 19px;
+ background-image: url(/src/assets/images/dry/refeng2.gif);
+ background-size: 196px;
background-repeat: no-repeat;
display: inline-flex;
flex-direction: column-reverse;
@@ -498,7 +500,7 @@
}
.info-text {
- font-size: 16px;
+ font-size: 14px;
font-weight: bold;
}
.herbName {
@@ -514,9 +516,10 @@
line-height: 35px;
}
.eqpName {
- margin-top: 68px;
- margin-left: 150px;
- width: 95px;
+ margin-top: 190px;
+ margin-left: 58px;
+ width: 205px;
+ /* font-size: 14px; */
font-weight: bold;
text-align: center;
background-color: white;
--
Gitblit v1.9.3