From 946b26f26e54d40e85be9feb28cb5373384f03ea Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期六, 02 十二月 2023 09:07:10 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

---
 springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 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 79680e0..0bc6e31 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
@@ -18,7 +18,11 @@
 import com.example.springboot.component.PlcPositioning2;
 import com.example.springboot.component.PlcParameter2;
 import com.example.springboot.component.PlcParameter1;
-//import com.example.springboot.component.PlcServoManualone;
+import com.example.springboot.component.PlcServoManualone;
+import com.example.springboot.component.PLCAutomaticParameterSetting;
+import com.example.springboot.component.PlcManualonePosition;
+import com.example.springboot.component.PlcManualonePosition2;
+import com.example.springboot.component.PLCManualJog;
 
 @Component
 @Order(1)
@@ -31,24 +35,28 @@
     //
     System.out.println("鍚姩瀹屾垚");
 
-     new PlcHold().start();
+    new PlcHold().start();
 
-    // new Plcaction().start();
     //
-    // new Plchome().start();
+    new Plchome().start();
     //
     // new PlcParameter().start();
-    //
-    // new Plcalarm().start();
-    //
+    // //
+    // // new Plcalarm().start();
+    // //
     // new Plcsign().start();
-    //
+    // //
+    // new Plcaction().start();
     // new Plcstate().start();
     // new PlcPositioning1().start();
     // new PlcPositioning2().start();
     // new PlcParameter2().start();
     // new PlcParameter1().start();
     // new PLCAutomaticParameterSetting().start();
+
+    // new PlcManualonePosition().start();
+    // new PlcManualonePosition2().start();
     // new PlcServoManualone().start();
+    // new PLCManualJog().start();
   }
 }
\ No newline at end of file

--
Gitblit v1.8.0