|
|
@ -6,13 +6,20 @@ |
|
|
src="../../../../assets/img/shuju/title-tip.png" /> |
|
|
src="../../../../assets/img/shuju/title-tip.png" /> |
|
|
<div class="title-label"> |
|
|
<div class="title-label"> |
|
|
区域化党建 |
|
|
区域化党建 |
|
|
|
|
|
<el-cascader |
|
|
|
|
|
v-model="selectAgency" |
|
|
|
|
|
:options="propTree" |
|
|
|
|
|
:props="{ checkStrictly: true }" |
|
|
|
|
|
:show-all-levels="false" |
|
|
|
|
|
clearable |
|
|
|
|
|
@change="handleCascader"> |
|
|
|
|
|
</el-cascader> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
</div> |
|
|
<div class="second-title"> |
|
|
<div class="second-title"> |
|
|
<div class="second-title-label">党建单位分类统计</div> |
|
|
<div class="second-title-label">党建单位分类统计</div> |
|
|
<div class="second-select"> |
|
|
<div class="second-select"> |
|
|
<el-select v-model="serviceMatter" |
|
|
<el-select v-model="serviceMatter" |
|
|
clearable |
|
|
|
|
|
placeholder="请选择" |
|
|
placeholder="请选择" |
|
|
@change="handleSelectChange" |
|
|
@change="handleSelectChange" |
|
|
@clear="handleSelectChange"> |
|
|
@clear="handleSelectChange"> |
|
|
@ -31,6 +38,7 @@ |
|
|
end-placeholder="结束日期" |
|
|
end-placeholder="结束日期" |
|
|
prefix-icon="el-icon-caret-bottom" |
|
|
prefix-icon="el-icon-caret-bottom" |
|
|
value-format="yyyy-MM-dd HH:mm:ss" |
|
|
value-format="yyyy-MM-dd HH:mm:ss" |
|
|
|
|
|
:clearable="false" |
|
|
:default-time="['00:00:00', '23:59:59']" |
|
|
:default-time="['00:00:00', '23:59:59']" |
|
|
> |
|
|
> |
|
|
</el-date-picker> |
|
|
</el-date-picker> |
|
|
@ -135,7 +143,7 @@ export default { |
|
|
{ title: "区域化党建单位名称", coulmn: 'unitName' }, |
|
|
{ title: "区域化党建单位名称", coulmn: 'unitName' }, |
|
|
{ title: "活动标题", coulmn: 'title' }, |
|
|
{ title: "活动标题", coulmn: 'title' }, |
|
|
{ title: "活动地址", coulmn: 'address' }, |
|
|
{ title: "活动地址", coulmn: 'address' }, |
|
|
{ title: "服务事项", coulmn: 'serviceMatter' }, |
|
|
{ title: "服务事项", coulmn: 'serviceMatterName' }, |
|
|
{ title: "服务人数", coulmn: 'peopleCount' }, |
|
|
{ title: "服务人数", coulmn: 'peopleCount' }, |
|
|
{ title: "活动时间", coulmn: 'activityTime' } |
|
|
{ title: "活动时间", coulmn: 'activityTime' } |
|
|
], |
|
|
], |
|
|
@ -147,13 +155,15 @@ export default { |
|
|
value2: '', |
|
|
value2: '', |
|
|
timeRange: '', |
|
|
timeRange: '', |
|
|
visibleLoading: true, |
|
|
visibleLoading: true, |
|
|
serviceMatter: '', |
|
|
serviceMatter: 'all', |
|
|
pageNo: 1, |
|
|
pageNo: 1, |
|
|
pageSize: 10, |
|
|
pageSize: 10, |
|
|
total: 0, |
|
|
total: 0, |
|
|
activeIndex: 0, |
|
|
activeIndex: 0, |
|
|
activeLevel: "1", |
|
|
activeLevel: "1", |
|
|
|
|
|
selectAgency: '', |
|
|
unitList: [], |
|
|
unitList: [], |
|
|
|
|
|
propTree: [], |
|
|
partyItem: [ |
|
|
partyItem: [ |
|
|
{ |
|
|
{ |
|
|
name: '楼宇党建', |
|
|
name: '楼宇党建', |
|
|
@ -231,33 +241,37 @@ export default { |
|
|
async mounted () { |
|
|
async mounted () { |
|
|
const { user } = this.$store.state |
|
|
const { user } = this.$store.state |
|
|
this.agencyId = user.agencyId |
|
|
this.agencyId = user.agencyId |
|
|
|
|
|
console.log('agencyId-------', this.agencyId) |
|
|
|
|
|
this.initTime() |
|
|
await nextTick(100); |
|
|
await nextTick(100); |
|
|
|
|
|
await this.getAgencyList() |
|
|
this.loadUnit() |
|
|
this.loadUnit() |
|
|
this.getList(); |
|
|
this.getList(this.agencyId) |
|
|
this.getCateCount() |
|
|
this.getCateCount(this.agencyId) |
|
|
this.getCateType() |
|
|
this.getCateType(this.agencyId) |
|
|
|
|
|
|
|
|
await this.getWorkUserInfo() |
|
|
await this.getWorkUserInfo() |
|
|
await this.getMapUnitList() |
|
|
await this.getMapUnitList(this.agencyId) |
|
|
}, |
|
|
}, |
|
|
watch: { |
|
|
watch: { |
|
|
timeRange(val) { |
|
|
timeRange(val) { |
|
|
console.log('val-www', val) |
|
|
console.log('val-www', val) |
|
|
this.getList(); |
|
|
this.getList(this.agencyId); |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
methods: { |
|
|
methods: { |
|
|
|
|
|
|
|
|
//具体人员列表 |
|
|
//具体人员列表 |
|
|
async getList () { |
|
|
async getList (agencyId) { |
|
|
this.visibleLoading = true |
|
|
this.visibleLoading = true |
|
|
|
|
|
|
|
|
const url = "/heart/icpartyactivity/activitylist" |
|
|
const url = "/heart/icpartyactivity/activitylist" |
|
|
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list" |
|
|
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list" |
|
|
let params = { |
|
|
let params = { |
|
|
agencyId: this.agencyId, |
|
|
agencyId, |
|
|
pageSize: this.pageSize, |
|
|
pageSize: this.pageSize, |
|
|
pageNo: this.pageNo, |
|
|
pageNo: this.pageNo, |
|
|
serviceMatter: this.serviceMatter, |
|
|
serviceMatter: this.serviceMatter == 'all' ? '' : this.serviceMatter, |
|
|
startTime: this.timeRange && this.timeRange[0] || '', |
|
|
startTime: this.timeRange && this.timeRange[0] || '', |
|
|
endTime: this.timeRange && this.timeRange[1] || '' |
|
|
endTime: this.timeRange && this.timeRange[1] || '' |
|
|
} |
|
|
} |
|
|
@ -277,12 +291,61 @@ export default { |
|
|
} |
|
|
} |
|
|
this.visibleLoading = false |
|
|
this.visibleLoading = false |
|
|
}, |
|
|
}, |
|
|
async getCateCount () { |
|
|
async getAgencyList() { |
|
|
|
|
|
// const url = "/gov/org/customeragency/staffinagencylist"; |
|
|
|
|
|
// const url = '/gov/org/customeragency/agencygridtree' |
|
|
|
|
|
const url = '/gov/org/customeragency/staffinagencylist' |
|
|
|
|
|
// let params = { |
|
|
|
|
|
// agencyId: this.$store.state.user.agencyId, |
|
|
|
|
|
// }; |
|
|
|
|
|
const { data, code, msg } = await requestPost(url); |
|
|
|
|
|
if (code === 0) { |
|
|
|
|
|
console.log('data-org----o', data) |
|
|
|
|
|
let { agencyList, subAgencyList } = data |
|
|
|
|
|
this.selectAgency = [`${agencyList.agencyId}-${agencyList.level}`] |
|
|
|
|
|
let arr = [] |
|
|
|
|
|
agencyList.subAgencyList = subAgencyList |
|
|
|
|
|
arr.push(agencyList) |
|
|
|
|
|
this.propTree = arr && this.getTreeData(arr) |
|
|
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
this.$message.error(msg) |
|
|
|
|
|
} |
|
|
|
|
|
}, |
|
|
|
|
|
getTreeData(data){ |
|
|
|
|
|
if (!Array.isArray(data)) return [] |
|
|
|
|
|
let arr = data.map(item => { |
|
|
|
|
|
let _item = {} |
|
|
|
|
|
if (item.subAgencyList) { |
|
|
|
|
|
if (item.subAgencyList.length === 0) { |
|
|
|
|
|
_item = { |
|
|
|
|
|
label: item.agencyName, |
|
|
|
|
|
value: item.agencyId + '-' + item.level, |
|
|
|
|
|
level: item.level, |
|
|
|
|
|
children: undefined |
|
|
|
|
|
} |
|
|
|
|
|
} else _item = { |
|
|
|
|
|
label: item.agencyName, |
|
|
|
|
|
value: item.agencyId + '-' + item.level, |
|
|
|
|
|
level: item.level, |
|
|
|
|
|
children: this.getTreeData(item.subAgencyList)} |
|
|
|
|
|
} else { |
|
|
|
|
|
_item = { |
|
|
|
|
|
label: item.agencyName, |
|
|
|
|
|
value: item.agencyId + '-' + item.level, |
|
|
|
|
|
level: item.level, |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
return _item |
|
|
|
|
|
}) |
|
|
|
|
|
return arr |
|
|
|
|
|
}, |
|
|
|
|
|
async getCateCount (agencyId) { |
|
|
|
|
|
|
|
|
const url = "/heart/icpartyactivity/statistics" |
|
|
const url = "/heart/icpartyactivity/statistics" |
|
|
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list" |
|
|
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list" |
|
|
let params = { |
|
|
let params = { |
|
|
agencyId: this.agencyId |
|
|
agencyId |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
const { data, code, msg } = await requestPost(url, params) |
|
|
const { data, code, msg } = await requestPost(url, params) |
|
|
@ -293,12 +356,12 @@ export default { |
|
|
this.$message.error(msg) |
|
|
this.$message.error(msg) |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
async getCateType () { |
|
|
async getCateType (agencyId) { |
|
|
|
|
|
|
|
|
const url = "/heart/icpartyunit/typestatistics" |
|
|
const url = "/heart/icpartyunit/typestatistics" |
|
|
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list" |
|
|
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list" |
|
|
let params = { |
|
|
let params = { |
|
|
agencyId: this.agencyId |
|
|
agencyId |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
const { data, code, msg } = await requestPost(url, params) |
|
|
const { data, code, msg } = await requestPost(url, params) |
|
|
@ -352,7 +415,37 @@ export default { |
|
|
this.$message.error(msg) |
|
|
this.$message.error(msg) |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
handleCascader(val) { |
|
|
|
|
|
console.log('val-vvv', val) |
|
|
|
|
|
if (val.length > 0) { |
|
|
|
|
|
const _arr = val[val.length - 1].split('-') |
|
|
|
|
|
const orgType = _arr[1] !== 'grid' ? 'agency': 'grid' |
|
|
|
|
|
this.getList(_arr[0]) |
|
|
|
|
|
this.getMapUnitList(_arr[0]) |
|
|
|
|
|
this.getCateCount(_arr[0]) |
|
|
|
|
|
this.getCateType(_arr[0]) |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
}, |
|
|
|
|
|
initTime() { |
|
|
|
|
|
const end = new Date(); |
|
|
|
|
|
const start = new Date(); |
|
|
|
|
|
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); |
|
|
|
|
|
console.log('time-rtt', this.timeFormat(start), this.timeFormat(end)) |
|
|
|
|
|
this.timeRange = [this.timeFormat(start), this.timeFormat(end)] |
|
|
|
|
|
}, |
|
|
|
|
|
timeFormat(date) { |
|
|
|
|
|
if (!date || typeof date === 'string') { |
|
|
|
|
|
return false |
|
|
|
|
|
} |
|
|
|
|
|
var y = date.getFullYear() //年 |
|
|
|
|
|
var m = date.getMonth() + 1 //月 |
|
|
|
|
|
if (m < 10) m = '0' + m |
|
|
|
|
|
var d = date.getDate() //日 |
|
|
|
|
|
if (d < 10) d = '0' + d |
|
|
|
|
|
|
|
|
|
|
|
return y + '-' + m + '-' + d + ' 00:00:00' |
|
|
|
|
|
}, |
|
|
async loadUnit () { |
|
|
async loadUnit () { |
|
|
const url = "/heart/icresidemanddict/subcodelist" |
|
|
const url = "/heart/icresidemanddict/subcodelist" |
|
|
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/option" |
|
|
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/option" |
|
|
@ -365,7 +458,10 @@ export default { |
|
|
|
|
|
|
|
|
if (code === 0) { |
|
|
if (code === 0) { |
|
|
this.unitList = data |
|
|
this.unitList = data |
|
|
|
|
|
this.unitList.unshift({ |
|
|
|
|
|
label: '全部', |
|
|
|
|
|
value: 'all' |
|
|
|
|
|
}) |
|
|
} else { |
|
|
} else { |
|
|
this.$message.error(msg) |
|
|
this.$message.error(msg) |
|
|
} |
|
|
} |
|
|
@ -419,27 +515,33 @@ export default { |
|
|
// }, |
|
|
// }, |
|
|
|
|
|
|
|
|
//获取联建单位分布图 |
|
|
//获取联建单位分布图 |
|
|
async getMapUnitList () { |
|
|
async getMapUnitList (agencyId) { |
|
|
const url = "/heart/icpartyunit/distribution" |
|
|
const url = "/heart/icpartyunit/distribution" |
|
|
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/distribution" |
|
|
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/distribution" |
|
|
|
|
|
|
|
|
let params = { |
|
|
let params = { |
|
|
agencyId: this.agencyId |
|
|
agencyId |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
const { data, code, msg } = await requestPost(url, params) |
|
|
const { data, code, msg } = await requestPost(url, params) |
|
|
|
|
|
|
|
|
if (code === 0) { |
|
|
if (code === 0) { |
|
|
// this.unitMapList = data |
|
|
console.log('unitMapList----data', data) |
|
|
this.unitMapList = this.unitMapList1 |
|
|
this.unitMapList = data.map((item, index) => { |
|
|
|
|
|
return { |
|
|
|
|
|
...item, |
|
|
|
|
|
urlIndex: index |
|
|
|
|
|
} |
|
|
|
|
|
}) |
|
|
|
|
|
// this.unitMapList = this.unitMapList1 |
|
|
|
|
|
console.log('unitMapList----', this.unitMapList) |
|
|
this.unitMapList.forEach(item => { |
|
|
this.unitMapList.forEach(item => { |
|
|
|
|
|
|
|
|
if (item.type === '党建楼宇') { |
|
|
if (item.type === '楼宇党建') { |
|
|
item.urlIndex = 0 |
|
|
item.urlIndex = 0 |
|
|
} else if (item.type === '两新党建') { |
|
|
} else if (item.type === '两新组织') { |
|
|
item.urlIndex = 1 |
|
|
item.urlIndex = 1 |
|
|
} else if (item.type === '辖区单位') { |
|
|
} else if (item.type === '区域单位党建') { |
|
|
item.urlIndex = 2 |
|
|
item.urlIndex = 2 |
|
|
} else if (item.type === '机关直属部门') { |
|
|
} else if (item.type === '机关直属部门') { |
|
|
item.urlIndex = 3 |
|
|
item.urlIndex = 3 |
|
|
@ -492,7 +594,7 @@ export default { |
|
|
this.showedMoreInfo = true |
|
|
this.showedMoreInfo = true |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
handleSelectChange () { |
|
|
handleSelectChange (val) { |
|
|
this.getList(); |
|
|
this.getList(); |
|
|
}, |
|
|
}, |
|
|
pageSizeChangeHandleNew (val) { |
|
|
pageSizeChangeHandleNew (val) { |
|
|
@ -562,8 +664,22 @@ export default { |
|
|
margin-right: 6px; |
|
|
margin-right: 6px; |
|
|
} |
|
|
} |
|
|
.title-label { |
|
|
.title-label { |
|
|
font-size: 16px; |
|
|
font-size: 20px; |
|
|
font-weight: 800; |
|
|
font-weight: 800; |
|
|
|
|
|
::v-deep .el-input { |
|
|
|
|
|
width: 180px; |
|
|
|
|
|
margin-left: 10px; |
|
|
|
|
|
.el-input__inner { |
|
|
|
|
|
font-size: 18px; |
|
|
|
|
|
font-weight: 800; |
|
|
|
|
|
color: #fff; |
|
|
|
|
|
background: transparent; |
|
|
|
|
|
border: 0; |
|
|
|
|
|
} |
|
|
|
|
|
.el-icon-arrow-down::before { |
|
|
|
|
|
content: "\e790"; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
::v-deep .el-dropdown { |
|
|
::v-deep .el-dropdown { |
|
|
font-size: 16px; |
|
|
font-size: 16px; |
|
|
|
jiangyy
4 years ago