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 @@
MSISDN
{{currentSubscriber.phoneNumber}}
+
+
IMEI
+
{{currentSubscriber.imei}}
+
+
+
IMSI
+
{{currentSubscriber.imsi}}
+
+
+
APN
+
{{currentSubscriber.apn}}
+
{{$t('entities.group')}}
Terrorist
@@ -407,7 +419,7 @@
{{$t('overall.location')}}
-
{{locationHandler(currentSubscriber.subscriberDto)}}
+
{{locationHandler(currentSubscriber)}}
{{$t('location.traceTracking')}}
@@ -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