diff --git a/src/utils/request.js b/src/utils/request.js index a7a943d..3a5b7dc 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -73,17 +73,24 @@ service.interceptors.response.use( // 通用下载方法 export function download(url, params, filename, config) { - let token = localStorage.getItem('token') - return axios.post(url, params, {"Content-type": "multipart/form-data",headers:{"Authorization": `${token}`}}).then( async (data) => { - const isBlob = blobValidate(data.data); - console.log(isBlob,'====data'); + return service.post(url, params, { + transformRequest: [(params) => { return tansParams(params) }], + headers: { 'Content-Type': 'application/x-www-form-urlencoded' }, + responseType: 'blob', + ...config + }).then(async (data) => { + const isBlob = blobValidate(data); if (isBlob) { - const blob = new Blob([data.data]) + const blob = new Blob([data]) saveAs(blob, filename) } else { - ElMessage.error('网络异常'); + const resText = await data.text(); + const rspObj = JSON.parse(resText); + const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default'] + ElMessage.error(errMsg); } - // downloadLoadingInstance.close(); + }).catch((r) => { + ElMessage.error('下载文件出现错误,请联系管理员!') }) } diff --git a/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index.vue b/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index.vue index a0ceb56..3a172b4 100644 --- a/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index.vue +++ b/src/views/backOfficeSystem/HumanIntelligence/CollectCrculate/index.vue @@ -2,7 +2,7 @@
- + 导出 @@ -85,6 +85,7 @@