From 8a00f3f65d85c20f74c26eb13be1be0e512fd0b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Wed, 13 Mar 2024 10:13:55 +0800
Subject: [PATCH] =?UTF-8?q?CN-1577=20fix:=20=E5=9B=A0=E5=9C=B0=E5=9B=BE?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=BB=8E=E8=80=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=99=9A=E6=8B=9F=E5=88=97=E8=A1=A8=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6=E8=BF=9B=E8=A1=8C=E9=80=82=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../charts2/entityDetailSubscriberMap.scss    |  2 +-
 .../charts/entityDetail/EntityDetailMap.vue   | 21 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/assets/css/components/views/charts2/entityDetailSubscriberMap.scss b/src/assets/css/components/views/charts2/entityDetailSubscriberMap.scss
index f5a58696..52737329 100644
--- a/src/assets/css/components/views/charts2/entityDetailSubscriberMap.scss
+++ b/src/assets/css/components/views/charts2/entityDetailSubscriberMap.scss
@@ -176,7 +176,7 @@
                 }
                 .scroll-view {
                   width: 100%;
-                  height: 384px;
+                  height: 604px;
                   overflow-y: scroll;
                   position: relative;
 
diff --git a/src/views/charts2/charts/entityDetail/EntityDetailMap.vue b/src/views/charts2/charts/entityDetail/EntityDetailMap.vue
index e97a82d7..4525ac07 100644
--- a/src/views/charts2/charts/entityDetail/EntityDetailMap.vue
+++ b/src/views/charts2/charts/entityDetail/EntityDetailMap.vue
@@ -21,8 +21,8 @@
       <div class="analysis-statistics" id="subscribersBlock" style="position: absolute;right: 0;top: 0;">
         <div class="analysis-statistics__subscribers">
           <div class="analysis-statistics__subscriber" style="height: 664px;">
-            <chart-no-data v-if="trackingNoData" test-id="trackingNoData" style="width: calc(100% - 30px);height: 100%;"></chart-no-data>
-            <chart-error v-if="showTrackingError" :content="trackingErrorMsg" style="width: calc(100% - 30px)" />
+            <chart-no-data v-if="trackingNoData" test-id="trackingNoData" style="width: calc(100% - 20px);height: 100%;"></chart-no-data>
+            <chart-error v-if="showTrackingError" :content="trackingErrorMsg" style="width: calc(100% - 20px);margin-left: 20px;" />
             <div v-if="!trackingNoData && !showTrackingError" class="subscriber__body">
               <div class="body-item-record">
                 <div class="item-record__header">{{ $t('location.trackRecord') }}</div>
@@ -358,15 +358,18 @@ export default {
     },
     async queryTraceTracking () {
       const params = {
-        ...this.timeFilter,
+        startTime: getSecond(this.timeFilter.startTime),
+        endTime: getSecond(this.timeFilter.endTime),
+        dateRangeValue: this.timeFilter.dateRangeValue,
         subscriberIds: `'${this.entity.entityName}'`,
         level: this.mapLevel
       }
       this.trackingSubscriber.subscriberId = this.entity.entityName
       try {
         const response = await axios.get(api.location.tracking, { params })
-
         if (response.data.data.result) {
+          this.trackingNoData = false
+          this.showTrackingError = false
           const find = response.data.data.result.find(item => item.subscriberId === this.trackingSubscriber.subscriberId)
           if (find) {
             this.trackingSubscriber.trackRecords = find.trackRecords
@@ -380,16 +383,14 @@ export default {
 
         // 计算停留时间
         if (this.trackingSubscriber.trackRecords.length > 0) {
-          this.trackingNoData = false
-          this.showTrackingError = false
           const trackRecords = this.trackingSubscriber.trackRecords
           // 初始化时间线可视范围角标
-          if (trackRecords.length < 7) {
+          if (trackRecords.length < 11) {
             this.trackingSubscriber.scrollStartIndex = 0
             this.trackingSubscriber.scrollEndIndex = trackRecords.length
           } else {
             this.trackingSubscriber.scrollStartIndex = 0
-            this.trackingSubscriber.scrollEndIndex = 7
+            this.trackingSubscriber.scrollEndIndex = 11
           }
 
           if (trackRecords && trackRecords.length > 0) {
@@ -473,7 +474,7 @@ export default {
       show: false,
       showLine: false,
       scrollStartIndex: 0,
-      scrollEndIndex: 7,
+      scrollEndIndex: 11,
       startOffset: 0,
       listHeight: 0,
       trackRecords: []
@@ -481,7 +482,7 @@ export default {
     const trackingSubscriberList = ref([])
     const scrollInfo = ref({
       itemSize: 50,
-      containerHeight: 360
+      containerHeight: 660
     })
     const trackingNoData = ref(true)
     const showTrackingError = ref(false)