From d8887d36d08e3a0a5068763c8460b0b4f16e87ee Mon Sep 17 00:00:00 2001
From: shikeying <pxzsky@163.com>
Date: 星期一, 03 四月 2023 16:21:37 +0800
Subject: [PATCH] 待办任务审批测试界面
---
src/plugins/download.js | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/plugins/download.js b/src/plugins/download.js
index 1ca9d53..99ebcd4 100644
--- a/src/plugins/download.js
+++ b/src/plugins/download.js
@@ -5,12 +5,9 @@
import errorCode from '@/utils/errorCode'
import { blobValidate } from "@/utils/ruoyi";
-// const baseURL = process.env.VUE_APP_BASE_API
-const baseURL = "http://localhost:8082/admin";
-
export default {
name(name, isDelete = true) {
- var url = baseURL + "/common/download?fileName=" + encodeURI(name) + "&delete=" + isDelete
+ var url = globalConf.ftpUrl + "/common/download?fileName=" + encodeURI(name) + "&delete=" + isDelete
axios({
method: 'get',
url: url,
@@ -27,7 +24,7 @@
})
},
resource(resource) {
- var url = baseURL + "/common/download/resource?resource=" + encodeURI(resource);
+ var url = globalConf.ftpUrl + "/common/download/resource?resource=" + encodeURI(resource);
axios({
method: 'get',
url: url,
@@ -43,11 +40,22 @@
}
})
},
- zip(url, name) {
- var url = baseURL + url;
+
+ /**
+ * 涓嬭浇zip鏂囦欢锛屽鏋渓ocal瀛樺湪鍊硷紝鍒欎粠鏈湴涓嬭浇鏂囦欢
+ * @param url 涓氬姟閾炬帴
+ * @param name 涓嬭浇淇濆瓨鐨勬枃浠跺悕
+ * @param local 鍙涓嶄负绌猴紝灏辫〃绀轰粠鏈湴涓嬭浇
+ * @date 2023-02-24 鏃跺厠鑻辨坊鍔� local 鍙傛暟
+ */
+ zip(url, name, local) {
+ let fullUrl = globalConf.ftpUrl + url;
+ if(local !== null && local !== ""){
+ fullUrl = globalConf.baseUrl + url;
+ }
axios({
method: 'get',
- url: url,
+ url: fullUrl,
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() }
}).then(async (res) => {
@@ -56,7 +64,7 @@
const blob = new Blob([res.data], { type: 'application/zip' })
this.saveAs(blob, name)
} else {
- this.printErrMsg(res.data);
+ await this.printErrMsg(res.data);
}
})
},
--
Gitblit v1.9.1