From 602cb0a2528afff995ec024b5ed2017c63e1663b Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Thu, 26 May 2022 16:04:05 +0800
Subject: [PATCH] bug

---
 .../visual/communityParty/gridParty.vue       | 22 ++++++-------------
 .../visual/communityParty/memberInfo.vue      |  6 ++++-
 .../visual/components/screen-map/index.vue    | 12 +++++++++-
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue
index fbe6af59..6b6aa616 100644
--- a/src/views/modules/visual/communityParty/gridParty.vue
+++ b/src/views/modules/visual/communityParty/gridParty.vue
@@ -10,8 +10,7 @@
             :options="propTree" 
             :props="{ checkStrictly: true }" 
             :show-all-levels="false"
-            :getCheckedNodes="getCheckedNodes"
-            clearable 
+            :getCheckedNodes="getCheckedNodes" 
             @change="handleCascader">
           </el-cascader>
         </div> 
@@ -166,8 +165,9 @@ export default {
     ]
     await this.loadOrgData()
     await this.getWorkUserInfo()
-    this.loadMap()
-    this.isfirstInit = false
+    // this.loadMap()
+    this.getMapData()
+    // this.isfirstInit = false
     // 地图相关end
   },
   methods: {
@@ -189,7 +189,6 @@ export default {
       // };
       const { data, code, msg } = await requestPost(url);
       if (code === 0) {
-        console.log('data-org----o', data)
         this.selectAgency = [`${data.agencyId}-${data.level}`]
         this.orgType = data.level
         this.agencyId = data.agencyId
@@ -230,7 +229,6 @@ export default {
     },
     // 组织点击事件
     async handleCascader(val) {
-      console.log('val-vvv', val)
       const _arr = val[val.length - 1].split('-')
       const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
       this.agencyId = _arr[0]
@@ -238,7 +236,6 @@ export default {
       this.orgType = orgType
       this.noEduInit = false
       this.agencyInfo = { ...this.orgData }
-      console.log('agencyInfo-----', this.agencyInfo)
       this.eduCode = ''
       await this.loadOrgData()
       this.getEduCount(_arr[0])
@@ -342,7 +339,6 @@ export default {
             }
 
           };
-          console.log('zlcm')
         } else {
           element.isClick = false
           element.label = {
@@ -400,7 +396,6 @@ export default {
       this.visibleLoading = false
     },
     pieInitOks (dom) {
-      console.log('pies准备好了', dom)
       this.pieEduChartS = dom
       // this.pieInitState = true
     },
@@ -424,7 +419,6 @@ export default {
           this.showedUnitMoreInfo = true
           this.unitAclist = data.list
           this.$nextTick(() => {
-            console.log(this.unitAclist[0].demandRecId)
             this.$refs['unitdetailInfo'].getDetail(this.unitAclist[0].demandRecId)
           }) 
         } else {
@@ -511,10 +505,11 @@ export default {
       window.app.ajax.post(
         url,
         params,
-        (data, rspMsg) => { 
+        (data, rspMsg) => {
           this.unitMapList = data
-          this.isfirstInit = false
           this.loadMap()
+          this.isfirstInit = false
+          this.$refs.map.handleClosePopup()
         },
         (rspMsg, data) => {
           this.$message.error(rspMsg)
@@ -526,9 +521,7 @@ export default {
       this.userId = ''
       const featureInfo = feature.values_.properties.info
       this.userId = feature.values_.properties.info.id
-      console.log('feature.values_.properties.info:::', JSON.stringify(feature.values_.properties.info))
       let coordinate = [featureInfo.longitude, featureInfo.latitude]
-      console.log(feature.values_.properties.info)
       let showData = `
                 <div style='font-size:16px; color:#FFFFFF;'>个人信息</div>
                 <div style='font-size:12px; color:#FFFFFF;margin-top:10px'>姓名：
@@ -557,7 +550,6 @@ export default {
     },
     lookMore(e) {
       this.userId = this.userId
-      console.log('userId:', this.userId)
       this.showedMoreInfo = true
     }
   },
diff --git a/src/views/modules/visual/communityParty/memberInfo.vue b/src/views/modules/visual/communityParty/memberInfo.vue
index ed06439a..1b07df9c 100644
--- a/src/views/modules/visual/communityParty/memberInfo.vue
+++ b/src/views/modules/visual/communityParty/memberInfo.vue
@@ -29,6 +29,10 @@
                 <span class="item-field">需求类型：</span>
                 <span v-if="info.categoryName">{{ info.categoryName }}</span>
               </div>
+              <div class="item">
+                <span class="item-field">上报类型：</span>
+                <span v-if="info.reportTypeName">{{ info.reportTypeName }}</span>
+              </div>
               <div class="item">
                 <span class="item-field">上报人：</span>
                 <span v-if="info.reportUserName">{{ info.reportUserName }}</span>
@@ -171,7 +175,7 @@ export default {
     margin-bottom: 0;
     .list {
       display: block;
-      width: 50%;
+      width: auto;
       .item {
         display: flex;
         width: 100%;
diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue
index e1490b41..b5ef77fb 100644
--- a/src/views/modules/visual/components/screen-map/index.vue
+++ b/src/views/modules/visual/components/screen-map/index.vue
@@ -33,7 +33,8 @@
       <div id="popup-content"
            class="popup-content"></div>
       <a href="#" 
-         id="popup-goMore">更多>>>></a>
+         id="popup-goMore"
+         class="popup-goMore">更多>>>></a>
     </div>
   </div>
 </template>
@@ -745,6 +746,12 @@ const vueGis = {
        //把 overlay 显示到指定的 x,y坐标
       
     },
+    // 关闭弹窗
+    handleClosePopup() {
+        this.overlay.setPosition(undefined);
+        document.getElementById("popup-closer").blur();
+        return false;
+    },
 
     //取随机数
     getRndBetween (lowerLimit, upperLimit) {
@@ -888,6 +895,9 @@ export default vueGis;
 .popup-content {
   width: 300px;
 }
+.popup-goMore{
+  margin: 20px 0;
+}
 .ol-popup-closer:after {
   content: "✖";
   // color: rgba(1, 17, 104, 1);