diff --git a/src/views/modules/visual/communityGovern/processAnalyze.vue b/src/views/modules/visual/communityGovern/processAnalyze.vue index f640be1b..8ed41ee2 100644 --- a/src/views/modules/visual/communityGovern/processAnalyze.vue +++ b/src/views/modules/visual/communityGovern/processAnalyze.vue @@ -163,14 +163,14 @@ export default { legendArray: [ { name: '未结案', - count: 120, - percent: '25.0%', + count: 0, + percent: '0%', url: require('../../../../assets/img/shuju/measure/huang@2x.png') }, { name: '已结案', - count: 351, - percent: '50.0%', + count: 0, + percent: '0%', url: require('../../../../assets/img/shuju/measure/lv@2x.png') } ], @@ -321,17 +321,29 @@ export default { this.projectTotal = data.projectTotal this.dateIncr = data.dateIncr this.monthIncr = data.monthIncr + this.legendArray = [ + { + name: '未结案', + count: data.pendingTotal, + percent: data.pendingRatio, + url: require('../../../../assets/img/shuju/measure/huang@2x.png') + }, + { + name: '已结案', + count: data.closedTotal, + percent: data.closedRatio, + url: require('../../../../assets/img/shuju/measure/lv@2x.png') + } + ] this.pieData = [ { name: "未结案", value: data.pendingTotal, - selected: true, - }, { name: "已结案", - value: data.pendingTotal + value: data.closedTotal, } ] @@ -512,19 +524,27 @@ export default { async assignPieChart () { this.pieTotal = 0 + let maxIndex = 0 + let maxValue = this.pieData[0].value const _that = this // 获取pieChart配置 this.pieOption = pieOption(this.pieChartS) - this.pieData.forEach(item => { + this.pieData.forEach((item, index) => { this.pieTotal = this.pieTotal + item.value - + if (item.value > maxValue) { + maxValue = item.value + maxIndex = index + item.selected = true + } else if (index !== 0) { + item.selected = false + } }); this.pieOption.title.text = this.pieTotal - this.clickPie(0) + this.clickPie(maxIndex) let fun = function (params) { _that.clickPie(params.dataIndex) diff --git a/src/views/modules/visual/communityGovern/typeAnalyze.vue b/src/views/modules/visual/communityGovern/typeAnalyze.vue index c807e563..a1b3f1b0 100644 --- a/src/views/modules/visual/communityGovern/typeAnalyze.vue +++ b/src/views/modules/visual/communityGovern/typeAnalyze.vue @@ -247,8 +247,9 @@ export default { }, - handleChangeDate (value) { + async handleChangeDate (value) { this.dateIdShow = value + await this.getPieChart() this.getPie() }, @@ -267,7 +268,6 @@ export default { } - const url = "/data/aggregator/project/projectcategorylist"; // const url = "http://yapi.elinkservice.cn/mock/245/data/aggregator/project/projectcategorylist"; let params = { @@ -340,7 +340,6 @@ export default { } } - let fun = function (params) { _that.clickPie(params.dataIndex) @@ -392,10 +391,11 @@ export default { this.getTable() }, - handleChangeAgency (value) { + async handleChangeAgency (value) { this.agencyName = this.$refs["myCascader"].getCheckedNodes()[0].label this.agencyId = this.agencyIdArray.length > 0 ? this.agencyIdArray[this.agencyIdArray.length - 1] : '' + await this.getPieChart() this.getPie() console.log(this.agencyIdArray) }, @@ -419,7 +419,7 @@ export default { if (code === 0) { this.demand.total = data.total; this.tableList = data.list - if (data.list.length > 0) { + if (data.list && data.list.length > 0) { this.demand.list = data.list.map((item) => { //楼院小组:issue; 项目立项:agency 事件上报:resi_event【也可控制点击查看时里边三个按钮的显示】 item.originShow = item.origin === 'issue' ? '楼院小组' : item.origin === 'agency' ? '项目立项' : '事件上报' diff --git a/src/views/modules/visual/components/screen-echarts-frame/index.vue b/src/views/modules/visual/components/screen-echarts-frame/index.vue index 66736e48..fc4511e8 100644 --- a/src/views/modules/visual/components/screen-echarts-frame/index.vue +++ b/src/views/modules/visual/components/screen-echarts-frame/index.vue @@ -2,8 +2,8 @@
- +