From a0e05f4c659a5b1053e10dffedb4c3f53179c31c Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 18 九月 2023 21:17:19 +0800
Subject: [PATCH] 增加参数下发 开关控制进入页面验证密码
---
springboot-vue3/src/main/java/com/example/springboot/controller/UserController.java | 2 +-
CanadaMes-ui/src/views/Electrical/Action.vue | 1 +
CanadaMes-ui/src/lang/locales/en-US.json | 6 ------
CanadaMes-ui/src/lang/locales/zh-CN.json | 6 ++----
4 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/CanadaMes-ui/src/lang/locales/en-US.json b/CanadaMes-ui/src/lang/locales/en-US.json
index 09b53ef..2dfc7f6 100644
--- a/CanadaMes-ui/src/lang/locales/en-US.json
+++ b/CanadaMes-ui/src/lang/locales/en-US.json
@@ -274,16 +274,10 @@
"Are you sure to perform this operation ?":"Are you sure to perform this operation ?",
"prompt":"prompt",
"Yes":"Yes",
-<<<<<<< .mine
- "No":"No",
- "ElectricalPassword":"ElectricalPassword"
-
-=======
"No":"No",
"Please enter the password":"Please enter the password",
"Password error":"Password error",
"DataBase Connection failed":"DataBase Connection failed"
->>>>>>> .theirs
}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/lang/locales/zh-CN.json b/CanadaMes-ui/src/lang/locales/zh-CN.json
index 5a565aa..ffda1af 100644
--- a/CanadaMes-ui/src/lang/locales/zh-CN.json
+++ b/CanadaMes-ui/src/lang/locales/zh-CN.json
@@ -279,11 +279,9 @@
"alacontent": "鎶ヨ鍐呭",
"time-on": "寮�濮嬫椂闂�",
"End-Time": "缁撴潫鏃堕棿",
-<<<<<<< HEAD
- "ElectricalPassword":"鐢垫皵瀵嗙爜"
-=======
+
"Please enter the password":"璇疯緭鍏ュ瘑鐮�",
"Password error":"瀵嗙爜閿欒",
"DataBase Connection failed":"鏁版嵁搴撹繛鎺ュけ璐�"
->>>>>>> 5aa99c119f387d6f32a58dfc7190351f6f92ecf6
+
}
\ No newline at end of file
diff --git a/CanadaMes-ui/src/views/Electrical/Action.vue b/CanadaMes-ui/src/views/Electrical/Action.vue
index 6c6ef90..cd1cdf9 100644
--- a/CanadaMes-ui/src/views/Electrical/Action.vue
+++ b/CanadaMes-ui/src/views/Electrical/Action.vue
@@ -123,6 +123,7 @@
// 瀵嗙爜姝ｇ‘锛屾墽琛岀浉搴旀搷浣�
} else {
this.$message.success(this.$t('Password error')); // 瀵嗙爜閿欒
+
}
}).catch(() => {
this.$message({
diff --git a/springboot-vue3/src/main/java/com/example/springboot/controller/UserController.java b/springboot-vue3/src/main/java/com/example/springboot/controller/UserController.java
index e80aa0f..a40ae9e 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/controller/UserController.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/controller/UserController.java
@@ -171,7 +171,7 @@
-
+
--
Gitblit v1.8.0