From d160c3a61cc38359de4794b208884bba430f0a1c Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail.com>
Date: 星期一, 10 七月 2023 22:56:42 +0800
Subject: [PATCH] merge
---
src/plugins/download.ts | 36 ++++++++++++++++++++++--------------
1 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/src/plugins/download.ts b/src/plugins/download.ts
index e1c4414..c6c8521 100644
--- a/src/plugins/download.ts
+++ b/src/plugins/download.ts
@@ -34,21 +34,29 @@
},
async zip(url: string, name: string) {
url = baseURL + url;
- const res = await axios({
- method: 'get',
- url: url,
- responseType: 'blob',
- headers: {
- Authorization: 'Bearer ' + getToken(),
- datasource: localStorage.getItem('dataName')
+ downloadLoadingInstance = ElLoading.service({ text: '姝ｅ湪涓嬭浇鏁版嵁锛岃绋嶅��', background: 'rgba(0, 0, 0, 0.7)' });
+ try {
+ const res = await axios({
+ method: 'get',
+ url: url,
+ responseType: 'blob',
+ headers: {
+ Authorization: 'Bearer ' + getToken(),
+ datasource: localStorage.getItem('dataName')
+ }
+ });
+ const isBlob = blobValidate(res.data);
+ if (isBlob) {
+ const blob = new Blob([res.data], { type: 'application/zip' });
+ FileSaver.saveAs(blob, name);
+ } else {
+ this.printErrMsg(res.data);
}
- });
- const isBlob = blobValidate(res.data);
- if (isBlob) {
- const blob = new Blob([res.data], { type: 'application/zip' });
- FileSaver.saveAs(blob, name);
- } else {
- this.printErrMsg(res.data);
+ downloadLoadingInstance.close();
+ } catch (r) {
+ console.error(r)
+ ElMessage.error('涓嬭浇鏂囦欢鍑虹幇閿欒锛岃鑱旂郴绠＄悊鍛橈紒')
+ downloadLoadingInstance.close();
}
},
async printErrMsg(data: any) {
--
Gitblit v1.9.3