diff --git a/frontend/src/api/plan/plan.ts b/frontend/src/api/plan/plan.ts index 5e41b70..3361f39 100644 --- a/frontend/src/api/plan/plan.ts +++ b/frontend/src/api/plan/plan.ts @@ -137,10 +137,15 @@ export const importSubPlan = (params: Plan.ResPlan) => { // 导出计划检测结果数据 export const exportPlanCheckData = (params: Plan.ResPlan) => { - return http.download(`/adPlan/exportPlanCheckData?planId=${params.id}`) + return http.download(`/adPlan/exportPlanCheckData?planId=${params.id}&report=1`) } // 导入子检测计划检测结果数据 export const importSubPlanCheckData = (params: Plan.ResPlan) => { return http.upload(`/adPlan/importSubPlanCheckData`, params) +} + +// 合并子检测计划检测结果数据 +export const mergeSubPlanCheckData = (params: Plan.ResPlan) => { + return http.upload(`/adPlan/mergePlanCheckData?planId=${params.id}`) } \ 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 f0a3526..25c5a8a 100644 --- a/frontend/src/views/plan/planList/components/childrenPlan.vue +++ b/frontend/src/views/plan/planList/components/childrenPlan.vue @@ -66,10 +66,17 @@ type="primary" icon="Upload" @click="importSubCheckDataClick" + v-if="planFormContent && planFormContent?.children.length > 0" > 导入检测结果 - + 数据合并 { await props.refreshTable!() } } + +const mergeSubCheckDataClick = () => { + ElMessageBox.confirm(`确定合并【${planFormContent.value?.name}】的检测数据吗`, '温馨提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }) + .then(() => { + const params = { + id: planFormContent.value?.id + } + mergeSubPlanCheckData(params).then(res => { + ElMessage.success('合并成功') + }) + }) + .catch(() => {}) +} defineExpose({ open, handleTableDataUpdate }) interface ChildrenPlanProps {