1

1 year ago · 38f072e18d
7 changed files with 14 additions and 3 deletions
--- a/src/main/java/a8k/controler/engineer/EngineerPageControler.java
+++ b/src/main/java/a8k/controler/engineer/EngineerPageControler.java
@ -151,6 +151,8 @@ public class EngineerPageControler {

 			var status = new HashMap<String,Object>();
 			status.put("name", statusAnnotation.name());
+			status.put("group", statusAnnotation.group());
+			status.put("order", statusAnnotation.order());
 			var value = method.invoke(service);
 			status.put("value", value);
 			statusList.add(status);
--- a/src/main/java/a8k/controler/engineer/utils/EnginnerPageStatu.java
+++ b/src/main/java/a8k/controler/engineer/utils/EnginnerPageStatu.java
@ -9,4 +9,5 @@ import java.lang.annotation.Target;
 public @interface EnginnerPageStatu {
 	String name();
 	String group() default "";
+	int order() default 0;
 }
--- a/src/main/java/a8k/service/hardware/HbotControlService.java
+++ b/src/main/java/a8k/service/hardware/HbotControlService.java
@ -471,12 +471,12 @@ public class HbotControlService implements HardwareCtrlModule {
 	}


-	@EnginnerPageStatu(name = "Z轴光电⬆")
+	@EnginnerPageStatu(name = "Z轴光电⬆", group="G1", order=1)
 	public Boolean getZPPS() throws HardwareException {
 		return canBus.stepMotorReadIoState(MId.PipetteModZM, 0);
 	}

-	@EnginnerPageStatu(name = "X轴光电➡")
+	@EnginnerPageStatu(name = "X轴光电➡",group="G2", order=2)
 	public Boolean getXPPS() throws HardwareException {
 		return canBus.hbotReadInio(MId.HbotM, 0);
 	}
--- a/src/main/resources/static/test/css/app.8750cb6d.css
+++ b/src/main/resources/static/test/css/app.8750cb6d.css
--- a/src/main/resources/static/test/index.html
+++ b/src/main/resources/static/test/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.ce3623b2.js"></script><script defer="defer" src="js/app.231e7193.js"></script><link href="css/app.34c997bb.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.ce3623b2.js"></script><script defer="defer" src="js/app.2b116387.js"></script><link href="css/app.8750cb6d.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>
--- a/src/main/resources/static/test/js/app.2b116387.js
+++ b/src/main/resources/static/test/js/app.2b116387.js
--- a/src/main/resources/static/test/js/app.2b116387.js.map
+++ b/src/main/resources/static/test/js/app.2b116387.js.map