From 8f6576fd595f67a3b17ef2e5e8054e8f194078f7 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 05 九月 2024 20:35:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/page/login/userlogin.vue | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 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 0e775ec..9122bf3 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,24 +7,24 @@
label-width="0"
>
- <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="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 size="small"
@keyup.enter.native="handleLogin"
v-model="loginForm.username"
auto-complete="off"
:placeholder="$t('login.username')">
- <i slot="prefix" class="icon-yonghu"/>
+ <i slot="prefix" class="icon-yonghu" style="color: white"/>
</el-input>
</el-form-item>
<el-form-item prop="password">
@@ -34,8 +34,8 @@
v-model="loginForm.password"
auto-complete="off"
:placeholder="$t('login.password')">
- <i class="el-icon-view el-input__icon" slot="suffix" @click="showPassword"/>
- <i slot="prefix" class="icon-mima"/>
+ <i class="el-icon-view el-input__icon" slot="suffix" @click="showPassword" style="color: white"/>
+ <i slot="prefix" class="icon-mima" style="color: white"/>
</el-input>
</el-form-item>
@@ -74,7 +74,7 @@
//鐢ㄦ埛鍚�
username: "admin",
//瀵嗙爜
- password: "admin",
+ password: "",
selectInput:'',
//涓嬫媺input鏁版嵁
value:'绠＄悊缁�',
@@ -173,7 +173,10 @@
text: '鐧诲綍涓�,璇风◢鍚庛�傘�傘��',
spinner: "el-icon-loading"
});
- this.$store.dispatch("LoginByUsername", this.loginForm).then(() => {
+ this.$store.dispatch("LoginByUsername", this.loginForm).then((data) => {
+ if(data.obj.passwordInfo){
+ this.$message.warning(data.obj.passwordInfo);
+ }
if (this.website.switchMode) {
const deptId = this.userInfo.deptOid;
const roleId = this.userInfo.userOid;
@@ -186,7 +189,7 @@
});
return false;
}
- }
+ };
this.$router.push({path: this.tagWel.value});
loading.close();
}).catch((err) => {
--
Gitblit v1.9.3