Skip to content

Commit 3921266

Browse files
committed
feat: 修复导出在baseApi配置为/时候的路径拼接错误
1 parent c909d32 commit 3921266

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

web/src/components/exportExcel/exportExcel.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
</template>
66

77
<script setup>
8+
import {getUrl} from "@/utils/image";
9+
810
const props = defineProps({
911
templateId: {
1012
type: String,
@@ -35,7 +37,10 @@
3537
ElMessage.error('组件未设置模板ID')
3638
return
3739
}
38-
const baseUrl = import.meta.env.VITE_BASE_API
40+
let baseUrl = import.meta.env.VITE_BASE_API
41+
if (baseUrl === "/"){
42+
baseUrl = ""
43+
}
3944
const paramsCopy = JSON.parse(JSON.stringify(props.condition))
4045
if (props.limit) {
4146
paramsCopy.limit = props.limit
@@ -52,6 +57,7 @@
5257
`${encodeURIComponent(key)}=${encodeURIComponent(value)}`
5358
)
5459
.join('&')
60+
5561
const url = `${baseUrl}/sysExportTemplate/exportExcel?templateID=${props.templateId}${params ? '&' + params : ''}`
5662
5763
window.open(url, '_blank')

web/src/components/exportExcel/exportTemplate.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
ElMessage.error('组件未设置模板ID')
2020
return
2121
}
22-
const baseUrl = import.meta.env.VITE_BASE_API
22+
let baseUrl = import.meta.env.VITE_BASE_API
23+
if (baseUrl === "/"){
24+
baseUrl = ""
25+
}
2326
const url = `${baseUrl}/sysExportTemplate/exportTemplate?templateID=${props.templateId}`
2427
window.open(url, '_blank')
2528
}

web/src/components/exportExcel/importExcel.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
<script setup>
1313
import { ElMessage } from 'element-plus'
1414
15-
const baseUrl = import.meta.env.VITE_BASE_API
15+
let baseUrl = import.meta.env.VITE_BASE_API
16+
if (baseUrl === "/"){
17+
baseUrl = ""
18+
}
1619
1720
const props = defineProps({
1821
templateId: {

0 commit comments

Comments
 (0)