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 | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 95cff50..8ceb629 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,7 +1,7 @@
<template>
<div class="login">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
- <h3 class="title">若依后台管理系统</h3>
+ <h3 class="title">新疆维吾尔自治区特种作业<br/>安全生产知识和管理能力考核系统</h3>
<el-form-item prop="username">
<el-input
v-model="loginForm.username"
@@ -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>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</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,7 +99,9 @@
watch: {
$route: {
handler: function(route) {
+ console.log(route,'route')
this.redirect = route.query && route.query.redirect;
+ // this.redirect = '/notCoalMine/nPeopleManage'
},
immediate: true
}
@@ -118,8 +121,8 @@
});
},
getCookie() {
- const username = Cookies.get("username");
- const password = Cookies.get("password");
+ const username = Cookies.get("username")
+ const password = Cookies.get("password")
const rememberMe = Cookies.get('rememberMe')
this.loginForm = {
username: username === undefined ? this.loginForm.username : username,
@@ -161,13 +164,14 @@
justify-content: center;
align-items: center;
height: 100%;
- background-image: url("../assets/images/login-background.jpg");
+ background: url("../assets/images/login-background.jpg") no-repeat center;
background-size: cover;
}
.title {
- margin: 0px auto 30px auto;
+ margin: 0 auto 30px;
text-align: center;
color: #707070;
+ line-height: 28px;
}
.login-form {
--
Gitblit v1.9.2