Browse Source

合并党建分支到dev

feature
YUJT 3 years ago
parent
commit
3180b40a6f
  1. 73
      src/views/modules/partymember/icpartyorg-add-or-update.vue
  2. 23
      src/views/modules/partymember/icpartyorgtree.vue
  3. 51
      src/views/modules/partymember/lookMember.vue
  4. 16
      src/views/modules/visual/communityParty/community.vue
  5. 5
      src/views/modules/visual/communityParty/gridParty.vue
  6. 159
      src/views/modules/visual/communityParty/party.vue

73
src/views/modules/partymember/icpartyorg-add-or-update.vue

@ -140,6 +140,7 @@
agencyListVisible:false,
orgList: [],
agencyId: '',
level: '',
partyOrgTypeList: [],
agencyOrgList:[]
}
@ -162,41 +163,44 @@
this.$refs['dataForm'].resetFields()
this.dataForm.latitude = ''
if (this.dataForm.id) {
this.setPartyOrgType()
this.getInfo()
} else {
this.setPartyOrgType()
this.initMap()
if(this.dataForm.orgId) {
this.dataForm.mySelectOrg = this.dataForm.orgId
this.dataForm.orgPid = this.dataForm.orgId
this.dataForm.orgPids = this.dataForm.orgPids ? this.dataForm.orgPids + ':' + this.dataForm.orgId : this.dataForm.orgId
this.dataForm.partyOrgType = this.dataForm._partyOrgType
if (this.dataForm.partyOrgType === '0') { // 0,1,2,3,4,5
this.dataForm.partyOrgType = '1'
} else if (this.dataForm.partyOrgType === '1') {
this.dataForm.partyOrgType = '2'
} else if (this.dataForm.partyOrgType === '2') {
this.dataForm.partyOrgType = '3'
} else if (this.dataForm.partyOrgType === '3') {
this.dataForm.partyOrgType = '4'
} else if (this.dataForm.partyOrgType === '4') {
this.dataForm.partyOrgType = '5'
}
console.log(this.dataForm.orgPid)
console.log(this.dataForm.orgPids)
// this.getOrgList()
console.log(this.dataForm.partyOrgType, this.dataForm.orgPid, this.dataForm.orgPids)
this.setPartyOrgType_xzxj()
this.getInfoAgencyLisy()
} else {
this.dataForm.mySelectOrg = ''
}
}
this.setPartyOrgType()
})
},
//
setPartyOrgType_xzxj() {
if (this.dataForm.partyOrgType === '0') { // 0,1,2,3,4,5
this.dataForm.partyOrgType = '1'
} else if (this.dataForm.partyOrgType === '1') {
this.dataForm.partyOrgType = '2'
} else if (this.dataForm.partyOrgType === '2') {
this.dataForm.partyOrgType = '3'
} else if (this.dataForm.partyOrgType === '3') {
this.dataForm.partyOrgType = '4'
} else if (this.dataForm.partyOrgType === '4') {
this.dataForm.partyOrgType = '5'
}
},
//
setPartyOrgType() {
// community:street,: district,: city :province
// 0,1,2,3,4,5
this.level = localStorage.getItem('level')
this.level = localStorage.getItem('level') ? localStorage.getItem('level') : ''
if (this.level == 'province') {
this.partyOrgTypeList = [
{value: '0', name: '省委'},
@ -236,35 +240,34 @@
},
//
changeAgencyOrg () {
console.log(this.dataForm.agencyId)
this.getOrgList()
if(!this.dataForm.orgId){ // orgId
this.getOrgList()
}
},
//
changePartyOrgType(value){
if(value != '5'){ //
this.dataForm.agencyId = ''
if(value == '5'){ //
this.dataForm.agencyId = localStorage.getItem('agencyId')
this.dataForm.agencyPids = ''
this.getOrgList()
} else {
//
this.getInfoAgencyLisy()
}
//
this.getInfoAgencyLisy()
// this.$http.get('/gov/org/customeragency/getOrgTreeByUserAndType', {params: {agencyId: this.agencyId, orgType:value}}).then(({data: res}) => {
// if (res.code !== 0) {
// return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '')
// }
// this.agencyOrgList = this.removeEmptyChildren(res.data)
// }).catch(() => {})
},
//
//
getOrgList() {
if (!this.dataForm.id) { //
this.orgList = []
this.dataForm.mySelectOrg = '', //
this.dataForm.orgPid = '', // ID,0
this.dataForm.orgPids = ''
}
this.$http.get('/resi/partymember/icPartyOrg/getParentOrgList', {params: {agencyId: this.dataForm.agencyId, partyOrgType: this.dataForm.partyOrgType}}).then(({data: res}) => {
if (res.code !== 0) {
return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
}
this.orgList = this.removeEmptyChildren(res.data)
// this.orgList.unshift({
// partyOrgName: '',
// id: '0'
// });
}).catch(() => {
})
},
@ -309,8 +312,8 @@
this.dataForm.agencyId = this.dataForm.agencyId
//
this.getInfoAgencyLisy()
//
this.getOrgList()
console.log(':::::', JSON.stringify(this.dataForm))
this.initMap()
}).catch(() => {
})

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

@ -14,7 +14,8 @@
row-key="id"
border
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}">
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
:height="tableHeight">
<el-table-column prop="partyOrgName" label="党组织名称"></el-table-column>
<el-table-column label="操作" align="center" width="300">
<template slot-scope="scope">
@ -62,13 +63,16 @@
import AddOrUpdate from './icpartyorg-add-or-update'
import TableTreeColumn from '@/components/table-tree-column'
import lookMember from './lookMember'
import { mapGetters } from 'vuex'
export default {
data () {
return {
searchH: 0,
dataForm: {
id: '',
customerId: '',
orgPids: ''
orgPids: '',
agencyId: ''
},
tableLoading: false,
tableData: [],
@ -83,9 +87,24 @@
TableTreeColumn,
lookMember
},
computed: {
...mapGetters(['clientHeight', 'iframeHeight']),
tableHeight() {
const h = this.clientHeight - this.searchH - 230 + this.iframeHeigh
const _h = this.clientHeight - 230 - this.searchH
return this.$store.state.inIframe ? h : _h
}
},
mounted() {
this.$nextTick(() => {
this.searchH = this.$refs.searchCard.$el.offsetHeight
console.log('tableHeight', this.tableHeight)
})
},
async created () {
this.agencyId = localStorage.getItem('agencyId')
this.dataForm.customerId = localStorage.getItem('customerId')
this.dataForm.agencyId = localStorage.getItem('agencyId')
this.getTableData()
// this.pageLoading = true
},

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

@ -34,17 +34,6 @@
<el-form-item label="地址" prop="address">
<el-input v-model="searchForm.address" placeholder="请输入" class="input-width" clearable></el-input>
</el-form-item>
</div>
<div>
<el-form-item label="流动党员" prop="isLd">
<el-select v-model="searchForm.isLd" filterable placeholder="请选择" clearable>
<el-option label="是" value="1" />
<el-option label="否" value="0" />
</el-select>
</el-form-item>
<el-form-item label="流动党员证号" prop="ldzh">
<el-input v-model="searchForm.ldzh" placeholder="请输入" class="input-width" clearable></el-input>
</el-form-item>
<el-form-item label="职务" prop="partyZw">
<el-select v-model="searchForm.partyZw" filterable placeholder="请选择" clearable>
<el-option
@ -55,26 +44,42 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="是否缴费" prop="isPay">
</div>
<div>
<!-- <el-form-item label="流动党员" prop="isLd">
<el-select v-model="searchForm.isLd" filterable placeholder="请选择" clearable>
<el-option label="是" value="1" />
<el-option label="否" value="0" />
</el-select>
</el-form-item> -->
<!-- <el-form-item label="流动党员证号" prop="ldzh">
<el-input v-model="searchForm.ldzh" placeholder="请输入" class="input-width" clearable></el-input>
</el-form-item> -->
<!-- <el-form-item label="是否缴费" prop="isPay">
<el-select v-model="searchForm.isPay" filterable placeholder="请选择" clearable>
<el-option label="是" value="1" />
<el-option label="否" value="0" />
</el-select>
</el-form-item>
</el-form-item> -->
<el-form-item label="党员中心户" prop="isDyzxh">
<el-select v-model="searchForm.isDyzxh" filterable placeholder="请选择" clearable>
<el-option label="是" value="1" />
<el-option label="否" value="0" />
</el-select>
</el-form-item>
<el-form-item>
<el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
<el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
</el-form-item>
</div>
<el-form-item label="免学习" prop="isMxx">
<!-- <el-form-item label="免学习" prop="isMxx">
<el-select v-model="searchForm.isMxx" filterable placeholder="请选择" clearable>
<el-option label="是" value="1" />
<el-option label="否" value="0" />
</el-select>
</el-form-item>
<el-form-item label="最近一次缴费时间"
</el-form-item> -->
<!-- <el-form-item label="最近一次缴费时间"
label-width="130px"
prop="startTime">
<el-date-picker v-model="timeRangePay"
@ -87,8 +92,8 @@
end-placeholder="结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="入党时间"
</el-form-item> -->
<!-- <el-form-item label="入党时间"
prop="startTime">
<el-date-picker v-model="timeRange"
size="small"
@ -100,11 +105,7 @@
end-placeholder="结束时间">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
<el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
</el-form-item>
</el-form-item> -->
</el-form>
</div>
</el-card>
@ -388,8 +389,8 @@ export default {
computed: {
...mapGetters(['clientHeight', 'iframeHeight']),
tableHeight() {
const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
const _h = this.clientHeight - 280 - this.searchH
const h = this.clientHeight - this.searchH - 490 + this.iframeHeigh
const _h = this.clientHeight - 490 - this.searchH
return this.$store.state.inIframe ? h : _h
}
},

16
src/views/modules/visual/communityParty/community.vue

@ -364,9 +364,11 @@ export default {
if (params.seriesIndex == 0 || params.seriesIndex == 2) {
this.unitType = ''
this.getUnitList(this.agencyId)
return
}
this.clickEduPie(params.dataIndex)
this.$refs.eduChart.clear()
this.noInit = false
this.clickEduPie(0)
// return
} else this.clickEduPie(params.dataIndex)
}
this.$refs.eduChart.handleClick(fun)
// this.noInit = true
@ -619,7 +621,7 @@ export default {
return {
...item,
color: "#00E5ED",
fillColor: "rgba(0, 229, 237, 0.16)"
fillColor: "rgba(0, 229, 237, 0)"
}
})
@ -772,9 +774,11 @@ export default {
this.orgId = _arr[0]
this.orgLevel = orgType
this.unitType = ''
this.$refs.eduChart.clear()
this.getList(_arr[0])
await this.getCateType(_arr[0])
await this.loadOrgData()
this.agencyInfo = { ...this.orgData }
console.log('agencyInfo-----', this.agencyInfo)
this.getUnitList(_arr[0])
@ -832,7 +836,8 @@ export default {
url,
params,
(data, rspMsg) => {
this.agencyInfo = data
// this.agencyInfo = data
this.agencyInfo = { ...data, agencyLevel: data.level}
if (!data.latitude) {
this.agencyInfo.latitude = 36.072227
}
@ -841,6 +846,7 @@ export default {
}
if (!data.level) {
this.agencyInfo.level = 'street'
this.agencyInfo.agencyLevel = 'street'
}
},

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

@ -310,7 +310,10 @@ export default {
this.pieEduOptions.legend = { ...legend }
this.clickEduPie(0)
let fun = params => {
this.clickEduPie(params.dataIndex)
if (params.seriesIndex == 0 || params.seriesIndex == 2) {
this.$refs.eduChart.clear()
this.clickEduPie('-1')
} else this.clickEduPie(params.dataIndex)
}
this.$refs.eduChart.handleClick(fun)
},

159
src/views/modules/visual/communityParty/party.vue

@ -311,12 +311,21 @@ export default {
this.pieAgeOptions = pieOption(this.pieAgeChartS)
this.clickAgePie(0)
let fun = params => {
// if (params.seriesIndex == 0 || params.seriesIndex == 2) {
// this.ageCode = ''
// this.getAgeList()
// return
// }
if (params.seriesIndex == 0 || params.seriesIndex == 2) {
this.ageCode = ''
// this.getUnitList(this.agencyId)
this.getAgeList()
return
}
this.clickAgePie(params.dataIndex)
this.$refs.ageChart.clear()
this.noInit = false
this.clickAgePie(0)
// return
} else this.clickAgePie(params.dataIndex)
// this.clickAgePie(params.dataIndex)
}
this.$refs.ageChart.handleClick(fun)
// option && this.$refs.pieChart.setOption(option);
@ -364,143 +373,27 @@ export default {
// this.pieEduOptions.series[1].width = 400
this.clickEduPie(0)
let fun = params => {
// if (params.seriesIndex == 0 || params.seriesIndex == 2) {
// this.eduCode = ''
// this.getEduList()
// return
// }
this.clickEduPie(params.dataIndex)
if (params.seriesIndex == 0 || params.seriesIndex == 2) {
this.eduCode = ''
this.getEduList()
return
}
this.clickEduPie(params.dataIndex)
this.$refs.eduChart.clear()
this.noEduInit = false
this.clickEduPie(0)
// return
} else this.clickEduPie(params.dataIndex)
}
this.$refs.eduChart.handleClick(fun)
// this.noInit = true
// option && this.$refs.pieChart.setOption(option);
},
initChartType() {
const eId = document.getElementById('echartType')
let _charts = echarts.init(eId)
let option = {
tooltip: {
trigger: 'item'
},
legend: {
show: true,
orient: 'vertical',
top: '20%',
right: 0,
textStyle: {
width: 90,
color: '#fff',
rich: {
a: {
width: 90
}
}
},
formatter: name => {
for (let a = 0; a < this.eduItem.length; a++) {
// this.data
if (this.eduItem[a].name === name) {
//
let params1 = name + "\n"; //returnlegend
console.log(params1);
let tmp = params1.split("\n");
let res = "" + params1;
for (let i in tmp) {
res = res.replace(tmp[i], "");
}
return res + params1;
}
}
}
},
title: {
text: '12000', //80%
subtext: '总数',
left: 196,
top: "center",
textAlign: 'center',
textStyle: {
color: "#fff",
fontSize: 28,
align: "center"
},
subtextStyle: {
fontSize: 16,
color: '#fff',
align: 'center'
}
},
series: [
{
// name: 'Access From',
type: 'pie',
// center: ['50%', '50%'],
radius: ['40%', '60%'],
avoidLabelOverlap: true,
// top: top + '%',
// height: '80%',
// left: 0,
width: 400,
label: {
position: 'outside',
alignTo: 'edge',
formatter: '{a|{c}}\n{r|}\n{name|{b}}',
minMargin: 5,
edgeDistance: 20,
lineHeight: 15,
color: '#fff',
fontSize: 15,
rich: {
name: {
padding: [0, 6, 0, 6]
},
a: {
fontSize: 15,
color: '#fff',
padding: [0, 6, 0, 6]
},
r: {
backgroundColor: 'auto',
borderRadius: 6,
width: 6,
height: 6,
// padding: [3, 3, 0, -12]
}
}
},
emphasis: {
label: {
show: true,
fontSize: '14',
fontWeight: 'bold'
}
},
labelLine: {
show: true,
length: 20,
length2: 0,
maxSurfaceAngle: 80
},
labelLayout: function (params) {
const isLeft = params.labelRect.x < _charts.getWidth() / 2;
const points = params.labelLinePoints;
// Update the end point.
points[2][0] = isLeft
? params.labelRect.x
: params.labelRect.x + params.labelRect.width;
return {
labelLinePoints: points
};
},
data: this.eduItem
}
]
}
option && _charts.setOption(option);
},
clickAgePie (seriesIndex) {
let _code = ''
let isClick = false
@ -841,6 +734,8 @@ export default {
this.orgType = orgType
this.noInit = false
this.noEduInit = false
this.$refs.ageChart.clear()
this.$refs.eduChart.clear()
this.getAgeCount(_arr[0], orgType)
this.getEduCount(_arr[0], orgType)
this.getAgeList(_arr[0], orgType)
@ -850,6 +745,8 @@ export default {
console.log('val-vvvpppppp', val)
this.noInit = false
this.noEduInit = false
this.$refs.ageChart.clear()
this.$refs.eduChart.clear()
if (val.length > 0) {
const i = val.length - 1
this.agencyId = val[i]

Loading…
Cancel
Save