From bcdde144f91ba05e4eb950db59788618aa4f91e2 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 24 Feb 2022 13:51:51 +0800
Subject: [PATCH 1/4] dd

---
 src/views/modules/visual/communityParty/party.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue
index 8d4ab043..7e555137 100644
--- a/src/views/modules/visual/communityParty/party.vue
+++ b/src/views/modules/visual/communityParty/party.vue
@@ -760,7 +760,7 @@ export default {
       this.getAgeList(this.agencyId, this.orgType)
     },
     pageCurrentChangeHandleAge (val) {
-      this.agePageSize = val
+      this.agePageNo = val
       this.getAgeList(this.agencyId, this.orgType)
     },
     pageSizeChangeHandleNew(val) {

From 7740e61e184438b82d1876fa1e151c2f6b22ad0d Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 24 Feb 2022 14:12:34 +0800
Subject: [PATCH 2/4] dd

---
 src/views/modules/visual/measure/volunteer.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/visual/measure/volunteer.vue b/src/views/modules/visual/measure/volunteer.vue
index 02e93ecd..1e17f225 100644
--- a/src/views/modules/visual/measure/volunteer.vue
+++ b/src/views/modules/visual/measure/volunteer.vue
@@ -57,13 +57,13 @@
                 <div class="card-count-item">
                   <div class="card-count-content">
                     <div class="card-count-num">{{ vInfo.partyServiceTotal || 0 }}</div>
-                    <div class="card-count-label">党员数量</div>
+                    <div class="card-count-label">党员服务次数</div>
                   </div>
                 </div>
                 <div class="card-count-item">
                   <div class="card-count-content">
                     <div class="card-count-num">{{ vInfo.resiServiceTotal || 0 }}</div>
-                    <div class="card-count-label">居民数量</div>
+                    <div class="card-count-label">居民服务次数</div>
                   </div>
                 </div>
               </div>

From 9d20b0c859eb88421727588a5c5955b56530b5f3 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 24 Feb 2022 14:48:14 +0800
Subject: [PATCH 3/4] dd

---
 src/views/modules/visual/communityParty/community.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index 816af10f..985ebba0 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -322,7 +322,10 @@ export default {
       const url = "/heart/icpartyactivity/statistics"
       // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list"
       let params = {
-        agencyId
+        agencyId,
+        serviceMatter: this.serviceMatter == 'all' ? '' : this.serviceMatter,
+        startTime: this.timeRange && this.timeRange[0] || '',
+        endTime: this.timeRange && this.timeRange[1] || ''
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -338,7 +341,10 @@ export default {
       const url = "/heart/icpartyunit/typestatistics"
       // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list"
       let params = {
-        agencyId
+        agencyId,
+        // serviceMatter: this.serviceMatter == 'all' ? '' : this.serviceMatter,
+        // startTime: this.timeRange && this.timeRange[0] || '',
+        // endTime: this.timeRange && this.timeRange[1] || ''
       }
 
       const { data, code, msg } = await requestPost(url, params)

From dfb611f770fdf9dde1c1d054a8a43dfe52cfafa5 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 24 Feb 2022 15:33:10 +0800
Subject: [PATCH 4/4] dd

---
 src/views/modules/visual/communityParty/community.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index 985ebba0..b550259b 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -233,6 +233,7 @@ export default {
     timeRange (val) {
       console.log('val-www', val)
       this.getList(this.agencyId);
+      this.getCateCount(this.agencyId)
     }
   },
   methods: {
@@ -581,6 +582,7 @@ export default {
 
     handleSelectChange (val) {
       this.getList(this.agencyId);
+      this.getCateCount(this.agencyId)
     },
     pageSizeChangeHandleNew (val) {
       this.pageNo = 1;