diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue index 20059300..45d0e85f 100644 --- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue +++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanfuwufenxi.vue @@ -309,6 +309,7 @@ export default { opacity: 1, } } + this.demand.pageNo = 1 this.getTable(element.code) } else { element.label = { diff --git a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue index 2d0b7025..626673f0 100644 --- a/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue +++ b/src/views/modules/visual/communityGovern/shijianfenlei/shijianfenleifenxi.vue @@ -240,9 +240,7 @@ export default { categoryCode: '', tableOrgId: '', eventId: '', - processStatus: '', - isFirstLoadPie: true, // 首次加载显示全部数据,无联动 - isFirstLoadTable: true, // 首次加载显示全部数据,无联动 + processStatus: '' } }, // mixins: [animate] @@ -261,12 +259,6 @@ export default { // 获取服务器数据 await this.handleChangeDate(this.dataType) - if (this.isFirstLoadPie) { - await this.getGridPieData() - } - if (this.isFirstLoadTable) { - await this.getTable() - } this.dataLoading = false }, @@ -364,7 +356,6 @@ export default { this.$refs.pieChart.hideLoading() } if (code === 0) { - this.categoryCode = data[0].categoryCode this.pieData = [] data.forEach((item, index) => { let ob = { @@ -395,7 +386,7 @@ export default { orgType: this.orgType, queryStartTime: this.queryStartTime, queryEndTime: this.queryEndTime, - categoryCode: this.isFirstLoadPie ? '' : this.categoryCode + categoryCode: this.categoryCode } const { data, code, msg } = await requestPost(url, params) if (this.$refs.gridPieChart) { @@ -429,7 +420,7 @@ export default { queryStartTime: this.queryStartTime, queryEndTime: this.queryEndTime, processStatus: this.processStatus, // 处理状态,processing,closed_case。可为空,为空查询所有状态的事件列表 - categoryCode: this.isFirstLoadTable ? '' : this.categoryCode, + categoryCode: this.categoryCode, pageNo: this.demand.pageNo, pageSize: this.demand.pageSize, } @@ -496,18 +487,18 @@ export default { 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 - } + // 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(maxIndex) + this.clickPie() // this.clickPie(maxIndex) let fun = function (params) { _that.clickPie(params.dataIndex) @@ -545,11 +536,9 @@ export default { this.pieOption.series[1].data = this.pieData // this.$refs.pieChart.hideLoading() this.$refs.pieChart.setOption(this.pieOption) - if (!this.isFirstLoadPie) { - this.tableOrgId = '' - this.demand.pageNo = 1 - this.getGridPieData() - } + this.tableOrgId = '' + this.demand.pageNo = 1 + this.getGridPieData() }, @@ -579,19 +568,19 @@ export default { this.gridPieData.forEach((item, index) => { this.gridPieTotal = this.gridPieTotal + item.value - if (item.value > maxValue) { - maxValue = item.value - maxIndex = index - item.selected = true - } else if (index !== 0) { - item.selected = false - } + // if (item.value > maxValue) { + // maxValue = item.value + // maxIndex = index + // item.selected = true + // } else if (index !== 0) { + // item.selected = false + // } }) this.gridPieOption.title.text = this.gridPieTotal // this.gridPieOption.legend.bottom = 50 - this.clickGridPie(maxIndex) + this.clickGridPie() // this.clickGridPie(maxIndex) let fun = function (params) { _that.clickGridPie(params.dataIndex) @@ -629,12 +618,8 @@ export default { this.gridPieOption.series[1].data = this.gridPieData // this.$refs.pieChart.hideLoading() this.$refs.gridPieChart.setOption(this.gridPieOption) - if (!this.isFirstLoadTable) { - this.demand.pageNo = 1 - this.getTable() - } - this.isFirstLoadPie = false - this.isFirstLoadTable = false + this.demand.pageNo = 1 + this.getTable() }, handleChangeAgency (value) {