diff --git a/src/services/globalCmd/globalCmd.ts b/src/services/globalCmd/globalCmd.ts index 1f71afb..f57f755 100644 --- a/src/services/globalCmd/globalCmd.ts +++ b/src/services/globalCmd/globalCmd.ts @@ -3,15 +3,15 @@ import { addTxnRecord } from "../txn"; type UpTrayStepStruct = { method: "upTray"; - params: { - heaterId: number; - }; + // params: { + // heaterId: number; + // }; }; type DownTrayStepStruct = { method: "downTray"; - params: { - heaterId: number; - }; + // params: { + // heaterId: number; + // }; }; export type TubeSolStruct = { tubeNum: number; @@ -30,15 +30,15 @@ type AddLiquidStepStruct = { }; type MoveToSolStepStruct = { method: "moveToSol"; - params: { - heaterId: number; - }; + // params: { + // heaterId: number; + // }; }; type MoveToHeaterStepStruct = { method: "moveToHeater"; - params: { - heaterId: number; - }; + // params: { + // heaterId: number; + // }; }; type ShakingStepStruct = { method: "shaking"; @@ -50,15 +50,15 @@ type ShakingStepStruct = { type StartHeatingStepStruct = { method: "startHeating"; params: { - heaterId: number; + // heaterId: number; temperature: number; }; }; type StopHeatingStepStruct = { method: "stopHeating"; - params: { - heaterId: number; - }; + // params: { + // heaterId: number; + // }; }; type TakePhotoStepStruct = { method: "takePhoto"; @@ -116,6 +116,8 @@ export const CmdDescMap: { [k in OperationCmd]: string } = { closeClaw: "收合夹爪", moveMachineArm: "移动机械臂", moveTube: "移动试管", + openDoor: "开门", + closeDoor: "关门", }; export type OperationCmd = @@ -137,8 +139,8 @@ export type OperationCmd = | "closeClaw" // 收合夹爪 | "moveMachineArm" // 移动机械臂 | "moveTube" // 移动试管 - | 'openDoor' //开门 - | 'closeDoor' //关门 + | "openDoor" //开门 + | "closeDoor"; //关门 export function debugCmd(params: { command: OperationCmd; params: Record }) { const commandId = addTxnRecord({ ...params, category: "debug" }); diff --git a/src/views/oreManage/components/CraftConfig.vue b/src/views/oreManage/components/CraftConfig.vue index 0c91fda..069b2b1 100644 --- a/src/views/oreManage/components/CraftConfig.vue +++ b/src/views/oreManage/components/CraftConfig.vue @@ -66,14 +66,7 @@ const emit = defineEmits<{ function addStep(step: StepCmd) { let st: StepStruct; - if (step === "upTray" || step === "downTray" || step === "moveToSol" || step === "moveToHeater" || step === "stopHeating") { - st = { - method: step, - params: { - heaterId: 2, - }, - }; - } else if (step === "addLiquid") { + if (step === "addLiquid") { st = { method: step, params: { @@ -85,7 +78,6 @@ function addStep(step: StepCmd) { st = { method: step, params: { - heaterId: 2, temperature: 100, }, }; diff --git a/src/views/oreManage/components/StepItemEx.vue b/src/views/oreManage/components/StepItemEx.vue index 46d71de..996fd54 100644 --- a/src/views/oreManage/components/StepItemEx.vue +++ b/src/views/oreManage/components/StepItemEx.vue @@ -33,7 +33,7 @@ -
-
+ -->
- +