Browse Source

更新UI界面

tags/v0
zhaohe 7 months ago
parent
commit
12c9286dd1
  1. 2
      appresource/static/engineer/css/app.d22b2bc5.css
  2. 2
      appresource/static/engineer/index.html
  3. 2
      appresource/static/engineer/js/app.ab8e6e32.js
  4. 2
      appresource/static/engineer/js/app.d39856d3.js
  5. 2
      appresource/static/engineer/js/app.d39856d3.js.map
  6. 24
      src/main/java/a8k/app/controler/api/v1/app/state/AppTubeSettingMgrControler.java
  7. 163
      src/main/java/a8k/app/service/data/UtilsProjectColorAllocer.java
  8. 158
      src/main/java/a8k/extui/mgr/ExtApiPageGroupCfgMgr.java
  9. 2
      src/main/java/a8k/extui/oldpage/pos_calibration/PosMeasureUtilsPage.java
  10. 2
      src/main/java/a8k/extui/page/debug/P00AppEventAndMessageBoxDebugPage.java
  11. 2
      src/main/java/a8k/extui/page/debug/P00MainflowCtrlServiceDebugPage.java
  12. 2
      src/main/java/a8k/extui/page/debug/P01EmergencyTubeDebugPage.java
  13. 2
      src/main/java/a8k/extui/page/debug/P01ProjInfoDebugPage.java
  14. 2
      src/main/java/a8k/extui/page/debug/P02ConsumablesMgrDebugPage.java
  15. 2
      src/main/java/a8k/extui/page/debug/P02TubeSettingDebugPage.java
  16. 2
      src/main/java/a8k/extui/page/debug/P11IncubationPlateStateDebugPageAll.java
  17. 2
      src/main/java/a8k/extui/page/debug/P12TueStateDebugPage.java
  18. 2
      src/main/java/a8k/extui/page/debug/P13OptModuleStateDebugPage.java
  19. 2
      src/main/java/a8k/extui/page/debug/P20AppSettingDebugPage.java
  20. 2
      src/main/java/a8k/extui/page/debug/P22UserOperaionInRunOnlyModePage.java
  21. 2
      src/main/java/a8k/extui/page/debug/P22UserOperaionInVertualModePage.java
  22. 2
      src/main/java/a8k/extui/page/extapp/A8kOptVerification.java
  23. 2
      src/main/java/a8k/extui/page/extapp/OptModuleParamCalibration.java
  24. 2
      src/main/java/a8k/extui/page/extapp/P01PipetteGunVerification.java
  25. 2
      src/main/java/a8k/extui/page/extapp/P02A8kTemperaturaVerfication.java
  26. 2
      src/main/java/a8k/extui/page/extsetting/DeviceActionParameterSettingPage.java
  27. 2
      src/main/java/a8k/extui/page/extsetting/ProjInfoMgrPage.java
  28. 2
      src/main/java/a8k/extui/page/extsetting/pos_calibration/P01MiniServoReferencePointIniter.java
  29. 2
      src/main/java/a8k/extui/page/extsetting/pos_calibration/P02TubeFeedingModulePosCalibrationPage.java
  30. 2
      src/main/java/a8k/extui/page/extsetting/pos_calibration/P03TubePreProcesPosCalibrationPage.java
  31. 2
      src/main/java/a8k/extui/page/extsetting/pos_calibration/P04ReactionPlatesTransmitControlerCalibrationPage.java
  32. 2
      src/main/java/a8k/extui/page/extsetting/pos_calibration/P20HbotTipPosCalibrationPage.java
  33. 2
      src/main/java/a8k/extui/page/extsetting/pos_calibration/P21HbotLittleBSPosCalibrationPage.java
  34. 2
      src/main/java/a8k/extui/page/extsetting/pos_calibration/P23HbotLargeBottleBSPosCalibrationPage.java
  35. 2
      src/main/java/a8k/extui/page/extsetting/pos_calibration/P24Hbot2DCodeScanPosCalibrationPage.java
  36. 2
      src/main/java/a8k/extui/page/extsetting/pos_calibration/P25HbotSamplePosCalibrationPage.java
  37. 2
      src/main/java/a8k/extui/page/init/BackgroudProcessCtrlPage.java
  38. 2
      src/main/java/a8k/extui/page/init/DeviceInitPage.java
  39. 10
      src/main/java/a8k/extui/page/measurement/PlateBoxPosMeasurePage.java
  40. 2
      src/main/java/a8k/extui/page/test/codetest/OptFormulaTestPage.java
  41. 2
      src/main/java/a8k/extui/page/test/codetest/OptFormulaTestPageV2.java
  42. 2
      src/main/java/a8k/extui/page/test/driver/LowLevelBoardVersionPreviewPage.java
  43. 2
      src/main/java/a8k/extui/page/test/driver/PipetteCtrlDriverPage.java
  44. 2
      src/main/java/a8k/extui/page/test/frond_end_test/FakeReactionRecordGeneratorPage.java
  45. 2
      src/main/java/a8k/extui/page/test/frond_end_test/FakeStateGeneratorPage.java
  46. 2
      src/main/java/a8k/extui/page/test/frond_end_test/VirtualEventGeneratorPage.java
  47. 2
      src/main/java/a8k/extui/page/test/stress_test/PipetteGunStressTest.java
  48. 2
      src/main/java/a8k/extui/page/test/verification/P00PosVerifyUitilsPage.java
  49. 2
      src/main/java/a8k/extui/page/test/verification/P10ProjejIDCardTestPage.java
  50. 2
      src/main/java/a8k/extui/page/test/verification/P30InfeedAndPreProcessPosVerificationPage.java
  51. 2
      src/main/java/a8k/extui/page/test/verification/P31ReactionPlatesTransmitPosVerificationPage.java
  52. 2
      src/main/java/a8k/extui/page/test/verification/P32HbotPosVerificationPage.java
  53. 2
      src/main/java/a8k/extui/page/test/verification/P33HbotSamplePosVerificationPage.java
  54. 2
      src/main/java/a8k/extui/page/test/verification/P34LiquidOperationTestPage.java
  55. 3
      src/main/java/a8k/extui/page/test/verification/P50VerificationScriptPage.java
  56. 2
      src/main/java/a8k/extui/page/test/verification/P51FullFlowVerificationPage.java

2
appresource/static/engineer/css/app.89317f4a.css → appresource/static/engineer/css/app.d22b2bc5.css

