Merge branch 'master' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov

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)
     },
   },
 };