Browse Source

Merge branch 'dev_shequzhili' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev_shequzhili

shibei_master
jiangyy 3 years ago
parent
commit
04e22e9620
  1. 4
      src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue
  2. 2
      src/views/modules/visual/communityGovern/shijianfenlei/pieOption.js
  3. 16
      src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue

4
src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue

@ -635,7 +635,8 @@ export default {
} }
}; };
element.selected = !element.selected
isSelected = element.selected
} else { } else {
@ -651,6 +652,7 @@ export default {
color: 'rgba(255,255,255,0)' color: 'rgba(255,255,255,0)'
} }
}; };
element.selected = false
} }
}); });

2
src/views/modules/visual/communityGovern/shijianfenlei/pieOption.js

@ -74,7 +74,7 @@ export function pieOption (_charts) {
avoidLabelOverlap: false, avoidLabelOverlap: false,
// top: top + '%', // top: top + '%',
// height: '80%', // height: '80%',
// selectedMode: 'single', selectedMode: 'single',
left: 'center', left: 'center',
width: 480, width: 480,
label: { label: {

16
src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue

@ -294,6 +294,7 @@ export default {
this.queryEndTime = dateFormat(end, 'yyyy-MM-dd') + " 23:59:59" this.queryEndTime = dateFormat(end, 'yyyy-MM-dd') + " 23:59:59"
} }
if (index !== '0') { if (index !== '0') {
this.categoryCode = ''
await this.getApiData() await this.getApiData()
// this.assignData() // this.assignData()
} }
@ -306,6 +307,7 @@ export default {
handleSelectChange (value) { handleSelectChange (value) {
console.log(value) console.log(value)
this.categoryCode = ''
this.queryStartTime = value[0] + " 00:00:00" this.queryStartTime = value[0] + " 00:00:00"
this.queryEndTime = value[1] + " 23:59:59" this.queryEndTime = value[1] + " 23:59:59"
this.getApiData() this.getApiData()
@ -366,7 +368,7 @@ export default {
name: item.categoryName, name: item.categoryName,
categoryCode: item.categoryCode, categoryCode: item.categoryCode,
color: item.color, color: item.color,
selected: index == 0 ? true : false selected: false
} }
this.pieData.push(ob) this.pieData.push(ob)
}) })
@ -405,7 +407,7 @@ export default {
orgId: item.orgId, orgId: item.orgId,
orgType: item.orgType, orgType: item.orgType,
color: colorArray[colIndex], color: colorArray[colIndex],
selected: index == 0 ? true : false selected: false
} }
this.gridPieData.push(ob) this.gridPieData.push(ob)
}) })
@ -513,6 +515,7 @@ export default {
}, },
clickPie (seriesIndex) { clickPie (seriesIndex) {
let isSelected = false
this.pieData.forEach((element, index) => { this.pieData.forEach((element, index) => {
if (index === seriesIndex) { if (index === seriesIndex) {
element.label = { element.label = {
@ -525,6 +528,13 @@ export default {
} }
} }
this.categoryCode = element.categoryCode this.categoryCode = element.categoryCode
element.selected = !element.selected
isSelected = element.selected
// if (isSelected) {
// this.categoryCode = element.categoryCode
// } else {
// this.categoryCode = ''
// }
} else { } else {
element.label = { element.label = {
show: false, show: false,
@ -536,6 +546,7 @@ export default {
color: 'rgba(255,255,255,0)' color: 'rgba(255,255,255,0)'
} }
} }
element.selected = false
} }
}) })
this.pieOption.series[1].data = this.pieData this.pieOption.series[1].data = this.pieData
@ -631,6 +642,7 @@ export default {
}, },
handleChangeAgency (value) { handleChangeAgency (value) {
this.categoryCode = ''
let obj = this.$refs["myCascader"].getCheckedNodes()[0].data let obj = this.$refs["myCascader"].getCheckedNodes()[0].data
if (obj) { if (obj) {
this.orgType = obj.level === 'grid' ? 'grid' : 'agency' this.orgType = obj.level === 'grid' ? 'grid' : 'agency'

Loading…
Cancel
Save