Browse Source

bug

shibei_master
zhaoyongnian 3 years ago
parent
commit
31b81f15d2
  1. 19
      src/views/modules/partymember/icpartymemberpayrecorddetail.vue
  2. 2
      src/views/modules/partymember/icpartyorgtree.vue
  3. 100
      src/views/modules/partymember/lookMember.vue
  4. 6
      src/views/modules/visual/communityParty/gridParty.vue
  5. 8
      src/views/modules/visual/components/screen-map/index.vue

19
src/views/modules/partymember/icpartymemberpayrecorddetail.vue

@ -73,7 +73,7 @@
<div class="resi-row-btn"> <div class="resi-row-btn">
<el-button type="warning" size="small" :loading="exportBtn" class="diy-button--reset" @click="exportHandle()">{{ $t('export') }}</el-button> <el-button type="warning" size="small" :loading="exportBtn" class="diy-button--reset" @click="exportHandle()">{{ $t('export') }}</el-button>
</div> </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 type="selection" header-align="center" align="center" width="50"></el-table-column>-->
<el-table-column label="序号" header-align="center" align="center" width="50px"> <el-table-column label="序号" header-align="center" align="center" width="50px">
<template slot-scope="scope"> <template slot-scope="scope">
@ -114,7 +114,7 @@
import axios from 'axios' import axios from 'axios'
import mixinViewModule from '@/mixins/view-module' import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './icpartymemberpayrecorddetail-add-or-update' import AddOrUpdate from './icpartymemberpayrecorddetail-add-or-update'
import { mapGetters } from 'vuex'
export default { export default {
mixins: [mixinViewModule], mixins: [mixinViewModule],
data () { data () {
@ -125,6 +125,7 @@
deleteURL: '/resi/partymember/icPartyMemberPayRecordDetail', deleteURL: '/resi/partymember/icPartyMemberPayRecordDetail',
deleteIsBatch: true deleteIsBatch: true
}, },
searchH: 0,
exportBtn: false, exportBtn: false,
exportBtnTitle: '导出', exportBtnTitle: '导出',
dataForm: { dataForm: {
@ -157,6 +158,20 @@
components: { components: {
AddOrUpdate 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() { created() {
this.getOrgList() this.getOrgList()
}, },

2
src/views/modules/partymember/icpartyorgtree.vue

@ -47,7 +47,7 @@
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
:title="memberTitle" :title="memberTitle"
width="850px" width="1050px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="lookMemberClose"> @closed="lookMemberClose">

100
src/views/modules/partymember/lookMember.vue

@ -10,15 +10,97 @@
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}" :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
style="width: 100%" style="width: 100%"
highlight-current-row> highlight-current-row>
<el-table-column prop="name" <el-table-column
label="姓名"> prop="name"
</el-table-column> label="姓名"
<el-table-column prop="mobile" align="center"
label="联系方式"> width="100"
</el-table-column> />
<el-table-column prop="idCard" <el-table-column
label="身份证号"> prop="idCard"
</el-table-column> 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-table>
<el-pagination <el-pagination
@size-change="handleSizeChange" @size-change="handleSizeChange"

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

@ -5,14 +5,14 @@
<img class="title-icon" src="../../../../assets/img/shuju/title-tip.png" /> <img class="title-icon" src="../../../../assets/img/shuju/title-tip.png" />
<div class="title-label"> <div class="title-label">
网格党建平面图&nbsp;&nbsp; 网格党建平面图&nbsp;&nbsp;
<el-cascader <!-- <el-cascader
v-model="selectAgency" v-model="selectAgency"
:options="propTree" :options="propTree"
:props="{ checkStrictly: true }" :props="{ checkStrictly: true }"
:show-all-levels="false" :show-all-levels="false"
:getCheckedNodes="getCheckedNodes" :getCheckedNodes="getCheckedNodes"
@change="handleCascader"> @change="handleCascader">
</el-cascader> </el-cascader> -->
</div> </div>
</div> </div>
<div class="card-echart"> <div class="card-echart">
@ -148,7 +148,7 @@ export default {
}, },
async mounted() { async mounted() {
await nextTick(100); await nextTick(100);
await this.getAgencyList() // await this.getAgencyList()
this.agencyId = this.$store.state.user.agencyId this.agencyId = this.$store.state.user.agencyId
this.getEduCount(this.$store.state.user.agencyId) // this.getEduCount(this.$store.state.user.agencyId) //
this.getEduList() // this.getEduList() //

8
src/views/modules/visual/components/screen-map/index.vue

@ -622,9 +622,11 @@ const vueGis = {
map.addLayer(polygonLayer) 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 //icon

Loading…
Cancel
Save