【功能修复】全局：移除多余的 exportLoading 变量；修复角色导出接口不正确

YunaiV · YunaiV · commit 7e3f3102a60a · 2024-07-27T15:23:47.000+08:00
diff --git a/src/api/system/role.js b/src/api/system/role.js
@@ -67,7 +67,7 @@ export function delRole(roleId) {
 // 导出角色
 export function exportRole(query) {
   return request({
-    url: '/system/role/export',
+    url: '/system/role/export-excel',
     method: 'get',
     params: query,
     responseType: 'blob'
diff --git a/src/views/infra/apiAccessLog/index.vue b/src/views/infra/apiAccessLog/index.vue
@@ -202,8 +202,9 @@ export default {
         return exportApiAccessLogExcel(params);
       }).then(response => {
         this.$download.excel(response, 'API 访问日志.xls');
+      }).finally(() => {
         this.exportLoading = false;
-      }).catch(() => {});
+      });
     }
   }
 };
diff --git a/src/views/infra/apiErrorLog/index.vue b/src/views/infra/apiErrorLog/index.vue
@@ -220,8 +220,9 @@ export default {
         return exportApiErrorLogExcel(params);
       }).then(response => {
         this.$download.excel(response, 'API 错误日志.xls');
+      }).finally(() => {
         this.exportLoading = false;
-      }).catch(() => {});
+      });
     }
   }
 };
diff --git a/src/views/infra/config/index.vue b/src/views/infra/config/index.vue
@@ -254,8 +254,9 @@ export default {
           return exportConfig(params);
         }).then(response => {
           this.$download.excel(response, '参数配置.xls');
-          this.exportLoading = false;
-      }).catch(() => {});
+      }).finally(() => {
+        this.exportLoading = false;
+      });
     },
   }
 };
diff --git a/src/views/infra/job/index.vue b/src/views/infra/job/index.vue
@@ -366,12 +366,13 @@ export default {
     handleExport() {
       const queryParams = this.queryParams;
       this.$modal.confirm("是否确认导出所有定时任务数据项?").then(() => {
-          this.exportLoading = true;
-          return exportJob(queryParams);
-        }).then(response => {
-          this.$download.excel(response, '定时任务.xls');
-          this.exportLoading = false;
-      }).catch(() => {});
+        this.exportLoading = true;
+        return exportJob(queryParams);
+      }).then(response => {
+        this.$download.excel(response, '定时任务.xls');
+      }).finally(() => {
+        this.exportLoading = false;
+      });
     }
   }
 };
diff --git a/src/views/mall/product/brand/index.vue b/src/views/mall/product/brand/index.vue
@@ -119,8 +119,6 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 导出遮罩层
-      exportLoading: false,
       // 显示搜索条件
       showSearch: true,
       // 总条数
diff --git a/src/views/mall/product/property/value.vue b/src/views/mall/product/property/value.vue
@@ -222,18 +222,6 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {
       });
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
-        this.exportLoading = true;
-        return exportData(queryParams);
-      }).then(response => {
-        this.$download.excel(response, '字典数据.xls');
-        this.exportLoading = false;
-      }).catch(() => {
-      });
     }
   }
 };
