From 423155b8134694c2f2e68f6d3f5239ba0541b0cf Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 31 十二月 2024 18:10:35 +0800
Subject: [PATCH] ll
---
screen/src/views/FireFighting.vue | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/screen/src/views/FireFighting.vue b/screen/src/views/FireFighting.vue
index 473d5ec..b6fa2a4 100644
--- a/screen/src/views/FireFighting.vue
+++ b/screen/src/views/FireFighting.vue
@@ -147,7 +147,9 @@
<div class="item">
<img class="icon" src="@/assets/images/FireFighting/ic_wendu@2x.png" alt="">
<div class="content">
- <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="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,7 +157,9 @@
<div class="item">
<img class="icon" src="@/assets/images/FireFighting/ic_shidu@2x.png" alt="">
<div class="content">
- <div class="num" v-if="dataList8[dataIndex8].humidityData && dataList8[dataIndex8].humidityData.latestValue">{{ Number(dataList8[dataIndex8].humidityData.latestValue).toFixed(1) }}<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 }}掳C</div>
</div>
@@ -284,7 +288,7 @@
<span class="status" v-else-if="item.handleStatus == 3">鏍稿疄涓�</span>
<span v-else class="status">鏈牳瀹�</span>
</div>
- <div class="have_time">宸茬粡鍙戠敓{{ item.haveTime }}</div>
+ <div class="have_time">宸插彂鐢焮{ item.haveTime }}</div>
</div>
<div class="wrap">
<div class="title">
@@ -520,8 +524,8 @@
let conNum = maxNum - minNum
let acNum = item.obj.value.replaceAll('M', '')
var data = (((acNum - minNum) / conNum) * 100).toFixed(0)
- console.log('data', data);
-
+ console.log('data', data)
+
const option = {
tooltip: {
trigger: 'none',
@@ -659,7 +663,7 @@
label: {
distance: 15,
show: true,
- position: data > 52 ? 'inside' : 'top',
+ position: data > 52 ? 'inside' : 'top',
formatter: '{c}' + '%',
fontSize: 72,
color: '#1AFCFF',
@@ -929,7 +933,14 @@
getFighalarmDataList().then(res => {
dataList7.value = res.data || []
dataList7.value = dataList7.value.map(item => {
- item.haveTime = dayjs.duration(new Date().getTime() - new Date(item.alarmTime).getTime()).format('H灏忔椂m鍒嗛挓')
+ let times = new Date().getTime() - new Date(item.alarmTime).getTime()
+ if (times > 86400000) {
+ item.haveTime = dayjs.duration(times).format('D澶〩灏忔椂m鍒嗛挓')
+ } else if (times > 3600000) {
+ item.haveTime = dayjs.duration(times).format('H灏忔椂m鍒嗛挓')
+ } else {
+ item.haveTime = dayjs.duration(times).format('m鍒嗛挓')
+ }
return item
})
})
@@ -1252,6 +1263,7 @@
width: 108%;
display: flex;
margin: 0 -4%;
+
.content_wrap {
flex: 1;
flex-shrink: 0;
--
Gitblit v1.9.3