From e181f04c642204e79749af93fa921875ff6c21ba Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期二, 20 五月 2025 10:46:35 +0800
Subject: [PATCH] refactor(qms): 重构趋势图展示逻辑
---
src/views/login.vue | 158 ++++++++++++++++++++++++++++++++--------------------
1 files changed, 97 insertions(+), 61 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 1084c02..ab68a08 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,59 +1,79 @@
<template>
<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-select v-model="loginForm.tenantId" filterable placeholder="璇烽�夋嫨/杈撳叆鍏徃鍚嶇О" style="width: 100%">
+ <div class="title-box">
+ <h3 class="title">鍏板疂杞﹂棿璐ㄩ噺绠＄悊绯荤粺</h3>
+ <lang-select />
+ </div>
+ <el-form-item v-if="tenantEnabled" prop="tenantId">
+ <el-select v-model="loginForm.tenantId" filterable :placeholder="proxy.$t('login.selectPlaceholder')" 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>
</el-select>
</el-form-item>
<el-form-item prop="username">
- <el-input v-model="loginForm.username" type="text" size="large" auto-complete="off" placeholder="璐﹀彿">
+ <el-input v-model="loginForm.username" type="text" size="large" auto-complete="off" :placeholder="proxy.$t('login.username')">
<template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
</el-input>
</el-form-item>
<el-form-item prop="password">
- <el-input v-model="loginForm.password" type="password" size="large" auto-complete="off" placeholder="瀵嗙爜" @keyup.enter="handleLogin">
+ <el-input
+ v-model="loginForm.password"
+ type="password"
+ size="large"
+ auto-complete="off"
+ :placeholder="proxy.$t('login.password')"
+ @keyup.enter="handleLogin"
+ >
<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-input v-model="loginForm.code" size="large" auto-complete="off" placeholder="楠岃瘉鐮�" style="width: 63%" @keyup.enter="handleLogin">
+ <el-form-item v-if="captchaEnabled" prop="code">
+ <el-input
+ v-model="loginForm.code"
+ size="large"
+ auto-complete="off"
+ :placeholder="proxy.$t('login.code')"
+ 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-button circle title="寰俊鐧诲綍" @click="doSocialLogin('wechat')">
- <svg-icon icon-class="wechat" />
+ <el-checkbox v-model="loginForm.rememberMe" style="margin: 0 0 25px 0">{{ proxy.$t('login.rememberPassword') }}</el-checkbox>
+ <el-form-item style="float: right">
+<!-- <el-button circle :title="proxy.$t('login.social.wechat')" @click="doSocialLogin('wechat')">-->
+<!-- <svg-icon icon-class="wechat" />-->
+<!-- </el-button>-->
+ <el-button circle :title="proxy.$t('login.social.keycloak')" @click="doSocialLogin('keycloak')">
+ <svg-icon icon-class="keycloak" />
</el-button>
- <el-button circle title="MaxKey鐧诲綍" @click="doSocialLogin('maxkey')">
- <svg-icon icon-class="maxkey" />
- </el-button>
- <el-button circle title="Gitee鐧诲綍" @click="doSocialLogin('gitee')">
- <svg-icon icon-class="gitee" />
- </el-button>
- <el-button circle title="Github鐧诲綍" @click="doSocialLogin('github')">
- <svg-icon icon-class="github" />
- </el-button>
+<!-- <el-button circle :title="proxy.$t('login.social.topiam')" @click="doSocialLogin('topiam')">-->
+<!-- <svg-icon icon-class="topiam" />-->
+<!-- </el-button>-->
+<!-- <el-button circle :title="proxy.$t('login.social.gitee')" @click="doSocialLogin('gitee')">-->
+<!-- <svg-icon icon-class="gitee" />-->
+<!-- </el-button>-->
+<!-- <el-button circle :title="proxy.$t('login.social.github')" @click="doSocialLogin('github')">-->
+<!-- <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">
- <span v-if="!loading">鐧� 褰�</span>
- <span v-else>鐧� 褰� 涓�...</span>
+ <el-form-item style="width: 100%">
+ <el-button :loading="loading" size="large" type="primary" style="width: 100%" @click.prevent="handleLogin">
+ <span v-if="!loading">{{ proxy.$t('login.login') }}</span>
+ <span v-else>{{ proxy.$t('login.logging') }}</span>
</el-button>
- <div style="float: right;" v-if="register">
- <router-link class="link-type" :to="'/register'">绔嬪嵆娉ㄥ唽</router-link>
+ <div v-if="register" style="float: right">
+ <router-link class="link-type" :to="'/register'">{{ proxy.$t('login.switchRegisterPage') }}</router-link>
</div>
</el-form-item>
</el-form>
<!-- 搴曢儴 -->
<div class="el-login-footer">
- <span>Copyright 漏 2018-2023 鐤媯鐨勭嫯瀛怢i All Rights Reserved.</span>
+ <span>Copyright 漏 2018-2024 涓婃捣鍏版郸鏅鸿兘绉戞妧鏈夐檺鍏徃 All Rights Reserved.</span>
</div>
</div>
</template>
@@ -64,25 +84,29 @@
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';
+import { useI18n } from 'vue-i18n';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const userStore = useUserStore();
const router = useRouter();
+const { t } = useI18n();
const loginForm = ref<LoginData>({
tenantId: '000000',
- username: 'admin',
- password: 'admin123',
+ username: '',
+ password: '',
rememberMe: false,
code: '',
uuid: ''
} as LoginData);
const loginRules: ElFormRules = {
- tenantId: [{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勭鎴风紪鍙�" }],
- username: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ偍鐨勮处鍙�' }],
- password: [{ required: true, trigger: 'blur', message: '璇疯緭鍏ユ偍鐨勫瘑鐮�' }],
- code: [{ required: true, trigger: 'change', message: '璇疯緭鍏ラ獙璇佺爜' }]
+ tenantId: [{ required: true, trigger: 'blur', message: t('login.rule.tenantId.required') }],
+ username: [{ required: true, trigger: 'blur', message: t('login.rule.username.required') }],
+ password: [{ required: true, trigger: 'blur', message: t('login.rule.password.required') }],
+ code: [{ required: true, trigger: 'change', message: t('login.rule.code.required') }]
};
const codeUrl = ref('');
@@ -92,13 +116,20 @@
// 绉熸埛寮�鍏�
const tenantEnabled = ref(true);
-
// 娉ㄥ唽寮�鍏�
const register = ref(false);
-const redirect = ref(undefined);
+const redirect = ref('/');
const loginRef = ref<ElFormInstance>();
// 绉熸埛鍒楄〃
const tenantList = ref<TenantVO[]>([]);
+
+watch(
+ () => router.currentRoute.value,
+ (newRoute: any) => {
+ redirect.value = newRoute.query && newRoute.query.redirect && decodeURIComponent(newRoute.query.redirect);
+ },
+ { immediate: true }
+);
const handleLogin = () => {
loginRef.value?.validate(async (valid: boolean, fields: any) => {
@@ -106,13 +137,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');
@@ -120,7 +151,9 @@
// 璋冪敤action鐨勭櫥褰曟柟娉�
const [err] = await to(userStore.login(loginForm.value));
if (!err) {
- await router.push({ path: redirect.value || '/' });
+ const redirectUrl = redirect.value || '/';
+ await router.push(redirectUrl);
+ loading.value = false;
} else {
loading.value = false;
// 閲嶆柊鑾峰彇楠岃瘉鐮�
@@ -148,7 +181,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');
@@ -158,14 +191,13 @@
password: password === null ? String(loginForm.value.password) : String(password),
rememberMe: rememberMe === null ? false : Boolean(rememberMe)
} as LoginData;
-}
-
+};
/**
* 鑾峰彇绉熸埛鍒楄〃
*/
const initTenantList = async () => {
- const { data } = await getTenantList();
+ const { data } = await getTenantList(false);
tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
if (tenantEnabled.value) {
tenantList.value = data.voList;
@@ -173,19 +205,14 @@
loginForm.value.tenantId = tenantList.value[0].tenantId;
}
}
-}
-
-//妫�娴嬬鎴烽�夋嫨妗嗙殑鍙樺寲
-watch(() => loginForm.value.tenantId, () => {
- localStorage.setItem("tenantId", String(loginForm.value.tenantId))
-});
+};
/**
* 绗笁鏂圭櫥褰�
* @param type
*/
const doSocialLogin = (type: string) => {
- authBinding(type).then((res: any) => {
+ authBinding(type, loginForm.value.tenantId).then((res: any) => {
if (res.code === HttpStatus.SUCCESS) {
// 鑾峰彇鎺堟潈鍦板潃璺宠浆
window.location.href = res.data;
@@ -195,12 +222,12 @@
});
};
-
-
onMounted(() => {
- getCode();
- initTenantList();
- getLoginData();
+ // getCode();
+ // initTenantList();
+ // getLoginData();
+
+ doSocialLogin('keycloak')
});
</script>
@@ -210,14 +237,23 @@
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;
}
-.title {
- margin: 0px auto 30px auto;
- text-align: center;
- color: #707070;
+.title-box {
+ display: flex;
+
+ .title {
+ margin: 0px auto 30px auto;
+ text-align: center;
+ color: #707070;
+ }
+
+ :deep(.lang-select--style) {
+ line-height: 0;
+ color: #7483a3;
+ }
}
.login-form {
--
Gitblit v1.9.3