diff --git a/frontend/src/api/device/interface/icd.ts b/frontend/src/api/device/interface/icd.ts index 933d9d4..b3e69e7 100644 --- a/frontend/src/api/device/interface/icd.ts +++ b/frontend/src/api/device/interface/icd.ts @@ -24,6 +24,8 @@ export namespace ICD { createTime?: string| null; //创建时间 updateBy?: string| null; //更新用户 updateTime?: string| null; //更新时间 + angle: number; // 是否支持电压相角、电流相角指标 + usePhaseIndex: number; // 角型接线时是否使用相别的指标来进行检测 } /** 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 @@ - - - \ No newline at end of file +} + +// 对外映射 +defineExpose({ open }) +const props = defineProps<{ + refreshTable: (() => Promise) | undefined +}>() + \ No newline at end of file diff --git a/frontend/src/views/plan/planList/components/childrenPlan.vue b/frontend/src/views/plan/planList/components/childrenPlan.vue index c8df2b6..00a868d 100644 --- a/frontend/src/views/plan/planList/components/childrenPlan.vue +++ b/frontend/src/views/plan/planList/components/childrenPlan.vue @@ -61,7 +61,14 @@ > 导出检测结果 - 导入检测结果 + + 导入检测结果 + 数据合并 @@ -158,6 +165,7 @@ +