fix:导出加载条显示异常,下载参数

This commit is contained in:
秋帆
2024-04-10 23:05:09 +08:00
parent 7885e351a0
commit 5869c34abb
6 changed files with 11 additions and 8 deletions

View File

@@ -4,7 +4,7 @@ import type * as System from './type'
const BASE_URL = '/system/log' const BASE_URL = '/system/log'
/** @desc 查询日志列表 */ /** @desc 查询日志列表 */
export function listLog(query: System.LogQuery) { export function listLog(query: System.PageLogQuery) {
return http.get<PageRes<System.LogResp[]>>(`${BASE_URL}`, query) return http.get<PageRes<System.LogResp[]>>(`${BASE_URL}`, query)
} }

View File

@@ -44,7 +44,10 @@ export interface LogDetailResp extends LogResp {
responseHeaders: string responseHeaders: string
responseBody: string responseBody: string
} }
export interface LogQuery extends PageQuery { // 系统日志分页查询条件
export interface PageLogQuery extends PageQuery,LogQuery{}
// 系统日志查询条件
export interface LogQuery{
description?: string description?: string
module?: string module?: string
ip?: string ip?: string

View File

@@ -11,14 +11,13 @@ interface NavigatorWithMsSaveOrOpenBlob extends Navigator {
msSaveOrOpenBlob(blob: Blob, fileName: string): void msSaveOrOpenBlob(blob: Blob, fileName: string): void
} }
export const useDownload = async ( export const useDownload = async (
api: (param: any) => Promise<any>, api: () => Promise<any>,
tempName: string = '',
params: any = {},
isNotify = true, isNotify = true,
tempName: string = '',
fileType = '.xlsx' fileType = '.xlsx'
) => { ) => {
try { try {
const res = await api(params) const res = await api()
if (res.headers['content-disposition']) { if (res.headers['content-disposition']) {
tempName = decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1]); tempName = decodeURI(res.headers['content-disposition'].split(';')[1].split('=')[1]);
} else { } else {

View File

@@ -62,6 +62,7 @@ http.interceptors.response.use(
const { data } = response const { data } = response
const { success, code, msg } = data const { success, code, msg } = data
if(response.request.responseType==='blob'){ if(response.request.responseType==='blob'){
NProgress.done()
return response return response
} }
// 成功 // 成功

View File

@@ -97,7 +97,7 @@ const columns: TableInstance['columns'] = [
] ]
//导出登录日志 //导出登录日志
const onExportFile = ()=>{ const onExportFile = ()=>{
useDownload(exportLog,'',queryForm) useDownload(()=>exportLog(queryForm))
} }
const queryForm = reactive({ const queryForm = reactive({
module: '登录', module: '登录',

View File

@@ -111,7 +111,7 @@ const columns: TableInstance['columns'] = [
] ]
//导出操作日志 //导出操作日志
const onExportFile = ()=>{ const onExportFile = ()=>{
useDownload(exportOperateLog,'',queryForm) useDownload(()=>exportOperateLog(queryForm))
} }
const queryForm = reactive({ const queryForm = reactive({
description: undefined, description: undefined,