From 11fa88902780abd2e371d74e80951272164415c6 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 20 Dec 2021 09:35:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A5=E6=88=BF=E6=89=BE=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppBuilding/AppBuilding.vue          |   2 +-
 src/apps/AppBuilding/components/detail.vue    |   3 +-
 .../AppBuilding/components/img/model-icon.png | Bin 0 -> 1926 bytes
 src/apps/AppBuilding/components/list.vue      |   8 +-
 src/apps/AppBuilding/components/map.vue       | 161 +++++++++++-------
 src/apps/AppBuilding/components/searchMap.vue |  43 ++++-
 6 files changed, 148 insertions(+), 69 deletions(-)
 create mode 100644 src/apps/AppBuilding/components/img/model-icon.png

diff --git a/src/apps/AppBuilding/AppBuilding.vue b/src/apps/AppBuilding/AppBuilding.vue
index 93bc7439..f1c8e622 100644
--- a/src/apps/AppBuilding/AppBuilding.vue
+++ b/src/apps/AppBuilding/AppBuilding.vue
@@ -21,7 +21,7 @@ export default {
 
   data() {
     return {
-      component: 'Add',
+      component: 'SearchMap',
       params: {}
     }
   },
diff --git a/src/apps/AppBuilding/components/detail.vue b/src/apps/AppBuilding/components/detail.vue
index 0dc831c0..a634df55 100644
--- a/src/apps/AppBuilding/components/detail.vue
+++ b/src/apps/AppBuilding/components/detail.vue
@@ -226,7 +226,8 @@ export default {
       this.$emit('change', {
         type: 'Add',
         params: {
-          id: this.houseId
+          id: this.houseId,
+          communityId: this.communityId
         }
       })
     }
diff --git a/src/apps/AppBuilding/components/img/model-icon.png b/src/apps/AppBuilding/components/img/model-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..8277dffe249f68ac6011b5bf03b21ff31cad2eda
GIT binary patch
literal 1926
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
M07*qoM6N<$f(NphkpKVy

literal 0
HcmV?d00001

diff --git a/src/apps/AppBuilding/components/list.vue b/src/apps/AppBuilding/components/list.vue
index b35cdf65..1eea815b 100644
--- a/src/apps/AppBuilding/components/list.vue
+++ b/src/apps/AppBuilding/components/list.vue
@@ -10,7 +10,7 @@
           <p class="address">{{item.createAddress}}</p>
           <span class="status" :class="'color'+item.locationStatus">{{$dict.getLabel('BuildLocationStatus', item.locationStatus)}}</span>
         </div>
-        <div class="item-btn" v-if="item.locationStatus != 1">
+        <div class="item-btn" v-if="item.locationStatus != 1" @click="toMap(item.communityId, item.areaId)">
           <span>去定位</span>
         </div>
       </div>
@@ -61,6 +61,12 @@ export default {
         type: 'Detail',
         params: {id}
       })
+    },
+    toMap(id, areaId) {
+      this.$emit('change', {
+        type: 'Map',
+        params: {id, areaId}
+      })
     }
     
   },
diff --git a/src/apps/AppBuilding/components/map.vue b/src/apps/AppBuilding/components/map.vue
index d2387bd6..2de290c8 100644
--- a/src/apps/AppBuilding/components/map.vue
+++ b/src/apps/AppBuilding/components/map.vue
@@ -1,12 +1,16 @@
 <template>
   <div class="map">
     <div class="build-btn">
-      <img src="./img/build-icon.png" alt=""> 楼栋<br/>列表
+      <img src="./img/model-icon.png" alt="" @click="toDetail"> 楼栋<br/>模型
     </div>
     <div class="map-content">
       <AiTMap :areaId="areaId" :map.sync="map" :lib.sync="lib" :ops="ops" :libraries="['service', 'tools']"></AiTMap>
     </div>
-    <u-popup v-model="show" mode="bottom" border-radius="14">
+    <div class="footer">
+      <div class="click" @click="isFlag=true">点击定位</div>
+      <div class="btn" @click="confirm">确认定位</div>
+    </div>
+    <!-- <u-popup v-model="show" mode="bottom" border-radius="14">
       <div class="popup">
         <div class="bg"></div>
         <div class="title">恒大城西社区居委会</div>
@@ -38,92 +42,86 @@
           </span>
         </div>
       </div>
