From 31b81f15d29da8a6f86a0303a58c3e01308f3022 Mon Sep 17 00:00:00 2001
From: zhaoyongnian <541231643@qq.com>
Date: Thu, 9 Jun 2022 14:27:12 +0800
Subject: [PATCH] bug

---
 .../icpartymemberpayrecorddetail.vue          |  19 +++-
 .../modules/partymember/icpartyorgtree.vue    |   2 +-
 src/views/modules/partymember/lookMember.vue  | 100 ++++++++++++++++--
 .../visual/communityParty/gridParty.vue       |   6 +-
 .../visual/components/screen-map/index.vue    |   8 +-
 5 files changed, 117 insertions(+), 18 deletions(-)

diff --git a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
index e184c20c..6ac74f3d 100644
--- a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
+++ b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
@@ -73,7 +73,7 @@
         <div class="resi-row-btn">
           <el-button type="warning" size="small" :loading="exportBtn" class="diy-button--reset" @click="exportHandle()">{{ $t('export') }}</el-button>
         </div>
-      <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+      <el-table class="resi-table" :height="tableHeight" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
         <el-table-column label="序号" header-align="center" align="center" width="50px">
           <template slot-scope="scope">
@@ -114,7 +114,7 @@
   import axios from 'axios'
   import mixinViewModule from '@/mixins/view-module'
   import AddOrUpdate from './icpartymemberpayrecorddetail-add-or-update'
-
+  import { mapGetters } from 'vuex'
     export default {
   mixins: [mixinViewModule],
   data () {
@@ -125,6 +125,7 @@
         deleteURL: '/resi/partymember/icPartyMemberPayRecordDetail',
         deleteIsBatch: true
       },
+      searchH: 0,
       exportBtn: false,
       exportBtnTitle: '导出',
       dataForm: {
@@ -157,6 +158,20 @@
   components: {
     AddOrUpdate
   },
+  computed: {
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    tableHeight() {
+      const h = this.clientHeight - this.searchH - 270 + this.iframeHeigh
+      const _h = this.clientHeight - 270 - this.searchH
+      return this.$store.state.inIframe ? h : _h
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.searchH = this.$refs.searchCard.$el.offsetHeight
+      console.log('tableHeight', this.tableHeight)
+    })
+  },
   created() {
       this.getOrgList()
   },
diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index 1c74a852..ff1acebd 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -47,7 +47,7 @@
                 :close-on-click-modal="false"
                 :close-on-press-escape="false"
                 :title="memberTitle"
-                width="850px"
+                width="1050px"
                 top="5vh"
                 class="dialog-h"
                 @closed="lookMemberClose">
diff --git a/src/views/modules/partymember/lookMember.vue b/src/views/modules/partymember/lookMember.vue
index 4d2197a8..ee42fadc 100644
--- a/src/views/modules/partymember/lookMember.vue
+++ b/src/views/modules/partymember/lookMember.vue
@@ -10,15 +10,97 @@
                     :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
                     style="width: 100%"
                     highlight-current-row>
-            <el-table-column prop="name"
-                            label="姓名">
-            </el-table-column>
-            <el-table-column prop="mobile"
-                            label="联系方式">
-            </el-table-column>
-            <el-table-column prop="idCard"
-                            label="身份证号">
-            </el-table-column>
+            <el-table-column
+              prop="name"
+              label="姓名"
+              align="center"
+              width="100"
+            />
+            <el-table-column
+              prop="idCard"
+              label="身份证号"
+              align="center"
+              min-width="180"
+            />
+            <el-table-column
+              prop="mobile"
+              label="手机号"
+              align="center"
+              min-width="160"
+            />
+            <el-table-column
+              prop="rdsj"
+              label="入党时间"
+              align="center"
+              min-width="160"
+            />
+            <el-table-column
+              prop="sszb"
+              label="所属党组织"
+              align="center"
+              min-width="160"
+            />
+            <el-table-column
+              prop="ldzh"
+              label="流动党员证号"
+              align="center"
+              min-width="160"
+            />
+            <el-table-column
+              prop="partyZw"
+              label="职务"
+              align="center"
+              width="100"
+            />
+            <el-table-column
+              prop="address"
+              label="地址"
+              align="center"
+              show-overflow-tooltip
+              min-width="180"
+            />
+            <el-table-column
+              prop="isPay"
+              label="是否缴费"
+              align="center"
+              width="100"
+            />
+            <el-table-column
+              prop="payDate"
+              label="最近一次缴费时间"
+              align="center"
+              min-width="160"
+            />
+            <el-table-column
+              prop="culture"
+              label="文化程度"
+              align="center"
+              width="100"
+            />
+            <el-table-column
+              prop="point"
+              label="量化积分"
+              align="center"
+              width="100"
+            />
+            <el-table-column
+              prop="activityPoint"
+              label="活跃积分"
+              align="center"
+              width="100"
+            />
+            <el-table-column
+              prop="volunteerCategory"
+              label="志愿者类别"
+              align="center"
+              width="100"
+            />
+            <el-table-column
+              prop="remark"
+              label="备注"
+              align="center"
+              min-width="180"
+            />
           </el-table>
           <el-pagination
             @size-change="handleSizeChange"
diff --git a/src/views/modules/visual/communityParty/gridParty.vue b/src/views/modules/visual/communityParty/gridParty.vue
index bd73c11c..7fd851c8 100644
--- a/src/views/modules/visual/communityParty/gridParty.vue
+++ b/src/views/modules/visual/communityParty/gridParty.vue
@@ -5,14 +5,14 @@
         <img class="title-icon" src="../../../../assets/img/shuju/title-tip.png" />
         <div class="title-label">
           网格党建平面图&nbsp;&nbsp;
-          <el-cascader 
+          <!-- <el-cascader 
             v-model="selectAgency"
             :options="propTree" 
             :props="{ checkStrictly: true }" 
             :show-all-levels="false"
             :getCheckedNodes="getCheckedNodes" 
             @change="handleCascader">
-          </el-cascader>
+          </el-cascader> -->
         </div> 
       </div>
       <div class="card-echart">
@@ -148,7 +148,7 @@ export default {
   },
   async mounted() {
     await nextTick(100);
-    await this.getAgencyList()
+    // await this.getAgencyList()
     this.agencyId  = this.$store.state.user.agencyId
     this.getEduCount(this.$store.state.user.agencyId) // 饼状统计图
     this.getEduList() // 左下角列表数据
diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue
index bf287012..af528b54 100644
--- a/src/views/modules/visual/components/screen-map/index.vue
+++ b/src/views/modules/visual/components/screen-map/index.vue
@@ -622,9 +622,11 @@ const vueGis = {
 
 
       map.addLayer(polygonLayer)
-      map.addInteraction(select);
-
-
+      if (this.$route.path == '/main-shuju/visual-communityParty-gridParty' || this.$route.path == '/main-shuju/visual-communityParty-community') { // 2022.6.9 网格党建平面图 联建单位分析页面 点位点击以后会消失，屏蔽这段代码以后可以解决
+         console.log('去掉默认点击')
+      } else {
+          map.addInteraction(select);
+      }
     },
 
     //初始化多边形icon图层