From f89331b66bad4572dd4fc365774f12eac09492b3 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期二, 19 九月 2023 13:59:52 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java | 2 +-
CanadaMes-ui/src/views/Electrical/Action.vue | 12 ++++++------
CanadaMes-ui/src/views/Electrical/Parameter.vue | 10 +++++-----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Action.vue b/CanadaMes-ui/src/views/Electrical/Action.vue
index b65c1f1..1560ce5 100644
--- a/CanadaMes-ui/src/views/Electrical/Action.vue
+++ b/CanadaMes-ui/src/views/Electrical/Action.vue
@@ -25,9 +25,9 @@
</div>
</template>
-<script >
-import { SelectPassword } from "../../api/home";
+<script >
import LanguageMixin from '../../lang/LanguageMixin'
+import { SelectPassword } from "../../api/home";
let socket;
export default {
name: "Action",
@@ -109,9 +109,9 @@
}
},
created () {
- this.init();
- this.isClickable = false;
-
+
+ this.init();
+
},
methods: {
setActiveButton(buttonName) {
@@ -171,7 +171,7 @@
},
send () {
- this.isClickable = true;
+
SelectPassword().then(res => {
this.password = res.data.password;
});
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter.vue b/CanadaMes-ui/src/views/Electrical/Parameter.vue
index 96a56c8..01527f1 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter.vue
@@ -35,11 +35,11 @@
</template>
-<script>
-import { SelectPassword } from "../../api/home";
+<script>
let socket;
import LanguageMixin from '../../lang/LanguageMixin'
+import { SelectPassword } from "../../api/home";
export default {
name: "Parameter",
mixins: [LanguageMixin],
@@ -79,9 +79,9 @@
created () {
this.initWebSocket();
- this.isButtonDisabled = true;
-
-
+
+ this.isButtonDisabled = true;
+
},
methods: {
diff --git a/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java b/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
index 5a5c756..7334872 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java
@@ -56,7 +56,7 @@
*/
public static Connection getConn() throws SQLException {
Connection conn = null;
- conn = DriverManager.getConnection("jdbc:mysql://localhost:3306/canadames?serverTimezone=GMT%2B8&characterEncoding=utf-8", "root", "beibo.123/");
+ conn = DriverManager.getConnection("jdbc:mysql://localhost:3306/canadameserp?serverTimezone=GMT%2B8&characterEncoding=utf-8", "root", "beibo.123/");
return conn;
}
--
Gitblit v1.8.0