From 376d70df409cad52a0d77f0e2bbb616905f6eb68 Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Tue, 22 Oct 2024 18:36:44 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20location=20map=20tooltip=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=BA=9B=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/views/location/location.scss   |  2 +-
 src/views/location/Index.vue                  | 21 ++++++++++++++-----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/assets/css/components/views/location/location.scss b/src/assets/css/components/views/location/location.scss
index 83658385..89797c15 100644
--- a/src/assets/css/components/views/location/location.scss
+++ b/src/assets/css/components/views/location/location.scss
@@ -888,7 +888,7 @@ $color-highlight: #CC4444;
       position: relative;
       display: flex;
       flex-direction: column;
-      padding: 10px 0 10px 63px;
+      padding: 10px 10px 10px 63px;
       color: $color-white;
 
       .header__icon {
diff --git a/src/views/location/Index.vue b/src/views/location/Index.vue
index 33365a6d..594b7c36 100644
--- a/src/views/location/Index.vue
+++ b/src/views/location/Index.vue
@@ -397,6 +397,18 @@
             <div class="item__label">MSISDN</div>
             <div class="item__value">{{currentSubscriber.phoneNumber}}</div>
           </div>
+          <div class="body__item">
+            <div class="item__label">IMEI</div>
+            <div class="item__value">{{currentSubscriber.imei}}</div>
+          </div>
+          <div class="body__item">
+            <div class="item__label">IMSI</div>
+            <div class="item__value">{{currentSubscriber.imsi}}</div>
+          </div>
+          <div class="body__item">
+            <div class="item__label">APN</div>
+            <div class="item__value">{{currentSubscriber.apn}}</div>
+          </div>
           <div class="body__item">
             <div class="item__label">{{$t('entities.group')}}</div>
             <div class="item__value">Terrorist</div>
@@ -407,7 +419,7 @@
           </div>
           <div class="body__item">
             <div class="item__label">{{$t('overall.location')}}</div>
-            <div class="item__value">{{locationHandler(currentSubscriber.subscriberDto)}}</div>
+            <div class="item__value">{{locationHandler(currentSubscriber)}}</div>
           </div>
           <div class="body__tracking" @click="trackSubscriber(currentSubscriber)">{{$t('location.traceTracking')}}</div>
         </template>
@@ -905,7 +917,7 @@ export default {
       }
       try {
         data.forEach(marker => {
-          if (type === this.tooltipType.human && (marker.subscriberDto || marker.subscriberLatitude)) {
+          if (type === this.tooltipType.human && marker.subscriberLatitude) {
             const el = document.createElement('div')
             el.className = `map-marker map-marker--${type}`
             if (marker.subscriberId === this.highlightSubscriber.subscriberId) {
@@ -921,9 +933,7 @@ export default {
             el.innerHTML = svg
             // 鼠标事件，控制tooltip显示和marker尺寸
             this.bindMarkerEvent(el, marker, type)
-            const position = marker.subscriberDto
-              ? [marker.subscriberDto.subscriberLongitude, marker.subscriberDto.subscriberLatitude]
-              : [marker.subscriberLongitude, marker.subscriberLatitude]
+            const position = [marker.subscriberLongitude, marker.subscriberLatitude]
             const mapMarker = new maplibregl.Marker({ element: el })
               .setLngLat(position)
               .addTo(this.mapChart)
@@ -1257,6 +1267,7 @@ export default {
     },
     bindMarkerEvent (el, markerData, type) {
       el.addEventListener('mouseenter', e => {
+        console.info(this.currentSubscriber)
         this.currentMarkerDom = el
         if (type === this.tooltipType.human) {
           this.currentSubscriber = markerData