diff --git a/src/views/mall/product/spu/index.vue b/src/views/mall/product/spu/index.vue
@@ -240,8 +240,6 @@ export default {
       categoryList: [],
       // 遮罩层
       loading: true,
-      // 导出遮罩层
-      exportLoading: false,
       // 显示搜索条件
       showSearch: true,
       // 总条数
diff --git a/src/views/mall/promotion/coupon/index.vue b/src/views/mall/promotion/coupon/index.vue
@@ -81,8 +81,6 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 导出遮罩层
-      exportLoading: false,
       // 显示搜索条件
       showSearch: true,
       // 总条数
diff --git a/src/views/mall/promotion/coupon/template/index.vue b/src/views/mall/promotion/coupon/template/index.vue
@@ -186,8 +186,6 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 导出遮罩层
-      exportLoading: false,
       // 显示搜索条件
       showSearch: true,
       // 总条数
diff --git a/src/views/mall/promotion/discountActivity/index.vue b/src/views/mall/promotion/discountActivity/index.vue
@@ -163,8 +163,6 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 导出遮罩层
-      exportLoading: false,
       // 显示搜索条件
       showSearch: true,
       // 总条数
diff --git a/src/views/mall/promotion/rewardActivity/index.vue b/src/views/mall/promotion/rewardActivity/index.vue
@@ -136,8 +136,6 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 导出遮罩层
-      exportLoading: false,
       // 显示搜索条件
       showSearch: true,
       // 总条数
diff --git a/src/views/mall/promotion/seckill/config/index.vue b/src/views/mall/promotion/seckill/config/index.vue
@@ -75,8 +75,6 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 导出遮罩层
-      exportLoading: false,
       // 显示搜索条件
       showSearch: true,
       // 总条数
diff --git a/src/views/mall/trade/afterSale/index.vue b/src/views/mall/trade/afterSale/index.vue
@@ -111,8 +111,6 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 导出遮罩层
-      exportLoading: false,
       // 显示搜索条件
       showSearch: true,
       // 总条数
diff --git a/src/views/mall/trade/order/index.vue b/src/views/mall/trade/order/index.vue
@@ -149,8 +149,6 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 导出遮罩层
-      exportLoading: false,
       // 显示搜索条件
       showSearch: true,
       // 总条数
diff --git a/src/views/mp/message/index.vue b/src/views/mp/message/index.vue
@@ -161,8 +161,6 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 导出遮罩层
-      exportLoading: false,
       // 显示搜索条件
       showSearch: true,
       // 总条数
diff --git a/src/views/pay/notify/index.vue b/src/views/pay/notify/index.vue
@@ -149,8 +149,6 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 导出遮罩层
-      exportLoading: false,
       // 显示搜索条件
       showSearch: true,
       // 总条数
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
@@ -292,12 +292,13 @@ export default {
     handleExport() {
       const queryParams = this.queryParams;
       this.$modal.confirm('是否确认导出所有数据项?').then(() => {
-          this.exportLoading = true;
-          return exportData(queryParams);
-        }).then(response => {
-          this.$download.excel(response, '字典数据.xls');
-          this.exportLoading = false;
-      }).catch(() => {});
+        this.exportLoading = true;
+        return exportData(queryParams);
+      }).then(response => {
+        this.$download.excel(response, '字典数据.xls');
+      }).finally(() => {
+        this.exportLoading = false;
+      });
     }
   }
 };
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
@@ -243,8 +243,9 @@ export default {
         return exportType(params);
       }).then(response => {
         this.$download.excel(response, '字典类型.xls');
+      }).finally(() => {
         this.exportLoading = false;
-      }).catch(() => {});
+      });
     }
   }
 };
diff --git a/src/views/system/loginlog/index.vue b/src/views/system/loginlog/index.vue
@@ -117,16 +117,17 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       this.$modal.confirm('是否确认导出所有操作日志数据项?').then(() => {
-          // 处理查询参数
-          let params = {...this.queryParams};
-          params.pageNo = undefined;
-          params.pageSize = undefined;
-          this.exportLoading = true;
-          return exportLoginLog(params);
-        }).then(response => {
-          this.$download.excel(response, '登录日志.xls');
-          this.exportLoading = false;
-      }).catch(() => {});
+        // 处理查询参数
+        let params = {...this.queryParams};
+        params.pageNo = undefined;
+        params.pageSize = undefined;
+        this.exportLoading = true;
+        return exportLoginLog(params);
+      }).then(response => {
+        this.$download.excel(response, '登录日志.xls');
+      }).finally(() => {
+        this.exportLoading = false;
+      });
     }
   }
 };
diff --git a/src/views/system/oauth2/client/index.vue b/src/views/system/oauth2/client/index.vue
@@ -165,8 +165,6 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 导出遮罩层
-      exportLoading: false,
       // 显示搜索条件
       showSearch: true,
       // 总条数
diff --git a/src/views/system/operatelog/index.vue b/src/views/system/operatelog/index.vue
@@ -194,16 +194,17 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       this.$modal.confirm('是否确认导出所有操作日志数据项?').then(() => {
-          // 处理查询参数
-          let params = {...this.queryParams};
-          params.pageNo = undefined;
-          params.pageSize = undefined;
-          this.exportLoading = true;
-          return exportOperateLog(params);
-        }).then(response => {
-          this.$download.excel(response, '操作日志.xls');
-          this.exportLoading = false;
-      }).catch(() => {});
+        // 处理查询参数
+        let params = {...this.queryParams};
+        params.pageNo = undefined;
+        params.pageSize = undefined;
+        this.exportLoading = true;
+        return exportOperateLog(params);
+      }).then(response => {
+        this.$download.excel(response, '操作日志.xls');
+      }).finally(() => {
+        this.exportLoading = false;
+      });
     }
   }
 };
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
@@ -231,12 +231,13 @@ export default {
     handleExport() {
       const queryParams = this.queryParams;
       this.$modal.confirm('是否确认导出所有岗位数据项?').then(() => {
-          this.exportLoading = true;
-          return exportPost(queryParams);
-        }).then(response => {
-          this.$download.excel(response, '岗位数据.xls');
-          this.exportLoading = false;
-      }).catch(() => {});
+        this.exportLoading = true;
+        return exportPost(queryParams);
+      }).then(response => {
+        this.$download.excel(response, '岗位数据.xls');
+      }).finally(() => {
+        this.exportLoading = false;
+      });
     }
   }
 };
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
@@ -482,13 +482,14 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$modal.confirm('是否确认导出所有角色数据项?').then(function() {
-          this.exportLoading = true;
-          return exportRole(queryParams);
-        }).then(response => {
-          this.$download.excel(response, '角色数据.xls');
-          this.exportLoading = false;
-      }).catch(() => {});
+      this.$modal.confirm('是否确认导出所有角色数据项?').then(() => {
+        this.exportLoading = true;
+        return exportRole(queryParams);
+      }).then(response => {
+        this.$download.excel(response, '角色数据.xls');
+      }).finally(() => {
+        this.exportLoading = false;
+      });
     }
   }
 };
