From 5f9ca1634f6a0ba288048556e29fe2b3e7784682 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 15 十二月 2023 09:59:56 +0800
Subject: [PATCH] 调整提示框
---
CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue | 2 +-
springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java | 2 +-
CanadaMes-ui/src/views/home/index.vue | 3 ++-
springboot-vue3/src/main/java/com/example/springboot/config/AppRunnerConfig.java | 22 +++++++++++-----------
CanadaMes-ui/src/views/Electrical/ManualonePosition.vue | 2 +-
5 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
index 48cd9cb..d1ef0b8 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition.vue
@@ -440,7 +440,7 @@
const jsonData2 = this.jsonData;
const weihuiling = obj.weihuiling;
const handleMouseMove = throttle(function (event) {
- const inputBox = document.querySelectorAll('.el-card__body');
+ const inputBox = document.querySelectorAll('.input-box');
const target = event.target;
if (obj.zuhe1 &&inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
// 鎵ц鏇存柊閫昏緫
diff --git a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
index 5186048..e0179d3 100644
--- a/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
+++ b/CanadaMes-ui/src/views/Electrical/ManualonePosition2.vue
@@ -327,7 +327,7 @@
const jsonData2 = this.jsonData;
const weihuiling = obj.weihuiling;
const handleMouseMove = throttle(function (event) {
- const inputBox = document.querySelectorAll('.el-card__body');
+ const inputBox = document.querySelectorAll('.input-box');
const target = event.target;
if (obj.zuhe1 && inputBox && Array.from(inputBox).every(box => !box.contains(target))) {
// 鎵ц鏇存柊閫昏緫
diff --git a/CanadaMes-ui/src/views/home/index.vue b/CanadaMes-ui/src/views/home/index.vue
index 8947496..b137523 100644
--- a/CanadaMes-ui/src/views/home/index.vue
+++ b/CanadaMes-ui/src/views/home/index.vue
@@ -1740,9 +1740,10 @@
else {
this.PromptSize = 250;
this.CountDowns = "Waiting for reset";
- this.dialogFormCountDown = false;
+
// if(澶嶄綅瀹屾垚==true){
// clearInterval(timer);
+ // this.dialogFormCountDown = false;
// }
}
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java
index 3ab528a..4d24906 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java
@@ -64,7 +64,7 @@
addresses.add("DB100.116");
addresses.add("DB100.16");
- addresses.add("DB103.20");
+ addresses.add("DB106.2");
List<Short> arraylist = S7control.getinstance().readWords(addresses);
// System.out.println(arraylist);
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 0da68ca..008aa99 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
@@ -21,21 +21,21 @@
new Plchome().start();
- // new Plcalarm().start();
+ new Plcalarm().start();
-// new Plcsign().start();
+ new Plcsign().start();
-// new Plcaction().start();
-// new Plcstate().start();
-// new PlcPositioning1().start();
+ new Plcaction().start();
+ new Plcstate().start();
+ new PlcPositioning1().start();
-// new PlcParameter2().start();
+ new PlcParameter2().start();
-// new PLCAutomaticParameterSetting().start();
+ new PLCAutomaticParameterSetting().start();
-// new PlcManualonePosition().start();
-// new PlcManualonePosition2().start();
-// new PlcServoManualone().start();
-// new PLCManualJog().start();
+ new PlcManualonePosition().start();
+ new PlcManualonePosition2().start();
+ new PlcServoManualone().start();
+ new PLCManualJog().start();
}
}
\ No newline at end of file
--
Gitblit v1.8.0