ADD: 修改数据合并逻辑，新增 event-source-polyfill包，实现长连接通信，展示合并进度

frontend/src/api/plan/plan.ts

@@ -141,16 +141,6 @@ export const exportPlanCheckData = (params: any) => {
     )
 }
 
-// 导入子检测计划检测结果数据
-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}`)
-}
-
 //根据误差体系id获取测试项
 export const getPqErrSysTestItemList = (params: {errorSysId : string}) => {
     return http.get(`/pqErrSys/getTestItems?id=${params.errorSysId}`)
@@ -159,4 +149,9 @@ export const getPqErrSysTestItemList = (params: {errorSysId : string}) => {
 // 获取计划项目成员
 export const getMemberList = (params: {id : string}) => {
     return http.get(`/adPlan/getMemberList?planId=${params.id}`)
+}
+
+// 导入并合并子检测计划检测结果数据
+export const importAndMergePlanCheckData = (params: Plan.ResPlan) => {
+    return http.upload(`/adPlan/importAndMergePlanCheckData`, params)
 }