From be3c76f29b571b6a5cf5ccb620d18ed28f4a4cb3 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 30 Dec 2021 18:51:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apps/AppCountryAlbum/list.vue                      | 5 ++---
 src/apps/AppResidentDocument/AppResidentDocument.vue   | 6 ++++--
 src/apps/AppServicePublic/AppServicePublic.vue         | 6 ++++--
 src/apps/AppSpecialPeople/detail.vue                   | 5 ++---
 src/apps/AppVideoSurveillance/AppVideoSurveillance.vue | 5 ++---
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/apps/AppCountryAlbum/list.vue b/src/apps/AppCountryAlbum/list.vue
index b78933ab..cf8fc5ed 100644
--- a/src/apps/AppCountryAlbum/list.vue
+++ b/src/apps/AppCountryAlbum/list.vue
@@ -2,7 +2,7 @@
   <div class="list">
     <AiTopFixed>
       <div class="area-content">
-        <AiAreaPicker :areaId="user.areaId" v-model="areaId" @select="areaSelect">
+        <AiAreaPicker :areaId="user.areaId" v-model="areaId" @select="areaSelect" :name.sync="areaName">
           <img src="./img/local-icon.png" alt="">
           <span class="label" v-if="areaName">{{ areaName }}</span>
           <span v-else>请选择</span>
@@ -50,8 +50,7 @@ export default {
 
   methods: {
     areaSelect(e) {
-      this.areaId = e.id
-      this.areaName = e.name
+      this.areaId = e
       this.getList()
     },
     getList() {
diff --git a/src/apps/AppResidentDocument/AppResidentDocument.vue b/src/apps/AppResidentDocument/AppResidentDocument.vue
index 66531c65..eccba2e2 100644
--- a/src/apps/AppResidentDocument/AppResidentDocument.vue
+++ b/src/apps/AppResidentDocument/AppResidentDocument.vue
@@ -7,7 +7,7 @@
       <!-- @select="areaSelect" -->
       <u-form label-width="auto">
         <u-form-item label="区域选择" right-icon="arrow-right" class="areaIds">
-          <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="seachObj"></AiAreaPicker>
+          <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="seachObj" :name.sync="areaName"></AiAreaPicker>
         </u-form-item>
       </u-form>
     </div>
@@ -66,6 +66,7 @@ export default {
       ],
       currentTabs: 0,
       areaId: '',
+      areaName: ''
     }
   },
   computed: {
@@ -74,6 +75,7 @@ export default {
   watch: {},
   onLoad() {
     this.areaId = this.user.areaId
+    this.areaName = this.user.areaName
     this.getList()
   },
   onShow() {
@@ -112,7 +114,7 @@ export default {
     },
 
     seachObj(e) {
-      this.areaId = e.id
+      this.areaId = e
       this.current = 1
       this.getList()
     },
diff --git a/src/apps/AppServicePublic/AppServicePublic.vue b/src/apps/AppServicePublic/AppServicePublic.vue
index 288f0af6..cabf1748 100644
--- a/src/apps/AppServicePublic/AppServicePublic.vue
+++ b/src/apps/AppServicePublic/AppServicePublic.vue
@@ -8,7 +8,7 @@
     </AiTopFixed>
     <div class="header-top">
       <div>区域选择</div>
-      <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="areaSelect"></AiAreaPicker>
+      <AiAreaPicker v-model="areaId" :areaId="user.areaId" @select="areaSelect" :name.sync="areaName"></AiAreaPicker>
     </div>
     <u-search class="serach_content" placeholder="请输入标题" :show-action="false" v-model="keyword" @clear="clearSearch"
               @search="search"></u-search>
@@ -72,6 +72,7 @@ export default {
       datas: [],
       keyword: '',
       areaId: '',
+      areaName: '',
       current: 1,
       size: 10,
       pages: 0,
@@ -94,6 +95,7 @@ export default {
   watch: {},
   onLoad(o) {
     this.areaId = this.user.areaId
+    this.areaName = this.user.areaName
     this.moduleId = o.moduleId
     this.listName = o.listName
     this.getType()
@@ -157,7 +159,7 @@ export default {
     },
 
     areaSelect(e) {
-      this.areaId = e.id
+      this.areaId = e
       this.getList()
     },
 
diff --git a/src/apps/AppSpecialPeople/detail.vue b/src/apps/AppSpecialPeople/detail.vue
index 856153de..bea58638 100644
--- a/src/apps/AppSpecialPeople/detail.vue
+++ b/src/apps/AppSpecialPeople/detail.vue
@@ -6,7 +6,7 @@
     <div class="area-select">
       <div class="select-content">
         <div class="area-content">
-          <AiAreaPicker :areaId="user.areaId" v-model="areaId" @select="areaSelect">
+          <AiAreaPicker :areaId="user.areaId" v-model="areaId" @select="areaSelect" :name.sync="areaName">
             <img src="./img/local-icon.png" alt="">
             <span class="label" v-if="areaName">{{ areaName }}</span>
             <span v-else>请选择</span>
@@ -106,8 +106,7 @@ export default {
 
   methods: {
     areaSelect(e) {
-      this.areaId = e.id
-      this.areaName = e.name
+      this.areaId = e
       this.getStatistic()
       this.getStatisticMon()
       this.getUserList()
diff --git a/src/apps/AppVideoSurveillance/AppVideoSurveillance.vue b/src/apps/AppVideoSurveillance/AppVideoSurveillance.vue
index 0d2be350..b1c708a6 100644
--- a/src/apps/AppVideoSurveillance/AppVideoSurveillance.vue
+++ b/src/apps/AppVideoSurveillance/AppVideoSurveillance.vue
@@ -8,7 +8,7 @@
         </div>
       </div> -->
       <div class="area-content">
-        <AiAreaPicker :areaId="user.areaId" v-model="areaId" @select="areaSelect">
+        <AiAreaPicker :areaId="user.areaId" v-model="areaId" @select="areaSelect" :name.sync="areaName">
           <img src="./img/local-icon.png" alt="">
           <span class="label" v-if="areaName">{{ areaName }}</span>
           <span v-else>请选择</span>
@@ -120,8 +120,7 @@ export default {
       })
     },
     areaSelect(e) {
-      this.areaId = e.id
-      this.areaName = e.name
+      this.areaId = e
       this.getList()
     },
     showMonitor(row) {