From b5719c1fc93b3d5859df2d2553d91cf8c68f8520 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 30 Mar 2022 10:49:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=96=AB=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/router/index.js b/src/router/index.js index e7888582..a64bfe14 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -312,6 +312,13 @@ router.beforeEach((to, from, next) => { url: "visual/heart/index", children: [], }, + { + icon: "icon-setting", + id: "2221321fefefaewfa122223", + name: "疫情防控", + url: "", + children: [], + }, { icon: "icon-setting", id: "44rq22222q2222", From b26c97fe6dc0fa7dc979662a3945e31c2ca13660 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Wed, 30 Mar 2022 15:56:13 +0800 Subject: [PATCH 2/4] dd --- src/views/modules/visual/communityParty/party.vue | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue index 7e555137..113cf3b2 100644 --- a/src/views/modules/visual/communityParty/party.vue +++ b/src/views/modules/visual/communityParty/party.vue @@ -157,6 +157,8 @@ export default { visibleLoading: true, agencyId: '', orgType: '', + ageCode: '', + eduCode: '', pageNo: 1, pageSize: 10, agePageNo: 1, @@ -489,6 +491,7 @@ export default { } }); + this.ageCode = isClick && _code || '' this.pieAgeOptions.title.text = this.ageTotalCount this.pieAgeOptions.series[1].data = this.ageItem // this.$refs.pieChart.hideLoading() @@ -497,6 +500,7 @@ export default { const _arr = this.selectAgency[this.selectAgency.length - 1].split('-') const orgType = _arr[1] !== 'grid' ? 'agency': 'grid' console.log('zlcm---isClick', isClick) + this.agePageNo = 1 this.getAgeList(_arr[0], orgType, isClick && _code || '') } this.noInit = true @@ -544,6 +548,7 @@ export default { } }); + this.eduCode = isClick && _code || '' this.pieEduOptions.title.text = this.eduTotalCount this.pieEduOptions.series[1].data = this.eduItem // this.$refs.pieChart.hideLoading() @@ -551,7 +556,7 @@ export default { if (this.noEduInit) { const _arr = this.selectAgency[this.selectAgency.length - 1].split('-') const orgType = _arr[1] !== 'grid' ? 'agency': 'grid' - + this.pageNo = 1 this.getEduList(_arr[0], orgType, isClick && _code || '') } this.noEduInit = true @@ -757,20 +762,20 @@ export default { pageSizeChangeHandleAge(val) { this.agePageNo = 1 this.agePageSize = val - this.getAgeList(this.agencyId, this.orgType) + this.getAgeList(this.agencyId, this.orgType, this.ageCode) }, pageCurrentChangeHandleAge (val) { this.agePageNo = val - this.getAgeList(this.agencyId, this.orgType) + this.getAgeList(this.agencyId, this.orgType, this.ageCode) }, pageSizeChangeHandleNew(val) { this.pageNo = 1; this.pageSize = val; - this.getEduList(this.agencyId, this.orgType) + this.getEduList(this.agencyId, this.orgType, this.eduCode) }, pageCurrentChangeHandleNew(val) { this.pageNo = val; - this.getEduList(this.agencyId, this.orgType) + this.getEduList(this.agencyId, this.orgType, this.eduCode) }, }, }; From ea773405ed6a2659d0ac310d766925ef292dc2b6 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 1 Apr 2022 16:52:05 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/importRecord/index.vue | 49 +++++++++++++----------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/src/views/modules/importRecord/index.vue b/src/views/modules/importRecord/index.vue index 75557687..0c484b2f 100644 --- a/src/views/modules/importRecord/index.vue +++ b/src/views/modules/importRecord/index.vue @@ -1,12 +1,11 @@