Merge branch 'dev' into test

.gitignore

@@ -15,4 +15,5 @@ hs_err_pid*
 node_modules
 dist
 epmet-oper
+package-lock.json
 .idea/

src/views/modules/base/community/community.vue

@@ -276,7 +276,8 @@ export default {
 
 .div_table {
   margin-left: 15px;
-  width: calc(100vw - 550px);
+  flex: 1;
+  // width: calc(100vw - 550px);
   background-color: #ffffff;
   border-radius: 5px;
   padding: 10px;

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: {
@@ -322,7 +323,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 +342,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)
@@ -575,6 +582,7 @@ export default {
 
     handleSelectChange (val) {
       this.getList(this.agencyId);
+      this.getCateCount(this.agencyId)
     },
     pageSizeChangeHandleNew (val) {
       this.pageNo = 1;

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) {

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>