From 7107e83baeadbaac8a179e5667f8dd35f6ce4bd5 Mon Sep 17 00:00:00 2001 From: lijing1 Date: Tue, 25 Nov 2025 17:01:57 +0800 Subject: [PATCH] =?UTF-8?q?update:=E5=AF=BC=E5=87=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- src/components/common/table/baseTable.vue | 4 +++- src/components/common/table/treeTable.vue | 4 +++- src/components/common/uploadList/index.vue | 1 + src/utils/file.ts | 5 ++++- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/App.vue b/src/App.vue index 01958953..de269656 100644 --- a/src/App.vue +++ b/src/App.vue @@ -15,7 +15,7 @@ localStorage.setItem('USER_INFO_DATA', $wujie?.props?.USER_INFO_DATA || '{"tenan if ($wujie) { // 路径跳转 $wujie.bus.$on('ROUTER_CHANGE', (data: any) => { - router.push({ + router.replace({ path: data.path.split('/spdm')[1], query: data.query, }); diff --git a/src/components/common/table/baseTable.vue b/src/components/common/table/baseTable.vue index c82f804c..c2f223ff 100644 --- a/src/components/common/table/baseTable.vue +++ b/src/components/common/table/baseTable.vue @@ -161,6 +161,7 @@ interface Props { exportApi?: any; exportFileName?: string; exportDict?: any; + exportParams?: any; render?: (data: any, cb: (cbData: any) => void) => void | undefined; params?: any; head?: any; @@ -184,6 +185,7 @@ const props = withDefaults(defineProps(), { exportApi: undefined, exportFileName: '', exportDict: {}, + exportParams: {}, render: undefined, params: () => {}, head: null, @@ -410,7 +412,7 @@ const actionClickFun = (row: any, action: any) => { }; const exportFun = () => { - exportFile(props.exportApi, props.tableName, props.exportFileName, {}, props.exportDict); + exportFile(props.exportApi, props.tableName, props.exportFileName, { ...searchData.value, ...props.exportParams }, props.exportDict); }; watch(() => props.tableName, () => { diff --git a/src/components/common/table/treeTable.vue b/src/components/common/table/treeTable.vue index acc6bf83..09eba49c 100644 --- a/src/components/common/table/treeTable.vue +++ b/src/components/common/table/treeTable.vue @@ -183,6 +183,7 @@ interface Props { exportApi?: any; exportFileName?: string; exportDict?: any; + exportParams?: any; params?: any; head?: any; searchItems?: any[]; @@ -204,6 +205,7 @@ const props = withDefaults(defineProps(), { exportApi: undefined, exportFileName: '', exportDict: {}, + exportParams: {}, params: () => {}, head: null, searchItems: () => [] as any[], @@ -486,7 +488,7 @@ const actionClickFun = (row: any, action: any) => { }; const exportFun = () => { - exportFile(props.exportApi, props.tableName, props.exportFileName, {}, props.exportDict); + exportFile(props.exportApi, props.tableName, props.exportFileName, props.exportParams, props.exportDict); }; watch(() => props.tableName, () => { diff --git a/src/components/common/uploadList/index.vue b/src/components/common/uploadList/index.vue index 63c9f9f4..add22e45 100644 --- a/src/components/common/uploadList/index.vue +++ b/src/components/common/uploadList/index.vue @@ -205,6 +205,7 @@ const removeFun = (index: any) => { .name { flex: 1; color: var(--el-text-color-primary); + word-break: break-word; } .status { color: var(--el-text-color-secondary); diff --git a/src/utils/file.ts b/src/utils/file.ts index a9a40271..5876be2d 100644 --- a/src/utils/file.ts +++ b/src/utils/file.ts @@ -192,7 +192,10 @@ export const exportFile = (api: any, tableName: string, fileName: string, params } return val; }); - api(listData, `${dayjs().format('YYYYMMDDHHmmss')}_${fileName || tableName}.xlsx`); + api({ + exportExcelFormatList: listData, + ...params, + }, `${dayjs().format('YYYYMMDDHHmmss')}_${fileName || tableName}.xlsx`); } }); };