|
@@ -10,7 +10,7 @@ import { saveAs } from 'file-saver'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-let downloadLoadingInstance = Loading.service();
|
|
|
|
|
|
+// let downloadLoadingInstance = Loading.service();
|
|
// 是否显示重新登录
|
|
// 是否显示重新登录
|
|
export let isRelogin = { show: false };
|
|
export let isRelogin = { show: false };
|
|
|
|
|
|
@@ -82,7 +82,7 @@ service.interceptors.response.use(res => {
|
|
if(res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer'){
|
|
if(res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer'){
|
|
return res.data
|
|
return res.data
|
|
}
|
|
}
|
|
- downloadLoadingInstance.close();
|
|
|
|
|
|
+ // downloadLoadingInstance.close();
|
|
if (code === 401) {
|
|
if (code === 401) {
|
|
if (!isRelogin.show) {
|
|
if (!isRelogin.show) {
|
|
isRelogin.show = true;
|
|
isRelogin.show = true;
|
|
@@ -119,7 +119,7 @@ service.interceptors.response.use(res => {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
error => {
|
|
error => {
|
|
- downloadLoadingInstance.close();
|
|
|
|
|
|
+ // downloadLoadingInstance.close();
|
|
console.log('err' + error)
|
|
console.log('err' + error)
|
|
let { message } = error;
|
|
let { message } = error;
|
|
if (message == "Network Error") {
|
|
if (message == "Network Error") {
|
|
@@ -142,30 +142,5 @@ service.interceptors.response.use(res => {
|
|
}
|
|
}
|
|
)
|
|
)
|
|
|
|
|
|
-// 通用下载方法
|
|
|
|
-export function download(url, params, filename) {
|
|
|
|
- downloadLoadingInstance = Loading.service({ text: "正在下载数据,请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
|
|
|
|
- // return service.post(url, params, {
|
|
|
|
- // transformRequest: [(params) => { return tansParams(params) }],
|
|
|
|
- // headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
|
|
|
|
- // responseType: 'blob'
|
|
|
|
- // }).then(async (data) => {
|
|
|
|
- // const isLogin = await blobValidate(data);
|
|
|
|
- // if (isLogin) {
|
|
|
|
- // const blob = new Blob([data])
|
|
|
|
- // saveAs(blob, filename)
|
|
|
|
- // } else {
|
|
|
|
- // const resText = await data.text();
|
|
|
|
- // const rspObj = JSON.parse(resText);
|
|
|
|
- // // const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
|
|
|
|
- // // Message.error(errMsg);
|
|
|
|
- // }
|
|
|
|
- // downloadLoadingInstance.close();
|
|
|
|
- // }).catch((r) => {
|
|
|
|
- // console.error(r)
|
|
|
|
- // Message.error('下载文件出现错误,请联系管理员!')
|
|
|
|
- // downloadLoadingInstance.close();
|
|
|
|
- // })
|
|
|
|
-}
|
|
|
|
|
|
|
|
export default service
|
|
export default service
|