From d4acc4ccec0ddc751830bcdd4408eccb82caf83d Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Fri, 27 May 2022 14:54:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visual/communityParty/gridParty.vue       | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue
index 180fc9382..226d0e430 100644
--- a/src/views/modules/visual/communityParty/gridParty.vue
+++ b/src/views/modules/visual/communityParty/gridParty.vue
@@ -522,31 +522,40 @@ export default {
       const featureInfo = feature.values_.properties.info
       this.userId = feature.values_.properties.info.id
       let coordinate = [featureInfo.longitude, featureInfo.latitude]
+      let {name, gridName, houseName, mobile, idCard, gzdw, rhzk, icResiUser} = feature.values_.properties.info
+      name = name ? name : '--'
+      gridName = gridName ? gridName : '--'
+      houseName = houseName ? houseName : '--'
+      mobile = mobile ? mobile : '--'
+      idCard = idCard ? idCard : '--'
+      gzdw = gzdw ? gzdw : '--'
+      rhzk = rhzk ? rhzk : '--'
       let showData = `
                 <div style='font-size:16px; color:#FFFFFF;'>个人信息</div>
                 <div style='font-size:12px; color:#FFFFFF;margin-top:10px'>姓名：
-                  <span>`+ feature.values_.properties.info.name + `</span>
+                  <span>`+ name + `</span>
                 </div>
                 <div style='font-size:12px; color:#FFFFFF;margin-top:10px'>所属网格：
-                  <span>`+ feature.values_.properties.info.gridName + `</span>
+                  <span>`+ gridName + `</span>
                 </div>
                 <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>所属房屋：
-                  <span>`+ feature.values_.properties.info.houseName + `</span>
+                  <span>`+ houseName + `</span>
                 </div>
                 <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>手机号：
-                  <span>`+ feature.values_.properties.info.mobile + `</span>
+                  <span>`+ mobile + `</span>
                 </div>
                 <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>身份证号：
-                  <span>`+ feature.values_.properties.info.idCard + `</span>
+                  <span>`+ idCard + `</span>
                 </div> 
                 <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>工作单位：
-                  <span>`+ feature.values_.properties.info.gzdw + `</span>
+                  <span>`+ gzdw + `</span>
                 </div> 
                 <div style='font-size:12px; color:#FFFFFF;margin-top:5px'>人户状况：
-                  <span>`+ feature.values_.properties.info.rhzk + `</span>
+                  <span>`+ rhzk + `</span>
                 </div>
                 `
-        this.$refs.map.handleShowPopup(showData, coordinate, true)
+        const isShowMore = icResiUser ? true : false
+        this.$refs.map.handleShowPopup(showData, coordinate, isShowMore)
     },
     lookMore(e) {
       this.userId = this.userId