From 0045ab1fecab1065b5ec289cca8f5db7a289c726 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 11 Feb 2022 11:20:57 +0800
Subject: [PATCH] BUG 27200

---
 bin/serve.js                                  |  32 +-
 src/components/AiPagePicker.vue               |   4 +-
 .../pages/img/gird--select-icon.png           | Bin 0 -> 1276 bytes
 src/components/pages/img/user-img.png         | Bin 0 -> 1467 bytes
 src/components/pages/img/xz.png               | Bin 0 -> 1489 bytes
 src/components/pages/img/xzh.png              | Bin 0 -> 1730 bytes
 src/components/pages/selectGird.vue           | 338 ++++++++++++++++++
 .../pages}/selectResident.vue                 |   6 +-
 .../AppGridManagement/AppGridManagement.vue   |  36 +-
 9 files changed, 385 insertions(+), 31 deletions(-)
 create mode 100644 src/components/pages/img/gird--select-icon.png
 create mode 100644 src/components/pages/img/user-img.png
 create mode 100644 src/components/pages/img/xz.png
 create mode 100644 src/components/pages/img/xzh.png
 create mode 100644 src/components/pages/selectGird.vue
 rename src/{apps/AppComponent => components/pages}/selectResident.vue (93%)

diff --git a/bin/serve.js b/bin/serve.js
index 7e618f5f..fc5e714f 100644
--- a/bin/serve.js
+++ b/bin/serve.js
@@ -68,10 +68,9 @@ const start = () => {
       navigationStyle: "custom"
     }
   }
