From 98be6a386c4b3d1a1752ad486cd367129a643e08 Mon Sep 17 00:00:00 2001 From: tianq Date: Wed, 19 Apr 2023 18:09:26 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=A4=87=E4=B8=AA=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/census/census-accountActiveList.vue | 7 ++++--- src/views/modules/census/census-accountList.vue | 3 ++- src/views/modules/census/census-houseList.vue | 10 +++++----- src/views/modules/census/census-nineList.vue | 1 + src/views/modules/census/census-orgStatusList.vue | 5 +++-- src/views/modules/census/census-residentList.vue | 14 ++++++++------ src/views/modules/communityParty/dyhx/party.vue | 4 +++- 7 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/views/modules/census/census-accountActiveList.vue b/src/views/modules/census/census-accountActiveList.vue index 9987471cc..1ad37e0fc 100644 --- a/src/views/modules/census/census-accountActiveList.vue +++ b/src/views/modules/census/census-accountActiveList.vue @@ -67,10 +67,10 @@ :height="maxTableHeight" > - - + + - + - +
-
{{ index }}{{ item.name }}
+
{{ item.name }}
{{ item.value }}
{{ item.radio }}%
@@ -122,7 +122,7 @@ style="width: 100%;" :height="maxTableHeight" > - + @@ -276,6 +276,7 @@ export default { this.orgId = this.optionData.agencyId; this.orgIdPath = this.optionData.orgIdPath; this.orgType = this.optionData.level; + this.handleSearch(); }, show(row) { this.dialogVisible = true; @@ -412,7 +413,7 @@ export default { radio: item.count == 0 ? '0' : ((item.count / this.pieData.total) * 100).toFixed(2) }; }); - + this.$forceUpdate(); this.iniPieChart(this.chartData); }, setPieData2() { @@ -432,7 +433,7 @@ export default { radio: item.count == 0 ? '0' : ((item.count / this.pieData2.total) * 100).toFixed(2) }; }); - + this.$forceUpdate(); this.iniPieChart2(this.chartData2); }, // 获取饼状图 @@ -954,5 +955,4 @@ export default { } } } - diff --git a/src/views/modules/census/census-nineList.vue b/src/views/modules/census/census-nineList.vue index 75cec240f..f46418def 100644 --- a/src/views/modules/census/census-nineList.vue +++ b/src/views/modules/census/census-nineList.vue @@ -218,6 +218,7 @@ export default { else this.formData[n] = ''; } this.orgType = ''; + this.handleSearch(); }, show(row) { this.dialogVisible = true; diff --git a/src/views/modules/census/census-orgStatusList.vue b/src/views/modules/census/census-orgStatusList.vue index f6757a57b..e538903c8 100644 --- a/src/views/modules/census/census-orgStatusList.vue +++ b/src/views/modules/census/census-orgStatusList.vue @@ -113,13 +113,13 @@ - + - + - + @@ -201,7 +201,7 @@ export default { pieInitState2: false, pieOption: [], pieOption2: [], - color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'], + color: ['#3C94FE', '#F0D915', '#6FC364', '#FEB349', '#F44230', '#A17AFA', '#22C1C3', '#A19FFF', '#FE6252', '#5DC7F0'], chartData: [], chartData2: [], pieData: [], @@ -246,6 +246,7 @@ export default { else this.formData[n] = ''; } this.orgType = ''; + this.handleSearch(); }, show(row) { this.dialogVisible = true; @@ -758,8 +759,8 @@ export default { cursor: pointer; min-width: 100px; display: flex; - margin-top: 10px; - margin-bottom: 10px; + margin-top: 10px; + margin-bottom: 10px; margin-right: 25px; width: 160px; .kuai { @@ -840,7 +841,9 @@ export default { } .div_table { padding: 30px !important; - .table{margin-top: 16px!important;} + .table { + margin-top: 16px !important; + } } .div_table_title { margin-top: -10px; @@ -881,5 +884,4 @@ export default { } } } - diff --git a/src/views/modules/communityParty/dyhx/party.vue b/src/views/modules/communityParty/dyhx/party.vue index c4f8a07cd..46555b69e 100644 --- a/src/views/modules/communityParty/dyhx/party.vue +++ b/src/views/modules/communityParty/dyhx/party.vue @@ -218,7 +218,8 @@ export default { pieInitState2: false, pieOption: [], pieOption2: [], - color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'], + color: ['#3C94FE', '#F0D915', '#6FC364', '#FEB349', '#F44230', '#A17AFA', '#22C1C3', '#A19FFF', '#FE6252', '#5DC7F0'], + // color: ['#3C94FE', '#A17AFA', '#A19FFF', '#22C1C3', '#6FC364', '#F0D915', '#FEB349', '#FE6252', '#F44230', '#5DC7F0'], chartData: [], chartData2: [], pieData: [], @@ -300,6 +301,7 @@ export default { if (typeof this.formData[n] == 'object') this.formData[n] = []; else this.formData[n] = ''; } + this.handleSearch(); }, handleChangeAgency(val) { let obj = this.$refs['myCascader'].getCheckedNodes()[0].data; From f810b5bf8d07166bab98911be7e62b7bbb0a8137 Mon Sep 17 00:00:00 2001 From: tianqian <277562116@qq.com> Date: Wed, 19 Apr 2023 19:26:02 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E7=BB=9F=E8=AE=A1legend?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/census/census-houseList.vue | 10 ++-- .../modules/census/census-residentList.vue | 47 ++++++++++--------- .../modules/communityParty/dyhx/party.vue | 14 +++--- 3 files changed, 40 insertions(+), 31 deletions(-) diff --git a/src/views/modules/census/census-houseList.vue b/src/views/modules/census/census-houseList.vue index a0decafb1..ef7102252 100644 --- a/src/views/modules/census/census-houseList.vue +++ b/src/views/modules/census/census-houseList.vue @@ -62,7 +62,7 @@
-
+
{{ item.name }}
@@ -91,7 +91,7 @@
-
+
@@ -242,7 +242,9 @@ export default { orgId: '', purpose: '', rentFlag: '', - orgIdPath: '' + orgIdPath: '', + chartDataData:[], + chartData2Data:[] }; }, computed: { @@ -413,6 +415,7 @@ export default { radio: item.count == 0 ? '0' : ((item.count / this.pieData.total) * 100).toFixed(2) }; }); + this.chartDataData=this.chartData.data ; this.$forceUpdate(); this.iniPieChart(this.chartData); }, @@ -433,6 +436,7 @@ export default { radio: item.count == 0 ? '0' : ((item.count / this.pieData2.total) * 100).toFixed(2) }; }); + this.chartData2Data=this.chartData2.data ; this.$forceUpdate(); this.iniPieChart2(this.chartData2); }, diff --git a/src/views/modules/census/census-residentList.vue b/src/views/modules/census/census-residentList.vue index a6368f6a3..68b23a91a 100644 --- a/src/views/modules/census/census-residentList.vue +++ b/src/views/modules/census/census-residentList.vue @@ -40,7 +40,7 @@
-
+
{{ item.name }}
@@ -69,7 +69,7 @@
-
+
{{ item.name }}
@@ -211,7 +211,9 @@ export default { code: '', pieDatatotal: 0, pieDatatotal2: 0, - codeType: 'education' + codeType: 'education', + chartDataData: [], + chartData2Data: [] }; }, computed: { @@ -362,34 +364,35 @@ export default { } }, setPieData() { - let data = [...this.pieData]; - this.pieDatatotal = data - .map(item => item.totalResi) - .reduce(function(prev, cur, index, arr) { - console.log(prev, cur, index); - return prev + cur; - }); + let data = [...this.pieData.list]; + // this.pieDatatotal = data + // .map(item => item.totalResi) + // .reduce(function(prev, cur, index, arr) { + // console.log(prev, cur, index); + // return prev + cur; + // }); this.chartData.name = data.map(item => item.codeName); this.chartData.data = data.map(item => { return { value: item.totalResi, name: item.codeName, code: item.code, - radio: item.totalResi == 0 ? '0' : ((item.totalResi / this.pieDatatotal) * 100).toFixed(2) + radio: item.totalResi == 0 ? '0' : ((item.totalResi / this.pieData.total) * 100).toFixed(2) }; }); + this.chartDataData = this.chartData.data; console.log('chartData', this.chartData); this.iniPieChart(this.chartData); }, setPieData2() { - let data = [...this.pieData2]; + let data = [...this.pieData2.list]; - this.pieDatatotal2 = data - .map(item => item.totalResi) - .reduce(function(prev, cur, index, arr) { - console.log(prev, cur, index); - return prev + cur; - }); + // this.pieDatatotal2 = data + // .map(item => item.totalResi) + // .reduce(function(prev, cur, index, arr) { + // console.log(prev, cur, index); + // return prev + cur; + // }); this.chartData2.name = data.map(item => item.codeName); this.chartData2.data = data.map(item => { @@ -397,10 +400,10 @@ export default { value: item.totalResi, name: item.codeName, code: item.code, - radio: item.totalResi == 0 ? '0' : ((item.totalResi / this.pieDatatotal2) * 100).toFixed(2) + radio: item.totalResi == 0 ? '0' : ((item.totalResi / this.pieData2.total) * 100).toFixed(2) }; }); - + this.chartData2Data = this.chartData2.data; console.log('chartData', this.chartData2); this.iniPieChart2(this.chartData2); }, @@ -420,7 +423,7 @@ export default { }, color: this.color, title: { - text: this.pieDatatotal, + text: this.pieData.total, subtext: '总数', x: 'center', y: 'center', @@ -530,7 +533,7 @@ export default { }, color: this.color, title: { - text: this.pieDatatotal2, + text: this.pieData2.total, subtext: '总数', x: 'center', y: 'center', diff --git a/src/views/modules/communityParty/dyhx/party.vue b/src/views/modules/communityParty/dyhx/party.vue index 46555b69e..87f84974f 100644 --- a/src/views/modules/communityParty/dyhx/party.vue +++ b/src/views/modules/communityParty/dyhx/party.vue @@ -37,7 +37,7 @@
-
+
{{ item.name }}
@@ -103,7 +103,7 @@
-
+
{{ item.name }}
@@ -269,7 +269,9 @@ export default { pieEduOptions: null, formData: { orgId: '' - } + }, + chartDataData: [], + chartData2Data: [] }; }, computed: { @@ -671,7 +673,7 @@ export default { console.log(prev, cur, index); return prev + cur; }); - console.log('this.pieDatatotal',this.pieDatatotal); + console.log('this.pieDatatotal', this.pieDatatotal); this.chartData.name = data.map(item => item.value); this.chartData.data = data.map(item => { return { @@ -681,6 +683,7 @@ export default { radio: item.radio }; }); + this.chartDataData = this.chartData.data; console.log('chartData', this.chartData); this.$forceUpdate(); this.initAgeCharts(this.chartData); @@ -705,7 +708,7 @@ export default { radio: item.radio }; }); - + this.chartData2Data = this.chartData2.data; console.log('chartData', this.chartData2); this.$forceUpdate(); this.initEduCharts(this.chartData2); @@ -1026,5 +1029,4 @@ export default { } } } - From 8720582ff0c2be5cc51319ffb43c20527874db30 Mon Sep 17 00:00:00 2001 From: tianqian <277562116@qq.com> Date: Wed, 19 Apr 2023 19:28:35 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/census/census-accountList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue index 5aaa0bde7..45bd20e33 100644 --- a/src/views/modules/census/census-accountList.vue +++ b/src/views/modules/census/census-accountList.vue @@ -126,7 +126,7 @@ margin-top: -30px; margin-bottom: 10px;" > - 导出 + 导出
@@ -498,7 +499,7 @@ export default { }, async getPiesubData(orgId, orgType) { // staffLoginLog/streetTotal - this.orgType = orgType; + console.log(orgType); let url = ''; if (orgType == 'street') { @@ -513,7 +514,7 @@ export default { console.log('orgType', orgType); // district street community // 1 是区县 2是镇街 3是社区 4是下级 - switch (orgType) { + switch (this.orgType) { case 'district': this.title = '区县级账号登录情况'; // url = '/gov/org/staffLoginLog/district-count'; @@ -672,12 +673,12 @@ export default { console.log('param', param); if (param.data.level != 'community') { - // if (param.data.level == 'district') { - // orgType = 'street'; - // } - // if (param.data.level == 'street') { - // orgType = 'community'; - // } + if (param.data.level == 'district') { + this.orgType = 'street'; + } + if (param.data.level == 'street') { + this.orgType = 'community'; + } this.pageNo = 1; this.getPiesubData(param.data.id, param.data.level); From e92c8cbfbcb9789b82a764036dd70009a678e365 Mon Sep 17 00:00:00 2001 From: tianq Date: Thu, 20 Apr 2023 10:31:12 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E6=95=B0=E6=8D=AE10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/census/census-accountList.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue index aea098281..7a17b01af 100644 --- a/src/views/modules/census/census-accountList.vue +++ b/src/views/modules/census/census-accountList.vue @@ -377,7 +377,7 @@ export default { endDate: this.formData.endDate, isPage: true, pageNo: this.pageNo, - pageSize: 10 + pageSize: this.pageSize, }; this.tableLoading2 = true; const { data, code, msg } = await requestPost(url, param); @@ -455,7 +455,7 @@ export default { const { pageSize, pageNo, formData } = this; const { data, code, msg } = await requestPost(url, { - pageSize, + pageSize:10, pageNo, isPage: true, dataRange: 'exclude_zero', From 5172e8e395a72098f3449e842246846549c86ba3 Mon Sep 17 00:00:00 2001 From: tianq Date: Thu, 20 Apr 2023 10:35:05 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=8A=A0=E6=BB=9A=E5=8A=A8=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/census/census-accountList.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/views/modules/census/census-accountList.vue b/src/views/modules/census/census-accountList.vue index 7a17b01af..6b41569ec 100644 --- a/src/views/modules/census/census-accountList.vue +++ b/src/views/modules/census/census-accountList.vue @@ -124,11 +124,11 @@
导出
- +