From a2aa94ae99095ec3fb5c463eefca33f89fd25bca Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: Tue, 05 Mar 2024 08:52:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/login.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 93ae70d..8ceb629 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -18,6 +18,7 @@
type="password"
auto-complete="off"
placeholder="密码"
+ show-password
@keyup.enter.native="handleLogin"
>
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
@@ -55,9 +56,9 @@
</el-form-item>
</el-form>
<!-- 底部 -->
- <div class="el-login-footer">
- <span>技术支持：中国科学院</span>
- </div>
+<!-- <div class="el-login-footer">-->
+<!-- <span>技术支持：中国科学院</span>-->
+<!-- </div>-->
</div>
</template>
@@ -72,8 +73,8 @@
return {
codeUrl: "",
loginForm: {
- username: "admin",
- password: "admin123",
+ username: "",
+ password: "",
rememberMe: false,
code: "",
uuid: ""
@@ -98,8 +99,9 @@
watch: {
$route: {
handler: function(route) {
- // this.redirect = route.query && route.query.redirect;
- this.redirect = '/notCoalMine/nPeopleManage'
+ console.log(route,'route')
+ this.redirect = route.query && route.query.redirect;
+ // this.redirect = '/notCoalMine/nPeopleManage'
},
immediate: true
}
--
Gitblit v1.9.2