From 4a4d152c10f84764db6a6f3774a8507ae4f279e8 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 17 Jan 2022 14:24:54 +0800
Subject: [PATCH] bug

---
 .../AppGridManagement/AppGridManagement.vue   | 60 +++++++++++++++++-
 src/apps/AppGridManagement/Organization.vue   | 62 +------------------
 src/apps/AppGridManagement/Statistics.vue     | 55 +---------------
 3 files changed, 64 insertions(+), 113 deletions(-)

diff --git a/src/apps/AppGridManagement/AppGridManagement.vue b/src/apps/AppGridManagement/AppGridManagement.vue
index 66352826..24ee2a0d 100644
--- a/src/apps/AppGridManagement/AppGridManagement.vue
+++ b/src/apps/AppGridManagement/AppGridManagement.vue
@@ -1,5 +1,14 @@
 <template>
   <div class="AppGridManagement">
+    <div class="pad-t32" v-if="component != 'Map'"></div>
+    <div class="select-gird" v-if="component != 'Map'">
+      <img src="./components/img/gird-icon.png" alt="" class="gird-icon">
+      <div @click="linkTo('./SelectGird')">
+        {{params.girdName}}
+        <img src="./components/img/down-icon.png" alt="" class="down-icon"> 
+      </div>
+      <span @click="linkTo('./SetGird')" v-if="checkType == 2">网格配置</span>
+    </div>
     <component v-if="refresh && isAdmin" :is="component" @change="onChange" :params="params"> </component>
     <div class="tabs" v-if="isTab && isAdmin">
       <div class="item" @click="tabClick(index, item.component)" v-for="(item, index) in tabs" :key="index">
@@ -50,7 +59,8 @@ export default {
         }
       ],
       isTab: true,
-      isAdmin: false
+      isAdmin: false,
+      checkType: ''
     }
   },
 
@@ -79,10 +89,15 @@ export default {
         if (res.code == 0) {
           if (res.data.checkType != '0') {
             this.isAdmin = true
+            this.checkType = res.data.checkType
+            this.params = res.data.appGirdInfo
           }
         }
       })
     },
