From 94419347e117c070c228f4b3f5da7a4a9cc3d866 Mon Sep 17 00:00:00 2001
From: TiaStars <L18864257234@163.com>
Date: Wed, 3 Apr 2024 15:02:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=98=AF=E5=90=A6=E5=9C=A8?=
 =?UTF-8?q?=E7=BA=BF=E3=80=81=E5=AE=9E=E6=97=B6=E5=AE=9A=E4=BD=8D=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=E8=87=AA=E5=8A=A8=E5=BC=B9=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bigScreen/components/mapLeftContent.vue   | 20 ++++++++++++++++---
 src/views/bigScreen/map/index.vue             | 15 ++++++++++++--
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/views/bigScreen/components/mapLeftContent.vue b/src/views/bigScreen/components/mapLeftContent.vue
index 10229e3..60ce595 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-03-22 10:15:17
+ * @LastEditTime: 2024-04-02 09:44:54
 -->
 <template>
   <div class="left-wai-box">
@@ -140,9 +140,12 @@
       </div>
       <div class="unfold-foot-two" v-show="!isPerson" v-loading="personLoading" element-loading-background="rgba(11, 34, 72, 0.8)">
         <div class="main-lists" v-for="(item,index) in personList" :key="item.imei" :class="(index+1) % 2 == 0? 'main-lists2':''">
-          <div class="list-title">
+          <div class="list-title list-titleTwo">
             {{ item.userName }}
           </div>
+          <div class="list-isLine">
+          {{ item.status == "1" ? '在线' : '离线'}}
+        </div>
           <div class="list-right">
             <div class="real-time-location" @click="realTimeLocation(item)">
               <img src="@/assets/images/location1.png" alt="">
@@ -653,7 +656,7 @@ export default {
   }
   .unfold-foot-two {
     padding: 10px 0;
-    height: 100%;
+    height: calc(100% - 90px);
     overflow-y: auto;
     .main-lists {
       display: flex;
@@ -671,6 +674,17 @@ export default {
         line-height: 20px;
         // padding-left: 24px;
       }
+      .list-isLine {
+        flex: .5;
+        font-size: 14px;
+        font-family: 'Source Han Sans CN-Regular';
+        font-weight: 400;
+        color: #D3EEF2;
+        line-height: 20px;
+      }
+      .list-titleTwo {
+        flex: .5;
+      }
       .list-right {
         // flex: 1;
         display: flex;
diff --git a/src/views/bigScreen/map/index.vue b/src/views/bigScreen/map/index.vue
index 8d81de2..0ba6d72 100644
--- a/src/views/bigScreen/map/index.vue
+++ b/src/views/bigScreen/map/index.vue
@@ -4,7 +4,7 @@
  * @Author: JC9527
  * @Date: 2024-01-09 23:08:15
  * @LastEditors: JC9527
- * @LastEditTime: 2024-03-20 13:15:38
+ * @LastEditTime: 2024-04-03 15:00:36
 -->
 <template>
   <div class="map-main">
@@ -1808,7 +1808,18 @@ export default {
       if(id == 1 && this.actionMap == 1) {
         this.personLine.forEach(per=>{
           if(item.imei == per.imei) {
-            this.map.setZoomAndCenter(16,[per.longitude,per.latitude]);
+            getUserByImei({imei:per.imei}).then(resTwo=>{
+              if(resTwo.code == 200) {
+              this.map.setZoomAndCenter(16,[per.longitude,per.latitude]);
+              setTimeout(()=>{
+                this.personInfo.position = [per.longitude,per.latitude];
+                this.personInfo.info = per;
+                this.personInfo.personinfo = resTwo.data[0];
+                this.personInfo.visible = true;
+              },1500)
+              }
+            })
+            
           }
         })
       } else if(id == 3 && this.actionMap == 3){