+
ID
+
{{subscriber.subscriberId}}
+
{{$t('entities.group')}}
Terrorist
@@ -430,9 +437,9 @@ export default {
this.renderMarker(mapFollowedSubscriberData, this.tooltipType.human)
/* 右侧关注列表 */
- this.queryFollowedList()
+ await this.queryFollowedList()
/* 右上角折线图 */
- this.renderActiveSubscribersLine()
+ await this.renderActiveSubscribersLine()
},
async initTraceTrackingTab () {
await this.queryTraceTracking()
@@ -693,15 +700,14 @@ export default {
}
try {
data.forEach(marker => {
- if (type === this.tooltipType.human && marker.subscriberDto && marker.subscriberDto.hexId) {
- const geo = h3ToGeo(marker.subscriberDto.hexId)
+ if (type === this.tooltipType.human && marker.subscriberDto) {
const el = document.createElement('div')
el.className = `map-marker map-marker--${type}`
el.innerHTML = svg
// 鼠标事件,控制tooltip显示和marker尺寸
this.bindMarkerEvent(el, marker, type)
const mapMarker = new maplibregl.Marker({ element: el })
- .setLngLat([geo[1], geo[0]])
+ .setLngLat([marker.subscriberDto.subscriberLongitude, marker.subscriberDto.subscriberLatitude])
.addTo(this.mapChart)
this.humanMarkers.push(mapMarker)
} else if (type === this.tooltipType.baseStation) {
@@ -1281,7 +1287,7 @@ export default {
timeFilter.value.startTime = parseInt(startTimeParam)
timeFilter.value.endTime = parseInt(endTimeParam)
}
- const minuteTimeFilter = ref({ startTime: timeFilter.value.endTime - 60, endTime: timeFilter.value.endTime })
+ const minuteTimeFilter = ref({})
const tooltip = ref({
type: ''
})
@@ -1674,11 +1680,12 @@ export default {
border: 1px solid rgb(226,229,236);
border-radius: 2px;
- .subscriber__header-inactive {
- background-color: #CCCCCC;
- }
.subscriber__header {
background-color: #38ACD2;
+
+ &.subscriber__header-inactive {
+ background-color: #CCCCCC;
+ }
}
.subscriber__header {