From a32ca3c849c6c559a91310ee979167f7bd996e60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=BE=E5=90=8C=E5=AD=A6?= <stary1993@qq.com>
Date: Fri, 29 Aug 2025 09:54:19 +0800
Subject: [PATCH] =?UTF-8?q?ADD:=E6=95=B0=E6=8D=AE=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/plan/plan.ts                 |  7 ++++-
 .../plan/planList/components/childrenPlan.vue | 27 ++++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

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"
                     >
                         导入检测结果
                     </el-button>
-                    <el-button type="primary" icon="Box" v-auth.plan="'add_subplan'" v-if="!isTabPlanFather">
+                    <el-button
+                        type="primary"
+                        icon="Box"
+                        v-auth.plan="'add_subplan'"
+                        v-if="!isTabPlanFather && planFormContent && planFormContent?.children.length > 0"
+                        @click="mergeSubCheckDataClick"
+                    >
                         数据合并
                     </el-button>
                     <el-button
@@ -180,6 +187,7 @@ import {
     exportSubPlan,
     getDevListByPlanId,
     importSubPlanCheckData,
+    mergeSubPlanCheckData,
     subPlanBindDev
 } from '@/api/plan/plan'
 import { Device } from '@/api/device/interface/device'
@@ -641,6 +649,23 @@ const importResult = async (success: boolean | undefined) => {
         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 {