From 220db80e605945ced1b33443020933206b0915db Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 24 七月 2025 14:56:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'bak/master' into master-lpyun
---
src/views/dry/monitor/WorkShop.vue | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/views/dry/monitor/WorkShop.vue b/src/views/dry/monitor/WorkShop.vue
index b361f6a..10a219a 100644
--- a/src/views/dry/monitor/WorkShop.vue
+++ b/src/views/dry/monitor/WorkShop.vue
@@ -86,7 +86,7 @@
vertical
/>
<div class="info-text"
- >鐑锛�<span>{{ realTime.get(item.id)?.windTemp | 0 }}</span> 掳C</div
+ >鐑锛�<span>{{ realTime.get(item.id)?.trendVo?.bellowsTemp | 0 }}</span> 掳C</div
>
</div>
</div>
@@ -387,7 +387,7 @@
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.tempValue = [res.trendVo.bellowsTemp, 100]
res.percent = ((res.dryTime / (res.dryTime + res.remain)) * 100).toFixed(2)
res.mois = [
(res.trendVo.moisture / 100).toFixed(2),
@@ -583,4 +583,15 @@
border: none;
background: #ce0000;
}
+
+
+ .blingbling {
+ -webkit-transition: -webkit-transform 0.4s ease-in-out;
+ transition: transform 0.4s ease-in-out;
+
+ }
+ .blingbling:hover {
+ -webkit-transform: scale(1.1);
+ transform: scale(1.1);
+ }
</style>
--
Gitblit v1.9.3