From cfa9e919f0b4fbcc2e036c67799b2ffc102376d8 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 10 五月 2024 15:58:26 +0800
Subject: [PATCH] 根据客户需求修改主界面权限设置，取消部分按钮，调整部分英文名称，添加铝框显示
---
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 64 +++++++-------------------------
1 files changed, 14 insertions(+), 50 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
index 421c746..91669b8 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java
@@ -17,56 +17,20 @@
//
System.out.println("鍚姩瀹屾垚");
-<<<<<<< HEAD
- // new PlcHold().start();
-
- // new Plchome().start();
- new PlcLayout().start();
- new Plcalarm().start();
-
- new Plcsign().start();
-
- new Plcstate().start();
- new PlcPositioning1().start();
-
- new PlcParameter2().start();
-
- new PLCAutomaticParameterSetting().start();
-
- new PlcManualonePosition().start();
- new PlcManualonePosition2().start();
- new PlcServoManualone().start();
- new PLCManualJog().start();
- new Plclog().start();
-
- new PlcInteractionState().start();
-=======
- // new PlcHold().start();
- new PLCAutoMes().start();
- // new PLCAutomaticParameterSettingReview2().start();
-
- //new Plchome().start();
+ // new PlcHold().start();
+ new Plchome().start();
// new PlcLayout().start();
- // new Plcalarm().start();
-
- // new Plcsign().start();
-
- // new Plcstate().start();
- // new PlcPositioning1().start();
-
- // new PlcParameter2().start();
-
- // new PLCAutomaticParameterSetting().start();
-
- // new PlcManualonePosition().start();
- // new PlcManualonePosition2().start();
- // new PlcServoManualone().start();
- // new PLCManualJog().start();
- // new Plclog().start();
-
- // new PlcInteractionState().start();
->>>>>>> f66c565a395e10901fc71abcfa37f4ff5a15be09
- //new PlcParameter1Review().start();
- // new PLCAutomaticParameterSettingReview().start();
+ // new Plcalarm().start();
+ // new Plcsign().start();
+ // new Plcstate().start();
+ // new PlcPositioning1().start();
+ // new PlcParameter2().start();
+ // new PLCAutomaticParameterSetting().start();
+ // new PlcManualonePosition().start();
+ // new PlcManualonePosition2().start();
+ // new PlcServoManualone().start();
+ // new PLCManualJog().start();
+ // new PlcInteractionState().start();
+
}
}
\ No newline at end of file
--
Gitblit v1.8.0