From a4320563d2411c2f4c8c5ab758bb8d28ae66bd29 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Sat, 6 Jan 2024 17:21:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E4=BA=BA=E5=91=98=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bigScreen/components/mapLeftContent.vue   | 24 ++++++++++++++-----
 src/views/bigScreen/map/index.vue             | 19 ++++++++++++---
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/views/bigScreen/components/mapLeftContent.vue b/src/views/bigScreen/components/mapLeftContent.vue
index 9631b8f..7c3eb6f 100644
--- a/src/views/bigScreen/components/mapLeftContent.vue
+++ b/src/views/bigScreen/components/mapLeftContent.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2023-08-15 09:44:13
  * @LastEditors: JC9527
- * @LastEditTime: 2024-01-04 15:23:57
+ * @LastEditTime: 2024-01-06 17:14:03
 -->
 <template>
   <div class="left-box">
@@ -68,7 +68,7 @@
     </div>
     <div class="item lfet-list-one" id="parent-getHeight" :style="itemOne">
       <title-box title="人员在线情况"></title-box>
-      <map-number title="在线人员总数" :onLine="100" :sum="150" type="人" :numberArray="peopleArray" :height="oneHeight" :id="1"
+      <map-number title="在线人员总数" :onLine="personOnLine" :sum="perpsonNum" type="人" :numberArray="peopleArray" :height="oneHeight" :id="1"
         v-on="$listeners"></map-number>
     </div>
     <div class="item lfet-list-two" :style="itemOne">
@@ -87,6 +87,8 @@ export default {
   components: { titleBox, mapNumber },
   data() {
     return {
+      perpsonNum:0,
+      personOnLine:0,
       peopleArray: [
         {
           title: '李飞'
@@ -168,6 +170,16 @@ export default {
       handler(newPerson) {
         // console.log(newPerson,'在线人员情况');
         this.peopleArray = newPerson
+        if(newPerson){
+          this.perpsonNum = newPerson.length;
+          let line = 0;
+          newPerson.forEach(element => {
+            if(element.status == "1") {
+              line += 1
+            }
+          });
+          this.personOnLine = line
+        }
       },
       immediate: true,
     },
@@ -225,10 +237,10 @@ export default {
       this.getDomHeight();
     });
     this.getDomHeight();
-    this.getEvent();
-    getTrend({ type: 1 }).then(res => {
-      console.log(res, '事件来源');
-    })
+    // this.getEvent();
+    // getTrend({ type: 1 }).then(res => {
+    //   console.log(res, '事件来源');
+    // })
 
 
   },
diff --git a/src/views/bigScreen/map/index.vue b/src/views/bigScreen/map/index.vue
index 758149b..06fa0d2 100644
--- a/src/views/bigScreen/map/index.vue
+++ b/src/views/bigScreen/map/index.vue
@@ -1226,7 +1226,7 @@ export default {
 
 
     // 各个点位获取
-    getMarkers(id){
+    getMarkers(id,status){
       let ico1 = require("../../../assets/images/icon/icon1.png");
       let ico2 = require("../../../assets/images/icon/icon2.png");
       let ico3 = require("../../../assets/images/icon/icon3.png");
@@ -1238,7 +1238,7 @@ export default {
       let offIcon3 = require("../../../assets/images/icon/offLine3.png");
       let offIcon4 = require("../../../assets/images/icon/offLine4.png");
       this.markers = [];
-      this.mapLoading = true;
+      this.mapLoading = status ? false : true;
       if(id == 1) {
         this.personLine = [];
         getDeviceList({ imei: "861316060216403,861316060216619,861316060207857,861316060214648,861316060214317,861316060215553,861316060212493,861316060214804,861316060207931,861316060216056" }).then((res) => {
@@ -2757,6 +2757,7 @@ export default {
         this.markerOffset = new AMap.Pixel(-27, -94);
       }
       this.getMarkers(id);
+      // this.markerInterval()
       
       // if (id == 1) {
       //   this.getTem();
@@ -2780,14 +2781,26 @@ export default {
     },
     getCarList(){
       getCarManageList({pageNum: 1,pageSize: 10}).then(res=>{
-        console.log(res);
+        // console.log(res);
         this.carLine = res.rows
       })
     },
+    // 定时器
+    markerInterval(){
+      let timer
+      if(this.actionMap == 1) {
+        timer = setInterval(() => {
+          this.getMarkers(1,true)
+        }, 10000);
+      } else {
+        clearInterval(timer)
+      }
+    },
   },
 
   mounted() {
     this.getCarList()
+    // this.markerInterval()
   },
 };
 </script>