From 56a5147c67f7f8bf81262d53d2cfd1f5e4492b89 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 24 Jun 2022 17:14:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=E4=BA=94=E5=A4=A7?=
 =?UTF-8?q?=E5=9B=BE=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../communityGovern/fivelayers/mapIndex.vue   | 42 +++++++++++--------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
index 0670470b..21db55ad 100644
--- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
+++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
@@ -117,6 +117,9 @@
            class="popup-content">
         <div v-show="selPlaceType==='resi'|| selPlaceType === 'special_resi'">
           <div class="popTitle">居民信息</div>
+          <div class="popContentTitle">姓名：
+            <span>{{ selInfo.icUserName }}</span>
+          </div>
           <div class="popContentTitle">所属网格：
             <span>{{ selInfo.gridName }}</span>
           </div>
@@ -126,9 +129,7 @@
           <div class="popContentTitle">本地户籍：
             <span>{{ selInfo.isBdhjShow }}</span>
           </div>
-          <div class="popContentTitle">姓名：
-            <span>{{ selInfo.icUserName }}</span>
-          </div>
+
           <div class="popContentTitle">手机：
             <span>{{ selInfo.mobile }}</span>
           </div>
@@ -138,17 +139,12 @@
           <div class="popContentTitle">身份证号：
             <span>{{ selInfo.idCard }}</span>
           </div>
-          <div class="popContentTitle">出生日期：
-            <span>{{ selInfo.birthday }}</span>
-          </div>
-          <div class="popContentTitle">联系人：
-            <span>{{ selInfo.contacts }}</span>
-          </div>
-          <div class="popContentTitle">联系人手机：
-            <span>{{ selInfo.contactsMobile }}</span>
+
+          <div class="popContentTitle">工作单位：
+            <span>{{ selInfo.gzdw?selInfo.gzdw:'--' }}</span>
           </div>
-          <div class="popContentTitle">志愿者类别：
-            <span>{{ selInfo.categories }}</span>
+          <div class="popContentTitle">人户状况：
+            <span>{{ selInfo.rhzkShow }}</span>
           </div>
           <div class="div_resi_more">
             <div @click="toPeople"
@@ -534,22 +530,22 @@ const vueGis = {
           value: 'zhzl'
         },
         {
-          select: true,
+          select: false,
           label: '应急处置图层',
           value: 'yjcl'
         },
         {
-          select: true,
+          select: false,
           label: '安全生产图层',
           value: 'aqsc'
         },
         {
-          select: true,
+          select: false,
           label: '城市管理图层',
           value: 'csgl'
         },
         {
-          select: true,
+          select: false,
           label: '公共服务图层',
           value: 'ggfw'
         },
@@ -560,7 +556,7 @@ const vueGis = {
       selImg: require('../../../../../assets/img/shuju/xuanzhong.png'),
       noSelImg: require('../../../../../assets/img/shuju/weixuan.png'),
 
-      coverageTypes: ['zhzl', 'yjcl', 'aqsc', 'csgl', 'ggfw'],
+      coverageTypes: ['zhzl'],
       categoryKeys: [],
       search: '',
       pageNo: 1,
@@ -818,6 +814,16 @@ const vueGis = {
 
         data.isBdhjShow = data.isBdhj ? data.isBdhj === '0' ? '否' : '是' : '--'
         data.genderShow = data.gender ? data.gender === '0' ? '女' : '男' : '--'
+        if (data.rhzk === 'rhyz') {
+          data.rhzkShow = '人户一致'
+        } else if (data.rhzk === 'rzhbz') {
+          data.rhzkShow = '人在户不在'
+        } else if (data.rhzk === 'hzrbz') {
+          data.rhzkShow = '户在人不在'
+        } else {
+          data.rhzkShow = '--'
+        }
+
         let categoriesArray = []
 
         for (let key in data.volunteerCategories) {