楼宇撒点

src/hooks/useInitMap.ts

@@ -280,9 +280,11 @@ function addEventListener() {
                 html = transOrgHtml(data)
               } else if (data?.isList) {
                 html = transListHtml(data)
-              } else if (data?.NAME) {
-                if (!data.NAME) return
-                store.dispatch('getBuildingDetail', data.NAME)
+              } else if (data?.NAME || data?.OBJECTID) {
+                store.dispatch(
+                  'getBuildingDetail',
+                  data?.NAME || data?.OBJECTID,
+                )
               }
 
               if (!html) return

src/view/components/basic-info.vue

@@ -258,7 +258,9 @@ watch(
         outStreetValue: 0,
       }
       curTagKey.value = null
-      store.commit('SET_MAP_POINTS')
+      if (!store.state.showBuildingDrawer) {
+        store.commit('SET_MAP_POINTS')
+      }
       store.commit('SET_CUR_TAG', '')
     }
   },

src/view/components/building-drawer.vue

@@ -234,6 +234,7 @@ const getFloors = async (data: any) => {
 }
 
 const buildingNext = async (building: any) => {
+  showBuildingDetail.value = false
   floors.value = await getFloors(building)
   setBuilding(building, true)
   showBuildingDetail.value = true

src/view/components/filter-drawer.vue

@@ -563,8 +563,9 @@ watch(
         )?.map((item: any) => item.extra) || []
       emit('boundary', { type: 'area', name: area })
     }
-    // TODO 地图落点
-    store.commit('SET_MAP_POINTS', points)
+    if (!store.state.showBuildingDrawer) {
+      store.commit('SET_MAP_POINTS', points)
+    }
   },
 )
 watch(