Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client

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; // 角型接线时是否使用相别的指标来进行检测
   }
 
   /**

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)
 }