From b06f6a316b6a8293bb8aba6bfff33336b66c032a Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 09:01:52 +0800
Subject: [PATCH] !64 版本升级 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance
---
src/views/login.vue | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index e5c73fa..a92f399 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -2,7 +2,7 @@
<div class="login">
<el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
<h3 class="title">RuoYi-Vue-Plus澶氱鎴风鐞嗙郴缁�</h3>
- <el-form-item prop="tenantId" v-if="tenantEnabled">
+ <el-form-item v-if="tenantEnabled" prop="tenantId">
<el-select v-model="loginForm.tenantId" filterable placeholder="璇烽�夋嫨/杈撳叆鍏徃鍚嶇О" style="width: 100%">
<el-option v-for="item in tenantList" :key="item.tenantId" :label="item.companyName" :value="item.tenantId"></el-option>
<template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template>
@@ -18,16 +18,16 @@
<template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
</el-input>
</el-form-item>
- <el-form-item prop="code" v-if="captchaEnabled">
+ <el-form-item v-if="captchaEnabled" prop="code">
<el-input v-model="loginForm.code" size="large" auto-complete="off" placeholder="楠岃瘉鐮�" style="width: 63%" @keyup.enter="handleLogin">
<template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>
</el-input>
<div class="login-code">
- <img :src="codeUrl" @click="getCode" class="login-code-img" />
+ <img :src="codeUrl" class="login-code-img" @click="getCode" />
</div>
</el-form-item>
- <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">璁颁綇瀵嗙爜</el-checkbox>
- <el-form-item style="float: right;">
+ <el-checkbox v-model="loginForm.rememberMe" style="margin: 0px 0px 25px 0px">璁颁綇瀵嗙爜</el-checkbox>
+ <el-form-item style="float: right">
<el-button circle title="寰俊鐧诲綍" @click="doSocialLogin('wechat')">
<svg-icon icon-class="wechat" />
</el-button>
@@ -41,12 +41,12 @@
<svg-icon icon-class="github" />
</el-button>
</el-form-item>
- <el-form-item style="width:100%;">
- <el-button :loading="loading" size="large" type="primary" style="width:100%;" @click.prevent="handleLogin">
+ <el-form-item style="width: 100%">
+ <el-button :loading="loading" size="large" type="primary" style="width: 100%" @click.prevent="handleLogin">
<span v-if="!loading">鐧� 褰�</span>
<span v-else>鐧� 褰� 涓�...</span>
</el-button>
- <div style="float: right;" v-if="register">
+ <div v-if="register" style="float: right">
<router-link class="link-type" :to="'/register'">绔嬪嵆娉ㄥ唽</router-link>
</div>
</el-form-item>
@@ -64,7 +64,7 @@
import { useUserStore } from '@/store/modules/user';
import { LoginData, TenantVO } from '@/api/types';
import { to } from 'await-to-js';
-import { HttpStatus } from "@/enums/RespEnum";
+import { HttpStatus } from '@/enums/RespEnum';
const userStore = useUserStore();
const router = useRouter();
@@ -79,7 +79,7 @@
} as LoginData);
const loginRules: ElFormRules = {
- tenantId: [{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勭鎴风紪鍙�" }],
+ tenantId: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ偍鐨勭鎴风紪鍙�' }],
username: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ偍鐨勮处鍙�' }],
password: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ偍鐨勫瘑鐮�' }],
code: [{ required: true, trigger: 'change', message: '璇疯緭鍏ラ獙璇佺爜' }]
@@ -92,7 +92,6 @@
// 绉熸埛寮�鍏�
const tenantEnabled = ref(true);
-
// 娉ㄥ唽寮�鍏�
const register = ref(false);
const redirect = ref(undefined);
@@ -100,9 +99,13 @@
// 绉熸埛鍒楄〃
const tenantList = ref<TenantVO[]>([]);
-watch(() => router.currentRoute.value, (newRoute: any) => {
- redirect.value = newRoute.query && newRoute.query.redirect;
-}, { immediate: true });
+watch(
+ () => router.currentRoute.value,
+ (newRoute: any) => {
+ redirect.value = newRoute.query && newRoute.query.redirect;
+ },
+ { immediate: true }
+);
const handleLogin = () => {
loginRef.value?.validate(async (valid: boolean, fields: any) => {
@@ -110,13 +113,13 @@
loading.value = true;
// 鍕鹃�変簡闇�瑕佽浣忓瘑鐮佽缃湪 localStorage 涓缃浣忕敤鎴峰悕鍜屽瘑鐮�
if (loginForm.value.rememberMe) {
- localStorage.setItem("tenantId", String(loginForm.value.tenantId));
+ localStorage.setItem('tenantId', String(loginForm.value.tenantId));
localStorage.setItem('username', String(loginForm.value.username));
localStorage.setItem('password', String(loginForm.value.password));
localStorage.setItem('rememberMe', String(loginForm.value.rememberMe));
} else {
// 鍚﹀垯绉婚櫎
- localStorage.removeItem("tenantId");
+ localStorage.removeItem('tenantId');
localStorage.removeItem('username');
localStorage.removeItem('password');
localStorage.removeItem('rememberMe');
@@ -153,7 +156,7 @@
};
const getLoginData = () => {
- const tenantId = localStorage.getItem("tenantId");
+ const tenantId = localStorage.getItem('tenantId');
const username = localStorage.getItem('username');
const password = localStorage.getItem('password');
const rememberMe = localStorage.getItem('rememberMe');
@@ -163,8 +166,7 @@
password: password === null ? String(loginForm.value.password) : String(password),
rememberMe: rememberMe === null ? false : Boolean(rememberMe)
} as LoginData;
-}
-
+};
/**
* 鑾峰彇绉熸埛鍒楄〃
@@ -178,12 +180,15 @@
loginForm.value.tenantId = tenantList.value[0].tenantId;
}
}
-}
+};
//妫�娴嬬鎴烽�夋嫨妗嗙殑鍙樺寲
-watch(() => loginForm.value.tenantId, () => {
- localStorage.setItem("tenantId", String(loginForm.value.tenantId))
-});
+watch(
+ () => loginForm.value.tenantId,
+ () => {
+ localStorage.setItem('tenantId', String(loginForm.value.tenantId));
+ }
+);
/**
* 绗笁鏂圭櫥褰�
@@ -200,8 +205,6 @@
});
};
-
-
onMounted(() => {
getCode();
initTenantList();
@@ -215,7 +218,7 @@
justify-content: center;
align-items: center;
height: 100%;
- background-image: url("../assets/images/login-background.jpg");
+ background-image: url('../assets/images/login-background.jpg');
background-size: cover;
}
--
Gitblit v1.9.3