From 67b2706c4ba0e09c445e8e5b9d39e499c6368cd6 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Wed, 20 Mar 2024 11:11:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/workStatus.vue                 |  7 ++-
 .../components/carouselChart.vue              | 11 ++++-
 .../realTimeMonitor/components/siderBar.vue   | 46 ++++---------------
 3 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/src/views/photographicDevice/components/workStatus.vue b/src/views/photographicDevice/components/workStatus.vue
index 0802e95..5bf1919 100644
--- a/src/views/photographicDevice/components/workStatus.vue
+++ b/src/views/photographicDevice/components/workStatus.vue
@@ -73,7 +73,7 @@
 
       <el-table-column
         prop="batteryCapacity"
-        label="电池电量（mA）"
+        label="电池电量（%）"
         show-overflow-tooltip
       ></el-table-column>
       <el-table-column
@@ -96,6 +96,11 @@
         label="网络连接状态"
         show-overflow-tooltip
       ></el-table-column>
+      <el-table-column
+        prop="connectionStr"
+        label="GPRS信号强度"
+        show-overflow-tooltip
+      ></el-table-column>
       <el-table-column
         prop="recvFlowStr"
         label="当月发送流量(M)"
diff --git a/src/views/realTimeMonitor/components/carouselChart.vue b/src/views/realTimeMonitor/components/carouselChart.vue
index a280a46..1259df2 100644
--- a/src/views/realTimeMonitor/components/carouselChart.vue
+++ b/src/views/realTimeMonitor/components/carouselChart.vue
@@ -92,7 +92,7 @@
               <!-- <el-image v-lazy="item.path + '!260x160'"></el-image> -->
               <img v-lazy="item.path + '!260x160'" />
 
-              <p class="timeInfo">
+              <p class="timeInfo" :class="{ alarmSpan: item.isAlarm === 1 }">
                 <el-tooltip
                   class="item"
                   effect="dark"
@@ -119,6 +119,7 @@
                       : item.channelName
                   }}</span
                 >
+                <span class="alarmSpan" v-if="item.isAlarm == 1">(已告警)</span>
               </p>
             </div>
             <div class="picBox" v-else-if="item.mediaType == 1">
@@ -614,6 +615,10 @@ export default {
             color: #169e8c;
           }
         }
+        .alarmSpan {
+          color: #f00;
+          font-weight: bold;
+        }
       }
       .moreSmallPic {
         width: 9.8%;
@@ -623,6 +628,10 @@ export default {
           color: #fff;
           background: linear-gradient(180deg, #4cdbc8 10%, #128071);
         }
+        .alarmSpan {
+          color: #f00;
+          font-weight: bold;
+        }
       }
     }
     .littlePic {
diff --git a/src/views/realTimeMonitor/components/siderBar.vue b/src/views/realTimeMonitor/components/siderBar.vue
index 686174a..07357e0 100644
--- a/src/views/realTimeMonitor/components/siderBar.vue
+++ b/src/views/realTimeMonitor/components/siderBar.vue
@@ -87,45 +87,19 @@
             <span :class="data.onlinestatus == 0 ? 'disconnect' : ''"
               >{{ node.label }}
 
-              <span class="num" v-if="node.level === 2 && data.bsManufacturer"
-                >({{ data.list.length }} )
+              <span
+                class="num"
+                v-if="node.level === 2 && data.bsManufacturer && zzradio == -1"
+                >({{ data.onlinenum }} / {{ data.totalnum }})
+              </span>
+              <span
+                class="num"
+                v-else-if="node.level === 2 && data.bsManufacturer"
+                >({{ data.list.length }})
               </span>
             </span>
           </span>
         </span>
-        <!-- <span v-else>
-          <span v-if="node.level === 1">
-            <span class="iconfont icon-dianli" style="margin-right: 6px"></span>
-            <span>{{ node.label }} </span>
-          </span>
-          <span v-else-if="node.level === 2">
-            <span class="iconfont icon-dianlihangye" style="margin-right: 6px">
-            </span>
-            <span
-              >{{ node.label }}
-              <span class="num">({{ data.list.length }}) </span></span
-            >
-          </span>
-          <span v-else>
-            <span
-              class="iconfont icon-shexiangtoulixian"
-              v-if="data.onlinestatus == 0"
-              :class="data.onlinestatus == 0 ? 'disconnect' : ''"
-              style="margin-right: 6px"
-            ></span>
-            <span
-              class="iconfont icon-shexiangtou-lixian"
-              v-else
-              :class="data.onlinestatus == 0 ? 'disconnect' : ''"
-              style="margin-right: 6px"
-            ></span>
-            <span
-              :id="data.id"
-              :class="data.onlinestatus == 0 ? 'disconnect' : ''"
-              >{{ node.label }}</span
-            >
-          </span>
-        </span> -->
       </span>
     </el-tree>
   </div>
@@ -380,7 +354,7 @@ export default {
 </script>
 <style lang="less">
 .realsideBar {
-  width: 300px;
+  width: 312px;
   display: flex;
   flex-direction: column;
   padding: 16px 0px;