From 0c7005a79b6dfccc2d25d98defb350de99c672d2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 18 十一月 2024 16:22:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/page/login/userlogin.vue | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 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 48701ab..be0f7a6 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
@@ -7,17 +7,6 @@
status-icon
>
- <!-- <el-form-item prop="selectInput">-->
- <!-- <el-select v-model="loginForm.value" placeholder="璇烽�夋嫨缁勭粐" style="width: 326px" @change="selectchange">-->
- <!-- <i slot="prefix" class="el-icon-s-operation"/>-->
- <!-- <el-option-->
- <!-- v-for="(item,index) in loginForm.region"-->
- <!-- :key="index"-->
- <!-- :label="item.TENANT_NAME"-->
- <!-- :value="item.TENANT_ID">-->
- <!-- </el-option>-->
- <!-- </el-select>-->
- <!-- </el-form-item>-->
<el-form-item prop="username">
<el-input v-model="loginForm.username"
:placeholder="$t('login.username')"
@@ -71,7 +60,7 @@
name: "userlogin",
data() {
return {
- userName:'',
+ userName: '',
passwordVisible: false,
passwordForm: {},
passwordOption: {
@@ -238,6 +227,11 @@
this.$store.dispatch("LoginByUsername", this.loginForm).then((data) => {
if (data.obj.failCode !== 'loginSuccess') {
// console.log('data', data);
+ if (data.obj.failCode === 'userIsLocked') {
+ this.$message.error(`鐧诲綍閿欒娆℃暟杩囧锛岃处鍙疯閿佸畾銆�${data.obj.failMsgArray[0]}銆戝垎閽焋);
+ loading.close();
+ return;
+ }
this.$message.error(data.msg);
if (data.obj.mustChangePassword) {
this.passwordVisible = true;
@@ -257,6 +251,7 @@
return false;
}
};
+
this.$router.push({path: this.tagWel.value});
loading.close();
}).catch((err) => {
@@ -293,7 +288,7 @@
this.$message.success('淇敼鎴愬姛锛屽嵆灏嗚烦杞埌棣栭〉');
this.passwordVisible = false;
this.$refs.changeForm.resetFields();
- this.$store.dispatch("LoginByUsername",{...this.loginForm,password:form.confirmPassword}).then(data => {
+ this.$store.dispatch("LoginByUsername", {...this.loginForm, password: form.confirmPassword}).then(data => {
if (data.obj.failCode !== 'loginSuccess') {
this.$message.error(data.msg);
}
--
Gitblit v1.9.3