-  findApp('src/apps', file => {
-    if (/.+\\App[^\\]+\\[^\\]+\.vue/g.test(file)) {
+  findApp('src/components/pages', file => {
+    if (/.+\\[^\\]+\\[^\\]+\.vue/g.test(file)) {
       let app = {
-        name: file.replace(/.*\\([^\\]+).vue/g, '$1'),
         path: file.replace(/^src\\(.*).vue/g, '$1').replace(/\\/g, '/')
       }
       let vue = fs.readFileSync(file).toString()
@@ -83,7 +82,7 @@ const start = () => {
       json.pages.push(app)
     }
   }).then(() => {
-    return findApp('src/saas', file => {
+    return findApp('src/apps', file => {
       if (/.+\\App[^\\]+\\[^\\]+\.vue/g.test(file)) {
         let app = {
           name: file.replace(/.*\\([^\\]+).vue/g, '$1'),
@@ -97,12 +96,29 @@ const start = () => {
         }
         json.pages.push(app)
       }
-    })
-  }).then(() => {
-    fsExtra.outputJson('src/pages.json', json, () => {
-      chalkTag.done('生成pages.json')
+    }).then(() => {
+      return findApp('src/saas', file => {
+        if (/.+\\App[^\\]+\\[^\\]+\.vue/g.test(file)) {
+          let app = {
+            name: file.replace(/.*\\([^\\]+).vue/g, '$1'),
+            path: file.replace(/^src\\(.*).vue/g, '$1').replace(/\\/g, '/')
+          }
+          let vue = fs.readFileSync(file).toString()
+          if (/appName/.test(vue)) {
+            let appName = vue.replace(/[\s\S]*(appName:.+),[\s\S]*/gm, '$1'),
+                title = appName.replace(/(appName:|["'])/g, '')
+            app.style = {navigationBarTitleText: title}
+          }
+          json.pages.push(app)
+        }
+      })
+    }).then(() => {
+      fsExtra.outputJson('src/pages.json', json, () => {
+        chalkTag.done('生成pages.json')
+      })
     })
   })
+
 }
 
 start();
diff --git a/src/components/AiPagePicker.vue b/src/components/AiPagePicker.vue
index d83fc6ce..3aef11c7 100644
--- a/src/components/AiPagePicker.vue
+++ b/src/components/AiPagePicker.vue
@@ -24,7 +24,8 @@ export default {
   data() {
     return {
       configList: {
-        resident: {url: "/apps/AppComponent/selectResident", label: "name"}
+        resident: {url: "/components/pages/selectResident", label: "name"},
+        gird: {url: "/components/pages/selectGird", label: "girdName"}
       },
     }
   },
@@ -43,6 +44,7 @@ export default {
           selected = this.value || this.selected?.map(e => e[nodeKey])
       uni.$once('pagePicker', data => {
         this.$emit("update:selected", data)
+        this.$emit("select", data)
         this.$emit("change", data.map(e => e[nodeKey]))
       })
       uni.navigateTo({url: `${config.url}?selected=${selected?.toString()}`})
diff --git a/src/components/pages/img/gird--select-icon.png b/src/components/pages/img/gird--select-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..205144d26b442ba78547c82b8b09585c5b7ac0d7
GIT binary patch
literal 1276
zcmV<Y1OxktP)<h;3K|Lk000e1NJLTq002w?002q|1^@s65zewU00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91OrQe*1ONa40RR91N&o-=0GatRKmY&)W=TXrRCodHoXt<vKor2=bUzSW
zV+4%E4~#KNq6s9PH0nVQ8WR%}@7|1wR}cOX9=sU!;?;v5Jm|s5LGcLDAS6VM9|R<T
ze2Bn8mTtG>n}yQtEYt3k-Lld*$)?@cH`AHlyuRt1PKJS$W*7NMn^`x3^Gh69I{?o}
zD%<=o%QE1jz*x7zlTTW9v7yoiGv^QIJUzW!xX(Dhjpv3VkMof+W^=|K?`=xl!E;lv
zC;}6(W|pkic)S>AK&rMQthcQ@lUD?^q9qB-B3LS1=#<cq1S6rr)_m3=3h6OaGeeig
zZ1icJhH&r%%ZJq3CBaCrGQ?;YtWFw50?5i(eRUupl@JiD&~L@<J*yHlDjl97N3UX|
zkP|Qk7?qfSsmLhg1WW-&B_?1hG75Q8A=eTYY=CDUO!zr%1J}wKPC0=Qa7SALuAfS+
z2E*Zs36-lV7B=$7hVN50*hq^<@UyUkhQ<r<djU@(PE`SB6(X+n+U@ez`s`F>6{rfZ
z$ZA^$HzHt~oj||{m?i;D^{Tv91l{x8u_UA=TOOb1@MY2+EjkY*pf%%l;!7rn-eFfK
z=sr<gj|AA6BS~mXdz;fgY9TOJc4B`5j_>nQoyppD2h3YTxBhgdAV9zrU{qoPrXr(|
z6EFoBl{gZo|KME?KT~<DP>=?{7yTwAr0x^3X}zULfaUVR%{HxI9a+OHa99b5Cq+M{
ztJuma79}^Q_Wz&u7MD8&-ss>S1~*POKq?Wa8mJ&W1cCbhrNY=8hf$n@sz!<hFab(T
za#kZn@<@s|_=Ms0`hS->Ow7BjIMmD_)8Oqt)8g<0XK_{OaEk#=X>YlX?i`jsSyH|u
z-|R6GVAs0R8-_-&23;6ukES*ZjUM%={nUkyB(yhsAv-`m{VKrA0k?cdzS-l(ciU{K
z+c-Y~)9hRVM!+-)XsSoz^q+skutyrq7FN79?fGg!->_FE-sI~oMFMPOHh8p}+=6e6
zVLF3+m?kv>M!+-)XsSoz!*(|^kRl_TmH}ACuR>1BV2G2FY9rQAEaqGtM|UfaQWa}c
zm0RZ<6rqtj33jzhKQyXMZT(9nALh@e>?#2(L*g$WVE%l{t`e{^B>sX(oc{Z7c}PpK
zk^E*qFjj!EId4R;q@D`%Z&eMiMgpv_f(0d?C#3IgHEi@|il#?WlO6#hV44Ip)ycv%
zfw8H@l7LPl^Sw8@b!{65H**Vowpaon$EZ%F#COPiNuAR8)!QgBkGq$5II3F5(4%A}
z>m{^m5<*#LJw~xZO8|zrT`@}u^RPw4D_>{}Yug=9)}eh^yzI(tZ9L7yZNK&z0n<cA
zzzCQo0ZnzXFaoAYKvNwpjAb?R#8{nWF%-k?>nK%3K(I2zUVjy7lM+6RteZAmtI!bE
zH(V3DNQ#XSE6f*LHNi-*DlT)w-PdT-NFP%u+cZ+_9w~N_#2L1S!t{Ld#_Cd$1u}7V
m*c6SI7E%Jx#<%_(-~I#a0*RiV93kWY0000<MNUMnLSTY)zah8)

literal 0
HcmV?d00001

diff --git a/src/components/pages/img/user-img.png b/src/components/pages/img/user-img.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9620e086f8e6738ca671aacc434531257ce7add
GIT binary patch
literal 1467
zcmV;s1w{IZP)<h;3K|Lk000e1NJLTq002q=002q|1^@s69MHmX00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91N}vM(1ONa40RR91N&o-=06xuyNB{r@B}qg<RCodHoLg@jMHI)+?#7oG
z$B9YYCQX5orWFtf^Z^Nac_~t=z963Z2@n#md=TDHC4|I#zd)rvR8(rAZ-`1oh(am7
zL349UT(@>=FXz9hrE2YUXJ=>6#`Yd*W$$?Q>^Z+VGdr_09*cbP?d6T7Hnlz{*IjYR
zdY#BE`mzk^sa3Pcy-k*N!6xUsFOE-Nf6-B^b8_ywo87FgeeDu`$&l<$`bd6SR-3_`
zeYITq>dcbW1OpEgAZ=7v&y!0hM-ohs(-vKvF7G)FSYG5Hl2S-LXmQ|pY!FdslUmfe
zHuBZ22PZFytD!^Avi-c_9_=<M2oln{y#^y2Pq%*g(%(E-EA~zoAjQ#-02pzV8<l=i
zKNK(f%`K*F)5{n=|2+kjf>I=)m@SPcMNngk`C`kKaV%P_<Y@m?mMX;zjc0bs?#XtW
z)@s{y_hFO%SZmOBi$|deN@AdF9%UZcU!djr0_DcK13Tk5RLVPaa3)V59ca_Fdv*Hx
zZk^f*@k#_#F=x~1ccy6i6}8&~<cDt*X@Q}g|Mel&8g22|>MqKdO_<2r^x1M*8Pbd9
z04%PB4rvj+BdXiVTa#4GIof{W+Ec6px+Fyu)cf2Xp}~$SGpyqS)+H%opwM2U;Wj1E
z)#DjpN`03eF;MgT`0qUWyR6Vi$a6OWI;BJo)TDW*=3~$q1YQgj`b4H>a@@SmAREO%
z6|&}U6^G8D1ZA?#3j)+hH($&h&A!h#oEplAvV=Q`zH*9uDi%?3jQ-=$8ALP%6-36D
zo`UiL2|5)6Rd1SqH4=x;#6hh;eimedcKSvPI)jW6i>TGD?I0Vp(;vj3GsqY*P<N_L
zevNDHJuY-Xr<90+YVzcONynfII;BJm6dd}6CkRZ5NnI*7iGsTSXlMFK#jt*P?(q~B
zbV-URC^&ZM#(z9Vr{7gTZ~O<=AuZydws@-P%FUX#pI2^f5p+n4I4C&y+k>a{_huus
zuebRcT$_X>0t${^y%j#HbgnT4H8D`tdW*tzLXmfquSrT00|kexb@gFQn7nboOcYd@
z35Sy4L_#mniGg}|Zk*;qOgGJyvh?1*@m@ZNq$L7si6I?Z2>)NCqi+^zX*L;HYU^$c
zm05vjcRyx8hbnn3jTXOnKe0GLv!x9E_*adv*i1@d2ZcF>z3dp^9Nv>BtgwqJhgi>n
z=^XvO`jl?)f!8f@507I3RW3L*$8h#>8}wQ^+jB)-R9FCxDvYD?tnIy-xc{h0|L_>F
z`ow%U!Wby5!Cailc_obn6q14!d5aveI3TE!w>BE|=X%3i18TyS$e?B?GG4p0mp^xl
zV6ydXZuD`WTK>di%YP%j4UJUvSk3$C@)YeRNdCftZLkrxMiFgLh@?*rmw1U_^u{@g
z11i_TM%W6QbwwN0@q<PFpYra9)ByuqVY9AifkHn9>nI0JU^8sj5iL*)+=m%d(Y0L*
zRAnOa!!j|>y0&Y9n#>O_C|%pNK;^~;rxEvuuCDD`pa$q+=jX&v>aHZE1T9dK3%HcL
z2$4zGcCE(d`>X3AOdF1@S`jrIu7~p?1*OO<1(kwQB%qj$BgzUtWvi%sc(PeF{v#!C
zSC&d&0$^lgPq)6g(jU3f@xFK1_>RBG&HD@*cxD4eHg*T(Uj5lYvtP<yumK~ldw|^m
zd0W7XQa2x%`!Exa4IAu%!mfbW9gts_ev?*1rh@GynMG&EL=<e-SUTOXwD*Rk{{wHl
VVH*lAC%^yz002ovPDHLkV1jT#mkR&@

literal 0
HcmV?d00001

diff --git a/src/components/pages/img/xz.png b/src/components/pages/img/xz.png
new file mode 100644
index 0000000000000000000000000000000000000000..98f78cdab2ae85e91b206b3aa327d3557742f637
GIT binary patch
literal 1489
zcmV;?1upuDP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NHJ4r-ARA>d&noVdMM;L}@cBNJ^
z<PfNvSjC3~9|8u)v9_d#78*!%DQ)UPa%xY-$Mg@9v(HILe{w86B_{{krX?4*kV1Qi
z>B?~o1|NbirdCoHaxgS%CGGZo=f_^#iltpyyV8Qav%53jJnzmovoqgFihVd%S62_L
zudlxqhT&-;<Z+lBLHdxC@*vG4y@B*oBp=~w8R>h2gM&X04-Y@%^G*(#wD98M;-Olt
zaV`vlbFgt1e*-aX{e%3oQaX3?dH2rP*cb)IK4J^-{j~wddHi`0gqKm9dc%05A>Qm9
z&Ub@AuDGsPLwc=HC{##PtyYK73dKf46dfl#hV<KLsZ%)H`ZpX$UI~ID*FCRDVQnAQ
zK+6KC%$=W~|0oQ_G%^pd03d$>_-%mxI66A|nD^Q}mX?-|K-jymavrwNm~s^<#q`9)
z#J8~BXvbDt0u~k)UTHLfA5f7;qp0M*5V^~x(uv>Nsiak&a{1vKLe#I|<-DftOW$>!
z_r}M^|7=yZr2yZ5cnZe9hatZ86~JFAl}g{WGMwajxm<o9UUdzvdKBg1ez{4{J2AJH
ztvv<6;0Jgs-@rhD?vl^vE+p-2dqG5>>A|5sW8A8W7dC|#b}O1EntrYT1AkLzmN!bJ
zlb^Ngm(dE6q}kuf<p*D&B`&f&M11%>5lsacxA_%i3qm-bdfv&eXejN&_aA&BMDQi*
zt-_t&Z01h81hB)_>y1B92tF@wc;3XvX@f`W^Zog+O-odAIrr6_9ova!X47%BAv}Ga
zZWDc;McTM7hHEioMnX5ru}y#;=haZT!Va63&qslFrpZ7S++X1^PR3}SO#%GEnvWDa
z&82RSHc^OHX|j-s`N&9CTV_)Lrw6zR*Ae%-HO|{glbp#!HZmGkWkw0$*lXrCQ0OY9
zNh;}f8OugiGP6D<fU`=Z53=KW-uUm`21#n4Y-A*>Vb%i7lo<ErOj6_Nl?!jPF3aq2
zF@o!}P!<*nFZ`4qNV1wZ^Cc^p$?k9^g$wlRa4znYI2l4`r8Hy63ElwN9gMA~X%edL
zc4j)g(w3F%=)`IbE4Y$M523S~wpitHjzS|e$7Nt=X45MjVI83hsqqxe(l-JuE7=`f
zsD*hxpYIz1mX+-4L#AEG-8HpN&ne>7<hom|bfFCvXXqoIne1{~R<hHDo)QHY#q5yc
z)ofYGP8UMBPY4E`;+e@VcZBs31cb{(VZ<yuq<A%Nv4+cZp?fTjW<j{GKMu=EcF76R
zlP7=ujf(??!i&XTpAYGf<iBeW@$B&7mtS&Bh<g?{q>fegb}NvPte~7FyZR0=#I3RA
z`QFASoo2MmN&w^Yc(MUyXLO*oH)W8GjAS*;dPT-nKjZTnyKc_CC_=N5)kaNJ3lNo?
z3piC6;%1b%*YI`ZT7};$hE*YM3gFHN!WPrK3lUfCs$b>G_#atx*qsY6F&*8-*%UxV
zvoqo&d8}4bA?|HqyexFU=UuYkwI0P#?~^ggu}uInG`KT@3~(iOXok46J;-1>ZiQ@Q
zj1p}Vzy~_|o0~)uA?@&@4sl0|q?gupt33jS*C%&Irb)6(0B<r54_}*Nn(=vtxY?BY
zy8HiGmkz6|y#f0DRI|MSlI*#N>FX^f`=0xHlh2B1w#~{w>wd*ieShI~^v$dM1}V3|
zXtQtItX2g5viU~0oMA{Z?krZ%D*t;21H}b1%CM^LY;;=@JjeN|fsG#2YPBLDv;C<-
rR0PxfI`-v{J$4G=H5Wx${oLk%)9=4SDWBtd00000NkvXXu0mjfj7GBY

literal 0
HcmV?d00001

diff --git a/src/components/pages/img/xzh.png b/src/components/pages/img/xzh.png
new file mode 100644
index 0000000000000000000000000000000000000000..967fa399ea01a0d7fced8adb1f7a3129aabdeb2c
GIT binary patch
literal 1730
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
YAB0b%2txdb<NyEw07*qoM6N<$f+k!g^8f$<

literal 0
HcmV?d00001

diff --git a/src/components/pages/selectGird.vue b/src/components/pages/selectGird.vue
new file mode 100644
index 00000000..8b01e012
--- /dev/null
+++ b/src/components/pages/selectGird.vue
@@ -0,0 +1,338 @@
+<template>
+  <div class="selectGird">
+    <AiTopFixed>
+      <u-search placeholder="搜索" v-model="name" :show-action="false"/>
+      <div class="hint">
+        <span v-for="(item, index) in selectList" :key="index"><span v-if="index" style="margin:0 4px;">/</span><span
+            style="color:#3F8DF5" @click="girdNameClick(item, index)">{{ item.girdName }}</span></span>
+      </div>
+    </AiTopFixed>
+    <div class="header-middle">
+      <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">
+              <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="rightes">
+              <div class="applicationNames">{{ item.girdName }}</div>
+              <u-icon v-if="item.girdLevel != 2" name="arrow-right" color="#ddd"/>
+            </div>
+          </div>
+        </div>
+        <AiEmpty description="暂无数据" class="emptyWrap" v-else/>
+      </div>
+    </div>
+    <div class="pad-b118"/>
+    <div class="footer">
+      <div class="btn" @click="confirm">确定选择</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'selectGird',
+  appName: "网格选择",
+  data() {
+    return {
+      current: 1,
+      name: '',
+      list: [],
+      selected: [],
+      SelectGird: {},
+      allData: null,
+      treeList: [],
+      selectList: [],
+      userGird: {},
+      userList: [],
+      girdLevel: 0,
+      parentGirdId: '',
+    }
+  },
+  computed: {
+    options() {
+      return this.treeList.filter(e => e.girdName?.indexOf(this.name) > -1 || !this.name) || []
+    }
+  },
+  onLoad() {
+    this.isGirdUser()
+  },
+  methods: {
+    isGirdUser() {
+      this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {
+        if (res.code == 0) {
+          if (res.data.checkType) {
+            this.userGird = res.data
+            this.getTree()
+          } else {
+            this.$u.toast('当前人员不是网格员或网格管理员')
+          }
+        }
+      })
+    },
+    getTree() {
+      this.selectList = []
+      this.$http.post(`/app/appgirdinfo/queryAppGirdInfoByGirdLevel?girdLevel=${this.girdLevel}&girdMemberId=${this.userGird.girdMemberId}&parentGirdId=${this.parentGirdId}`).then((res) => {
+        if (res?.data) {
+          this.allData = res.data
+          this.treeInit()
+        }
+      })
+    },
+
+    treeInit() {
+      this.treeList = this.allData
+      this.treeList.map((item) => {
+        item.isChecked = false
+      })
+      let obj = {
+        girdName: '可选范围',
+        id: '',
+        girdLevel: ''
+      }
+      this.selectList.push(obj)
+    },
+
+    itemClick(row) {
+      if (row.girdLevel == 2) return
+      const obj = {
+        girdName: row.girdName,
+        id: row.id,
+        girdLevel: row.girdLevel
+      };
+      this.selectList.push(obj)
+      this.searckGird(row)
+    },
+
+    searckGird(row) {
+      if (row.girdLevel == 2) return
+      const girdLevel = Number(row.girdLevel) + 1;
+      this.$http.post(`/app/appgirdinfo/queryAppGirdInfoByGirdLevel?girdLevel=${girdLevel}&girdMemberId=${this.userGird.girdMemberId}&parentGirdId=${row.id}`).then((res) => {
+        if (res?.data) {
+          this.treeList = res.data
+        }
+      })
+    },
+
+    girdNameClick(row, index) {
+      this.userList = []
+      if (!index) { //第一级别
+        this.selectList = []
+        this.treeInit()
+      } else {
+        const list = [];
+        this.selectList.map((item, i) => {
+          if (i <= index) {
+            list.push(item)
+          }
+        })
+        this.selectList = list
+        this.searckGird(row)
+      }
+    },
+
+
+    girdClick(row, index) {
+      if (this.treeList[index].isChecked) {//取消
+        this.treeList[index].isChecked = false
+        this.SelectGird = {}
+      } else {
+        this.treeList.map((item) => {
+          item.isChecked = false
+        })
+        this.treeList[index].isChecked = true
+        this.SelectGird = row
+      }
+      this.$forceUpdate()
+    },
+    confirm() {
+      if (this.SelectGird.id != null) {
+        uni.navigateBack({
+          success: () => {
+            uni.$emit("pagePicker", [this.SelectGird])
+          }
+        })
+      } else {
+        return this.$u.toast('请选择网格')
+      }
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.selectGird {
+  height: 100%;
+  background: #fff;
+  padding-bottom: 140px;
+
+  .hint {
+    padding-bottom: 28px;
+    line-height: 56px;
+    font-size: 30px;
+    font-weight: 500;
+    word-break: break-all;
+  }
+
+  .header-middle {
+    .showTypes {
+      .empty-div {
+        height: 16px;
+        background: #f5f5f5;
+      }
+
+      .cards {
+        display: flex;
+        align-items: center;
+        height: 120px;
+        line-height: 120px;
+        // background: pink;
+        padding: 0 0 0 32px;
+
+        .imges {
+          display: flex;
+          align-items: center;
+          // width: 200px;
+          .imgselect {
+            width: 48px;
+            height: 48px;
+            vertical-align: middle;
+          }
+
+          .avatras {
+            width: 74px;
+            height: 74px;
+            border-radius: 8px;
+            margin-left: 36px;
+          }
+        }
+
+        img {
+          width: 74px;
+          height: 74px;
+          border-radius: 8px;
+        }
+
+        .rightes {
+          width: calc(100% - 188px);
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-left: 32px;
+          border-bottom: 1px solid #e4e5e6;
+
+          .applicationNames {
+            width: calc(100% - 56px);
+            font-size: 36px;
+            font-weight: 500;
+            color: #333333;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
+        }
+      }
+    }
+
+    .showUsers {
+      .cards {
+        display: flex;
+        align-items: center;
+        height: 120px;
+        line-height: 120px;
+        // background: pink;
+        padding: 0 0 0 32px;
+
+        .imges {
+          display: flex;
+          align-items: center;
+          width: 200px;
+
+          .imgselect {
+            width: 48px;
+            height: 48px;
+          }
+
+          .avatras {
+            width: 74px;
+            height: 74px;
+            border-radius: 8px;
+            margin-left: 36px;
+          }
+        }
+
+        .rights {
+          width: 100%;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          margin-left: 32px;
+          border-bottom: 1px solid #e4e5e6;
+          padding-right: 40px;
+
+          .applicationNames {
+            font-size: 36px;
+            font-weight: 500;
+            color: #333333;
+          }
+
+          .idNumbers {
+            color: #666;
+          }
+        }
+      }
+    }
+  }
+
+  .subBtn {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    height: 118px;
+    background: #f4f8fb;
+
+    div {
+      width: 192px;
+      height: 80px;
+      line-height: 80px;
+      text-align: center;
+      background: #1365dd;
+      border-radius: 4px;
+      font-size: 32px;
+      color: #fff;
+      margin: 20px 34px 0 0;
+      float: right;
+    }
+  }
+
+  .footer {
+    width: 100%;
+    height: 118px;
+    background: #F4F8FB;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    text-align: right;
+
+    .btn {
+      display: inline-block;
+      width: 192px;
+      height: 80px;
+      line-height: 80px;
+      background: #1365DD;
+      border-radius: 4px;
+      text-align: center;
+      font-size: 32px;
+      font-family: PingFangSC-Regular, PingFang SC;
+      color: #FFF;
+      margin: 20px 34px 0 0;
+    }
+  }
+}
+</style>
diff --git a/src/apps/AppComponent/selectResident.vue b/src/components/pages/selectResident.vue
similarity index 93%
rename from src/apps/AppComponent/selectResident.vue
rename to src/components/pages/selectResident.vue
index 1c963e5f..0c92b8dc 100644
--- a/src/apps/AppComponent/selectResident.vue
+++ b/src/components/pages/selectResident.vue
@@ -10,7 +10,7 @@
         </div>
         <div class="user-info">
           <img :src="item.photo" alt="" v-if="item.photo">
-          <img src="../AppBuilding/components/img/user-img.png" alt="" v-else>{{ item.name }}
+          <img src="./img/user-img.png" alt="" v-else>{{ item.name }}
         </div>
       </div>
     </div>
@@ -32,8 +32,8 @@ export default {
       current: 1,
       name: '',
       list: [],
-      cirIcon: require('../AppBuilding/components/img/cir-icon.png'),
-      checkIcon: require('../AppBuilding/components/img/check-icon.png'),
+      cirIcon: require('./img/xz.png'),
+      checkIcon: require('./img/xzh.png'),
       selected: []
     }
   },
diff --git a/src/saas/AppGridManagement/AppGridManagement.vue b/src/saas/AppGridManagement/AppGridManagement.vue
index 125551e8..d91a0b8a 100644
--- a/src/saas/AppGridManagement/AppGridManagement.vue
+++ b/src/saas/AppGridManagement/AppGridManagement.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="AppGridManagement">
     <div class="pad-t32" v-if="component != 'Map' && isAdmin"></div>
-    <div class="select-gird" v-if="component != 'Map' && isAdmin">
-      <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>
+    <div class="select-gird" v-if="component != 'Map' && isAdmin" flex>
+      <AiPagePicker type="gird" class="fill" :selected="[params]" @select="handleSelectGird">
+        <img src="./components/img/gird-icon.png" alt="" class="gird-icon">
+        <div v-text="params.girdName"/>
+        <u-icon name="arrow-down" color="#999" class="down-icon" size="20"/>
+      </AiPagePicker>
       <span @click="linkTo('./SetGird')" v-if="checkType == 2">网格配置</span>
     </div>
     <component v-if="refresh && isAdmin" :is="component" @change="onChange" :params="params"></component>
@@ -31,7 +31,6 @@ import Map from './Map.vue'
 export default {
   name: 'AppGridManagement',
   appName: '网格管理',
-
   data() {
     return {
       component: 'Statistics',
@@ -63,7 +62,6 @@ export default {
       checkType: ''
     }
   },
-
   components: {
     Organization,
     Statistics,
@@ -75,18 +73,20 @@ export default {
       this.params = e.params
       this.component = e.type
     },
-    tabClick(index, component) {
-      this.tabIndex = index
-      this.component = component
+    refreshHome() {
       this.refresh = false
       this.$nextTick(() => {
         this.refresh = true
       })
+    }, tabClick(index, component) {
+      this.tabIndex = index
+      this.component = component
+      this.refreshHome();
     },
     isGirdUser() {
       this.isAdmin = false
       this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => {
-        if (res.code == 0) {
+        if (res?.data) {
           if (res.data.checkType != '0') {
             this.isAdmin = true
             this.checkType = res.data.checkType
@@ -98,9 +98,12 @@ export default {
     linkTo(url) {
       uni.navigateTo({url})
     },
+    handleSelectGird(v) {
+      this.params = v?.[0] || {}
+      this.refreshHome()
+    }
   },
   onLoad() {
-
     this.isGirdUser()
     uni.$on('hideTab', () => {
       this.isTab = false
@@ -108,10 +111,6 @@ export default {
     uni.$on('showTab', () => {
       this.isTab = true
     })
-
-    uni.$on('goback', (res) => {
-      this.params = res
-    })
   },
   onShow() {
     document.title = '网格管理'
@@ -149,8 +148,7 @@ export default {
 
   div {
     display: inline-block;
-    width: calc(100% - 144px);
-    padding-left: 20px;
+    padding: 0 20px;
     box-sizing: border-box;
     font-size: 32px;
     font-family: PingFangSC-Medium, PingFang SC;