无等级网格版合并

packages/grid/AppBuildMap/AppBuildMap.vue

@@ -35,7 +35,7 @@
         <h2>房屋信息</h2>
         <div class="community-info__item">
           <label>所属社区</label>
-          <span>{{ info.areaName}}</span>
+          <span>{{ info.areaName }}</span>
         </div>
         <div class="community-info__item">
           <label>所属小区</label>
@@ -43,7 +43,7 @@
         </div>
         <div class="community-info__item">
           <label>房屋类型</label>
-          <span>{{ dict.getLabel("communityBuildingType",info.buildingType) }}</span>
+          <span>{{ dict.getLabel("communityBuildingType", info.buildingType) }}</span>
         </div>
         <div class="community-info__item">
           <label>楼长姓名</label>
@@ -51,7 +51,7 @@
         </div>
         <div class="community-info__item">
           <label>楼长电话</label>
-          <span>{{ info.managerPhone}}</span>
+          <span>{{ info.managerPhone }}</span>
         </div>
       </div>
 
@@ -59,7 +59,7 @@
         <h2>人员信息</h2>
         <div class="community-info__item">
           <label>姓名</label>
-          <span style="color:#2266FF;">{{ resident.name}}</span>
+          <span style="color:#2266FF;">{{ resident.name }}</span>
         </div>
         <div class="community-info__item">
           <label>所属单元</label>
@@ -67,7 +67,7 @@
         </div>
         <div class="community-info__item">
           <label>房号</label>
-          <span>{{house.houseCode}}</span>
+          <span>{{ house.houseCode }}</span>
         </div>
         <div class="community-info__item">
           <label>联系方式</label>
@@ -86,7 +86,8 @@
       <!--        </div>-->
       <div class="community-btn">
         <el-button icon="iconfont iconloudongmoxing" size="small"
-                   @click="$router.push({query: {communityId: info.communityId, buildingId: info.id,unitNum:house ? house.unitNumber : 1,buildingNumber:info.buildingNumber}})">楼栋模型
+                   @click="$router.push({query: {communityId: info.communityId, buildingId: info.id,unitNum:house ? house.unitNumber : 1,buildingNumber:info.buildingNumber}})">
+          楼栋模型
         </el-button>
       </div>
     </div>
