diff --git a/src/main/java/a8k/controler/engineer/utils/EnginnerPageTabOrder.java b/src/main/java/a8k/controler/engineer/utils/EnginnerPageTabOrder.java index a05a790..44a491d 100644 --- a/src/main/java/a8k/controler/engineer/utils/EnginnerPageTabOrder.java +++ b/src/main/java/a8k/controler/engineer/utils/EnginnerPageTabOrder.java @@ -12,25 +12,20 @@ public enum EnginnerPageTabOrder { AppFrontEndEventRouter, - MotorTubeRackMoveCtrlService, - SamplesPreProcessModuleCtrlService, - ReactionPlatesTransmitCtrlService, - HbotControlService, - HardwareTestScript, - - CodeDebugParam, - PositionCalibration, + PosParam, + TimeParam, DeviceStatus, - PosParam, - TimeParam, HardwareCommonCtrl, TubeRackMoveCtrl, SamplesPreProcesCtrl, ReactionPlatesTransmitCtrl, - TestScript, + HbotControlService, + PositionCalibration, + CodeDebugParam, + TestScript, Max; } diff --git a/src/main/java/a8k/service/devicectrl/commonctrl/HardwareCommonCtrl.java b/src/main/java/a8k/service/devicectrl/commonctrl/HardwareCommonCtrl.java index b001252..c0fc6fc 100644 --- a/src/main/java/a8k/service/devicectrl/commonctrl/HardwareCommonCtrl.java +++ b/src/main/java/a8k/service/devicectrl/commonctrl/HardwareCommonCtrl.java @@ -18,7 +18,7 @@ import org.slf4j.Logger; import org.springframework.stereotype.Component; @Component -@EngineerPageTab(name = "硬件控制-通用控制", order = EnginnerPageTabOrder.SamplesPreProcesCtrl) +@EngineerPageTab(name = "硬件控制-通用控制", order = EnginnerPageTabOrder.HardwareCommonCtrl) @EnginnerPageParams(service = HardwareCommonCtrl.class) public class HardwareCommonCtrl { static Logger logger = org.slf4j.LoggerFactory.getLogger(HardwareCommonCtrl.class); diff --git a/src/main/java/a8k/service/devicectrl/ctrl/TubeRackMoveCtrl.java b/src/main/java/a8k/service/devicectrl/ctrl/TubeRackMoveCtrl.java index 4b369eb..22b8d3c 100644 --- a/src/main/java/a8k/service/devicectrl/ctrl/TubeRackMoveCtrl.java +++ b/src/main/java/a8k/service/devicectrl/ctrl/TubeRackMoveCtrl.java @@ -17,7 +17,7 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @Component -@EngineerPageTab(name = "硬件控制-进出料", order = EnginnerPageTabOrder.MotorTubeRackMoveCtrlService) +@EngineerPageTab(name = "硬件控制-进出料", order = EnginnerPageTabOrder.TubeRackMoveCtrl) @EnginnerPageParams(service = TubeRackMoveCtrl.class) public class TubeRackMoveCtrl { static Logger logger = LoggerFactory.getLogger(TubeRackMoveCtrl.class); diff --git a/zhaohe_app.db b/zhaohe_app.db index 195e082..2f2f088 100644 Binary files a/zhaohe_app.db and b/zhaohe_app.db differ