Merge branch 'dev-statics'

src/views/modules/shequzhili/statics/cEvent.vue

@@ -42,7 +42,7 @@
                     size="small">总计</el-button>
         <el-button @click="exportHandle"
                     class="diy-button--reset"
-                    size="small">导出</el-button>
+                    size="small" :loading="exportLoading">导出</el-button>
       </div>
       <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border  style="width: 100%"
       :height="tableHeight">
@@ -103,6 +103,7 @@ export default {
         deleteIsBatch: true,
         exportURL: '/data/stats/factAgencyUserHouseDaily/export'
       },
+      exportLoading: false,
       dataListLoading: false,
       optionsA: [],
       totalVisible: false,
@@ -179,6 +180,8 @@ export default {
     },
     exportHandle () {
       const url = '/data/aggregator/org/orgProjectDetailList/export'
+      this.dataForm.type = 1
+      this.exportLoading = true
       this.$http({
         method: 'Post',
         url,
@@ -199,9 +202,12 @@ export default {
           aLink.click()
           document.body.removeChild(aLink) //下载完成移除元素
           window.URL.revokeObjectURL(url) //释放掉blob对象
+          // this.exportLoading = false
         } else this.$message.error('下载失败')
+        this.exportLoading = false
       }).catch(err => {
         console.log('err', err)
+        this.exportLoading = false
         return this.$message.error('网络错误')
       })
     },

src/views/modules/shequzhili/statics/gridEvent.vue

@@ -46,7 +46,7 @@
                     size="small">总计</el-button> -->
         <el-button @click="exportHandle"
                     class="diy-button--reset"
-                    size="small">导出</el-button>
+                    size="small" :loading="exportLoading">导出</el-button>
       </div>
       <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border style="width: 100%"
       :height="tableHeight">
@@ -103,6 +103,7 @@ export default {
         deleteIsBatch: true,
         exportURL: '/data/stats/factAgencyUserHouseDaily/export'
       },
+      exportLoading: false,
       dataListLoading: false,
       dataList: [],
       optionsA: [],
@@ -184,6 +185,7 @@ export default {
       this.getTableList();
     },
     exportHandle () {
+      this.exportLoading = true
       const url = '/data/aggregator/org/memberProjectInfoList/export'
       this.$http({
         method: 'Post',
@@ -205,9 +207,12 @@ export default {
           aLink.click()
           document.body.removeChild(aLink) //下载完成移除元素
           window.URL.revokeObjectURL(url) //释放掉blob对象
+          // this.exportLoading = false
         } else this.$message.error('下载失败')
+        this.exportLoading = false
       }).catch(err => {
         console.log('err', err)
+        this.exportLoading = false
         return this.$message.error('网络错误')
       })
     },