Merge branch 'V20230915' of 192.168.60.201:root/dsk-operate-sys into V20230915

dsk-operate-ui/src/views/component/export-dialog.vue

@@ -30,7 +30,7 @@
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button @click="handleCancel()">取消</el-button>
-        <el-button type="primary" @click="handleEXCEL">确认导出</el-button>
+        <el-button type="primary" :loading="loading" @click="handleEXCEL">确认导出</el-button>
       </div>
     </el-dialog>
     <el-dialog :visible.sync="dialogExportVisible1" width="348px" append-to-body class="dialogExport1" @close="handleCancel2">
@@ -68,13 +68,15 @@ export default {
       exportTableData:[],
       forData:[],
       value:'',
-      title:this.data.title
+      title:this.data.title,
+      loading:false,
     }
   },
   watch: {
     'data.exportEXCEL':{
       handler(newValue, oldValue) {
         if(newValue === true){
+          this.loading = false;
           this.dialogExportVisible=false;
           this.dialogExportVisible1=true;
         }
@@ -91,6 +93,7 @@ export default {
   },
   methods: {
     handleEXCEL(){
+      this.loading = true;
       this.$nextTick(() => {
         this.$emit('clickEXCEL',this.value,this.title)
       })

dsk-operate-ui/src/views/detail/groupAccount/component/members.vue

@@ -302,8 +302,8 @@
           this.isSkeleton = false
           this.tableLoading = false
           if(res.code === 200){
-            this.tableData = res.data.list
-            this.tableDataTotal = res.data.total
+            this.tableData = res.rows
+            this.tableDataTotal = res.total
           }else {
             this.tableData = []
           }
@@ -498,6 +498,10 @@
         this.exportData.dialogExportVisible=true;
       },
       clickEXCEL(value,title) {
+        if(this.tableData.length === 0){
+          this.$message.error('当前信息列表数据为空，请重新筛选数据');
+          return
+        }
         if(value > 2000){
           return
         }

dsk-operate-ui/src/views/detail/groupAccount/component/performance.vue

@@ -315,6 +315,10 @@
         this.exportData.dialogExportVisible=true;
       },
       clickEXCEL(value,title) {
+        if(this.tableData.length === 0){
+          this.$message.error('当前信息列表数据为空，请重新筛选数据');
+          return
+        }
         if(value > 2000){
           return
         }

dsk-operate-ui/src/views/detail/groupAccount/component/zbxmmx.vue

@@ -291,6 +291,10 @@
         this.exportData.dialogExportVisible=true;
       },
       clickEXCEL(value,title) {
+        if(this.tableData.length === 0){
+          this.$message.error('当前信息列表数据为空，请重新筛选数据');
+          return
+        }
         if(value > 2000){
           return
         }

dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue

@@ -1001,6 +1001,10 @@ export default {
       this.exportData.dialogExportVisible=true;
     },
     clickEXCEL(value,title) {
+      if(this.tableData.length === 0){
+        this.$message.error('当前信息列表数据为空，请重新筛选数据');
+        return
+      }
       if(value > 2000){
         return
       }

dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue

@@ -3044,6 +3044,10 @@ export default {
       this.exportData.dialogExportVisible=true;
     },
     clickEXCEL(value,title) {
+      if(this.tableData.length === 0){
+        this.$message.error('当前信息列表数据为空，请重新筛选数据');
+        return
+      }
       if(value > 2000){
         return
       }

dsk-operate-ui/src/views/macro/urban/index.vue

@@ -848,6 +848,10 @@ export default {
       this.exportData.dialogExportVisible=true;
     },
     clickEXCEL(value,title) {
+      if(this.tableData.length === 0){
+        this.$message.error('当前信息列表数据为空，请重新筛选数据');
+        return
+      }
       if(value > 2000){
         return
       }

dsk-operate-ui/src/views/radar/components/MajorProject/index.vue

@@ -686,6 +686,10 @@ export default {
       this.exportData.dialogExportVisible=true;
     },
     clickEXCEL(value,title) {
+      if(this.tableData.length === 0){
+        this.$message.error('当前信息列表数据为空，请重新筛选数据');
+        return
+      }
       if(value > 2000){
         return
       }