From 0ece3ba8c92df0438af52b8de6b9225d8ada4103 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 30 十一月 2023 08:46:34 +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 | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 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 22ec077..f55ea2f 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
@@ -7,7 +7,10 @@
import org.springframework.stereotype.Component;
import com.example.springboot.component.PLCAutomaticParameterSetting;
+import com.example.springboot.component.PLCManualJog;
import com.example.springboot.component.PlcHold;
+import com.example.springboot.component.PlcManualonePosition;
+import com.example.springboot.component.PlcManualonePosition2;
import com.example.springboot.component.PlcParameter;
import com.example.springboot.component.Plcaction;
import com.example.springboot.component.Plchome;
@@ -18,7 +21,7 @@
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;
@Component
@Order(1)
@@ -33,15 +36,15 @@
new PlcHold().start();
- // new Plcaction().start();
+ new Plcaction().start();
//
new Plchome().start();
//
- // new PlcParameter().start();
+ new PlcParameter().start();
//
// new Plcalarm().start();
//
- // new Plcsign().start();
+ new Plcsign().start();
//
// new Plcstate().start();
// new PlcPositioning1().start();
@@ -50,5 +53,8 @@
// new PlcParameter1().start();
// new PLCAutomaticParameterSetting().start();
// new PlcServoManualone().start();
+ // new PLCManualJog().start();
+ // new PlcManualonePosition().start();
+ new PlcManualonePosition2().start();
}
}
\ No newline at end of file
--
Gitblit v1.8.0