From 72524446c3f1b9512906ff9fd249d23202420114 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 03 九月 2024 00:06:54 +0800
Subject: [PATCH] 修改了权限和家谱图姓名

---
 ruoyi-ui/src/views/login.vue |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/ruoyi-ui/src/views/login.vue b/ruoyi-ui/src/views/login.vue
index 0e1fd66..e27dce1 100644
--- a/ruoyi-ui/src/views/login.vue
+++ b/ruoyi-ui/src/views/login.vue
@@ -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="璇疯緭鍏ョ敤鎴峰悕"
@@ -150,8 +150,8 @@
 		<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>
@@ -242,14 +242,14 @@
       loginForm: {
         // username: "admin",
         // password: "admin123",
-        username: "",
+        nickName: "",
         password: "",
         rememberMe: false,
         code: "",
         uuid: ""
       },
       loginRules: {
-        username: [
+        nickName: [
           { required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勮处鍙�" }
         ],
         password: [
@@ -268,14 +268,14 @@
 	  
 
 	  registerForm: {
-	    username: "",
+	    nickName: "",
 	    password: "",
 	    confirmPassword: "",
 	    code: "",
 	    uuid: ""
 	  },
 	  registerRules: {
-	    username: [
+	    nickName: [
 	      { required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勮处鍙�" },
 	      { min: 2, max: 20, message: '鐢ㄦ埛璐﹀彿闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿', trigger: 'blur' }
 	    ],
@@ -310,8 +310,8 @@
 	      if (valid) {
 	        this.loading = true;
 	        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(() => {
@@ -344,11 +344,11 @@
       });
     },
     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 +358,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(() => {

--
Gitblit v1.9.1