From fc5c81dd482c3bea891c00cb7903008d8aa9f610 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 10 二月 2025 18:01:32 +0800
Subject: [PATCH] ll

---
 screen/src/views/FireFighting.vue |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/screen/src/views/FireFighting.vue b/screen/src/views/FireFighting.vue
index d76046e..98f7356 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">姝e父</div>
-                  <div class="num num4">{{ dataList4.offlineDeviceNum }}</div>
+                  <div class="num num4">{{ dataList4.onlineDeviceNum || 0 }}</div>
                 </div>
               </div>
             </div>
@@ -1055,16 +1055,20 @@
     getData7()
   }, 60 * 1000)
   setInterval(() => {
-
     getData5()
     getData8()
-
   }, 60 * 60 * 1000)
+
+  setInterval(() => {
+    changeData8(1)
+    changeData9(1)
+  }, 1000 * 5)
 
   setTimeout(() => {
     loopFn1()
     loopFn2()
   }, 12000)
+
 
 })
 
@@ -1107,17 +1111,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 {

--
Gitblit v1.9.3