diff --git a/frontend/src/api/plan/interface/index.ts b/frontend/src/api/plan/interface/index.ts index 2ece0aa..bb487ab 100644 --- a/frontend/src/api/plan/interface/index.ts +++ b/frontend/src/api/plan/interface/index.ts @@ -34,6 +34,7 @@ export namespace Plan { Check_By?:string;//计划检测人 progress?: number; // 进度百分比,例如 75 children?: ResPlan[]; + testConfig?: PlanTestConfig; } // 检测计划 + 分页 @@ -42,6 +43,7 @@ export namespace Plan { } + export interface ReqPlan extends ResPlan { datasourceIds:string; sourceIds: string | null; @@ -54,5 +56,14 @@ export namespace Plan { devIds: string[]; } + export interface PlanTestConfig { + planId: string; + waveRecord: number; + realTime: number; + statistics: number; + flicker: number; + maxTime: number; + } + } \ No newline at end of file diff --git a/frontend/src/views/home/components/preTest.vue b/frontend/src/views/home/components/preTest.vue index 2d0c08a..4c39a1f 100644 --- a/frontend/src/views/home/components/preTest.vue +++ b/frontend/src/views/home/components/preTest.vue @@ -174,10 +174,10 @@ function handleFatalError(stepRef: any, logRef: any, message: string) { stepRef.value = 'error'; ts.value = 'error'; step5.value = 'error'; - logRef.value = [{ + logRef.value.push({ type: 'error', log: message - }]; + }); } /** @@ -349,10 +349,10 @@ watch(webMsgSend, function (newValue, oldValue) { } else if (newValue.code == 10201) { step4.value = 'process' - step4InitLog.value = [{ + step4InitLog.value.push({ type: 'wait', log: '源参数下发中.....', - }]; + }); } else if (newValue.code == 10552) { ElMessage.error("存在已经初始化步骤,已经自动关闭,请重新发起检测!") handleFatalError(step4, step4InitLog, '存在已经初始化步骤,执行自动关闭,请重新发起检测!') @@ -373,10 +373,10 @@ watch(webMsgSend, function (newValue, oldValue) { }) } else if (newValue.code == 10201) { step4.value = 'process' - step4InitLog.value = [{ + step4InitLog.value.push({ type: 'wait', log: '获取数据相序校验数据!', - }]; + }); } else if (newValue.code == 25003) { handleFatalError(step4, step4InitLog, '相序校验未通过!') } else if (newValue.code == 25001) { diff --git a/frontend/src/views/plan/planList/components/planPopup.vue b/frontend/src/views/plan/planList/components/planPopup.vue index c81099e..7dd8f34 100644 --- a/frontend/src/views/plan/planList/components/planPopup.vue +++ b/frontend/src/views/plan/planList/components/planPopup.vue @@ -1,55 +1,55 @@