CN-1705 fix: 修复滚动加载的触发逻辑问题

This commit is contained in:
chenjinsong
2024-09-18 16:34:08 +08:00
parent 885b1cf55d
commit fe3f1590ec

View File

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