Merge branch 'dev' into test

4 years ago · e8ae488b92
3 changed files with 2 additions and 19714 deletions
--- a/.gitignore
+++ b/.gitignore
@ -15,4 +15,5 @@ hs_err_pid*
 node_modules
 dist
 epmet-oper
+package-lock.json
 .idea/
--- a/package-lock.json
+++ b/package-lock.json
--- 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) {