From 94d543658daa11d39ab5e5f0de4cfbed9abc45c8 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 14 Jan 2022 16:04:11 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=88=B7=E4=B8=BB=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppGridManagement/FamilyList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppGridManagement/FamilyList.vue b/src/apps/AppGridManagement/FamilyList.vue
index 79c9adaf..1c0d8bfd 100644
--- a/src/apps/AppGridManagement/FamilyList.vue
+++ b/src/apps/AppGridManagement/FamilyList.vue
@@ -15,7 +15,7 @@
                 <span class="user-tel">{{item.phone}}</span>
               </div>
               <div class="idCard">{{item.idNumber && item.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")}}</div>
-              <div class="address">{{item.householdAddress}}</div>
+              <div class="address">{{item.currentAreaName || '' + item.currentAddress}}</div>
             </div>
           </div>
         </li>

From c944d6dcec9e412dd606ab426b4a814ec00e633c Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 14 Jan 2022 16:07:50 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppGridManagement/Map.vue | 52 ++++++++++++++++++++++++------
 src/components/AiTMap.vue          |  1 -
 2 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/src/apps/AppGridManagement/Map.vue b/src/apps/AppGridManagement/Map.vue
index 669bdbe7..744bf2b7 100644
--- a/src/apps/AppGridManagement/Map.vue
+++ b/src/apps/AppGridManagement/Map.vue
@@ -11,7 +11,7 @@
       </div>
     </div>
     <div class="map-content">
-      <AiTMap ref="AiTMap" :map.sync="map" :lib.sync="lib" :libraries="['service', 'tools']"/>
+      <AiTMap ref="AiTMap" :map.sync="map" :lib.sync="lib" :libraries="['geometry','service', 'tools']"/>
     </div>
     <u-popup v-model="show" mode="bottom" border-radius="14">
       <div class="popup">
@@ -26,6 +26,15 @@
             <span class="label">网格层级</span>
             <span class="value">{{ $dict.getLabel('girdLevel', form.girdLevel) }}</span>
           </div>
+          <div v-if="form.girdMemberManageList && form.girdMemberManageList.length">
+            <div class="info-flex" v-for="(item, index) in  form.girdMemberManageList" :key="index">
+              <span class="label">网格长</span>
+              <span class="value">{{ item.name }}&nbsp;&nbsp;{{ item.phone }}
+                <img :src="$cdn + 'common/phone.png'" alt="" @click="callPhone(item.phone)" class="phone-icon"
+                    v-if="item.phone">
+              </span>
+            </div>
+          </div>
           <div v-if="form.girdMemberList && form.girdMemberList.length">
             <div class="info-flex" v-for="(item, index) in  form.girdMemberList" :key="index">
               <span class="label">网格管理员</span>
@@ -74,9 +83,10 @@ export default {
         if (res?.data) {
           this.treeList = res.data
 
-          const arr = res.data.map(e => {
+          const arr = res.data.filter(v => v.points).map(e => {
             return {
               id: e.id,
+              girdName: e.girdName,
               points: e.points.map(p => [p.lng, p.lat])
             }
           })
@@ -111,8 +121,8 @@ export default {
         }
         if (paths?.length > 0) {
           let bounds = []
+
           paths.forEach((path, i) => {
-            console.log(path)
             let color = colors[i % colors.length]
             let polygon = new TMap.MultiPolygon({
               map, styles: {
@@ -135,10 +145,33 @@ export default {
             })
 
             const points = path.points.map(e => new TMap.LatLng(e[1], e[0]))
-            
-            // console.log(TMap)
 
-            // var position = TMap.geometry.computeCentroid(points)
+            var position = TMap.geometry.computeCentroid(points)
+
+            let label = new TMap.MultiLabel({
+              id: `label~${path.id}`,
+              data: path.id,
+              map: map,
+              styles: {
+                building:  new TMap.LabelStyle({
+                  color: '#3777FF',
+                  size: 20,
+                  alignment: 'center',
+                  verticalAlignment: 'middle'
+                })
+              },
+              geometries: [
+                {
+                  id: `label-class-${i}`,
+                  styleId: 'building',
+                  position: position,
+                  content: path.girdName,
+                }
+              ]
+            })
+            label.on('click', e => {
+              this.getGridInfo(e.target.id.split('~')[1])
+            });
           })
           bounds = bounds.reduce((a, b) => {
             return fitBounds([
@@ -166,9 +199,10 @@ export default {
     },
     handleSelect(e) {
       if (e?.points?.length > 0) {
-        this.form = e
-        let path = e.points?.map(p => [p.lng, p.lat]) || []
-        this.renderGridMap([path])
+        const points = e.points.map(e => new TMap.LatLng(e.lat, e.lng))
+        var position = TMap.geometry.computeCentroid(points)
+        this.map.setCenter(position)
+        this.map.setZoom(15)
       } else {
         this.$u.toast("所选网格没有标绘!")
       }
diff --git a/src/components/AiTMap.vue b/src/components/AiTMap.vue
index c1e3165f..ada7504e 100644
--- a/src/components/AiTMap.vue
+++ b/src/components/AiTMap.vue
@@ -57,7 +57,6 @@ export default {
         center: new TMap.LatLng(this.config.lat, this.config.lng),
         ...this.ops
       })
-      console.log(TMap)
       this.$emit('loaded')
       this.$emit('update:lib', TMap)
       this.$emit('update:map', this.tmap)

From 9387e1416b3d50d7f8eb7612a7de794625cf3745 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Fri, 14 Jan 2022 16:08:53 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=BC=8F=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppGridManagement/AddFamily.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apps/AppGridManagement/AddFamily.vue b/src/apps/AppGridManagement/AddFamily.vue
index 926c25b3..c24d2767 100644
--- a/src/apps/AppGridManagement/AddFamily.vue
+++ b/src/apps/AppGridManagement/AddFamily.vue
@@ -23,7 +23,7 @@
                   <span class="user-tel">{{item.phone}}</span>
                  </div>
                 <div class="idCard">{{item.idNumber && item.idNumber.replace(/(.{6}).*(.{4})/,"$1********$2")}}</div>
-                <div class="address">{{item.householdAddress}}</div>
+                <div class="address">{{item.currentAreaName || '' + item.currentAddress}}</div>
               </div>
             </div>
           </div>