From ff8058418f55f262ac18bd80c111061dcacc8d5b Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Fri, 14 Jan 2022 18:03:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppGridManagement/Map.vue          | 24 ++++++++++++++++++++-
 src/apps/AppGridManagement/Organization.vue |  2 +-
 src/apps/AppGridManagement/Statistics.vue   |  2 +-
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/apps/AppGridManagement/Map.vue b/src/apps/AppGridManagement/Map.vue
index 40bf7727..4bfaf522 100644
--- a/src/apps/AppGridManagement/Map.vue
+++ b/src/apps/AppGridManagement/Map.vue
@@ -79,6 +79,27 @@ export default {
   },
   methods: {
     getLeafNodes() {
+      // this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {
+      //   if (res.code == 0) {
+      //     if (res.data.checkType != '0') {
+      //       this.$http.post(`/app/appgirdinfo/queryGirdMemberGirdsById?id=${res.data.appGirdInfo.id}`).then((res) => {
+      //         if (res?.data) {
+      //           this.treeList = res.data.filter(v => v.girdLevel === '2')
+
+      //           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])
+      //             } 
+      //           })
+
+      //           arr.length > 0 && this.renderGridMap(arr)
+      //         }
+      //       })
+      //     }
+      //   }
+      // })
       this.$http.post(`/app/appgirdinfo/queryGirdMemberGirdsById`).then((res) => {
         if (res?.data) {
           this.treeList = res.data.filter(v => v.girdLevel === '2')
@@ -88,8 +109,9 @@ export default {
               id: e.id,
               girdName: e.girdName,
               points: e.points.map(p => [p.lng, p.lat])
-            }
+            } 
           })
+
           arr.length > 0 && this.renderGridMap(arr)
         }
       })
diff --git a/src/apps/AppGridManagement/Organization.vue b/src/apps/AppGridManagement/Organization.vue
index 1f9e1fcc..dda2d2df 100644
--- a/src/apps/AppGridManagement/Organization.vue
+++ b/src/apps/AppGridManagement/Organization.vue
@@ -29,7 +29,7 @@
         <p>{{item.girdName}} </p>
       </div>
     </div>
-    <AiEmpty description="暂无数据" class="emptyWrap" v-if="!dataInfo.parentGirdMembers.length && !dataInfo.girdMembers.length"></AiEmpty>
+    <AiEmpty description="暂无数据" class="emptyWrap" v-if="dataInfo.parentGirdMembers && !dataInfo.parentGirdMembers.length && !dataInfo.girdMembers.length"></AiEmpty>
     <div class="pad-b112"></div>
   </div>
 </template>
diff --git a/src/apps/AppGridManagement/Statistics.vue b/src/apps/AppGridManagement/Statistics.vue
index ff2990d7..c80dedb0 100644
--- a/src/apps/AppGridManagement/Statistics.vue
+++ b/src/apps/AppGridManagement/Statistics.vue
@@ -83,7 +83,7 @@ export default {
   computed: {},
   watch: {},
   onLoad() {},
-  mounted() {
+  created() {
     this.$dict.load('girdType', 'girdLevel').then(() => {
       this.isGirdUser()
     })