+    linkTo(url) {
+      uni.navigateTo({ url })
+    },
   },
   onShow() {
     document.title = '网格管理'
@@ -95,6 +110,9 @@ export default {
   },
   onLoad() {
     this.isGirdUser()
+    uni.$on('goback', (res) => {
+      this.params = res
+    }) 
   },
   onReachBottom() {
     if(!this.tabIndex) {
@@ -108,6 +126,46 @@ export default {
 .AppGridManagement {
   height: 100vh;
 }
+.pad-t32{
+  padding-top: 32px;
+}
+.select-gird{
+  width: calc(100% - 60px);
+  padding: 24px 32px;
+  background: #FFFFFF;
+  border-radius: 16px;
+  margin: 0 30px 32px;
+  box-sizing: border-box;
+  img{
+    width: 32px;
+    height: 32px;
+    vertical-align: middle;
+  }
+  div{
+    display: inline-block;
+    width: calc(100% - 144px);
+    padding-left: 20px;
+    box-sizing: border-box;
+    font-size: 32px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #333;
+    line-height: 48px;
+    img{
+      margin-left: 8px;
+    }
+  }
+  span{
+    display: inline-block;
+    width: 112px;
+    height: 48px;
+    font-size: 28px;
+    font-family: PingFangSC-Medium, PingFang SC;
+    font-weight: 500;
+    color: #3F8DF5;
+    line-height: 48px;
+  }
+}
 .tabs {
   width: 100%;
   height: 98px;
diff --git a/src/apps/AppGridManagement/Organization.vue b/src/apps/AppGridManagement/Organization.vue
index dda2d2df..5a96b3fc 100644
--- a/src/apps/AppGridManagement/Organization.vue
+++ b/src/apps/AppGridManagement/Organization.vue
@@ -1,13 +1,5 @@
 <template>
   <div class="Organization">
-    <div class="select-gird">
-      <img src="./components/img/gird-icon.png" alt="" class="gird-icon">
-      <div @click="linkTo('./SelectGird')">
-        {{userGird.girdName}}
-        <img src="./components/img/down-icon.png" alt="" class="down-icon"> 
-      </div>
-      <span @click="linkTo('./SetGird')" v-if="checkType == 2">网格配置</span>
-    </div>
     <div class="title">网格人员</div>
     <div class="user-content" v-for="(item, index) in dataInfo.parentGirdMembers" :key="index">
       <image :src="item.photo" alt="" mode="aspectFill" v-if="item.photo" />
@@ -40,32 +32,22 @@ export default {
     return {
       userGird: {},
       dataInfo: {},
-      checkType: ''
     }
   },
+  props: ['params'],
   onShow() {
     document.title = '网格管理'
      
   },
   mounted() {
-    this.isGirdUser()
+    this.userGird = this.params
+    this.getGirdUserList()
     uni.$on('goback', (res) => {
       this.userGird = res
       this.getGirdUserList()
     }) 
   },
   methods: {
-    isGirdUser() {
-      this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {
-        if (res.code == 0) {
-          if (res.data.checkType != '0') {
-            this.checkType = res.data.checkType
-            this.userGird = res.data.appGirdInfo
-            this.getGirdUserList()
-          } 
-        }
-      })
-    },
     getGirdUserList() {
       this.$http.post(`/app/appgirdmemberinfo/listGirdMemberByGirdId?girdId=${this.userGird.id}`).then((res) => {
         if (res.code == 0) {
@@ -82,45 +64,7 @@ export default {
 
 <style lang="scss" scoped>
 .Organization {
-  padding-top: 32px;
   background-color: #f5f5f5;
-  .select-gird{
-  width: calc(100% - 60px);
-  padding: 24px 32px;
-  background: #FFFFFF;
-  border-radius: 16px;
-  margin: 0 30px 32px;
-  box-sizing: border-box;
-  img{
-    width: 32px;
-    height: 32px;
-    vertical-align: middle;
-  }
-  div{
-    display: inline-block;
-    width: calc(100% - 144px);
-    padding-left: 20px;
-    box-sizing: border-box;
-    font-size: 32px;
-    font-family: PingFangSC-Medium, PingFang SC;
-    font-weight: 500;
-    color: #333;
-    line-height: 48px;
-    img{
-      margin-left: 8px;
-    }
-  }
-  span{
-    display: inline-block;
-    width: 112px;
-    height: 48px;
-    font-size: 28px;
-    font-family: PingFangSC-Medium, PingFang SC;
-    font-weight: 500;
-    color: #3F8DF5;
-    line-height: 48px;
-  }
-  }
   .title{
     font-size: 38px;
     font-family: PingFangSC-Semibold, PingFang SC;
diff --git a/src/apps/AppGridManagement/Statistics.vue b/src/apps/AppGridManagement/Statistics.vue
index c80dedb0..46ae8a77 100644
--- a/src/apps/AppGridManagement/Statistics.vue
+++ b/src/apps/AppGridManagement/Statistics.vue
@@ -1,15 +1,5 @@
 <template>
   <div class="Statistics">
-    <div class="top">
-      <div class="left" @click="linkTo('./SelectGird')">
-        <img src="./components/img/gird-icon.png" alt="" />
-        <div class="girdNmae">{{ girdMsgList.girdName || '' }}</div>
-        <u-icon name="arrow-down" color="#666"></u-icon>
-      </div>
-
-      <div class="right" @click="linkTo('./SetGird')" v-if="checkType == 2">网格配置</div>
-    </div>
-
     <div class="middle">
       <div class="girdPeople">网格内人员情况</div>
 
@@ -86,6 +76,8 @@ export default {
   created() {
     this.$dict.load('girdType', 'girdLevel').then(() => {
       this.isGirdUser()
+      this.girdMsgList = this.params
+      this.getList()
     })
 
     uni.$on('goback', (res) => {
@@ -98,14 +90,6 @@ export default {
       this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {
         if (res.code == 0) {
           this.girdUser = res.data
-          this.checkType = res.data.checkType
-          if (this.girdUser.checkType != '0') {
-            
-            if (this.girdUser.appGirdInfo) {
-              this.girdMsgList = this.girdUser.appGirdInfo
-              this.getList()
-            }
-          }
         }
       })
     },
@@ -129,43 +113,8 @@ uni-page-body {
   height: 100%;
 }
 .Statistics {
-  height: 100%;
-  background: #f3f7f8;
   padding: 0 30px;
-  padding-top: 30px;
   box-sizing: border-box;
-  .top {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 24px 32px;
-    background: #fff;
-    border-radius: 16px;
-    .left {
-      display: flex;
-      align-items: center;
-      img {
-        width: 32px;
-        height: 32px;
-      }
-      .girdNmae {
-        margin-left: 20px;
-        font-size: 34px;
-        font-family: PingFangSC-Medium, PingFang SC;
-        font-weight: 500;
-        color: #333333;
-      }
-      .u-icon {
-        margin-left: 8px;
-      }
-    }
-    .right {
-      font-size: 28px;
-      font-family: PingFangSC-Medium, PingFang SC;
-      font-weight: 500;
-      color: #3f8df5;
-    }
-  }
 
   .middle {
     background: #ffffff;