From bea440900387207041324ae04969036df1521467 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期二, 31 十二月 2024 15:28:24 +0800
Subject: [PATCH] 整合代码
---
Source/plt-web/plt-web-ui/src/page/login/userlogin.vue | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/page/login/userlogin.vue b/Source/plt-web/plt-web-ui/src/page/login/userlogin.vue
index be0f7a6..4241691 100644
--- a/Source/plt-web/plt-web-ui/src/page/login/userlogin.vue
+++ b/Source/plt-web/plt-web-ui/src/page/login/userlogin.vue
@@ -120,7 +120,7 @@
//瑙掕壊ID
roleId: "",
//鐢ㄦ埛鍚�
- username: "admin",
+ username: "",
//瀵嗙爜
password: "",
selectInput: '',
@@ -158,6 +158,7 @@
},
created() {
// this.getTenant();
+ this.loginForm.username = this.userInfo.userName
},
mounted() {
//鍦╩ounted鑾峰彇棣栭〉涓嬫媺鑿滃崟鏁版嵁
@@ -212,6 +213,10 @@
done();
},
handleLogin() {
+ if (!this.loginForm.username) {
+ this.$message.error('璇疯緭鍏ョ敤鎴峰悕');
+ return;
+ }
if (!this.loginForm.password) {
this.$message.error('璇疯緭鍏ュ瘑鐮�');
return;
@@ -226,13 +231,26 @@
});
this.$store.dispatch("LoginByUsername", this.loginForm).then((data) => {
if (data.obj.failCode !== 'loginSuccess') {
- // console.log('data', data);
+ if (data.obj.failCode === 'passwordRemainDay') {
+ this.$message.warning(data.obj.passwordInfo);
+ this.$router.push({path: this.tagWel.value});
+ loading.close();
+ return;
+ }
+
if (data.obj.failCode === 'userIsLocked') {
this.$message.error(`鐧诲綍閿欒娆℃暟杩囧锛岃处鍙疯閿佸畾銆�${data.obj.failMsgArray[0]}銆戝垎閽焋);
loading.close();
return;
}
+
+ if (data.obj.failCode === 'userPwdNotEqual') {
+ this.$message.error('瀵嗙爜閿欒锛岃閲嶆柊杈撳叆锛�');
+ loading.close();
+ return;
+ }
this.$message.error(data.msg);
+
if (data.obj.mustChangePassword) {
this.passwordVisible = true;
}
@@ -289,7 +307,7 @@
this.passwordVisible = false;
this.$refs.changeForm.resetFields();
this.$store.dispatch("LoginByUsername", {...this.loginForm, password: form.confirmPassword}).then(data => {
- if (data.obj.failCode !== 'loginSuccess') {
+ if (data.obj.failCode !== 'loginSuccess' && data.obj.failCode !== 'passwordRemainDay') {
this.$message.error(data.msg);
}
this.$router.push({path: this.tagWel.value});
--
Gitblit v1.9.3