diff --git a/frontend/src/api/index.ts b/frontend/src/api/index.ts
index 1a9636b..9328762 100644
--- a/frontend/src/api/index.ts
+++ b/frontend/src/api/index.ts
@@ -211,13 +211,19 @@ class RequestHttp {
const eventSource = new EventSourcePolyfill(requestUrl, {
headers: {
Authorization: 'Bearer ' + userStore.accessToken
- }
+ },
+ // 增加超时时间到120秒
+ heartbeatTimeout: 120000
})
// 设置默认的Authorization头部
eventSource.addEventListener('open', function () {
console.log('SSE连接已建立')
})
+ // 添加错误处理
+ eventSource.addEventListener('error', function (err) {
+ console.error('SSE连接错误:', err)
+ })
return eventSource
}
diff --git a/frontend/src/api/plan/plan.ts b/frontend/src/api/plan/plan.ts
index 43b0f1e..e30c361 100644
--- a/frontend/src/api/plan/plan.ts
+++ b/frontend/src/api/plan/plan.ts
@@ -136,7 +136,7 @@ export const importSubPlan = (params: Plan.ResPlan) => {
// 导出计划检测结果数据
export const exportPlanCheckData = (params: any) => {
- return http.download(
+ return http.post(
`/adPlan/exportPlanCheckData?planId=${params.id}&devIds=${params.devIds}&report=${params.report}`
)
}
diff --git a/frontend/src/components/ImportZip/index.vue b/frontend/src/components/ImportZip/index.vue
index 8c2590a..80dcec2 100644
--- a/frontend/src/components/ImportZip/index.vue
+++ b/frontend/src/components/ImportZip/index.vue
@@ -5,6 +5,7 @@
:destroy-on-close="true"
width="450px"
:close-on-click-modal="!parameter.progressBar"
+ :show-close="!disable"
draggable
>
- 点击上传
+ 点击上传
@@ -28,11 +29,7 @@
-
+
{{ progressData.message }}
@@ -42,6 +39,15 @@
{{ progressData.message }}
+
开始导入
@@ -96,7 +102,12 @@ const uploadZip = (param: UploadRequestOptions) => {
}
setTimeout(() => {
- parameter.value.importApi!(zipFormData).then(res => handleImportResponse(res))
+ parameter.value.importApi!(zipFormData)
+ .then(res => handleImportResponse(res))
+ .catch(err => {
+ fileDisabled.value = false
+ disable.value = false
+ })
}, 1000)
}
@@ -104,13 +115,17 @@ const handleImportResponse = (res: any) => {
if (!parameter.value.progressBar) {
if (res.code === 'A0000') {
ElMessage.success('导入成功')
+ dialogVisible.value = false
+ emit('result', res.data)
} else {
ElMessage.error(res.message)
+ fileDisabled.value = false
+ disable.value = false
}
- dialogVisible.value = false
- emit('result', res.data)
} else {
- //
+ if (res.code !== 'A0000') {
+ ElMessage.error(res.message)
+ }
}
}
diff --git a/frontend/src/views/plan/planList/components/childrenPlan.vue b/frontend/src/views/plan/planList/components/childrenPlan.vue
index 7ebf459..d1bc1b3 100644
--- a/frontend/src/views/plan/planList/components/childrenPlan.vue
+++ b/frontend/src/views/plan/planList/components/childrenPlan.vue
@@ -172,6 +172,45 @@
+
+
+
+ {{ progressData.message }}
+
+
+ {{ progressData.message }}
+
+ 文件所在目录:
+
+ {{ progressData.message }}
+
+
+
+
+
+ 关闭
+
+