From f116ffb8abf668cdd5a8d33bd2f85363fd1ef28d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 六月 2025 16:51:58 +0800
Subject: [PATCH] 最新版本541200007
---
screen/src/views/FireFighting.vue | 55 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/screen/src/views/FireFighting.vue b/screen/src/views/FireFighting.vue
index b6fa2a4..79cd732 100644
--- a/screen/src/views/FireFighting.vue
+++ b/screen/src/views/FireFighting.vue
@@ -25,7 +25,7 @@
<div class="list_wrap">
<div class="list">
<div class="header line">
- <span class="item name">璁惧绫诲瀷</span>
+ <span class="item name">璁惧鍚嶇О</span>
<span class="item">鎬绘暟</span>
<span class="item">鎶ヨ</span>
<span class="item">灞忚斀</span>
@@ -41,7 +41,7 @@
<span class="item" style="color: #FEAF01;">{{ item.alarmDeviceNum || 0 }}</span>
<span class="item">{{ item.shieldDeviceNum || 0 }}</span>
<span class="item">{{ item.errDeviceNum || 0 }}</span>
- <span class="item">{{ item.offlineDeviceNum || 0 }}</span>
+ <span class="item">{{ item.onlineDeviceNum || 0 }}</span>
</div>
<div class="separate"></div>
</div>
@@ -90,14 +90,14 @@
<img src="@/assets/images/FireFighting/xiaofang_ic_zaixian@2x.png" alt="">
<div class="content">
<div class="name">鎬绘暟</div>
- <div class="num">{{ dataList4.onlineDeviceNum }}</div>
+ <div class="num">{{ dataList4.onlineDeviceNum || 0 }}</div>
</div>
</div>
<div class="item">
<img src="@/assets/images/FireFighting/xiaofang_ic_baojing@2x.png" alt="">
<div class="content">
<div class="name">鎶ヨ</div>
- <div class="num num2">{{ dataList4.alarmDeviceNum }}</div>
+ <div class="num num2">{{ dataList4.alarmDeviceNum || 0}}</div>
</div>
</div>
<div class="item">
@@ -111,14 +111,14 @@
<img src="@/assets/images/FireFighting/xiaofang_ic_guzhang@2x.png" alt="">
<div class="content">
<div class="name">鏁呴殰</div>
- <div class="num num3">{{ dataList4.errDeviceNum }}</div>
+ <div class="num num3">{{ dataList4.errDeviceNum || 0 }}</div>
</div>
</div>
<div class="item">
<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 class="num num4">{{ dataList4.onlineDeviceNum || 0 }}</div>
</div>
</div>
</div>
@@ -161,7 +161,7 @@
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 }}掳C</div>
+ dataList8[dataIndex8].humidityData?.alarmHigh }}%</div>
</div>
</div>
</div>
@@ -351,11 +351,13 @@
const initWatergage = (id, item) => {
const myChart = echarts.init(document.getElementById(id))
var data_value = item.obj.value.replaceAll('Mpa', '')
- const startI = item.level.indexOf('-')
- const endI = item.level.indexOf('Mpa')
- let maxNum = item.level.slice(startI + 1, endI)
- let minNum = item.level.slice(0, startI)
- // let maxNum =
+ // const startI = item.level.indexOf('-')
+ // const endI = item.level.indexOf('Mpa')
+ // let maxNum = item.level.slice(startI + 1, endI)
+ // let minNum = item.level.slice(0, startI)
+ let maxNum = item.max
+ let minNum = item.min
+ // let maxNum =
const option = {
barMaxWidth: 3,
polar: {
@@ -517,11 +519,13 @@
}
const initLiquidlevel = (id, item) => {
const myChart = echarts.init(document.getElementById(id))
- const startI = item.level.indexOf('-')
- const endI = item.level.indexOf('M')
- let maxNum = item.level.slice(startI + 1, endI)
- let minNum = item.level.slice(0, startI)
- let conNum = maxNum - minNum
+ // const startI = item.level.indexOf('-')
+ // const endI = item.level.indexOf('M')
+ // let maxNum = item.level.slice(startI + 1, endI)
+ // let minNum = item.level.slice(0, startI)
+ let maxNum = item.max
+ let minNum = item.min
+ let conNum = maxNum
let acNum = item.obj.value.replaceAll('M', '')
var data = (((acNum - minNum) / conNum) * 100).toFixed(0)
console.log('data', data)
@@ -1055,16 +1059,20 @@
getData7()
}, 60 * 1000)
setInterval(() => {
-
getData5()
getData8()
-
}, 60 * 60 * 1000)
+
+ setInterval(() => {
+ changeData8(1)
+ changeData9(1)
+ }, 1000 * 5)
setTimeout(() => {
loopFn1()
loopFn2()
}, 12000)
+
})
@@ -1107,17 +1115,20 @@
font-size: 14px;
.item {
- flex: 1;
+ flex: 2;
display: flex;
justify-content: center;
+ /* margin: 0 6px; */
align-items: center;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
+
}
.name {
- flex: 2;
+ flex: 5;
+ justify-content: flex-start;
}
.warnning {
@@ -1886,4 +1897,4 @@
object-fit: cover;
z-index: -1;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.3