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

src/views/modules/base/resi.vue

@@ -463,7 +463,7 @@ export default {
         url: window.SITE_CONFIG['apiURL'] + '/epmetuser/icresiuser/importExcel',
         method: 'post',
         data: formData,
-        timeout: '300000',
+        timeout: '900000',
         responseType: 'blob'
       })
         .then((res) => {

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)
@@ -573,6 +580,7 @@ export default {
 
     handleSelectChange (val) {
       this.getList(this.agencyId);
+      this.getCateCount(this.agencyId)
     },
     pageSizeChangeHandleNew (val) {
       this.pageNo = 1;