abu/wzj-vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pre Merge pull request !3 from 心如止水/configChangDb

Browse Source
This commit is contained in:
心如止水 2023-03-30 10:34:38 +00:00 committed by Gitee
commit be3b3ce506
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 75 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/api/login.js
View File

@ -19,6 +19,17 @@ export function login(tenantId, username, password, code, uuid) {
}) })
} }
//注册开关
export function registerEnabled() {
return request({
url: '/auth/registerEnabled',
headers: {
isToken: false
},
method: 'get'
})
}
// 注册方法 // 注册方法
export function register(data) { export function register(data) {
return request({ return request({

104
src/views/login.vue
View File

@ -10,42 +10,50 @@
:label="item.companyName" :label="item.companyName"
:value="item.tenantId"> :value="item.tenantId">
</el-option> </el-option>
<template #prefix><svg-icon icon-class="company" class="el-input__icon input-icon" /></template> <template #prefix>
<svg-icon icon-class="company" class="el-input__icon input-icon"/>
</template>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="username"> <el-form-item prop="username">
<el-input <el-input
v-model="loginForm.username" v-model="loginForm.username"
type="text" type="text"
size="large" size="large"
auto-complete="off" auto-complete="off"
placeholder="账号" placeholder="账号"
> >
<template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template> <template #prefix>
<svg-icon icon-class="user" class="el-input__icon input-icon"/>
</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="password"> <el-form-item prop="password">
<el-input <el-input
v-model="loginForm.password" v-model="loginForm.password"
type="password" type="password"
size="large" size="large"
auto-complete="off" auto-complete="off"
placeholder="密码" placeholder="密码"
@keyup.enter="handleLogin" @keyup.enter="handleLogin"
> >
<template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template> <template #prefix>
<svg-icon icon-class="password" class="el-input__icon input-icon"/>
</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item prop="code" v-if="captchaEnabled"> <el-form-item prop="code" v-if="captchaEnabled">
<el-input <el-input
v-model="loginForm.code" v-model="loginForm.code"
size="large" size="large"
auto-complete="off" auto-complete="off"
placeholder="验证码" placeholder="验证码"
style="width: 63%" style="width: 63%"
@keyup.enter="handleLogin" @keyup.enter="handleLogin"
> >
<template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template> <template #prefix>
<svg-icon icon-class="validCode" class="el-input__icon input-icon"/>
</template>
</el-input> </el-input>
<div class="login-code"> <div class="login-code">
<img :src="codeUrl" @click="getCode" class="login-code-img"/> <img :src="codeUrl" @click="getCode" class="login-code-img"/>
@ -54,11 +62,11 @@
<el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox> <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
<el-form-item style="width:100%;"> <el-form-item style="width:100%;">
<el-button <el-button
:loading="loading" :loading="loading"
size="large" size="large"
type="primary" type="primary"
style="width:100%;" style="width:100%;"
@click.prevent="handleLogin" @click.prevent="handleLogin"
> >
<span v-if="!loading">登 录</span> <span v-if="!loading">登 录</span>
<span v-else>登 录 中...</span> <span v-else>登 录 中...</span>
@ -76,14 +84,14 @@
</template> </template>
<script setup> <script setup>
import { getCodeImg, getTenantList } from "@/api/login"; import {getCodeImg, getTenantList,registerEnabled} from "@/api/login";
import Cookies from "js-cookie"; import Cookies from "js-cookie";
import { encrypt, decrypt } from "@/utils/jsencrypt"; import {encrypt, decrypt} from "@/utils/jsencrypt";
import useUserStore from '@/store/modules/user' import useUserStore from '@/store/modules/user';
const userStore = useUserStore() const userStore = useUserStore();
const router = useRouter(); const router = useRouter();
const { proxy } = getCurrentInstance(); const {proxy} = getCurrentInstance();
const loginForm = ref({ const loginForm = ref({
tenantId: "000000", tenantId: "000000",
@ -95,10 +103,10 @@ const loginForm = ref({
}); });
const loginRules = { const loginRules = {
tenantId: [{ required: true, trigger: "blur", message: "请输入您的租户编号" }], tenantId: [{required: true, trigger: "blur", message: "请输入您的租户编号"}],
username: [{ required: true, trigger: "blur", message: "请输入您的账号" }], username: [{required: true, trigger: "blur", message: "请输入您的账号"}],
password: [{ required: true, trigger: "blur", message: "请输入您的密码" }], password: [{required: true, trigger: "blur", message: "请输入您的密码"}],
code: [{ required: true, trigger: "change", message: "请输入验证码" }] code: [{required: true, trigger: "change", message: "请输入验证码"}]
}; };
const codeUrl = ref(""); const codeUrl = ref("");
@ -119,10 +127,10 @@ function handleLogin() {
loading.value = true; loading.value = true;
// 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码 // 勾选了需要记住密码设置在 cookie 中设置记住用户名和密码
if (loginForm.value.rememberMe) { if (loginForm.value.rememberMe) {
Cookies.set("tenantId", loginForm.value.tenantId, { expires: 30 }); Cookies.set("tenantId", loginForm.value.tenantId, {expires: 30});
Cookies.set("username", loginForm.value.username, { expires: 30 }); Cookies.set("username", loginForm.value.username, {expires: 30});
Cookies.set("password", encrypt(loginForm.value.password), { expires: 30 }); Cookies.set("password", encrypt(loginForm.value.password), {expires: 30});
Cookies.set("rememberMe", loginForm.value.rememberMe, { expires: 30 }); Cookies.set("rememberMe", loginForm.value.rememberMe, {expires: 30});
} else { } else {
// 否则移除 // 否则移除
Cookies.remove("tenantId"); Cookies.remove("tenantId");
@ -132,7 +140,7 @@ function handleLogin() {
} }
// 调用action的登录方法 // 调用action的登录方法
userStore.login(loginForm.value).then(() => { userStore.login(loginForm.value).then(() => {
router.push({ path: redirect.value || "/" }); router.push({path: redirect.value || "/"});
}).catch(() => { }).catch(() => {
loading.value = false; loading.value = false;
// 重新获取验证码 // 重新获取验证码
@ -144,6 +152,12 @@ function handleLogin() {
}); });
} }
function getRegisterEnabled() {
registerEnabled().then(res => {
register.value = res.data === undefined ? true : res.data;
});
}
function getCode() { function getCode() {
getCodeImg().then(res => { getCodeImg().then(res => {
captchaEnabled.value = res.data.captchaEnabled === undefined ? true : res.data.captchaEnabled; captchaEnabled.value = res.data.captchaEnabled === undefined ? true : res.data.captchaEnabled;
@ -180,6 +194,7 @@ function getCookie() {
}; };
} }
getRegisterEnabled();
getCode(); getCode();
initTenantList(); initTenantList();
getCookie(); getCookie();
@ -194,6 +209,7 @@ getCookie();
background-image: url("../assets/images/login-background.jpg"); background-image: url("../assets/images/login-background.jpg");
background-size: cover; background-size: cover;
} }
.title { .title {
margin: 0px auto 30px auto; margin: 0px auto 30px auto;
text-align: center; text-align: center;
@ -205,32 +221,39 @@ getCookie();
background: #ffffff; background: #ffffff;
width: 400px; width: 400px;
padding: 25px 25px 5px 25px; padding: 25px 25px 5px 25px;
.el-input { .el-input {
height: 40px; height: 40px;
input { input {
height: 40px; height: 40px;
} }
} }
.input-icon { .input-icon {
height: 39px; height: 39px;
width: 14px; width: 14px;
margin-left: 0px; margin-left: 0px;
} }
} }
.login-tip { .login-tip {
font-size: 13px; font-size: 13px;
text-align: center; text-align: center;
color: #bfbfbf; color: #bfbfbf;
} }
.login-code { .login-code {
width: 33%; width: 33%;
height: 40px; height: 40px;
float: right; float: right;
img { img {
cursor: pointer; cursor: pointer;
vertical-align: middle; vertical-align: middle;
} }
} }
.el-login-footer { .el-login-footer {
height: 40px; height: 40px;
line-height: 40px; line-height: 40px;
@ -243,6 +266,7 @@ getCookie();
font-size: 12px; font-size: 12px;
letter-spacing: 1px; letter-spacing: 1px;
} }
.login-code-img { .login-code-img {
height: 40px; height: 40px;
padding-left: 12px; padding-left: 12px;