From d6c3c2b130865da669ff430e050fb2e82c60be52 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 24 Dec 2021 19:54:09 +0800
Subject: [PATCH] 25623

---
 .../2.0.5/AppBuildManage/components/List.vue   |  2 +-
 packages/2.0.5/AppHouseMap/AppHouseMap.vue     | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/2.0.5/AppBuildManage/components/List.vue b/packages/2.0.5/AppBuildManage/components/List.vue
index 5ed67d22..b07beebb 100644
--- a/packages/2.0.5/AppBuildManage/components/List.vue
+++ b/packages/2.0.5/AppBuildManage/components/List.vue
@@ -51,7 +51,7 @@
                 <el-button type="text" @click="onAdd(row.id)">编辑</el-button>
                 <el-button type="text" @click="remove(row.id)">删除</el-button>
                 <el-button type="text" @click="toBuildMsg(row)">房屋信息</el-button>
-                <el-button type="text" @click="$router.push({ name: '63', query: { communityId: row.communityId, buildingId: row.id, unitNum: 1, buildingNumber: row.buildingNumber } })">
+                <el-button type="text" @click="$router.push({ name: 'AppHouseMap', query: { communityId: row.communityId, buildingId: row.id, unitNum: 1, buildingNumber: row.buildingNumber } })">
                   楼栋模型
                 </el-button>
               </div>
diff --git a/packages/2.0.5/AppHouseMap/AppHouseMap.vue b/packages/2.0.5/AppHouseMap/AppHouseMap.vue
index d7ee80b3..c7888546 100644
--- a/packages/2.0.5/AppHouseMap/AppHouseMap.vue
+++ b/packages/2.0.5/AppHouseMap/AppHouseMap.vue
@@ -1,6 +1,6 @@
 <template>
   <div style="height:100%;">
-    <div class="map" v-if="!showStatistics">
+    <div class="map" v-if="!hasCommunityId">
       <ai-title title="房屋地图" is-show-bottom-border style="margin-left: 20px"/>
       <div id="map" ref="rootmap" @click="hidePopup"/>
       <div class="map-area">
@@ -133,7 +133,7 @@
         </div>
       </div>
     </div>
-    <building-statistics :instance="instance" :dict="dict" v-if="showStatistics"/>
+    <building-statistics :instance="instance" :dict="dict" v-if="hasCommunityId"/>
   </div>
 </template>
 
@@ -195,6 +195,10 @@ export default {
   },
   computed: {
     ...mapState(['user']),
+
+    hasCommunityId() {
+      return !!this.$route.query?.communityId
+    }
   },
 
   watch: {
@@ -204,11 +208,10 @@ export default {
         this.debounce(this.search, 500)
       }
     },
-    type: {
-      // deep: true,
-      // handler() {
-      //   this.debounce(this.search, 500)
-      // }
+    hasCommunityId(v) {
+      if (!v) {
+        this.getCorpLocation()
+      }
     },
     showStatistics: {
       deep: true,
@@ -404,7 +407,6 @@ export default {
       context.marker.urlType = urlType
 
       context.marker.on('click', e => {
-        console.log(e)
         this.chooseBuildId = e.target.id
         this.getBuildInfo(e.target.id, e.target.urlType)
         context.marker.setContent(el);