diff --git a/frontend/src/api/plan/plan.ts b/frontend/src/api/plan/plan.ts
index b768f6e..5e41b70 100644
--- a/frontend/src/api/plan/plan.ts
+++ b/frontend/src/api/plan/plan.ts
@@ -1,7 +1,7 @@
-import type {Plan} from './interface'
+import type { Plan } from './interface'
import http from '@/api'
-import type {ErrorSystem} from '../device/interface/error'
-import type {Device} from '../device/interface/device'
+import type { ErrorSystem } from '../device/interface/error'
+import type { Device } from '../device/interface/device'
/**
* @name 检测计划管理模块
@@ -130,7 +130,7 @@ export const exportSubPlan = (params: Plan.ResPlan) => {
}
// 导入子检测计划
-export const importSubPlan = (params: Device.ReqPqDevParams) => {
+export const importSubPlan = (params: Plan.ResPlan) => {
return http.upload(`/adPlan/importSubPlan`, params)
}
@@ -138,4 +138,9 @@ export const importSubPlan = (params: Device.ReqPqDevParams) => {
// 导出计划检测结果数据
export const exportPlanCheckData = (params: Plan.ResPlan) => {
return http.download(`/adPlan/exportPlanCheckData?planId=${params.id}`)
+}
+
+// 导入子检测计划检测结果数据
+export const importSubPlanCheckData = (params: Plan.ResPlan) => {
+ return http.upload(`/adPlan/importSubPlanCheckData`, params)
}
\ No newline at end of file
diff --git a/frontend/src/components/ImportZip/index.vue b/frontend/src/components/ImportZip/index.vue
index df10b3c..f5e99a6 100644
--- a/frontend/src/components/ImportZip/index.vue
+++ b/frontend/src/components/ImportZip/index.vue
@@ -1,11 +1,5 @@
-
+
导出检测结果
- 导入检测结果
+
+ 导入检测结果
+
数据合并
@@ -158,6 +165,7 @@
+