@ -1,4 +1,4 @@
.vjs-tree-brackets{cursor:pointer}.vjs-tree-brackets:hover{color:#1890ff}.vjs-check-controller{position:absolute;left:0}.vjs-check-controller.is-checked .vjs-check-controller-inner{background-color:#1890ff;border-color:#0076e4}.vjs-check-controller.is-checked .vjs-check-controller-inner.is-checkbox:after{-webkit-transform:rotate(45deg) scaleY(1);transform:rotate(45deg) scaleY(1)}.vjs-check-controller.is-checked .vjs-check-controller-inner.is-radio:after{-webkit-transform:translate(-50%,-50%) scale(1);transform:translate(-50%,-50%) scale(1)}.vjs-check-controller .vjs-check-controller-inner{display:inline-block;position:relative;border:1px solid #bfcbd9;border-radius:2px;vertical-align:middle;-webkit-box-sizing:border-box;box-sizing:border-box;width:16px;height:16px;background-color:#fff;z-index:1;cursor:pointer;-webkit-transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46);transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.vjs-check-controller .vjs-check-controller-inner:after{-webkit-box-sizing:content-box;box-sizing:content-box;content:"";border:2px solid #fff;border-left:0;border-top:0;height:8px;left:4px;position:absolute;top:1px;-webkit-transform:rotate(45deg) scaleY(0);transform:rotate(45deg) scaleY(0);width:4px;-webkit-transition:-webkit-transform .15s cubic-bezier(.71,-.46,.88,.6) .05s;transition:-webkit-transform .15s cubic-bezier(.71,-.46,.88,.6) .05s;transition:transform .15s cubic-bezier(.71,-.46,.88,.6) .05s;transition:transform .15s cubic-bezier(.71,-.46,.88,.6) .05s,-webkit-transform .15s cubic-bezier(.71,-.46,.88,.6) .05s;-webkit-transform-origin:center;transform-origin:center}.vjs-check-controller .vjs-check-controller-inner.is-radio{border-radius:100%}.vjs-check-controller .vjs-check-controller-inner.is-radio:after{border-radius:100%;height:4px;background-color:#fff;left:50%;top:50%}.vjs-check-controller .vjs-check-controller-original{opacity:0;outline:none;position:absolute;z-index:-1;top:0;left:0;right:0;bottom:0;margin:0}.vjs-carets{position:absolute;right:0;cursor:pointer}.vjs-carets svg{-webkit-transition:-webkit-transform .3s;transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s}.vjs-carets:hover{color:#1890ff}.vjs-carets-close{-webkit-transform:rotate(-90deg);transform:rotate(-90deg)}.vjs-tree-node{display:-webkit-box;display:-ms-flexbox;display:flex;position:relative;line-height:20px}.vjs-tree-node.has-carets{padding-left:15px}.vjs-tree-node.has-carets.has-selector,.vjs-tree-node.has-selector{padding-left:30px}.vjs-tree-node.is-highlight,.vjs-tree-node:hover{background-color:#e6f7ff}.vjs-tree-node .vjs-indent{display:-webkit-box;display:-ms-flexbox;display:flex;position:relative}.vjs-tree-node .vjs-indent-unit{width:1em}.vjs-tree-node .vjs-indent-unit.has-line{border-left:1px dashed #bfcbd9}.vjs-tree-node.dark.is-highlight,.vjs-tree-node.dark:hover{background-color:#2e4558}.vjs-node-index{position:absolute;right:100%;margin-right:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vjs-colon{white-space:pre}.vjs-comment{color:#bfcbd9}.vjs-value{word-break:break-word}.vjs-value-null,.vjs-value-undefined{color:#d55fde}.vjs-value-boolean,.vjs-value-number{color:#1d8ce0}.vjs-value-string{color:#13ce66}.vjs-tree{font-family:Monaco,Menlo,Consolas,Bitstream Vera Sans Mono,monospace;font-size:14px;text-align:left}.vjs-tree.is-virtual{overflow:auto}.vjs-tree.is-virtual .vjs-tree-node{white-space:nowrap}.p-style[data-v-3f841166]{white-space:pre;word-break:keep-all;max-height:20vh;overflow-y:auto}.group-container[data-v-3f841166]{height:100%;display:flex;flex-direction:column}.action-param-label[data-v-69612837]{font-size:.6rem;top:-8px;position:absolute;z-index:9;left:5px;padding:0 5px;color:#7b7b7b}.action-button[data-v-69612837],.fixed-length-button[data-v-69612837]{white-space:normal;word-break:break-word}.fixed-length-button[data-v-69612837]{min-width:230px}[data-v-00520218]::-webkit-scrollbar{display:none}
.vjs-tree-brackets{cursor:pointer}.vjs-tree-brackets:hover{color:#1890ff}.vjs-check-controller{position:absolute;left:0}.vjs-check-controller.is-checked .vjs-check-controller-inner{background-color:#1890ff;border-color:#0076e4}.vjs-check-controller.is-checked .vjs-check-controller-inner.is-checkbox:after{-webkit-transform:rotate(45deg) scaleY(1);transform:rotate(45deg) scaleY(1)}.vjs-check-controller.is-checked .vjs-check-controller-inner.is-radio:after{-webkit-transform:translate(-50%,-50%) scale(1);transform:translate(-50%,-50%) scale(1)}.vjs-check-controller .vjs-check-controller-inner{display:inline-block;position:relative;border:1px solid #bfcbd9;border-radius:2px;vertical-align:middle;-webkit-box-sizing:border-box;box-sizing:border-box;width:16px;height:16px;background-color:#fff;z-index:1;cursor:pointer;-webkit-transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46);transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.vjs-check-controller .vjs-check-controller-inner:after{-webkit-box-sizing:content-box;box-sizing:content-box;content:"";border:2px solid #fff;border-left:0;border-top:0;height:8px;left:4px;position:absolute;top:1px;-webkit-transform:rotate(45deg) scaleY(0);transform:rotate(45deg) scaleY(0);width:4px;-webkit-transition:-webkit-transform .15s cubic-bezier(.71,-.46,.88,.6) .05s;transition:-webkit-transform .15s cubic-bezier(.71,-.46,.88,.6) .05s;transition:transform .15s cubic-bezier(.71,-.46,.88,.6) .05s;transition:transform .15s cubic-bezier(.71,-.46,.88,.6) .05s,-webkit-transform .15s cubic-bezier(.71,-.46,.88,.6) .05s;-webkit-transform-origin:center;transform-origin:center}.vjs-check-controller .vjs-check-controller-inner.is-radio{border-radius:100%}.vjs-check-controller .vjs-check-controller-inner.is-radio:after{border-radius:100%;height:4px;background-color:#fff;left:50%;top:50%}.vjs-check-controller .vjs-check-controller-original{opacity:0;outline:none;position:absolute;z-index:-1;top:0;left:0;right:0;bottom:0;margin:0}.vjs-carets{position:absolute;right:0;cursor:pointer}.vjs-carets svg{-webkit-transition:-webkit-transform .3s;transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s}.vjs-carets:hover{color:#1890ff}.vjs-carets-close{-webkit-transform:rotate(-90deg);transform:rotate(-90deg)}.vjs-tree-node{display:-webkit-box;display:-ms-flexbox;display:flex;position:relative;line-height:20px}.vjs-tree-node.has-carets{padding-left:15px}.vjs-tree-node.has-carets.has-selector,.vjs-tree-node.has-selector{padding-left:30px}.vjs-tree-node.is-highlight,.vjs-tree-node:hover{background-color:#e6f7ff}.vjs-tree-node .vjs-indent{display:-webkit-box;display:-ms-flexbox;display:flex;position:relative}.vjs-tree-node .vjs-indent-unit{width:1em}.vjs-tree-node .vjs-indent-unit.has-line{border-left:1px dashed #bfcbd9}.vjs-tree-node.dark.is-highlight,.vjs-tree-node.dark:hover{background-color:#2e4558}.vjs-node-index{position:absolute;right:100%;margin-right:4px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.vjs-colon{white-space:pre}.vjs-comment{color:#bfcbd9}.vjs-value{word-break:break-word}.vjs-value-null,.vjs-value-undefined{color:#d55fde}.vjs-value-boolean,.vjs-value-number{color:#1d8ce0}.vjs-value-string{color:#13ce66}.vjs-tree{font-family:Monaco,Menlo,Consolas,Bitstream Vera Sans Mono,monospace;font-size:14px;text-align:left}.vjs-tree.is-virtual{overflow:auto}.vjs-tree.is-virtual .vjs-tree-node{white-space:nowrap}.p-style[data-v-3f841166]{white-space:pre;word-break:keep-all;max-height:20vh;overflow-y:auto}.group-container[data-v-3f841166]{height:100%;display:flex;flex-direction:column}.action-param-label[data-v-69612837]{font-size:.6rem;top:-8px;position:absolute;z-index:9;left:5px;padding:0 5px;color:#7b7b7b}.action-button[data-v-69612837],.fixed-length-button[data-v-69612837]{white-space:normal;word-break:break-word}.fixed-length-button[data-v-69612837]{min-width:230px}[data-v-44341468]::-webkit-scrollbar{display:none}
/* /*
! tailwindcss v3.4.4 | MIT License | https://tailwindcss.com ! tailwindcss v3.4.4 | MIT License | https://tailwindcss.com

2
appresource/static/engineer/index.html

@ -1 +1 @@
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>a8k_webui</title><script defer="defer" src="js/chunk-vendors.5158647c.js"></script><script defer="defer" src="js/app.ab8e6e32.js"></script><link href="css/app.89317f4a.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but a8k_webui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>a8k_webui</title><script defer="defer" src="js/chunk-vendors.5158647c.js"></script><script defer="defer" src="js/app.d39856d3.js"></script><link href="css/app.d22b2bc5.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but a8k_webui doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>

2
appresource/static/engineer/js/app.ab8e6e32.js
File diff suppressed because it is too large
View File

2
appresource/static/engineer/js/app.d39856d3.js
File diff suppressed because it is too large
View File

2
appresource/static/engineer/js/app.d39856d3.js.map
File diff suppressed because it is too large
View File

24
src/main/java/a8k/app/controler/api/v1/app/state/AppTubeSettingMgrControler.java

@ -43,25 +43,29 @@ public class AppTubeSettingMgrControler {
public static class TubeSettingVal { public static class TubeSettingVal {
public String uuid; public String uuid;
public TubeSetting setting;
public List<TubeSetting> setting;
} }
@Operation(summary = "配置试管") @Operation(summary = "配置试管")
@PostMapping("/updateTubeSetting") @PostMapping("/updateTubeSetting")
public ApiRet<Void> updateTubeSetting(@RequestBody TubeSettingVal model) throws AppException { public ApiRet<Void> updateTubeSetting(@RequestBody TubeSettingVal model) throws AppException {
tubeSettingMgrService.updateTubeSetting(model.uuid, model.setting);
return ApiRet.success();
}
@Operation(summary = "配置试管(Muti)")
@PostMapping("/updateMutiTubeSettings")
public ApiRet<Void> updateTubeSetting(@RequestBody List<TubeSettingVal> model) throws AppException {
for (TubeSettingVal val : model) {
tubeSettingMgrService.updateTubeSetting(val.uuid, val.setting);
// tubeSettingMgrService.updateTubeSetting(model.uuid, model.setting);
for (TubeSetting val : model.setting) {
tubeSettingMgrService.updateTubeSetting(model.uuid, val);
} }
return ApiRet.success(); return ApiRet.success();
} }
// @Operation(summary = "配置试管(Muti)")
// @PostMapping("/updateMutiTubeSettings")
// public ApiRet<Void> updateTubeSetting(@RequestBody List<TubeSettingVal> model) throws AppException {
// for (TubeSettingVal val : model) {
// tubeSettingMgrService.updateTubeSetting(val.uuid, val.setting);
// }
// return ApiRet.success();
// }
//添加试管架返回整个列表 //添加试管架返回整个列表
@Operation(summary = "添加<试管架>配置") @Operation(summary = "添加<试管架>配置")
@PostMapping("/newTubeHolderSetting") @PostMapping("/newTubeHolderSetting")

163
src/main/java/a8k/app/service/data/UtilsProjectColorAllocer.java

@ -6,129 +6,46 @@ import org.springframework.stereotype.Component;
public class UtilsProjectColorAllocer { public class UtilsProjectColorAllocer {
// https://blog.csdn.net/weixin_44878336/article/details/135003274 // https://blog.csdn.net/weixin_44878336/article/details/135003274
final static String[] colors = { final static String[] colors = {
"#FFB6C1", // 1:浅粉红
"#FFC0CB", // 2:粉红
"#DC143C", // 3:猩红
"#DB7093", // 苍白的紫罗兰红色
"#FF69B4", // 热情的粉红
"#FF1493", // 深粉色
"#C71585", // 适中的紫罗兰红色
"#DA70D6", // 兰花的紫色
"#D8BFD8", //
"#DDA0DD", // 李子
"#EE82EE", // 紫罗兰
"#FF00FF", // 洋红
"#FF00FF", // 灯笼海棠
"#8B008B", // 深洋红色
"#800080", // 紫色
"#BA55D3", // 适中的兰花紫
"#9400D3", // 深紫罗兰色
"#9932CC", // 深兰花紫
"#4B0082", // 靛青
"#8A2BE2", // 深紫罗兰的蓝色
"#9370DB", // 适中的紫色
"#7B68EE", // 适中的板岩暗蓝灰色
"#6A5ACD", // 板岩暗蓝灰色
"#483D8B", // 深板岩暗蓝灰色
"#E6E6FA", // 薰衣草花的淡紫色
"#F8F8FF", // 幽灵的白色
"#0000FF", // 纯蓝
"#0000FF", // 靛蓝
"#0000CD", // 适中的蓝色
"#191970", // 午夜的蓝色
"#00008B", // 深蓝色
"#000080", // 海军蓝,深靛蓝
"#4169E1", // 皇家蓝
"#6495ED", // 矢车菊的蓝色
"#B0C4DE", // 淡钢蓝
"#778899", // 浅石板灰
"#708090", // 石板灰
"#1E90FF", // 道奇蓝
"#F0F8FF", // 爱丽丝蓝
"#4682B4", // 钢蓝
"#87CEFA", // 淡蓝色
"#87CEEB", // 天蓝色
"#00BFFF", // 深天蓝
"#ADD8E6", // 淡蓝
"#B0E0E6", // 火药蓝
"#5F9EA0", // 军校蓝
"#F0FFFF", // 蔚蓝色
"#E1FFFF", // 淡青色
"#AFEEEE", // 苍白的绿宝石
"#00FFFF", // 青色
"#00FFFF", // 水绿色
"#00CED1", // 深绿宝石
"#2F4F4F", // 深石板灰
"#008B8B", // 深青色
"#008080", // 水鸭色
"#48D1CC", // 适中的绿宝石
"#20B2AA", // 浅海洋绿
"#40E0D0", // 绿宝石
"#7FFFAA", // 绿玉/碧绿色
"#00FA9A", // 适中的碧绿色
"#00FF7F", // 适中的春天的绿色
"#F5FFFA", // 薄荷奶油
"#3CB371", // 春天的绿色
"#2E8B57", // 海洋绿
"#F0FFF0", // 蜂蜜
"#90EE90", // 淡绿色
"#98FB98", // 苍白的绿色
"#8FBC8F", // 深海洋绿
"#32CD32", // 酸橙绿
"#00FF00", // 酸橙色
"#228B22", // 森林绿
"#008000", // 纯绿
"#006400", // 深绿色
"#7FFF00", // 查特酒绿
"#7CFC00", // 草坪绿
"#ADFF2F", // 绿黄色
"#556B2F", // 橄榄土褐色
"#F5F5DC", // 米色(浅褐色)
"#FAFAD2", // 浅秋麒麟黄
"#FFFFF0", // 象牙
"#FFFFE0", // 浅黄色
"#FFFF00", // 纯黄
"#808000", // 橄榄
"#BDB76B", // 深卡其布
"#FFFACD", // 柠檬薄纱
"#EEE8AA", // 灰秋麒麟
"#F0E68C", // 卡其布
"#FFD700", //
"#FFF8DC", // 玉米色
"#DAA520", // 秋麒麟
"#FFFAF0", // 花的白色
"#FDF5E6", // 老饰带
"#F5DEB3", // 小麦色
"#FFE4B5", // 鹿皮鞋
"#FFA500", // 橙色
"#FFEFD5", // 番木瓜
"#FFEBCD", // 漂白的杏仁
"#FFDEAD", // 纳瓦霍白/印第安黄
"#FAEBD7", // 古代的白色
"#D2B48C", // 晒黑
"#DEB887", // 结实的树
"#FFE4C4", // (浓汤)乳脂番茄等
"#FF8C00", // 深橙色
"#FAF0E6", // 亚麻布
"#CD853F", // 秘鲁
"#FFDAB9", // 桃色
"#F4A460", // 沙棕色
"#D2691E", // 巧克力
"#8B4513", // 马鞍棕色
"#FFF5EE", // 海贝壳
"#A0522D", // 黄土赭色
"#FFA07A", // 浅鲜肉(鲑鱼)
"#FF7F50", // 珊瑚
"#FF4500", // 橙红色
"#E9967A", // 深鲜肉(鲑鱼)
"#FF6347", // 番茄
"#FFE4E1", // 薄雾玫瑰
"#FA8072", // 鲜肉(鲑鱼)
"#FFFAFA", //
"#F08080", // 淡珊瑚色
"#BC8F8F", // 玫瑰棕色
"#CD5C5C", // 印度红
"#FF0000", // 纯红
"#255FAB",
"#28D818",
"#2C6967",
"#374184",
"#39CD80",
"#428681",
"#4295AD",
"#465EFB",
"#4A9CD5",
"#587585",
"#5AB786",
"#67DCED",
"#688BBD",
"#6A7761",
"#6BA4A6",
"#72B99C",
"#765BEA",
"#785FA8",
"#83746D",
"#88EA92",
"#8FAEE9",
"#8FD5BF",
"#99B597",
"#9AF6DB",
"#A0B7E3",
"#A8B93F",
"#AAA192",
"#AC91D2",
"#BCDADF",
"#BFBA97",
"#DDC4C3",
"#E8D8B6",
"#E9BD82",
"#EB9747",
"#F5B43F",
"#F6D054",
"#F8D1ED",
"#F9F166",
"#FAE898",
"#FBE3E3",
}; };
static public String getProjColor(Integer projId) { static public String getProjColor(Integer projId) {

158
src/main/java/a8k/extui/mgr/ExtApiPageGroupCfgMgr.java

@ -1,26 +1,28 @@
package a8k.extui.mgr; package a8k.extui.mgr;
import a8k.extui.newpage.debug.*;
import a8k.extui.newpage.extsetting.DeviceActionParameterSettingPage;
import a8k.extui.newpage.extsetting.ProjInfoMgrPage;
import a8k.extui.newpage.test.driver.LowLevelBoardVersionPreviewPage;
import a8k.extui.page.debug.*;
import a8k.extui.page.extsetting.DeviceActionParameterSettingPage;
import a8k.extui.page.extsetting.ProjInfoMgrPage;
import a8k.extui.page.init.BackgroudProcessCtrlPage;
import a8k.extui.page.init.DeviceInitPage;
import a8k.extui.page.test.driver.LowLevelBoardVersionPreviewPage;
import a8k.extui.page.measurement.HbotPosMeasurePage; import a8k.extui.page.measurement.HbotPosMeasurePage;
import a8k.extui.newpage.test.codetest.OptFormulaTestPage;
import a8k.extui.newpage.test.codetest.OptFormulaTestPageV2;
import a8k.extui.newpage.test.driver.PipetteCtrlDriverPage;
import a8k.extui.newpage.extapp.A8kOptVerification;
import a8k.extui.newpage.test.frond_end_test.FakeReactionRecordGeneratorPage;
import a8k.extui.newpage.test.frond_end_test.VirtualEventGeneratorPage;
import a8k.extui.newpage.extapp.OptModuleParamCalibration;
import a8k.extui.newpage.extsetting.pos_calibration.*;
import a8k.extui.newpage.test.stress_test.PipetteGunStressTest;
import a8k.extui.newpage.extapp.P01PipetteGunVerification;
import a8k.extui.newpage.extapp.P02A8kTemperaturaVerfication;
import a8k.extui.page.verification.*;
import a8k.extui.page.verification.P34LiquidOperationTestPage;
import a8k.extui.page.verification.P10ProjejIDCardTestPage;
import a8k.extui.page.test.codetest.OptFormulaTestPage;
import a8k.extui.page.test.codetest.OptFormulaTestPageV2;
import a8k.extui.page.test.driver.PipetteCtrlDriverPage;
import a8k.extui.page.extapp.A8kOptVerification;
import a8k.extui.page.test.frond_end_test.FakeReactionRecordGeneratorPage;
import a8k.extui.page.test.frond_end_test.VirtualEventGeneratorPage;
import a8k.extui.page.extapp.OptModuleParamCalibration;
import a8k.extui.page.extsetting.pos_calibration.*;
import a8k.extui.page.test.stress_test.PipetteGunStressTest;
import a8k.extui.page.extapp.P01PipetteGunVerification;
import a8k.extui.page.extapp.P02A8kTemperaturaVerfication;
import a8k.extui.page.test.verification.*;
import a8k.extui.page.test.verification.P34LiquidOperationTestPage;
import a8k.extui.page.test.verification.P10ProjejIDCardTestPage;
import jakarta.annotation.PostConstruct; import jakarta.annotation.PostConstruct;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -79,23 +81,26 @@ public class ExtApiPageGroupCfgMgr {
@PostConstruct @PostConstruct
void init() { void init() {
pushMenu(new Menu("测量", List.of(
// new Menu(DeviceInitializeUtilsPage.class, "设备初始化"),
new Menu(HbotPosMeasurePage.class, "HBOT测量")
//初始化
//测量
//测试
//高级配置
//高级应用
pushMenu(
new Menu("初始化", List.of(
new Menu(DeviceInitPage.class, "设备初始化"),
new Menu(BackgroudProcessCtrlPage.class, "后台线程控制")
))); )));
pushMenu(new Menu("位置标定", List.of(
new Menu(P02TubeFeedingModulePosCalibrationPage.class, "试管入料校准"),
new Menu(P03TubePreProcesPosCalibrationPage.class, "试管预处理校准"),
new Menu(P04ReactionPlatesTransmitControlerCalibrationPage.class, "反应板相关位置校准"),
new Menu(P20HbotTipPosCalibrationPage.class, "Tip耗材位置校准"),
new Menu(P21HbotLittleBSPosCalibrationPage.class, "小瓶BS耗材位置校准"),
new Menu(P23HbotLargeBottleBSPosCalibrationPage.class, "大瓶BS耗材位置校准"),
new Menu(P24Hbot2DCodeScanPosCalibrationPage.class, "耗材扫描校准"),
new Menu(P25HbotSamplePosCalibrationPage.class, "取样位置校准")
pushMenu(
new Menu("测量", List.of(
new Menu(HbotPosMeasurePage.class, "HBOT测量")
))); )));
pushMenu(new Menu("验证", List.of(
pushMenu(
new Menu("测试", List.of(
new Menu("验证", List.of(
new Menu(P00PosVerifyUitilsPage.class, "工具"), new Menu(P00PosVerifyUitilsPage.class, "工具"),
new Menu(P10ProjejIDCardTestPage.class, "ID卡"), new Menu(P10ProjejIDCardTestPage.class, "ID卡"),
new Menu(P30InfeedAndPreProcessPosVerificationPage.class, "单步-入料和预处理"), new Menu(P30InfeedAndPreProcessPosVerificationPage.class, "单步-入料和预处理"),
@ -105,53 +110,84 @@ public class ExtApiPageGroupCfgMgr {
new Menu(P34LiquidOperationTestPage.class, "单步-液体操作"), new Menu(P34LiquidOperationTestPage.class, "单步-液体操作"),
new Menu(P50VerificationScriptPage.class, "脚本-模块验证"), new Menu(P50VerificationScriptPage.class, "脚本-模块验证"),
new Menu(P51FullFlowVerificationPage.class, "脚本-全流程验证") new Menu(P51FullFlowVerificationPage.class, "脚本-全流程验证")
)));
pushMenu(new Menu("光学标定与验证", List.of(
new Menu(A8kOptVerification.class, "光学模组验证"),
new Menu(OptModuleParamCalibration.class, "光学模块参数校准"),
new Menu(OptFormulaTestPageV2.class, "光学公式测试1"),
new Menu(OptFormulaTestPage.class, "光学公式测试2")
)));
pushMenu(new Menu("验证(过检专用)", List.of(
new Menu(P01PipetteGunVerification.class, "移液枪验证"),
new Menu(P02A8kTemperaturaVerfication.class, "温度控制验证")
)));
)),
new Menu("压力测试", List.of(
new Menu(PipetteGunStressTest.class, "移液枪压力测试")
))
))
);
pushMenu(new Menu("调试", List.of(
pushMenu(
new Menu("应用调试", List.of(
new Menu(P00AppEventAndMessageBoxDebugPage.class, "事件与消息"), new Menu(P00AppEventAndMessageBoxDebugPage.class, "事件与消息"),
new Menu(P22UserOperaionInRunOnlyModePage.class, "空转模式用户操作"),
new Menu(P22UserOperaionInVertualModePage.class, "虚拟模式用户操作"),
new Menu(P00MainflowCtrlServiceDebugPage.class, "主流程调试"),
new Menu("用户操作", List.of(
new Menu(P00MainflowCtrlServiceDebugPage.class, "主流程控制"),
new Menu(P02ConsumablesMgrDebugPage.class, "耗材"), new Menu(P02ConsumablesMgrDebugPage.class, "耗材"),
new Menu(P01EmergencyTubeDebugPage.class, "急诊"), new Menu(P01EmergencyTubeDebugPage.class, "急诊"),
new Menu(P02TubeSettingDebugPage.class, "试管配置"), new Menu(P02TubeSettingDebugPage.class, "试管配置"),
new Menu(P01ProjInfoDebugPage.class, "ID卡操作"), new Menu(P01ProjInfoDebugPage.class, "ID卡操作"),
new Menu(P11IncubationPlateStateDebugPageAll.class, "状态.孵育盘"),
new Menu(P12TueStateDebugPage.class, "状态.试管"),
new Menu(P13OptModuleStateDebugPage.class, "状态.光学模块"),
new Menu(P20AppSettingDebugPage.class, "设置.系统设置"),
new Menu(P22UserOperaionInRunOnlyModePage.class, "空转模式用户操作"),
new Menu(P22UserOperaionInVertualModePage.class, "虚拟模式用户操作")
)),
new Menu("状态", List.of(
new Menu(P11IncubationPlateStateDebugPageAll.class, "孵育盘"),
new Menu(P12TueStateDebugPage.class, "试管"),
new Menu(P13OptModuleStateDebugPage.class, "光学模块")
)),
new Menu(P20AppSettingDebugPage.class, "系统设置"),
new Menu("前端测试助手", List.of( new Menu("前端测试助手", List.of(
new Menu(FakeReactionRecordGeneratorPage.class, "虚拟反应记录生成"), new Menu(FakeReactionRecordGeneratorPage.class, "虚拟反应记录生成"),
new Menu(VirtualEventGeneratorPage.class, "虚拟事件生成") new Menu(VirtualEventGeneratorPage.class, "虚拟事件生成")
)) ))
)));
pushMenu(new Menu("驱动调试", List.of(
))
);
pushMenu(
new Menu("驱动调试", List.of(
new Menu(LowLevelBoardVersionPreviewPage.class, "低级板版本预览"), new Menu(LowLevelBoardVersionPreviewPage.class, "低级板版本预览"),
new Menu(PipetteCtrlDriverPage.getPageClass(), "移液抢驱动") new Menu(PipetteCtrlDriverPage.getPageClass(), "移液抢驱动")
)));
))
);
pushMenu(new Menu("数据", List.of(
pushMenu(
new Menu("高级设置", List.of(
new Menu("坐标设置", List.of(
new Menu(P02TubeFeedingModulePosCalibrationPage.class, "试管入料校准"),
new Menu(P03TubePreProcesPosCalibrationPage.class, "试管预处理校准"),
new Menu(P04ReactionPlatesTransmitControlerCalibrationPage.class, "反应板相关位置校准"),
new Menu(P20HbotTipPosCalibrationPage.class, "Tip耗材位置校准"),
new Menu(P21HbotLittleBSPosCalibrationPage.class, "小瓶BS耗材位置校准"),
new Menu(P23HbotLargeBottleBSPosCalibrationPage.class, "大瓶BS耗材位置校准"),
new Menu(P24Hbot2DCodeScanPosCalibrationPage.class, "耗材扫描校准"),
new Menu(P25HbotSamplePosCalibrationPage.class, "取样位置校准")
)),
new Menu("数据库", List.of(
new Menu(DeviceActionParameterSettingPage.class, "设备动作参数设置"), new Menu(DeviceActionParameterSettingPage.class, "设备动作参数设置"),
new Menu(ProjInfoMgrPage.class, "项目信息管理") new Menu(ProjInfoMgrPage.class, "项目信息管理")
)));
))
))
);
pushMenu(
new Menu("高级应用", List.of(
new Menu("光学标定与验证", List.of(
new Menu(A8kOptVerification.class, "光学模组验证"),
new Menu(OptModuleParamCalibration.class, "光学模块参数校准"),
new Menu(OptFormulaTestPageV2.class, "光学公式测试1"),
new Menu(OptFormulaTestPage.class, "光学公式测试2")
)),
new Menu("验证(过检专用)", List.of(
new Menu(P01PipetteGunVerification.class, "移液枪验证"),
new Menu(P02A8kTemperaturaVerfication.class, "温度控制验证")
))
))
);
pushMenu(new Menu("压力测试", List.of(
new Menu(PipetteGunStressTest.class, "移液枪压力测试")
)));
} }
} }

2
src/main/java/a8k/extui/page/utils/PosMeasureUtilsPage.java → src/main/java/a8k/extui/oldpage/pos_calibration/PosMeasureUtilsPage.java

@ -1,4 +1,4 @@
package a8k.extui.page.utils;
package a8k.extui.oldpage.pos_calibration;
import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.mgr.ExtApiPageMgr;
import a8k.extui.type.ExtUIPageCfg; import a8k.extui.type.ExtUIPageCfg;

2
src/main/java/a8k/extui/newpage/debug/P00AppEventAndMessageBoxDebugPage.java → src/main/java/a8k/extui/page/debug/P00AppEventAndMessageBoxDebugPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.debug;
package a8k.extui.page.debug;
import a8k.app.a8ktype.appevent.AppEvent; import a8k.app.a8ktype.appevent.AppEvent;
import a8k.app.a8ktype.ui.MessageBox; import a8k.app.a8ktype.ui.MessageBox;

2
src/main/java/a8k/extui/newpage/debug/P00MainflowCtrlServiceDebugPage.java → src/main/java/a8k/extui/page/debug/P00MainflowCtrlServiceDebugPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.debug;
package a8k.extui.page.debug;
import a8k.app.a8ktype.exception.AppException; import a8k.app.a8ktype.exception.AppException;
import a8k.app.a8ktype.state.DeviceWorkState; import a8k.app.a8ktype.state.DeviceWorkState;

2
src/main/java/a8k/extui/newpage/debug/P01EmergencyTubeDebugPage.java → src/main/java/a8k/extui/page/debug/P01EmergencyTubeDebugPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.debug;
package a8k.extui.page.debug;
import a8k.app.a8ktype.device.BloodType; import a8k.app.a8ktype.device.BloodType;
import a8k.app.a8ktype.exception.AppException; import a8k.app.a8ktype.exception.AppException;

2
src/main/java/a8k/extui/newpage/debug/P01ProjInfoDebugPage.java → src/main/java/a8k/extui/page/debug/P01ProjInfoDebugPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.debug;
package a8k.extui.page.debug;
import a8k.app.a8ktype.exception.AppException; import a8k.app.a8ktype.exception.AppException;
import a8k.app.dao.db.type.A8kProjInfoCardBreif; import a8k.app.dao.db.type.A8kProjInfoCardBreif;

2
src/main/java/a8k/extui/newpage/debug/P02ConsumablesMgrDebugPage.java → src/main/java/a8k/extui/page/debug/P02ConsumablesMgrDebugPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.debug;
package a8k.extui.page.debug;
import a8k.app.a8ktype.device.ConsumableGroup; import a8k.app.a8ktype.device.ConsumableGroup;
import a8k.app.a8ktype.device.TipGroup; import a8k.app.a8ktype.device.TipGroup;

2
src/main/java/a8k/extui/newpage/debug/P02TubeSettingDebugPage.java → src/main/java/a8k/extui/page/debug/P02TubeSettingDebugPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.debug;
package a8k.extui.page.debug;
import a8k.app.a8ktype.device.BloodType; import a8k.app.a8ktype.device.BloodType;
import a8k.app.a8ktype.exception.AppException; import a8k.app.a8ktype.exception.AppException;

2
src/main/java/a8k/extui/newpage/debug/P11IncubationPlateStateDebugPageAll.java → src/main/java/a8k/extui/page/debug/P11IncubationPlateStateDebugPageAll.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.debug;
package a8k.extui.page.debug;
import a8k.app.a8ktype.device.IncubatorPos; import a8k.app.a8ktype.device.IncubatorPos;

2
src/main/java/a8k/extui/newpage/debug/P12TueStateDebugPage.java → src/main/java/a8k/extui/page/debug/P12TueStateDebugPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.debug;
package a8k.extui.page.debug;
import a8k.app.a8ktype.state.Tube; import a8k.app.a8ktype.state.Tube;
import a8k.app.a8ktype.state.TubeHolder; import a8k.app.a8ktype.state.TubeHolder;

2
src/main/java/a8k/extui/newpage/debug/P13OptModuleStateDebugPage.java → src/main/java/a8k/extui/page/debug/P13OptModuleStateDebugPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.debug;
package a8k.extui.page.debug;
import a8k.app.a8ktype.state.OptScanModule; import a8k.app.a8ktype.state.OptScanModule;
import a8k.app.service.statemgr.OptScanModuleStateMgrService; import a8k.app.service.statemgr.OptScanModuleStateMgrService;

2
src/main/java/a8k/extui/newpage/debug/P20AppSettingDebugPage.java → src/main/java/a8k/extui/page/debug/P20AppSettingDebugPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.debug;
package a8k.extui.page.debug;
import a8k.app.dao.db.type.AppSetting; import a8k.app.dao.db.type.AppSetting;
import a8k.app.dao.db.type.appsetting.settingenum.*; import a8k.app.dao.db.type.appsetting.settingenum.*;

2
src/main/java/a8k/extui/newpage/debug/P22UserOperaionInRunOnlyModePage.java → src/main/java/a8k/extui/page/debug/P22UserOperaionInRunOnlyModePage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.debug;
package a8k.extui.page.debug;
import a8k.app.a8ktype.DeviceRunMode; import a8k.app.a8ktype.DeviceRunMode;
import a8k.app.a8ktype.device.A8kTubeHolderType; import a8k.app.a8ktype.device.A8kTubeHolderType;

2
src/main/java/a8k/extui/newpage/debug/P22UserOperaionInVertualModePage.java → src/main/java/a8k/extui/page/debug/P22UserOperaionInVertualModePage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.debug;
package a8k.extui.page.debug;
import a8k.app.a8ktype.DeviceRunMode; import a8k.app.a8ktype.DeviceRunMode;
import a8k.app.a8ktype.device.A8kTubeHolderType; import a8k.app.a8ktype.device.A8kTubeHolderType;

2
src/main/java/a8k/extui/newpage/extapp/A8kOptVerification.java → src/main/java/a8k/extui/page/extapp/A8kOptVerification.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.extapp;
package a8k.extui.page.extapp;
import a8k.app.a8kproj.A8kReactionResultComputer; import a8k.app.a8kproj.A8kReactionResultComputer;
import a8k.app.a8kproj.optalgo.type.OptScanResult; import a8k.app.a8kproj.optalgo.type.OptScanResult;

2
src/main/java/a8k/extui/newpage/extapp/OptModuleParamCalibration.java → src/main/java/a8k/extui/page/extapp/OptModuleParamCalibration.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.extapp;
package a8k.extui.page.extapp;
import a8k.app.a8ktype.device.ConsumableGroup; import a8k.app.a8ktype.device.ConsumableGroup;
import a8k.app.a8ktype.device.IncubatorPos; import a8k.app.a8ktype.device.IncubatorPos;

2
src/main/java/a8k/extui/newpage/extapp/P01PipetteGunVerification.java → src/main/java/a8k/extui/page/extapp/P01PipetteGunVerification.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.extapp;
package a8k.extui.page.extapp;
import a8k.app.constant.AppConstant; import a8k.app.constant.AppConstant;
import a8k.app.service.param.HbotTipPosMgr; import a8k.app.service.param.HbotTipPosMgr;

2
src/main/java/a8k/extui/newpage/extapp/P02A8kTemperaturaVerfication.java → src/main/java/a8k/extui/page/extapp/P02A8kTemperaturaVerfication.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.extapp;
package a8k.extui.page.extapp;
import a8k.app.a8ktype.param.TemperatureCtrlParam; import a8k.app.a8ktype.param.TemperatureCtrlParam;
import a8k.app.service.background.BackgroudProcessCtrlService; import a8k.app.service.background.BackgroudProcessCtrlService;

2
src/main/java/a8k/extui/newpage/extsetting/DeviceActionParameterSettingPage.java → src/main/java/a8k/extui/page/extsetting/DeviceActionParameterSettingPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.extsetting;
package a8k.extui.page.extsetting;
import a8k.app.controler.filemgr.StorageControler; import a8k.app.controler.filemgr.StorageControler;
import a8k.app.dao.db.DeviceActionParameterDao; import a8k.app.dao.db.DeviceActionParameterDao;

2
src/main/java/a8k/extui/newpage/extsetting/ProjInfoMgrPage.java → src/main/java/a8k/extui/page/extsetting/ProjInfoMgrPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.extsetting;
package a8k.extui.page.extsetting;
import a8k.app.a8ktype.exception.AppException; import a8k.app.a8ktype.exception.AppException;
import a8k.app.service.data.ProjIdCardInfoMgrService; import a8k.app.service.data.ProjIdCardInfoMgrService;

2
src/main/java/a8k/extui/newpage/extsetting/pos_calibration/P01MiniServoReferencePointIniter.java → src/main/java/a8k/extui/page/extsetting/pos_calibration/P01MiniServoReferencePointIniter.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.extsetting.pos_calibration;
package a8k.extui.page.extsetting.pos_calibration;
import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.mgr.ExtApiPageMgr;

2
src/main/java/a8k/extui/newpage/extsetting/pos_calibration/P02TubeFeedingModulePosCalibrationPage.java → src/main/java/a8k/extui/page/extsetting/pos_calibration/P02TubeFeedingModulePosCalibrationPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.extsetting.pos_calibration;
package a8k.extui.page.extsetting.pos_calibration;
import a8k.app.a8ktype.param.tubefeeding.TubeFeedingModulePos; import a8k.app.a8ktype.param.tubefeeding.TubeFeedingModulePos;
import a8k.app.a8ktype.param.tubefeeding.TubeFeedingModuleSetting; import a8k.app.a8ktype.param.tubefeeding.TubeFeedingModuleSetting;

2
src/main/java/a8k/extui/newpage/extsetting/pos_calibration/P03TubePreProcesPosCalibrationPage.java → src/main/java/a8k/extui/page/extsetting/pos_calibration/P03TubePreProcesPosCalibrationPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.extsetting.pos_calibration;
package a8k.extui.page.extsetting.pos_calibration;
import a8k.app.a8ktype.param.tubepreprocess.TubePreProcessGripperPos; import a8k.app.a8ktype.param.tubepreprocess.TubePreProcessGripperPos;
import a8k.app.a8ktype.param.tubepreprocess.TubePreProcessTubeClamp; import a8k.app.a8ktype.param.tubepreprocess.TubePreProcessTubeClamp;

2
src/main/java/a8k/extui/newpage/extsetting/pos_calibration/P04ReactionPlatesTransmitControlerCalibrationPage.java → src/main/java/a8k/extui/page/extsetting/pos_calibration/P04ReactionPlatesTransmitControlerCalibrationPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.extsetting.pos_calibration;
package a8k.extui.page.extsetting.pos_calibration;
import a8k.app.a8ktype.param.optpos.OptModuleParam; import a8k.app.a8ktype.param.optpos.OptModuleParam;
import a8k.app.service.param.OptModuleParamsMgr; import a8k.app.service.param.OptModuleParamsMgr;

2
src/main/java/a8k/extui/newpage/extsetting/pos_calibration/P20HbotTipPosCalibrationPage.java → src/main/java/a8k/extui/page/extsetting/pos_calibration/P20HbotTipPosCalibrationPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.extsetting.pos_calibration;
package a8k.extui.page.extsetting.pos_calibration;
import a8k.app.a8ktype.device.Pos3d; import a8k.app.a8ktype.device.Pos3d;

2
src/main/java/a8k/extui/newpage/extsetting/pos_calibration/P21HbotLittleBSPosCalibrationPage.java → src/main/java/a8k/extui/page/extsetting/pos_calibration/P21HbotLittleBSPosCalibrationPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.extsetting.pos_calibration;
package a8k.extui.page.extsetting.pos_calibration;
import a8k.app.a8ktype.device.Pos2d; import a8k.app.a8ktype.device.Pos2d;
import a8k.app.a8ktype.param.hbotpos.HbotLittleBSPos; import a8k.app.a8ktype.param.hbotpos.HbotLittleBSPos;

2
src/main/java/a8k/extui/newpage/extsetting/pos_calibration/P23HbotLargeBottleBSPosCalibrationPage.java → src/main/java/a8k/extui/page/extsetting/pos_calibration/P23HbotLargeBottleBSPosCalibrationPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.extsetting.pos_calibration;
package a8k.extui.page.extsetting.pos_calibration;
import a8k.app.a8ktype.device.Pos2d; import a8k.app.a8ktype.device.Pos2d;
import a8k.app.a8ktype.param.hbotpos.HbotLargeBottleBSPos; import a8k.app.a8ktype.param.hbotpos.HbotLargeBottleBSPos;

2
src/main/java/a8k/extui/newpage/extsetting/pos_calibration/P24Hbot2DCodeScanPosCalibrationPage.java → src/main/java/a8k/extui/page/extsetting/pos_calibration/P24Hbot2DCodeScanPosCalibrationPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.extsetting.pos_calibration;
package a8k.extui.page.extsetting.pos_calibration;
import a8k.app.a8ktype.device.Pos2d; import a8k.app.a8ktype.device.Pos2d;
import a8k.app.service.param.Hbot2DCodeScanParamMgr; import a8k.app.service.param.Hbot2DCodeScanParamMgr;

2
src/main/java/a8k/extui/newpage/extsetting/pos_calibration/P25HbotSamplePosCalibrationPage.java → src/main/java/a8k/extui/page/extsetting/pos_calibration/P25HbotSamplePosCalibrationPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.extsetting.pos_calibration;
package a8k.extui.page.extsetting.pos_calibration;
import a8k.app.a8ktype.device.Pos3d; import a8k.app.a8ktype.device.Pos3d;
import a8k.app.a8ktype.param.hbotpos.HbotSamplePos; import a8k.app.a8ktype.param.hbotpos.HbotSamplePos;

2
src/main/java/a8k/extui/page/utils/BackgroudProcessCtrlPage.java → src/main/java/a8k/extui/page/init/BackgroudProcessCtrlPage.java

@ -1,4 +1,4 @@
package a8k.extui.page.utils;
package a8k.extui.page.init;
import a8k.app.service.background.BackgroudProcessCtrlService; import a8k.app.service.background.BackgroudProcessCtrlService;
import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.mgr.ExtApiPageMgr;

2
src/main/java/a8k/extui/newpage/init/DeviceInitPage.java → src/main/java/a8k/extui/page/init/DeviceInitPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.init;
package a8k.extui.page.init;
import a8k.app.a8ktype.DeviceRunMode; import a8k.app.a8ktype.DeviceRunMode;
import a8k.app.a8ktype.exception.AppException; import a8k.app.a8ktype.exception.AppException;

10
src/main/java/a8k/extui/page/measurement/PlateBoxPosMeasurePage.java

@ -1,15 +1,5 @@
package a8k.extui.page.measurement; package a8k.extui.page.measurement;
import a8k.app.a8ktype.device.Pos2d;
import a8k.app.a8ktype.device.Pos3d;
import a8k.app.a8ktype.exception.AppException;
import a8k.app.hardware.driver.HbotDriver;
import a8k.app.hardware.driver.PipetteCtrlDriver;
import a8k.app.service.lowerctrl.HbotMoveCtrlService;
import a8k.extui.mgr.ExtApiPageMgr;
import a8k.extui.type.ExtApiStatu;
import jakarta.annotation.PostConstruct;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Component @Component

2
src/main/java/a8k/extui/newpage/test/codetest/OptFormulaTestPage.java → src/main/java/a8k/extui/page/test/codetest/OptFormulaTestPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.test.codetest;
package a8k.extui.page.test.codetest;
import a8k.app.a8kproj.A8kReactionResultComputer; import a8k.app.a8kproj.A8kReactionResultComputer;

2
src/main/java/a8k/extui/newpage/test/codetest/OptFormulaTestPageV2.java → src/main/java/a8k/extui/page/test/codetest/OptFormulaTestPageV2.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.test.codetest;
package a8k.extui.page.test.codetest;
import a8k.app.a8kproj.A8kReactionResultComputer; import a8k.app.a8kproj.A8kReactionResultComputer;

2
src/main/java/a8k/extui/newpage/test/driver/LowLevelBoardVersionPreviewPage.java → src/main/java/a8k/extui/page/test/driver/LowLevelBoardVersionPreviewPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.test.driver;
package a8k.extui.page.test.driver;
import a8k.app.a8ktype.exception.AppException; import a8k.app.a8ktype.exception.AppException;
import a8k.app.hardware.basedriver.A8kCanBusService; import a8k.app.hardware.basedriver.A8kCanBusService;

2
src/main/java/a8k/extui/newpage/test/driver/PipetteCtrlDriverPage.java → src/main/java/a8k/extui/page/test/driver/PipetteCtrlDriverPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.test.driver;
package a8k.extui.page.test.driver;
import a8k.app.hardware.driver.PipetteCtrlDriver; import a8k.app.hardware.driver.PipetteCtrlDriver;
import a8k.extui.mgr.ExtApiPageMgr; import a8k.extui.mgr.ExtApiPageMgr;

2
src/main/java/a8k/extui/newpage/test/frond_end_test/FakeReactionRecordGeneratorPage.java → src/main/java/a8k/extui/page/test/frond_end_test/FakeReactionRecordGeneratorPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.test.frond_end_test;
package a8k.extui.page.test.frond_end_test;
import a8k.SpringBootBeanUtil; import a8k.SpringBootBeanUtil;
import a8k.app.a8ktype.device.BloodType; import a8k.app.a8ktype.device.BloodType;

2
src/main/java/a8k/extui/newpage/test/frond_end_test/FakeStateGeneratorPage.java → src/main/java/a8k/extui/page/test/frond_end_test/FakeStateGeneratorPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.test.frond_end_test;
package a8k.extui.page.test.frond_end_test;
import a8k.SpringBootBeanUtil; import a8k.SpringBootBeanUtil;
import a8k.app.a8ktype.device.BloodType; import a8k.app.a8ktype.device.BloodType;

2
src/main/java/a8k/extui/newpage/test/frond_end_test/VirtualEventGeneratorPage.java → src/main/java/a8k/extui/page/test/frond_end_test/VirtualEventGeneratorPage.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.test.frond_end_test;
package a8k.extui.page.test.frond_end_test;
import a8k.app.a8ktype.appevent.*; import a8k.app.a8ktype.appevent.*;
import a8k.app.a8ktype.ui.*; import a8k.app.a8ktype.ui.*;

2
src/main/java/a8k/extui/newpage/test/stress_test/PipetteGunStressTest.java → src/main/java/a8k/extui/page/test/stress_test/PipetteGunStressTest.java

@ -1,4 +1,4 @@
package a8k.extui.newpage.test.stress_test;
package a8k.extui.page.test.stress_test;
import a8k.app.a8ktype.exception.AppException; import a8k.app.a8ktype.exception.AppException;
import a8k.app.hardware.driver.PipetteCtrlDriver; import a8k.app.hardware.driver.PipetteCtrlDriver;

2
src/main/java/a8k/extui/page/verification/P00PosVerifyUitilsPage.java → src/main/java/a8k/extui/page/test/verification/P00PosVerifyUitilsPage.java

@ -1,4 +1,4 @@
package a8k.extui.page.verification;
package a8k.extui.page.test.verification;
import a8k.app.a8ktype.exception.AppException; import a8k.app.a8ktype.exception.AppException;
import a8k.app.a8ktype.others.checkpoint.CheckResult; import a8k.app.a8ktype.others.checkpoint.CheckResult;

2
src/main/java/a8k/extui/page/verification/P10ProjejIDCardTestPage.java → src/main/java/a8k/extui/page/test/verification/P10ProjejIDCardTestPage.java

@ -1,4 +1,4 @@
package a8k.extui.page.verification;
package a8k.extui.page.test.verification;
import a8k.app.a8ktype.exception.AppException; import a8k.app.a8ktype.exception.AppException;
import a8k.app.dao.db.type.ProjExtInfoCard; import a8k.app.dao.db.type.ProjExtInfoCard;

2
src/main/java/a8k/extui/page/verification/P30InfeedAndPreProcessPosVerificationPage.java → src/main/java/a8k/extui/page/test/verification/P30InfeedAndPreProcessPosVerificationPage.java

@ -1,4 +1,4 @@
package a8k.extui.page.verification;
package a8k.extui.page.test.verification;
import a8k.app.a8ktype.exception.AppException; import a8k.app.a8ktype.exception.AppException;
import a8k.app.a8ktype.type.TubeHolderScanResult; import a8k.app.a8ktype.type.TubeHolderScanResult;

2
src/main/java/a8k/extui/page/verification/P31ReactionPlatesTransmitPosVerificationPage.java → src/main/java/a8k/extui/page/test/verification/P31ReactionPlatesTransmitPosVerificationPage.java

@ -1,4 +1,4 @@
package a8k.extui.page.verification;
package a8k.extui.page.test.verification;
import a8k.app.a8ktype.device.ConsumableGroup; import a8k.app.a8ktype.device.ConsumableGroup;
import a8k.app.a8ktype.device.IncubatorPos; import a8k.app.a8ktype.device.IncubatorPos;

2
src/main/java/a8k/extui/page/verification/P32HbotPosVerificationPage.java → src/main/java/a8k/extui/page/test/verification/P32HbotPosVerificationPage.java

@ -1,4 +1,4 @@
package a8k.extui.page.verification;
package a8k.extui.page.test.verification;
import a8k.app.a8ktype.device.ConsumableGroup; import a8k.app.a8ktype.device.ConsumableGroup;
import a8k.app.a8ktype.device.TipGroup; import a8k.app.a8ktype.device.TipGroup;

2
src/main/java/a8k/extui/page/verification/P33HbotSamplePosVerificationPage.java → src/main/java/a8k/extui/page/test/verification/P33HbotSamplePosVerificationPage.java

@ -1,4 +1,4 @@
package a8k.extui.page.verification;
package a8k.extui.page.test.verification;

2
src/main/java/a8k/extui/page/verification/P34LiquidOperationTestPage.java → src/main/java/a8k/extui/page/test/verification/P34LiquidOperationTestPage.java

@ -1,4 +1,4 @@
package a8k.extui.page.verification;
package a8k.extui.page.test.verification;
import a8k.app.a8ktype.device.*; import a8k.app.a8ktype.device.*;
import a8k.app.a8ktype.exception.AppException; import a8k.app.a8ktype.exception.AppException;

3
src/main/java/a8k/extui/page/verification/P50VerificationScriptPage.java → src/main/java/a8k/extui/page/test/verification/P50VerificationScriptPage.java

@ -1,11 +1,10 @@
package a8k.extui.page.verification;
package a8k.extui.page.test.verification;
import a8k.app.a8ktype.device.A8kTubeHolderType; import a8k.app.a8ktype.device.A8kTubeHolderType;
import a8k.app.a8ktype.device.ConsumableGroup; import a8k.app.a8ktype.device.ConsumableGroup;
import a8k.app.a8ktype.device.IncubatorPos; import a8k.app.a8ktype.device.IncubatorPos;
import a8k.app.a8ktype.device.TipGroup; import a8k.app.a8ktype.device.TipGroup;
import a8k.app.a8ktype.exception.AppException; import a8k.app.a8ktype.exception.AppException;
import a8k.app.a8ktype.state.TubeHolder;
import a8k.app.a8ktype.type.TubeHolderScanResult; import a8k.app.a8ktype.type.TubeHolderScanResult;
import a8k.app.constant.AppConstant; import a8k.app.constant.AppConstant;
import a8k.app.hardware.driver.*; import a8k.app.hardware.driver.*;

2
src/main/java/a8k/extui/page/verification/P51FullFlowVerificationPage.java → src/main/java/a8k/extui/page/test/verification/P51FullFlowVerificationPage.java

@ -1,4 +1,4 @@
package a8k.extui.page.verification;
package a8k.extui.page.test.verification;
import a8k.OS; import a8k.OS;
import a8k.app.a8kproj.A8kReactionResultComputer; import a8k.app.a8kproj.A8kReactionResultComputer;
Loading…
Cancel
Save