diff --git a/src/api/system/file/index.ts b/src/api/system/file/index.ts index 0be3d8c..86ac207 100644 --- a/src/api/system/file/index.ts +++ b/src/api/system/file/index.ts @@ -33,6 +33,18 @@ export function parseDownloadUrl(url:string,th?:boolean,full?:boolean) { return resultUrl; } +export async function getInfoByDownloadUrl(params: {id: string}, mode: ErrorMessageMode = 'modal') { + return defHttp.get( + { + url: Api.Info, + params, + }, + { + errorMessageMode: mode, + }, + ); +} + /** * @description: 查询文件分页 diff --git a/src/layouts/default/header/components/notify/index.vue b/src/layouts/default/header/components/notify/index.vue index 9124cff..47fd531 100644 --- a/src/layouts/default/header/components/notify/index.vue +++ b/src/layouts/default/header/components/notify/index.vue @@ -161,7 +161,7 @@ import { getOaMessage, getOaNews, setOaRead, setSingleRead, setWorkReadAll, getScheduleMsg, setScheduleRead, setScheduleReadAll } from '/@/api/system/login'; import { queryLoginUserNotices, setSystemNoticeRead } from '/@/api/system/systemNotice/index'; - import { getInfoByDownloadUrl } from '/@/api/system/file'; + import { getInfoByDownloadUrl,parseDownloadUrl } from '/@/api/system/file'; import { Empty } from 'ant-design-vue'; import ApprovalProcess from '/@/views/workflow/task/components/ApprovalProcess.vue'; @@ -356,8 +356,8 @@ record.paramsJson = record.paramsJson ? JSON.parse(record.paramsJson) : {}; let fileId = record.paramsJson.id || []; getInfoByDownloadUrl({ id: fileId }).then((res) => { - let fileUrl = res.fileUrlFixed || res.fileUrl; - downloadByUrl({ url: fileUrl, fileName: res.fileName + res.fileType || 'files.zip' }); + let fileUrl = parseDownloadUrl(res.fileUrl); + downloadByUrl({ url: res.fileUrl, fileName: res.fileOrg || 'files.zip' }); }); return; }