Merge branch 'test' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov 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/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>