From bb73a699efae828f0a70748fd2c2010090fe2026 Mon Sep 17 00:00:00 2001 From: tianq Date: Tue, 11 Apr 2023 15:57:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/census/census-houseList.vue | 215 +++++++++++++----- src/views/modules/census/census-nineList.vue | 10 +- 2 files changed, 161 insertions(+), 64 deletions(-) diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue index 2fb5edebe..c9cde91df 100644 --- a/src/views/modules/census/census-houseList.vue +++ b/src/views/modules/census/census-houseList.vue @@ -4,11 +4,10 @@
- + { @@ -327,45 +343,51 @@ export default { } }, setPieData() { - // let data = [...this.pieData]; - // console.log('data', data); - let chartData = { - name: ['反骨', '反骨2', '反骨3', '反骨4'], - data: [{ value: 62, name: '反骨' }, { value: 44, name: '反骨2' }, { value: 123, name: '反骨3' }, { value: 232, name: '反骨4' }] - }; - this.chartData = chartData; - // chartData.name = data.map(item => item.agencyName); - // chartData.data = data.map(item => { - // return { value: item.count, id: item.agencyId, level: item.agencyLevel, name: item.agencyName }; - // }); - console.log('chartData', chartData); - this.iniPieChart(chartData); + let data = [...this.pieData.list]; + this.chartData.name = data.map(item => item.type); + this.chartData.data = data.map(item => { + return { + value: item.count, + name: item.type, + radio: item.count == 0 ? '0' : ((item.count / this.pieData.total) * 100).toFixed(2) + }; + }); + + console.log('chartData', this.chartData); + this.iniPieChart(this.chartData); }, setPieData2() { - console.log('dddddddddddd'); - // let data = [...this.pieData]; - // console.log('data', data); - let chartData = { - name: ['自住', '出租', '闲置', '未售出'], - data: [{ value: 62, name: '自住' }, { value: 243, name: '出租' }, { value: 243, name: '闲置' }, { value: 243, name: '未售出' }] - }; - this.chartData2 = chartData; - // chartData.name = data.map(item => item.agencyName); - // chartData.data = data.map(item => { - // return { value: item.count, id: item.agencyId, level: item.agencyLevel, name: item.agencyName }; - // }); - console.log('chartData', chartData); - this.iniPieChart2(chartData); + let data = [...this.pieData2.list]; + this.chartData2.name = data.map(item => item.type); + this.chartData2.data = data.map(item => { + return { + value: item.count, + name: item.type, + radio: item.count == 0 ? '0' : ((item.count / this.pieData2.total) * 100).toFixed(2) + }; + }); + + console.log('chartData', this.chartData2); + this.iniPieChart(this.chartData2); }, // 获取饼状图 async iniPieChart(chartData) { this.$refs.pieChart.clear(); // 获取pieChart配置 this.pieOption = { + tooltip: { + trigger: 'item', + formatter: '{b}
总数 : {c}
占比 : {d}%', + backgroundColor: 'rgb(134,134,134)', + borderColor: 'rgb(134,134,134)', + textStyle: { + color: '#fff' + } + }, color: this.color, title: { - text: '12345', - subtext: '房屋总数(分)', + text: this.pieData.total, + subtext: '总数', x: 'center', y: 'center', textStyle: { @@ -382,7 +404,21 @@ export default { series: [ { type: 'pie', - radius: ['60%', '85%'], + radius: ['65%', '80%'], + avoidLabelOverlap: false, + label: { + show: false, + position: 'center' + }, + tooltip: { + show: true + }, + + data: chartData.data + }, + { + type: 'pie', + radius: ['60%', '65%'], center: ['50%', '50%'], selectedMode: false, hoverAnimation: false, @@ -407,19 +443,32 @@ export default { } } }, - { type: 'pie', - radius: ['65%', '80%'], - avoidLabelOverlap: false, + radius: ['80%', '85%'], + center: ['50%', '50%'], + selectedMode: false, + hoverAnimation: false, + data: [{ value: 1, name: '' }], + itemStyle: { + color: '#f7f7f7' + }, label: { - show: false, - position: 'center' + show: false + }, + labelLine: { + show: false }, tooltip: { - show: true + show: false }, - data: chartData.data + animation: false, + cursor: 'auto', + emphasis: { + itemStyle: { + color: '#f7f7f7' + } + } } ] }; @@ -430,10 +479,19 @@ export default { // 获取pieChart配置 this.pieOption2 = { + tooltip: { + trigger: 'item', + formatter: '{b}
总数 : {c}
占比 : {d}%', + backgroundColor: 'rgb(134,134,134)', + borderColor: 'rgb(134,134,134)', + textStyle: { + color: '#fff' + } + }, color: this.color, title: { - text: '12345', - subtext: '房屋总数(分)', + text: this.pieData.total, + subtext: '总数', x: 'center', y: 'center', textStyle: { @@ -459,12 +517,39 @@ export default { tooltip: { show: true }, - z: 9999, + data: chartData.data }, { type: 'pie', - radius: ['60%', '85%'], + radius: ['60%', '65%'], + center: ['50%', '50%'], + selectedMode: false, + hoverAnimation: false, + data: [{ value: 1, name: '' }], + itemStyle: { + color: '#f7f7f7' + }, + label: { + show: false + }, + labelLine: { + show: false + }, + tooltip: { + show: false + }, + animation: false, + cursor: 'auto', + emphasis: { + itemStyle: { + color: '#f7f7f7' + } + } + }, + { + type: 'pie', + radius: ['80%', '85%'], center: ['50%', '50%'], selectedMode: false, hoverAnimation: false, @@ -577,9 +662,13 @@ export default { }, handleChangeAgency(val) { let obj = this.$refs['myCascader'].getCheckedNodes()[0].data; - console.log(obj); - this.formData.orgId = obj.agencyId; - this.formData.level = obj.level; + + let tmp = this.formData.orgId; + if (!tmp && typeof tmp != 'undefined' && tmp != 0 && tmp != null) { + this.orgId = this.formData.orgId; + } else { + this.orgId = this.agencyId; + } }, deepTree(arr) { if (Array.isArray(arr)) { @@ -690,7 +779,7 @@ export default { justify-content: space-between; align-items: flex-end; - margin-bottom:0px; + margin-bottom: 0px; margin-top: 0px; .census_searchcensus_box { align-items: flex-end; diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue index 616765192..69c81768b 100644 --- a/src/views/modules/census/census-nineList.vue +++ b/src/views/modules/census/census-nineList.vue @@ -456,7 +456,15 @@ export default { async handleExport() { const url = '/gov/org/enterprise/export'; - const { pageSize, pageNo, formData } = this; + + const { pageSize, pageNo } = this; + + let tmp = this.formData.orgId; + if (!tmp && typeof tmp != 'undefined' && tmp != 0) { + this.formData.orgId = ''; + this.orgType = ''; + } + axios({ url: window.SITE_CONFIG['apiURL'] + url, method: 'post',