From fe3f1590eca34776b3d12c5e81e962511dbb811d Mon Sep 17 00:00:00 2001
From: chenjinsong <523037378@qq.com>
Date: Wed, 18 Sep 2024 16:34:08 +0800
Subject: [PATCH] =?UTF-8?q?CN-1705=20fix:=20=E4=BF=AE=E5=A4=8D=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E5=8A=A0=E8=BD=BD=E7=9A=84=E8=A7=A6=E5=8F=91=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/location/Index.vue | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/views/location/Index.vue b/src/views/location/Index.vue
index 6453a195..2c4af8ee 100644
--- a/src/views/location/Index.vue
+++ b/src/views/location/Index.vue
@@ -823,6 +823,9 @@ export default {
             if (marker.subscriberId === this.highlightSubscriber.subscriberId) {
               el.classList.add('map-marker--highlight')
             }
+            if (this.currentZoom && this.currentZoom < 11) {
+              el.classList.add('map-marker--hidden')
+            }
             el.innerHTML = svg
             // 鼠标事件，控制tooltip显示和marker尺寸
             this.bindMarkerEvent(el, marker, type)
@@ -834,6 +837,9 @@ export default {
           } else if (type === this.tooltipType.baseStation) {
             const el = document.createElement('div')
             el.className = `map-marker map-marker--${type}`
+            if (this.currentZoom && this.currentZoom < 11) {
+              el.classList.add('map-marker--hidden')
+            }
             el.innerHTML = svg
             // 鼠标事件，控制tooltip显示和marker尺寸
             this.bindMarkerEvent(el, marker, type)
@@ -1224,8 +1230,11 @@ export default {
     },
     async scrollList (e) {
       if (!this.isChecked) {
-        const obj = document.getElementById('locationMap-subscriber-scroll')
-        const scrollTop = obj.scrollTop
+        const dom = document.getElementById('locationMap-subscriber-scroll')
+        if (dom.scrollTop + dom.clientHeight >= dom.scrollHeight && !this.loading.subscriberLoading) {
+          await this.initSubscriberList()
+        }
+        /* const scrollTop = obj.scrollTop
         const scroll = scrollTop - this.preScrollTop
         this.preScrollTop = scrollTop
         // 向下滚动才进行加载数据
@@ -1234,7 +1243,7 @@ export default {
             obj.scrollHeight !== 0 &&
             !this.loading.subscriberLoading) {
           await this.initSubscriberList()
-        }
+        } */
       }
     },
     timeRefreshChange () {