From 86c122fb18b894e9f21582060a3167f2d2c9d9ae Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Wed, 1 Jun 2022 15:01:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=88=86=E6=9E=90?= =?UTF-8?q?=E9=A5=BC=E5=9B=BE=E9=80=89=E6=8B=A9=E6=A0=B7=E5=BC=8F=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visual/communityGovern/shijianchuli/pieOption.js | 2 +- .../communityGovern/shijianchuli/shijianchulifenxi.vue | 2 +- .../visual/communityGovern/shijianfenlei/pieOption.js | 2 +- .../communityGovern/shijianfenlei/shijianfenleifenxi.vue | 7 +++++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/views/modules/visual/communityGovern/shijianchuli/pieOption.js b/src/views/modules/visual/communityGovern/shijianchuli/pieOption.js index 4bca2b2f..5eb83bad 100644 --- a/src/views/modules/visual/communityGovern/shijianchuli/pieOption.js +++ b/src/views/modules/visual/communityGovern/shijianchuli/pieOption.js @@ -81,7 +81,7 @@ const center= ['50%', '170px'] avoidLabelOverlap: false, // top: top + '%', // height: '80%', - // selectedMode: 'single', + selectedMode: 'single', left: 'center', width: 400, label: { diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue index 3eb8819c..9e65d454 100644 --- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue +++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue @@ -589,7 +589,7 @@ export default { // 获取pieChart配置 this.pieOption = pieOption(this.pieChartS) - this.pieData[0].selected = true + this.pieData[0].selected = false this.pieData[1].selected = false this.pieOption.title.text = this.projectTotal diff --git a/src/views/modules/visual/communityGovern/shijianfenlei/pieOption.js b/src/views/modules/visual/communityGovern/shijianfenlei/pieOption.js index d0258212..aef4afae 100644 --- a/src/views/modules/visual/communityGovern/shijianfenlei/pieOption.js +++ b/src/views/modules/visual/communityGovern/shijianfenlei/pieOption.js @@ -74,7 +74,7 @@ export function pieOption (_charts) { avoidLabelOverlap: false, // top: top + '%', // height: '80%', - // selectedMode: 'single', + selectedMode: 'single', left: 'center', width: 480, label: { diff --git a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue index 337b8d78..7b90db60 100644 --- a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue +++ b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue @@ -294,6 +294,7 @@ export default { this.queryEndTime = dateFormat(end, 'yyyy-MM-dd') + " 23:59:59" } if (index !== '0') { + this.categoryCode = '' await this.getApiData() // this.assignData() } @@ -306,6 +307,7 @@ export default { handleSelectChange (value) { console.log(value) + this.categoryCode = '' this.queryStartTime = value[0] + " 00:00:00" this.queryEndTime = value[1] + " 23:59:59" this.getApiData() @@ -366,7 +368,7 @@ export default { name: item.categoryName, categoryCode: item.categoryCode, color: item.color, - selected: index == 0 ? true : false + selected: false } this.pieData.push(ob) }) @@ -405,7 +407,7 @@ export default { orgId: item.orgId, orgType: item.orgType, color: colorArray[colIndex], - selected: index == 0 ? true : false + selected: false } this.gridPieData.push(ob) }) @@ -631,6 +633,7 @@ export default { }, handleChangeAgency (value) { + this.categoryCode = '' let obj = this.$refs["myCascader"].getCheckedNodes()[0].data if (obj) { this.orgType = obj.level === 'grid' ? 'grid' : 'agency' From 211d325fd3351574dc6c0d5791b4659965c800b9 Mon Sep 17 00:00:00 2001 From: ZhaoTongYao <531131322@qq.com> Date: Wed, 1 Jun 2022 15:33:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=A4=84=E7=90=86?= =?UTF-8?q?=E9=A5=BC=E5=9B=BE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shijianchuli/shijianchulifenxi.vue | 25 +++++++++++-------- .../shijianfenlei/shijianfenleifenxi.vue | 9 +++++++ 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue index 9e65d454..f75a4ef1 100644 --- a/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue +++ b/src/views/modules/visual/communityGovern/shijianchuli/shijianchulifenxi.vue @@ -604,15 +604,7 @@ export default { }, clickPie (seriesIndex) { - - if (seriesIndex === 0) { - this.processStatus = 'closed_case' - } else if (seriesIndex === 1) { - this.processStatus = 'processing' - } else { - this.processStatus = '' - } - + let isSelected = false this.pieData.forEach((element, index) => { if (index === seriesIndex) { element.label = { @@ -626,7 +618,8 @@ export default { } }; - + element.selected = !element.selected + isSelected = element.selected } else { element.label = { show: false, @@ -639,8 +632,20 @@ export default { color: 'rgba(255,255,255,0)' } }; + element.selected = false } }); + if (isSelected) { + if (seriesIndex === 0) { + this.processStatus = 'closed_case' + } else if (seriesIndex === 1) { + this.processStatus = 'processing' + } else { + this.processStatus = '' + } + } else { + this.processStatus = '' + } this.pieOption.series[1].data = this.pieData this.demand.pageNo = 1 this.getTable() diff --git a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue index 7b90db60..2516ca07 100644 --- a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue +++ b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue @@ -515,6 +515,7 @@ export default { }, clickPie (seriesIndex) { + let isSelected = false this.pieData.forEach((element, index) => { if (index === seriesIndex) { element.label = { @@ -527,6 +528,13 @@ export default { } } this.categoryCode = element.categoryCode + element.selected = !element.selected + isSelected = element.selected + // if (isSelected) { + // this.categoryCode = element.categoryCode + // } else { + // this.categoryCode = '' + // } } else { element.label = { show: false, @@ -538,6 +546,7 @@ export default { color: 'rgba(255,255,255,0)' } } + element.selected = false } }) this.pieOption.series[1].data = this.pieData