From 09a9c6c647a7c90d6f83663cddac68983b351209 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 03 六月 2025 16:42:17 +0800
Subject: [PATCH] 登录修改
---
src/views/login.vue | 141 +++++++++++++++++++++++++++++++++-------------
1 files changed, 101 insertions(+), 40 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 4ac6e3e..1cc6cfd 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -2,6 +2,7 @@
<div class="login">
<el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
<h3 class="title">{{ title }}</h3>
+ <el-divider />
<el-form-item prop="username">
<el-input
v-model="loginForm.username"
@@ -10,7 +11,7 @@
auto-complete="off"
placeholder="璐﹀彿"
>
- <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>
+ <template #prefix><el-icon><User /></el-icon></template>
</el-input>
</el-form-item>
<el-form-item prop="password">
@@ -20,27 +21,27 @@
size="large"
auto-complete="off"
placeholder="瀵嗙爜"
+ show-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"
- >
- <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"/>
- </div>
- </el-form-item>
- <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">璁颁綇瀵嗙爜</el-checkbox>
+<!-- <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"-->
+<!-- >-->
+<!-- <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"/>-->
+<!-- </div>-->
+<!-- </el-form-item>-->
<el-form-item style="width:100%;">
<el-button
:loading="loading"
@@ -56,19 +57,42 @@
<router-link class="link-type" :to="'/register'">绔嬪嵆娉ㄥ唽</router-link>
</div>
</el-form-item>
+ <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">璁颁綇瀵嗙爜</el-checkbox>
</el-form>
+ <el-dialog
+ v-model="modalView"
+ title="鐧诲綍閮ㄩ棬"
+ width="500"
+ :show-close="false">
+ <el-form :model="factoryCommitForm">
+ <el-form-item>
+ <el-select v-model="currentFatoryId">
+ <el-option v-for="item in factoryList" :key="item.deptId" :label="item.deptName" :value="item.deptId" />
+ </el-select>
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button @click="cancelLogin">鍙栨秷</el-button>
+ <el-button type="primary" @click="factoryCommit()">
+ 纭
+ </el-button>
+ </div>
+ </template>
+ </el-dialog>
<!-- 搴曢儴 -->
- <div class="el-login-footer">
- <span>Copyright 漏 2018-2025 ruoyi.vip All Rights Reserved.</span>
- </div>
+<!-- <div class="el-login-footer">-->
+<!-- <span>Copyright 漏 2018-2025 ruoyi.vip All Rights Reserved.</span>-->
+<!-- </div>-->
</div>
</template>
<script setup>
-import { getCodeImg } from "@/api/login"
+import {getCodeImg, loginCheckFactory} from "@/api/login"
import Cookies from "js-cookie"
import { encrypt, decrypt } from "@/utils/jsencrypt"
import useUserStore from '@/store/modules/user'
+import {userDeptList} from "@/api/system/user.js"
const title = import.meta.env.VITE_APP_TITLE
const userStore = useUserStore()
@@ -80,14 +104,18 @@
username: "admin",
password: "admin123",
rememberMe: false,
- code: "",
+ // code: "",
uuid: ""
+})
+
+const factoryCommitForm = ref({
+ deptId:''
})
const loginRules = {
username: [{ 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("")
@@ -97,6 +125,11 @@
// 娉ㄥ唽寮�鍏�
const register = ref(false)
const redirect = ref(undefined)
+
+const modalView = ref(false)
+
+const factoryList = ref([])
+const currentFatoryId = ref('')
watch(route, (newRoute) => {
redirect.value = newRoute.query && newRoute.query.redirect
@@ -118,15 +151,13 @@
Cookies.remove("rememberMe")
}
// 璋冪敤action鐨勭櫥褰曟柟娉�
- userStore.login(loginForm.value).then(() => {
- const query = route.query
- const otherQueryParams = Object.keys(query).reduce((acc, cur) => {
- if (cur !== "redirect") {
- acc[cur] = query[cur]
- }
- return acc
- }, {})
- router.push({ path: redirect.value || "/", query: otherQueryParams })
+ userStore.loginCheck(loginForm.value).then(res => {
+ // 鏌ヨ鐢ㄦ埛閮ㄩ棬
+ userDeptList(res.data).then(res => {
+ factoryList.value = res.data
+ modalView.value = true
+ })
+
}).catch(() => {
loading.value = false
// 閲嶆柊鑾峰彇楠岃瘉鐮�
@@ -135,6 +166,21 @@
}
})
}
+ })
+}
+
+// 褰撳墠鐧诲綍鍏徃/閮ㄩ棬纭
+function factoryCommit(){
+ loginForm.value.factoryId = currentFatoryId.value
+ userStore.loginCheckFactory(loginForm.value).then(res => {
+ const query = route.query
+ const otherQueryParams = Object.keys(query).reduce((acc, cur) => {
+ if (cur !== "redirect") {
+ acc[cur] = query[cur]
+ }
+ return acc
+ }, {})
+ router.push({ path: redirect.value || "/", query: otherQueryParams })
})
}
@@ -159,30 +205,40 @@
}
}
+function cancelLogin() {
+ modalView.value = false
+ loading.value = false
+}
+
getCode()
getCookie()
</script>
<style lang='scss' scoped>
.login {
- display: flex;
- justify-content: center;
- align-items: center;
height: 100%;
- background-image: url("../assets/images/login-background.jpg");
+ background-image: url("../assets/images/login-background.png");
background-size: cover;
+ position: relative;
}
.title {
- margin: 0px auto 30px auto;
+ margin: 20px auto 14px auto;
text-align: center;
- color: #707070;
+ color: #2C51D9;
+ font-size: 28px;
+ font-weight: 700;
}
.login-form {
+ position: absolute;
+ top: 50%;
+ right: 15%;
+ transform: translate(0, -50%);
border-radius: 6px;
background: #ffffff;
- width: 400px;
- padding: 25px 25px 5px 25px;
+ width: 420px;
+ height: 500px;
+ padding: 40px;
z-index: 1;
.el-input {
height: 40px;
@@ -226,4 +282,9 @@
height: 40px;
padding-left: 12px;
}
+:deep() {
+ .el-form-item--default {
+ margin-bottom: 36px;
+ }
+}
</style>
--
Gitblit v1.9.3