@@ -153,19 +154,19 @@ export default {
       list: [],
       areaList: [],
       info: {},
-      resident:null,
+      resident: null,
       satellite: null,
       zoom: 11,
       chooseBuildId: '',
       buildList: [],
       searchList: [],
-      house:null,
-      center: []
+      house: null,
+      center: [],
+      mapLib: null
     }
   },
   computed: {
     ...mapState(['user']),
-
     hasCommunityId() {
       return !!this.$route.query?.communityId
     }
@@ -186,7 +187,7 @@ export default {
   },
 
   created() {
-    this.dict.load('householdRelation','communityBuildingType')
+    this.dict.load('householdRelation', 'communityBuildingType')
   },
 
   mounted() {
@@ -198,9 +199,9 @@ export default {
   },
 
   methods: {
-    getCorpLocation(){
-      this.instance.post("/app/appdvcpconfig/getCorpLocation").then(res=>{
-        if(res.code==0){
+    getCorpLocation() {
+      this.instance.post("/app/appdvcpconfig/getCorpLocation").then(res => {
+        if (res.code == 0) {
           this.initMap(res.data);
         }
       })
@@ -239,9 +240,9 @@ export default {
     },
 
     getBuildInfo(id) {
-      this.instance.post(`/app/appcommunityhouseinfo/queryDetailByIdWithBuilding`,null,{
-        params:{
-          buildId:id
+      this.instance.post(`/app/appcommunityhouseinfo/queryDetailByIdWithBuilding`, null, {
+        params: {
+          buildId: id
         }
       }).then(res => {
         if (res.code === 0) {
@@ -255,11 +256,11 @@ export default {
     },
 
     chooseCommunity(item) {
-      this.instance.post(`/app/appcommunityhouseinfo/queryDetailByIdWithBuilding`,null,{
-        params:{
-          buildId:item.buildingId,
-          houseId:item.id,
-          residentId:item.residentId
+      this.instance.post(`/app/appcommunityhouseinfo/queryDetailByIdWithBuilding`, null, {
+        params: {
+          buildId: item.buildingId,
+          houseId: item.id,
+          residentId: item.residentId
         }
       }).then(res => {
         if (res.code === 0) {
@@ -293,7 +294,7 @@ export default {
         <div class="polymeric-container">
           <p>${context.count}</p>
         </div>
-      </div>`
+      </div>`, {mapLib: AMap} = this
 
       let offset = new AMap.Pixel(-9, -9)
       context.marker.setContent(el)
@@ -308,12 +309,12 @@ export default {
     renderMarker(context) {
       const buildId = context.data[0].id
 
-      let el = `<div class="mark" id="buildId-${buildId}" style="${buildId === this.chooseBuildId?'background-color:#2266FF':''}">
+      let el = `<div class="mark" id="buildId-${buildId}" style="${buildId === this.chooseBuildId ? 'background-color:#2266FF' : ''}">
          <div class="mark-contaienr">
             <span>${context.data[0].communityName}</span>&nbsp;&nbsp;
             <span>${context.data[0].buildingNumber}栋</span>
           </div>
-        <div class="arrow" style="${buildId === this.chooseBuildId?'border-top-color: #2266FF':''}"></div>
+        <div class="arrow" style="${buildId === this.chooseBuildId ? 'border-top-color: #2266FF' : ''}"></div>
       </div>`
 
       context.marker.setContent(el);
@@ -336,6 +337,7 @@ export default {
     },
 
     addMakert(points) {
+      let {mapLib: AMap} = this
       new AMap.MarkerClusterer(this.map, points, {
         gridSize: 60,
         maxZoom: 15,
@@ -352,29 +354,26 @@ export default {
           size: 1000000
         }
       }).then(res => {
-        if (res.code === 0) {
+        if (res?.data) {
           this.buildList = res.data.records
           const points = res.data.records.map(item => {
             return {
               lnglat: [item.lng, item.lat],
               id: item.id,
               corpId: item.corpId,
-              areaName:item.areaName,
-              buildingNumber:item.buildingNumber,
-              communityName:item.communityName
+              areaName: item.areaName,
+              buildingNumber: item.buildingNumber,
+              communityName: item.communityName
             }
           })
-
           this.addMakert(points)
         }
       })
     },
-
     hidePopup() {
       this.isShowArea = false
       this.isShowSearch = false
     },
-
     switchLayer(flag) {
       if (flag) {
         this.map.addLayer(this.satellite)
@@ -384,9 +383,8 @@ export default {
 
       this.isImageMap = flag
     },
-
-    initMap({lng,lat}) {
-      this.center = [lng,lat];
+    initMap({lng, lat}) {
+      this.center = [lng, lat];
       AMapLoader.load({
         key: 'b553334ba34f7ac3cd09df9bc8b539dc',
         version: '2.0',
@@ -396,6 +394,7 @@ export default {
           plugins: []
         }
       }).then((AMap) => {
+        this.mapLib = AMap
         this.map = new AMap.Map('map', {
           resizeEnable: true,
           zooms: [6, 20],
@@ -422,7 +421,7 @@ export default {
   width: 100%;
 }
 
-::v-deep .ai-list__content--right-wrapper{
+::v-deep .ai-list__content--right-wrapper {
   height: 100%;
   margin: 0px !important;
   background-color: transparent !important;
@@ -804,7 +803,7 @@ export default {
       white-space: nowrap;
     }
 
-    p:first-child{
+    p:first-child {
       font-size: 14px;
     }
 
@@ -816,7 +815,7 @@ export default {
   }
 }
 
-::v-deep .mark{
+::v-deep .mark {
   user-select: none;
   cursor: pointer;
   height: 32px;
@@ -829,7 +828,7 @@ export default {
   box-sizing: border-box;
   padding: 0 12px;
 
-  .mark-contaienr{
+  .mark-contaienr {
     color: white;
     font-size: 14px;
     position: relative;
@@ -841,7 +840,7 @@ export default {
     justify-content: center;
   }
 
-  .arrow{
+  .arrow {
     position: absolute;
     left: 50%;
     transform: translateX(-50%);