From e15df9a20c29044b10772e3587a00d0be03b281d Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期日, 08 十二月 2024 20:57:41 +0800
Subject: [PATCH] 增加了内容
---
ruoyi-ui/src/views/login.vue | 140 +++++++++++++++++++++++++++-------------------
1 files changed, 82 insertions(+), 58 deletions(-)
diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 0e1fd66..8354128 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -1,18 +1,18 @@
<template>
<div>
-
+
<div class="login Group_132">
<div class="navbar topHeight">
<!-- <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
-
+
<breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
<top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
-->
<div class="right-menu">
-
-
-
+
+
+
<div class="avatar-wrapper">
<el-button @click="login">
<img :src="avatar" class="user-avatar">
@@ -20,14 +20,14 @@
<span>鐧诲綍</span>
</el-button>
<el-button @click="openReg">
-
+
<span>娉ㄥ唽</span>
</el-button>
</div>
-
+
</div>
</div>
-
+
<el-dialog :visible.sync="open" style="margin: 0px;" customClass="customWidth" width="620px">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" style="margin: 0px;">
<h3 class="title">鐧诲綍鏈兘閮藉缃�</h3>
@@ -37,9 +37,9 @@
</div></div>
<div class="yonghuming" style="">鐢ㄦ埛鍚�</div>
- <el-form-item prop="username" style="width: 380px; height: 48px; ">
+ <el-form-item prop="nickName" style="width: 380px; height: 48px; ">
<el-input
- v-model="loginForm.username"
+ v-model="loginForm.nickName"
type="text"
auto-complete="off"
placeholder="璇疯緭鍏ョ敤鎴峰悕"
@@ -107,7 +107,7 @@
</div>
<div class="code" @click="getCode" style="width: 24px;
-
+
height: 16px;
font-size: 12px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
@@ -134,24 +134,24 @@
<span v-if="!loading" style="width: 97px;height: 62px;">鐧诲綍</span>
<span v-else>鐧� 褰� 涓�...</span>
</el-button>
-
+
</el-form-item>
<el-form-item>
<a href="https://www.bendudu.com:8080/profile/upload/2023/10/10/Bendudu20231010_20231010203358A033.apk">鐐瑰嚮姝ゅ涓嬭浇搴旂敤绋嬪簭</a>
-
+
</el-form-item>
</el-form>
</el-dialog>
-
-
-
-
+
+
+
+
<el-dialog :visible.sync="openRegister" customClass="customWidth" width="450px">
<div class="register">
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
<h3 class="title">鏂扮敤鎴锋敞鍐�</h3>
- <el-form-item prop="username">
- <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="璐﹀彿">
+ <el-form-item prop="nickname">
+ <el-input v-model="registerForm.nickname" type="text" auto-complete="off" placeholder="璐﹀彿">
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
</el-input>
</el-form-item>
@@ -193,35 +193,37 @@
</el-form-item>
<el-form-item style="width:100%;">
<el-button
- :loading="loading"
+ :loading="loadingr"
size="medium"
type="primary"
style="width:100%;"
@click.native.prevent="handleRegister"
>
- <span v-if="!loading">娉� 鍐�</span>
+ <span v-if="!loadingr">娉� 鍐�</span>
<span v-else>娉� 鍐� 涓�...</span>
</el-button>
-
+
</el-form-item>
</el-form>
<!-- 搴曢儴 -->
-
+
</div>
</el-dialog>
<!-- 搴曢儴 -->
<div class="el-login-footer" >
- <span style="color: black; ">Copyright 漏 GDUT All Rights Reserved.<span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span></span>
+ <span style="color: black; "><span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span></span>
<a href="https://beian.miit.gov.cn/" target="_blank" style="color: black; ">绮CP澶�2023050334鍙�<span v-html="'\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0\u00a0'"></span>鍏畨澶囨鍙�44010402003045</a>
</div>
</div>
-
- <div class="gpr"></div>
+
+ <div class="gpr">
+<!-- <img :key="url" :src="url" style="width:100%;height:30%"></img> -->
+ </div>
</div>
</template>
<script>
-import { getCodeImg,Download } from "@/api/login";
+import { getCodeImg,Download,register } from "@/api/login";
import Cookies from "js-cookie";
import { encrypt, decrypt } from '@/utils/jsencrypt'
@@ -233,23 +235,26 @@
callback(new Error("涓ゆ杈撳叆鐨勫瘑鐮佷笉涓�鑷�"));
} else {
callback();
+
}
};
return {
+ url: require('../assets/images/index.png'),
openRegister: false,
+ avatar: undefined,
open: false,
codeUrl: "",
loginForm: {
// username: "admin",
// password: "admin123",
- username: "",
+ nickName: "",
password: "",
rememberMe: false,
code: "",
uuid: ""
},
loginRules: {
- username: [
+ nickName: [
{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勮处鍙�" }
],
password: [
@@ -258,26 +263,27 @@
code: [{ required: true, trigger: "change", message: "璇疯緭鍏ラ獙璇佺爜" }]
},
loading: false,
+ loadingr: false,
// 楠岃瘉鐮佸紑鍏�
captchaEnabled: true,
// 娉ㄥ唽寮�鍏�
- register: true,
+ // register: true,
redirect: undefined,
-
-
-
+
+
+
registerForm: {
- username: "",
+ nickname: "",
password: "",
confirmPassword: "",
code: "",
uuid: ""
},
registerRules: {
- username: [
+ nickname: [
{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勮处鍙�" },
- { min: 2, max: 20, message: '鐢ㄦ埛璐﹀彿闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿', trigger: 'blur' }
+ // { min: 2, max: 20, message: '鐢ㄦ埛璐﹀彿闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿', trigger: 'blur' }
],
password: [
{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勫瘑鐮�" },
@@ -306,19 +312,24 @@
},
methods: {
handleRegister() {
+ //alert(this.registerForm.nickname)
this.$refs.registerForm.validate(valid => {
if (valid) {
- this.loading = true;
+ this.loadingr = false;
+ //alert(this.registerForm.nickname)
register(this.registerForm).then(res => {
- const username = this.registerForm.username;
- this.$alert("<font color='red'>鎭枩浣狅紝鎮ㄧ殑璐﹀彿 " + username + " 娉ㄥ唽鎴愬姛锛�</font>", '绯荤粺鎻愮ず', {
+ const nickName = this.registerForm.nickname;
+ this.$alert("<font color='red'>鎭枩浣狅紝鎮ㄧ殑璐﹀彿 " + nickName + " 娉ㄥ唽鎴愬姛锛�</font>", '绯荤粺鎻愮ず', {
dangerouslyUseHTMLString: true,
type: 'success'
}).then(() => {
- this.$router.push("/login");
+ this.openRegister = false;
+ this.resetForm("registerForm");
+ // this.$router.push("/login");
+
}).catch(() => {});
}).catch(() => {
- this.loading = false;
+ this.loadingr = true;
if (this.captchaEnabled) {
this.getCode();
}
@@ -327,7 +338,7 @@
});
},
openReg(){
- this.openRegister = true;
+ this.openRegister = true;
},
login(){
this.open = true;
@@ -340,15 +351,16 @@
if (this.captchaEnabled) {
this.codeUrl = "data:image/gif;base64," + res.data.img;
this.loginForm.uuid = res.data.uuid;
+ this.registerForm.uuid = res.data.uuid;
}
});
},
getCookie() {
- const username = Cookies.get("username");
+ const nickName = Cookies.get("nickName");
const password = Cookies.get("password");
const rememberMe = Cookies.get('rememberMe')
this.loginForm = {
- username: username === undefined ? this.loginForm.username : username,
+ nickName: nickName === undefined ? this.loginForm.nickName : nickName,
password: password === undefined ? this.loginForm.password : decrypt(password),
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
};
@@ -358,14 +370,15 @@
if (valid) {
this.loading = true;
if (this.loginForm.rememberMe) {
- Cookies.set("username", this.loginForm.username, { expires: 30 });
+ Cookies.set("nickName", this.loginForm.nickName, { expires: 30 });
Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
} else {
- Cookies.remove("username");
+ Cookies.remove("nickName");
Cookies.remove("password");
Cookies.remove('rememberMe');
}
+ // alert(this.loginForm.nickName)
this.$store.dispatch("Login", this.loginForm).then(() => {
this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
}).catch(() => {
@@ -384,20 +397,31 @@
<style rel="stylesheet/scss" lang="scss">
.gpr{
width:100%;
- height:600px;
- background: no-repeat center/40% url("../assets/images/Group 132.png");
+ // height:1000px;
+
+ //background: no-repeat center/100% url("../assets/images/index.png");
}
.customWidth{
width:40%; // 璁剧疆寮瑰嚭妗嗗搴︾殑鏁板��
}
.topHeight{
height: 40px;
+
margin-right: 20px;
+ top:5px;
+ position: absolute;
}
.Group_132{
+ // background-image: url("../assets/images/index.png");
+
+
+
// background: no-repeat center/40% url("../assets/images/Group 132.png");
- height: 100%;
- width: 100%;
+ // height: 1200px;
+ min-width: 1300px;
+ width: 100vw;
+ height: 100vh;
+
background-color: #FEF7FC;
//background-position: 49.5% 16.2% ;
// background-position: 81.7px 71.3px;
@@ -409,17 +433,17 @@
display: flex;
justify-content: flex-end;
align-items: center;
- height: 100%;
+ // height: 60px;
width: 100%;
- background: no-repeat center/40% url("../assets/images/login_logo.png");
+ background: no-repeat center/100% url("../assets/images/index.png");
background-color: #FEF7FC;
-
+
//background-image: url("../assets/images/login-background.jpg");
//background-size: cover;
}
.title {
-
+
width:355px;
height: 58px;
font-size: 44px;
@@ -515,7 +539,7 @@
width: 108px;
height: 48px;
float: right;
-
+
img {
@@ -543,7 +567,7 @@
}
.code {
-
+
}
.register {
@@ -552,10 +576,10 @@
align-items: center;
height: 100%;
//background-image: url("../assets/images/login-background.jpg");
-
+
width:400px;
background-color: #FEF7FC;
-
+
//background-size: cover;
}
.title {
--
Gitblit v1.9.1