123

ruoyi-screen/src/components/GisMap.vue

@@ -13,10 +13,8 @@ import {
   syncWmtsLayerVisibility
 } from '@/utils/gisLoader'
 import {
-  GIS_POI_SEARCH_MODE,
-  getGisPoiSearchMode,
   parsePoiLngLat,
-  searchPois
+  searchNearbyPois
 } from '@/utils/gisPoiSearch'
 import {
   addTownshipBoundaryLayers,
@@ -24,6 +22,7 @@ import {
   buildTownshipInfo,
   flyToTownship,
   getTownshipLabelPoints,
+  getTownshipPoiSearchCenter,
   removeTownshipBoundaryLayers
 } from '@/utils/gisTownshipBoundary'
 import { getTownshipLivestockStats } from '@/constants/townshipLivestock'
@@ -49,7 +48,7 @@ const props = defineProps({
     type: Boolean,
     default: false
   },
-  /** 是否在地图加载后展示周边 POI Marker */
+  /** 点击乡镇后是否展示该乡镇中心点周边 POI（默认不加载，点击后才查） */
   showPoiMarkers: {
     type: Boolean,
     default: true
@@ -95,6 +94,8 @@ let lastWheelAround = null
 let poiMarkers = []
 let townshipMarkers = []
 let unbindTownshipClick = null
+/** 当前 POI 查询中心，仅点击乡镇后赋值 */
+let poiSearchCenter = null
 
 function logClickCoordinate(lngLat) {
   if (!lngLat) {
@@ -176,10 +177,14 @@ function bindTownshipDrillDown() {
     })
     emit('township-click', info)
 
-    if (props.showPoiMarkers && getGisPoiSearchMode() === GIS_POI_SEARCH_MODE.NEARBY) {
-      map.once('moveend', () => {
-        renderPoiMarkers()
-      })
+    if (props.showPoiMarkers) {
+      const searchCenter = getTownshipPoiSearchCenter(feature)
+      if (searchCenter) {
+        poiSearchCenter = searchCenter
+        map.once('moveend', () => {
+          renderPoiMarkers()
+        })
+      }
     }
   })
 }
@@ -280,15 +285,15 @@ function createPoiMarkerElement(name) {
 }
 
 async function renderPoiMarkers() {
-  if (!props.showPoiMarkers || !map || !cmmapglRef) {
+  if (!props.showPoiMarkers || !map || !cmmapglRef || !poiSearchCenter) {
     return
   }
   clearPoiMarkers()
 
   let pois = []
   try {
-    pois = await searchPois({
-      center: resolveCenter()
+    pois = await searchNearbyPois({
+      center: poiSearchCenter
     })
   } catch {
     return
@@ -330,6 +335,7 @@ function destroyMap() {
   wheelDeltaAccum = 0
   lastWheelAround = null
   clampingZoom = false
+  poiSearchCenter = null
   clearPoiMarkers()
   teardownTownshipBoundary()
   if (map) {
@@ -571,7 +577,6 @@ async function initMap() {
       syncWmtsLayerVisibility(map)
       resizeMap()
       renderTownshipBoundary()
-      renderPoiMarkers()
       emit('ready', map)
     })
     // 瓦片/遥测等非致命错误不向页面报错
@@ -589,9 +594,6 @@ watch(
       center: resolveCenter(),
       zoom: resolveZoom()
     })
-    if (props.showPoiMarkers && getGisPoiSearchMode() === GIS_POI_SEARCH_MODE.NEARBY) {
-      renderPoiMarkers()
-    }
   },
   { deep: true }
 )
@@ -600,9 +602,9 @@ watch(
   () => props.showPoiMarkers,
   (show) => {
     if (!map || !cmmapglRef) return
-    if (show) {
+    if (show && poiSearchCenter) {
       renderPoiMarkers()
-    } else {
+    } else if (!show) {
       clearPoiMarkers()
     }
   }

ruoyi-screen/src/utils/gisTownshipBoundary.js

@@ -43,6 +43,33 @@ function getTownshipDrillCenter(feature) {
   return null
 }
 
+/** POI 周边搜索中心：拉西镇用手动坐标，其余乡镇用 json 的 center/centroid */
+export function getTownshipPoiSearchCenter(feature) {
+  if (!feature) {
+    return null
+  }
+  const name = String(feature.properties?.name || '')
+  const override = TOWNSHIP_DRILL_CENTER_OVERRIDES[name]
+  if (Array.isArray(override) && override.length >= 2) {
+    const lng = Number(override[0])
+    const lat = Number(override[1])
+    if (Number.isFinite(lng) && Number.isFinite(lat)) {
+      return [lng, lat]
+    }
+  }
+
+  const center = feature.properties?.centroid || feature.properties?.center
+  if (Array.isArray(center) && center.length >= 2) {
+    const lng = Number(center[0])
+    const lat = Number(center[1])
+    if (Number.isFinite(lng) && Number.isFinite(lat)) {
+      return [lng, lat]
+    }
+  }
+
+  return null
+}
+
 export function getTownshipGeoJson() {
   return townshipGeoJson
 }