From 58ba2a2a398759ad29fbf13fbd0716082d5ba40d Mon Sep 17 00:00:00 2001 From: tianq Date: Wed, 19 Apr 2023 18:09:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9=E5=A4=87?= =?UTF-8?q?=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;