diff --git a/src/views/system/sms/log/index.vue b/src/views/system/sms/log/index.vue
@@ -267,8 +267,9 @@ export default {
         return exportSmsLogExcel(params);
       }).then(response => {
         this.$download.excel(response, '短信日志.xls');
+      }).finally(() => {
         this.exportLoading = false;
-      }).catch(() => {});
+      });
     },
     /** 详细按钮操作 */
     handleView(row) {
diff --git a/src/views/system/sms/template/index.vue b/src/views/system/sms/template/index.vue
@@ -330,8 +330,9 @@ export default {
         return exportSmsTemplateExcel(params);
       }).then(response => {
         this.$download.excel(response, '短信模板.xls');
+      }).finally(() => {
         this.exportLoading = false;
-      }).catch(() => {});
+      });
     },
     /** 发送短息按钮 */
     handleSendSms(row) {
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
@@ -293,12 +293,13 @@ export default {
       params.pageSize = undefined;
       // 执行导出
       this.$modal.confirm('是否确认导出所有租户数据项?').then(() => {
-          this.exportLoading = true;
-          return exportTenantExcel(params);
-        }).then(response => {
-          this.$download.excel(response, '租户.xls');
-          this.exportLoading = false;
-      }).catch(() => {});
+        this.exportLoading = true;
+        return exportTenantExcel(params);
+      }).then(response => {
+        this.$download.excel(response, '租户.xls');
+      }).catch(() => {
+        this.exportLoading = false;
+      });
     },
     /** 套餐名格式化 */
     getPackageName(packageId) {
diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue
@@ -102,8 +102,6 @@ export default {
     return {
       // 遮罩层
       loading: true,
-      // 导出遮罩层
-      exportLoading: false,
       // 显示搜索条件
       showSearch: true,
       // 总条数
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
@@ -571,16 +571,17 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       this.$modal.confirm('是否确认导出所有用户数据项?').then(() => {
-          // 处理查询参数
-          let params = {...this.queryParams};
-          params.pageNo = undefined;
-          params.pageSize = undefined;
-          this.exportLoading = true;
-          return exportUser(params);
-        }).then(response => {
-          this.$download.excel(response, '用户数据.xls');
-          this.exportLoading = false;
-      }).catch(() => {});
+        // 处理查询参数
+        let params = {...this.queryParams};
+        params.pageNo = undefined;
+        params.pageSize = undefined;
+        this.exportLoading = true;
+        return exportUser(params);
+      }).then(response => {
+        this.$download.excel(response, '用户数据.xls');
+      }).finally(() => {
+        this.exportLoading = false;
+      });
     },
     /** 导入按钮操作 */
     handleImport() {

Original file line number	Diff line number	Diff line change
`@@ -202,8 +202,9 @@ export default {`
`202`	`202`	`return exportApiAccessLogExcel(params);`
`203`	`203`	`}).then(response => {`
`204`	`204`	`this.$download.excel(response, 'API 访问日志.xls');`
	`205`	`+ }).finally(() => {`
`205`	`206`	`this.exportLoading = false;`
`206`		`- }).catch(() => {});`
	`207`	`+ });`
`207`	`208`	`}`
`208`	`209`	`}`
`209`	`210`	`};`
Original file line number	Diff line number	Diff line change
`@@ -220,8 +220,9 @@ export default {`
`220`	`220`	`return exportApiErrorLogExcel(params);`
`221`	`221`	`}).then(response => {`
`222`	`222`	`this.$download.excel(response, 'API 错误日志.xls');`
	`223`	`+ }).finally(() => {`
`223`	`224`	`this.exportLoading = false;`
`224`		`- }).catch(() => {});`
	`225`	`+ });`
`225`	`226`	`}`
`226`	`227`	`}`
`227`	`228`	`};`