Merge branch 'feature/dev_party_mange' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into feature/dev_party_mange

src/views/modules/visual/communityParty/gridParty.vue

@@ -365,6 +365,8 @@ export default {
         const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
         const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
         this.pageNo = 1
+        this.pageSize = 10;
+        this.eduList = []
         this.getEduList(isClick && _code || '')
         this.getMapData(isClick && _code || '')
       }
@@ -496,25 +498,25 @@ export default {
 
     },
     // 获取位置信息
-    getMapData () {
+    async getMapData () {
-      const url = '/epmetuser/icVolunteerPoly/mapData'
+      const url = "/epmetuser/icVolunteerPoly/mapData"
       let params = {
         agencyId: this.agencyId,
         code: this.eduCode
       }
-      window.app.ajax.post(
+      const { data, code, internalMsg } = await requestPost(url, params)
-        url,
+      if (code === 0) {
-        params,
-        (data, rspMsg) => {
           this.unitMapList = data
           this.loadMap()
           this.isfirstInit = false
           this.$refs.map.handleClosePopup()
-        },
+      } else {
-        (rspMsg, data) => {
+        this.$message.error(internalMsg)
-          this.$message.error(rspMsg)
+          this.unitMapList = []
-        }
+          this.loadMap()
-      )
+          this.isfirstInit = false
+          this.$refs.map.handleClosePopup()
+      }
     },
     //点击项目
     async clickProject (feature) {
@@ -522,31 +524,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