-    </u-popup>
+      <div class="popup-btn">查看楼栋模型</div>
+    </u-popup> -->
   </div>
 </template>
 
 <script>
 import { mapState } from 'vuex'
 export default {
-
+  props: ['params'],
   data() {
     return {
       areaId: '',
       ops: {},
       lib: '',
       map: null,
-      markerArr: [],
-      show: true,
-      value: ''
+      markerLayer: '',
+      isFlag: false,
+      latLng: {lat: '', lng: ''},
     }
   },
   computed: { ...mapState(['user']) },
   mounted() {
-    this.areaId = this.user.areaId
+    this.areaId = this.params.areaId
     this.initMap()
   },
 
   methods: {
-    initMap() {
-      //初始化地图
-      
+    initMap() {  //初始化地图
       this.$nextTick(() =>{
         let {lib: TMap, map} = this
-        var center = new TMap.LatLng(40.040422, 116.273521)
-        var marker = null;
-        var points = []
-        map.setCenter(center)
-        map.setZoom(18)
-
-        marker = new TMap.MultiMarker({
-          id: 'marker-layer', // 图层id
-          map: map,
-          styles: {
-            // 点标注的相关样式
-            marker: new TMap.MarkerStyle({
-              width: 25,
-              height: 35,
-              anchor: { x: 16, y: 32 },
-              src:'',
-            }),
-          },
-          geometries: [
-            {
-              // 点标注数据数组
-              id: 'demo',
-              styleId: 'marker',
-              position: new TMap.LatLng(40.040422, 116.273521),
-            },
-          ],
+        map.on("click", (evt) => {
+          if( this.markerLayer) {
+            this.markerLayer.setMap(null);
+          }
+         
+          this.markerLayer = new TMap.MultiMarker({
+            id: 'marker-layer',
+            map: map
+          });
+          if(this.isFlag) {
+            this.markerLayer.add({
+              position: evt.latLng
+            }); 
+            this.latLng = {
+              lat: evt.latLng.lat,
+              lng: evt.latLng.lng
+            }
+          }
+                               
         });
-
-        var infoWindow = null;
-        var infoWindow2 = null
-        var html = `<div style=" display: inline-block;padding: 6px 10px;line-height: 16px;border-radius: 24px; background: #5088FF;color: #fff;font-size: 12px;position: relative;">`
-          +`腾讯大厦<span style=" width: 0;height: 0;border-left: 6px solid transparent;border-right: 6px solid transparent;border-top: 12px solid #5088FF;position: absolute;bottom: -12px;left: 50%;margin-left:-6px;"></span></div>`
-        
-        infoWindow = new TMap.InfoWindow(
-          {
-          map: map,
-          enableCustom: true,
-          position: new TMap.LatLng(40.040422, 116.273521),
-          offset: { y: -70, x: -5 },
-          content: html
-          },
-        );
-
-        infoWindow2 = new TMap.InfoWindow(
-          {
-          map: map,
-          enableCustom: true,
-          position: new TMap.LatLng(40.03592, 116.27058),
-          offset: { y: -70, x: -5 },
-          content: html
-          },
-        );
       })
-      
     },
+    confirm() {
+      if(!this.latLng.lat) {
+        return this.$u.toast(`未获取到定位信息，无法定位`)
+      }
+
+      this.$http.post(`/app/appcommunitybuildinginfo/updateLocation`, null, {
+        params: {
+          id: this.params.id,
+          lat: this.latLng.lat,
+          lng: this.latLng.lng,
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.$u.toast('提交成功')
+          setTimeout(() => {
+            this.$emit('change', {
+              type: 'List',
+            })
+          }, 600)
+        }
+      })
+    },
+    toDetail() {
+      this.$emit('change', {
+        type: 'Detail',
+        params: this.params
+      })
+    }
     
   }
 }
@@ -144,7 +142,7 @@ uni-page-body{
     position: fixed;
     bottom: 136px;
     right: 24px;
-    z-index: 99;
+    z-index: 99999;
     padding: 16px 16px 0;
     box-sizing: border-box;
     font-size: 24px;
@@ -210,5 +208,40 @@ uni-page-body{
       }
     }
   }
+  .popup-btn{
+    width: 100%;
+    font-size: 32px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    height: 112px;
+    line-height: 112px;
+    text-align: center;
+    background: #1365DD;
+    color: #FFF;
+  }
+  .footer{
+    width: 100%;
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    z-index: 99999;
+    display: flex;
+    font-size: 32px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    height: 112px;
+    line-height: 112px;
+    text-align: center;
+    .click{
+      flex: 1;
+      color: #333;
+      background-color: #fff;
+    }
+    .btn{
+      flex: 2;
+      background: #1365DD;
+      color: #FFF;
+    }
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/apps/AppBuilding/components/searchMap.vue b/src/apps/AppBuilding/components/searchMap.vue
index beae1826..e1155c37 100644
--- a/src/apps/AppBuilding/components/searchMap.vue
+++ b/src/apps/AppBuilding/components/searchMap.vue
@@ -50,7 +50,46 @@ export default {
   },
 
   methods: {
-    initMap() {
+    initMap() { this.$nextTick(() =>{
+        let {lib: TMap, map} = this
+      var markerCluster = new TMap.MarkerCluster({
+        id: 'cluster',
+        map: map,
+        enableDefaultStyle: true, // 启用默认样式
+        minimumClusterSize: 1, // 形成聚合簇的最小个数
+        geometries: [{ // 点数组
+            position: new TMap.LatLng(39.953416, 116.480945)
+          },
+          {
+            position: new TMap.LatLng(39.984104, 116.407503)
+          },
+          {
+            position: new TMap.LatLng(39.908802, 116.497502)
+          },
+          {
+            position: new TMap.LatLng(40.040417, 116.373514)
+          },
+          {
+            position: new TMap.LatLng(39.953416, 116.380945)
+          },
+          {
+            position: new TMap.LatLng(39.984104, 116.307503)
+          },
+          {
+            position: new TMap.LatLng(39.908802, 116.397502)
+          },
+          {
+            position: new TMap.LatLng(40.040417, 116.273514)
+          },
+        ],
+        zoomOnClick: true, // 点击簇时放大至簇内点分离
+        gridSize: 60, // 聚合算法的可聚合距离
+        averageCenter: false, // 每个聚和簇的中心是否应该是聚类中所有标记的平均值
+        maxZoom: 10 // 采用聚合策略的最大缩放级别
+      });
+    })
+    },
+    initMap2() {
       //初始化地图
       
       this.$nextTick(() =>{
@@ -240,7 +279,7 @@ uni-page-body{
     position: fixed;
     bottom: 136px;
     right: 24px;
-    z-index: 99;
+    z-index: 99999;
     padding: 16px 16px 0;
     box-sizing: border-box;
     font-size: 24px;