From 79f33da4df32fc139c3855a8ecca6545723e0815 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 19 九月 2023 08:08:17 +0800
Subject: [PATCH] 删除不需要的代码，玻璃信息放入其他数据库 方便测试显示数据库连接的信息
---
springboot-vue3/src/main/java/com/example/springboot/service/JdbcConnections.java | 2 +-
CanadaMes-ui/src/views/Electrical/Action.vue | 27 ++-------------------------
CanadaMes-ui/src/views/Electrical/Parameter.vue | 27 ++-------------------------
3 files changed, 5 insertions(+), 51 deletions(-)
diff --git a/CanadaMes-ui/src/views/Electrical/Action.vue b/CanadaMes-ui/src/views/Electrical/Action.vue
index cd1cdf9..db3b8da 100644
--- a/CanadaMes-ui/src/views/Electrical/Action.vue
+++ b/CanadaMes-ui/src/views/Electrical/Action.vue
@@ -25,8 +25,7 @@
</div>
</template>
-<script >
-import { SelectPassword } from "../../api/home";
+<script >
import LanguageMixin from '../../lang/LanguageMixin'
let socket;
export default {
@@ -108,29 +107,7 @@
}
},
created () {
- this.init();
- SelectPassword().then(res => {
- this.password = res.data.password;
-});
- this.$prompt(this.$t('Are you sure to perform this operation?'), this.$t('prompt'), {
- inputType: 'password',
- inputPlaceholder: this.$t('Please enter the password'),
- confirmButtonText: this.$t('Yes'),
- cancelButtonText: this.$t('No'),
- type: 'warning'
- }).then(({ value }) => {
- if (this.password === value) {
- // 瀵嗙爜姝ｇ‘锛屾墽琛岀浉搴旀搷浣�
- } else {
- this.$message.success(this.$t('Password error')); // 瀵嗙爜閿欒
-
- }
- }).catch(() => {
- this.$message({
- type: 'info',
- message: this.$t('Operation canceled')
- });
- });
+ this.init();
},
methods: {
setActiveButton(buttonName) {
diff --git a/CanadaMes-ui/src/views/Electrical/Parameter.vue b/CanadaMes-ui/src/views/Electrical/Parameter.vue
index 5abab43..7bf5973 100644
--- a/CanadaMes-ui/src/views/Electrical/Parameter.vue
+++ b/CanadaMes-ui/src/views/Electrical/Parameter.vue
@@ -35,8 +35,7 @@
</template>
-<script>
-import { SelectPassword } from "../../api/home";
+<script>
let socket;
import LanguageMixin from '../../lang/LanguageMixin'
@@ -79,29 +78,7 @@
created () {
this.initWebSocket();
- this.isButtonDisabled = true;
- SelectPassword().then(res => {
- this.password = res.data.password;
-});
- this.$prompt(this.$t('Are you sure to perform this operation?'), this.$t('prompt'), {
- inputType: 'password',
- inputPlaceholder: this.$t('Please enter the password'),
- confirmButtonText: this.$t('Yes'),
- cancelButtonText: this.$t('No'),
- type: 'warning'
- }).then(({ value }) => {
- if (this.password === value) {
- // 瀵嗙爜姝ｇ‘锛屾墽琛岀浉搴旀搷浣�
- } else {
- this.$message.success(this.$t('Password error')); // 瀵嗙爜閿欒
- }
- }).catch(() => {
- this.$message({
- type: 'info',
- message: this.$t('Operation canceled')
- });
- });
-
+ 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