From de007aa5c8965898f6809a9297667af9a74164f5 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 16 Feb 2022 16:17:41 +0800
Subject: [PATCH] 27435

---
 src/components/pages/selectGird.vue | 18 +++++++++++++++++-
 src/saas/AppBuilding/map.vue        |  2 +-
 src/saas/AppGridManagement/Map.vue  | 25 +++++++++++++++++++------
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/components/pages/selectGird.vue b/src/components/pages/selectGird.vue
index 93cea67d..27c2e198 100644
--- a/src/components/pages/selectGird.vue
+++ b/src/components/pages/selectGird.vue
@@ -11,13 +11,24 @@
       <div class="showTypes">
         <div v-if="options.length > 0">
           <div class="cards" v-for="(item, index) in options" :key="index" @click="itemClick(item)">
-            <div class="imges">
+            <div class="imges" v-if="!isDisabledOneGird">
               <img src="./img/xzh.png" alt="" class="imgselect" v-if="item.isChecked"
                    @click.stop="girdClick(item, index)"/>
               <img src="./img/xz.png" alt="" class="imgselect" v-else
                    @click.stop="girdClick(item, index)"/>
               <img src="./img/gird--select-icon.png" alt="" class="avatras"/>
             </div>
+            <div class="imges" v-if="isDisabledOneGird">
+              <div v-if="item.girdLevel != 0">
+                <img src="./img/xzh.png" alt="" class="imgselect" v-if="item.isChecked"
+                   @click.stop="girdClick(item, index)"/>
+                <img src="./img/xz.png" alt="" class="imgselect" v-else
+                    @click.stop="girdClick(item, index)"/>
+              </div>
+              <span v-else class="imgselect"></span>
+              <img src="./img/gird--select-icon.png" alt="" class="avatras"/>
+            </div>
+
             <div class="rightes">
               <div class="applicationNames fill">{{ item.girdName }}</div>
               <u-icon v-if="item.girdLevel != 2" name="arrow-right" color="#ddd"/>
@@ -53,6 +64,7 @@ export default {
       girdLevel: 0,
       parentGirdId: '',
       isMyGird: false, //是否只查询当前户对应的网格员管理的三级网格
+      isDisabledOneGird: false, //是否可以选择一级网格 true不可选
     }
   },
   computed: {
@@ -68,6 +80,10 @@ export default {
     if (params.isMyGird) {
       this.isMyGird = params.isMyGird
     }
+
+    if(params.isDisabledOneGird) {
+      this.isDisabledOneGird = params.isDisabledOneGird
+    }
     this.isGirdUser()
     
   },
diff --git a/src/saas/AppBuilding/map.vue b/src/saas/AppBuilding/map.vue
index a221f8a7..f03de05c 100644
--- a/src/saas/AppBuilding/map.vue
+++ b/src/saas/AppBuilding/map.vue
@@ -71,7 +71,7 @@ export default {
     this.initMap()
   },
   onShow() {
-    document.title = "以房找人"
+    document.title = "楼栋定位"
   },
   methods: {
     initMap() {  //初始化地图
diff --git a/src/saas/AppGridManagement/Map.vue b/src/saas/AppGridManagement/Map.vue
index d89a221f..34602d35 100644
--- a/src/saas/AppGridManagement/Map.vue
+++ b/src/saas/AppGridManagement/Map.vue
@@ -1,11 +1,15 @@
 <template>
   <div class="detail">
     <div class="grid-select">
-      <span class="label">网格选择</span>
-      <div class="grid-select__right" @click="toChoose">
-        <span>{{ form.girdName || '请选择' }}</span>
-        <u-icon name="arrow-right" color="#cccccc" size="26" style="margin-left:4px;"></u-icon>
-      </div>
+      <AiPagePicker type="gird" class="fill" :selected="[form]" @select="handleSelectGird" :isDisabledOneGird="true">
+        <div class="gird-content">
+          <div class="label">网格选择</div>
+          <div class="grid-select__right">
+            <span>{{ form.girdName || '请选择' }}</span>
+            <u-icon name="arrow-right" color="#cccccc" size="26" style="margin-left:4px;"></u-icon>
+          </div>
+        </div>
+      </AiPagePicker>
     </div>
     <div class="map-content">
       <AiTMap ref="AiTMap" :map.sync="map" :lib.sync="lib" :libraries="['geometry','service', 'tools']"/>
@@ -92,6 +96,10 @@ export default {
   },
 
   methods: {
+    handleSelectGird(v) {
+      this.form = v?.[0]
+      this.getGridList(v?.[0].id, true)
+    },
     toChoose() {
       uni.navigateTo({
         url: './SelectGird?isFormMap=1'
@@ -308,8 +316,13 @@ ai-tree-picker {
     color: #333;
 
     .grid-select__right {
+      width: calc(100% - 140px);
+      text-align: right;
+    }
+
+    .gird-content{
       display: flex;
-      align-items: center;
+      justify-content: space-between;
     }
 
     .label {