From 78d120c423954f7f58ba23c9e0adb4a31a2360d2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 29 八月 2023 16:10:41 +0800
Subject: [PATCH] !37 修复 菜单图标选择器小屏幕显示不全的问题 Merge pull request !37 from David Wei/ts_fix_iconselect
---
src/plugins/download.ts | 39 ++++++++++++++++++++++-----------------
1 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/src/plugins/download.ts b/src/plugins/download.ts
index 2640763..ef66b3a 100644
--- a/src/plugins/download.ts
+++ b/src/plugins/download.ts
@@ -1,22 +1,22 @@
import axios from 'axios';
import FileSaver from 'file-saver';
-import { getToken } from '@/utils/auth';
import errorCode from '@/utils/errorCode';
import { blobValidate } from '@/utils/ruoyi';
import { LoadingInstance } from 'element-plus/es/components/loading/src/loading';
+import { globalHeaders } from '@/utils/request';
const baseURL = import.meta.env.VITE_APP_BASE_API;
let downloadLoadingInstance: LoadingInstance;
export default {
async oss(ossId: string | number) {
- const url = baseURL + '/system/oss/download/' + ossId;
+ const url = baseURL + '/resource/oss/download/' + ossId;
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() }
+ headers: globalHeaders()
});
const isBlob = blobValidate(res.data);
if (isBlob) {
@@ -34,21 +34,26 @@
},
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: globalHeaders()
+ });
+ 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