From 246b5c26a2c17f5baa0a70c893fae819ef8d2e84 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 26 十二月 2024 18:28:54 +0800
Subject: [PATCH] ll
---
screen/src/views/FireFighting.vue | 62 +++++++++++++++---------------
1 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/screen/src/views/FireFighting.vue b/screen/src/views/FireFighting.vue
index f0ca910..473d5ec 100644
--- a/screen/src/views/FireFighting.vue
+++ b/screen/src/views/FireFighting.vue
@@ -101,6 +101,13 @@
</div>
</div>
<div class="item">
+ <img src="@/assets/images/FireFighting/xiaofang_ic_pingbi@2x.png" alt="">
+ <div class="content">
+ <div class="name">灞忚斀</div>
+ <div class="num num5">{{ dataList4.shieldDeviceNum || 0 }}</div>
+ </div>
+ </div>
+ <div class="item">
<img src="@/assets/images/FireFighting/xiaofang_ic_guzhang@2x.png" alt="">
<div class="content">
<div class="name">鏁呴殰</div>
@@ -108,17 +115,10 @@
</div>
</div>
<div class="item">
- <img src="@/assets/images/FireFighting/xiaofang_ic_lixian@2x.png" alt="">
+ <img src="@/assets/images/FireFighting/xiaofang_ic_zhengchang@2x.png" alt="">
<div class="content">
<div class="name">姝ｅ父</div>
<div class="num num4">{{ dataList4.offlineDeviceNum }}</div>
- </div>
- </div>
- <div class="item">
- <img src="@/assets/images/FireFighting/xiaofang_ic_pingbi@2x.png" alt="">
- <div class="content">
- <div class="name">灞忚斀</div>
- <div class="num num5">{{ dataList4.shieldDeviceNum || 0 }}</div>
</div>
</div>
</div>
@@ -147,7 +147,7 @@
<div class="item">
<img class="icon" src="@/assets/images/FireFighting/ic_wendu@2x.png" alt="">
<div class="content">
- <div class="num">{{ dataList8[dataIndex8].temperatureData?.latestValue }}<span>掳C</span></div>
+ <div class="num" v-if="dataList8[dataIndex8].temperatureData && dataList8[dataIndex8].temperatureData.latestValue">{{ Number(dataList8[dataIndex8].temperatureData.latestValue).toFixed(1) }}<span>掳C</span></div>
<div class="la">闃堝�� {{ dataList8[dataIndex8].temperatureData?.alarmLow }}锝瀧{
dataList8[dataIndex8].temperatureData?.alarmHigh }}掳C</div>
</div>
@@ -155,9 +155,9 @@
<div class="item">
<img class="icon" src="@/assets/images/FireFighting/ic_shidu@2x.png" alt="">
<div class="content">
- <div class="num">{{ dataList8[dataIndex8].humidityData?.latestValue }}<span>%</span></div>
+ <div class="num" v-if="dataList8[dataIndex8].humidityData && dataList8[dataIndex8].humidityData.latestValue">{{ Number(dataList8[dataIndex8].humidityData.latestValue).toFixed(1) }}<span>%</span></div>
<div class="la">闃堝�� {{ dataList8[dataIndex8].humidityData?.alarmLow }}锝瀧{
- dataList8[dataIndex8].humidityData?.alarmHigh }}</div>
+ dataList8[dataIndex8].humidityData?.alarmHigh }}掳C</div>
</div>
</div>
</div>
@@ -559,7 +559,7 @@
{
name: '鏈�涓婂眰绔嬩綋鍦�',
type: 'pictorialBar',
- symbolSize: [260, 40],
+ symbolSize: [182, 40],
symbolOffset: [0, -20],
z: 12,
itemStyle: {
@@ -577,7 +577,7 @@
{
name: '涓棿绔嬩綋鍦�',
type: 'pictorialBar',
- symbolSize: [260, 40],
+ symbolSize: [182, 40],
symbolOffset: [0, -20],
z: 12,
itemStyle: {
@@ -610,7 +610,7 @@
{
name: '鏈�搴曢儴绔嬩綋鍦�',
type: 'pictorialBar',
- symbolSize: [260, 40],
+ symbolSize: [182, 40],
symbolOffset: [0, 20],
z: 12,
itemStyle: {
@@ -659,9 +659,9 @@
label: {
distance: 15,
show: true,
- position: data > 58 ? 'inside' : 'top',
+ position: data > 52 ? 'inside' : 'top',
formatter: '{c}' + '%',
- fontSize: 80,
+ fontSize: 72,
color: '#1AFCFF',
textShadowColor: '#03C7F9',
textShadowBlur: 30,
@@ -1225,16 +1225,16 @@
.num3 {
background-image: -webkit-linear-gradient(top,
- #fff 0%,
- #e9bf43 50%,
- #eb8131 100%);
+ #eb8131 0%,
+ #d0a72c 50%,
+ #e9bf43 100%);
}
.num4 {
background-image: -webkit-linear-gradient(top,
#fff 0%,
- #9e9e9e 50%,
- #9e9e9e 100%);
+ #78db91 50%,
+ #6de8b0 100%);
}
.num5 {
@@ -1249,9 +1249,9 @@
}
.center_box_two {
- width: 100%;
+ width: 108%;
display: flex;
-
+ margin: 0 -4%;
.content_wrap {
flex: 1;
flex-shrink: 0;
@@ -1436,11 +1436,11 @@
/* border: 6px solid red; */
.liquidle_te {
font-weight: 500;
- font-size: 16px;
+ font-size: 18px;
position: absolute;
- top: 102px;
+ top: 99px;
left: 0;
- width: 214px;
+ width: 206px;
display: flex;
flex-direction: column;
align-items: center;
@@ -1448,7 +1448,7 @@
.placeT {
font-size: 12px;
color: #869CC9;
- margin-top: 4px;
+ margin-top: 6px;
}
}
@@ -1462,14 +1462,14 @@
} */
.liquidlevel {
- width: 300px;
+ width: 220px;
height: 400px;
- transform: scale(0.24);
+ transform: scale(0.27);
color: #fff;
text-align: center;
position: relative;
- left: -42px;
- top: -140px;
+ left: -8px;
+ top: -143px;
}
}
}
--
Gitblit v1.9.3