Commit 483a8e61 by linjinhong

fix:【订单-POD(CN)订单跟踪】:"导出"功能,根据导出选项导出的内容数据错误#ID: 1000067

parent e7c40734
...@@ -426,7 +426,13 @@ const submitExportForm = async () => { ...@@ -426,7 +426,13 @@ const submitExportForm = async () => {
try { try {
await exportPodUSInfo({ await exportPodUSInfo({
...params, ...params,
...(resourceType === 2 ? searchForm.value : {}), ...(resourceType === 2
? {
...searchForm.value,
startTime: timeRange.value?.[0] || null,
endTime: timeRange.value?.[1] || null,
}
: {}),
}) })
ElMessage.success('请求成功,请稍后到右上角[我的下载]中查看') ElMessage.success('请求成功,请稍后到右上角[我的下载]中查看')
exportVisible.value = false exportVisible.value = false
......
...@@ -424,7 +424,13 @@ const submitExportForm = async () => { ...@@ -424,7 +424,13 @@ const submitExportForm = async () => {
try { try {
await exportPodCnInfo({ await exportPodCnInfo({
...params, ...params,
...(resourceType === 2 ? searchForm.value : {}), ...(resourceType === 2
? {
...searchForm.value,
startTime: timeRange.value?.[0] || null,
endTime: timeRange.value?.[1] || null,
}
: {}),
}) })
ElMessage.success('请求成功,请稍后到右上角[我的下载]中查看') ElMessage.success('请求成功,请稍后到右上角[我的下载]中查看')
exportVisible.value = false exportVisible.value = false
......
...@@ -2644,12 +2644,20 @@ const submitExportForm = async () => { ...@@ -2644,12 +2644,20 @@ const submitExportForm = async () => {
console.error('未知的资源类型:', resourceType) console.error('未知的资源类型:', resourceType)
} }
try { try {
const res = await exportPodCnInfo({ await exportPodCnInfo({
...params, ...params,
...(resourceType === 2 ? searchForm.value : {}), ...(resourceType === 2
? {
...searchForm.value,
startTime: timeRange.value?.[0] || null,
endTime: timeRange.value?.[1] || null,
}
: {}),
status: 'COMPLETE', status: 'COMPLETE',
}) })
window.open(filePath + res.message, '_blank') ElMessage.success('请求成功,请稍后到右上角[我的下载]中查看')
// window.open(filePath + res.message, '_blank')
exportVisible.value = false exportVisible.value = false
exportLoading.value = false exportLoading.value = false
} catch (e) { } catch (e) {
......
...@@ -3020,7 +3020,13 @@ const submitExportForm = async () => { ...@@ -3020,7 +3020,13 @@ const submitExportForm = async () => {
try { try {
await exportPodUSInfo({ await exportPodUSInfo({
...params, ...params,
...(resourceType === 2 ? searchForm.value : {}), ...(resourceType === 2
? {
...searchForm.value,
startTime: timeRange.value?.[0] || null,
endTime: timeRange.value?.[1] || null,
}
: {}),
}) })
ElMessage.success('请求成功,请稍后到右上角[我的下载]中查看') ElMessage.success('请求成功,请稍后到右上角[我的下载]中查看')
exportVisible.value = false exportVisible.value = false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment