From ca0c2cd9dcece8b67ee6d74161d183be10048d1d Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 18 九月 2025 13:52:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_script' into ywx
---
src/views/login.vue | 186 ++++++++++++++++++++++++++++------------------
1 files changed, 113 insertions(+), 73 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index c2a91ef..5300637 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,7 +1,8 @@
<template>
<div class="login">
<el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
- <h3 class="title">鑻ヤ緷鍚庡彴绠＄悊绯荤粺</h3>
+ <h3 class="title">{{ title }}</h3>
+ <el-divider />
<el-form-item prop="username">
<el-input
v-model="loginForm.username"
@@ -9,8 +10,9 @@
size="large"
auto-complete="off"
placeholder="璐﹀彿"
+ @input="getUserLoginFacotryList"
>
- <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 +22,32 @@
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 prop="currentFatoryId">
+ <el-select v-model="loginForm.currentFatoryId" placeholder="璇烽�夋嫨鍏徃" >
+ <el-option v-for="item in factoryList" :key="item.deptId" :label="item.deptName" :value="item.deptId" />
+ </el-select>
</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,120 +63,148 @@
<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>
<!-- 搴曢儴 -->
- <div class="el-login-footer">
- <span>Copyright 漏 2018-2023 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 Cookies from "js-cookie";
-import { encrypt, decrypt } from "@/utils/jsencrypt";
+import {getCodeImg} from "@/api/login"
+import Cookies from "js-cookie"
+import { encrypt, decrypt } from "@/utils/jsencrypt"
import useUserStore from '@/store/modules/user'
+import {userLoginFacotryList} from "@/api/system/user.js"
+const title = import.meta.env.VITE_APP_TITLE
const userStore = useUserStore()
-const router = useRouter();
-const { proxy } = getCurrentInstance();
+const route = useRoute()
+const router = useRouter()
+const { proxy } = getCurrentInstance()
const loginForm = ref({
- username: "admin",
- password: "admin123",
+ username: "",
+ password: "",
rememberMe: false,
- code: "",
- uuid: ""
-});
+ currentFatoryId:'',
+})
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("");
-const loading = ref(false);
+const codeUrl = ref("")
+const loading = ref(false)
// 楠岃瘉鐮佸紑鍏�
-const captchaEnabled = ref(true);
+const captchaEnabled = ref(true)
// 娉ㄥ唽寮�鍏�
-const register = ref(false);
-const redirect = ref(undefined);
+const register = ref(false)
+const redirect = ref(undefined)
+
+const factoryList = ref([])
+const currentFatoryId = ref('')
+
+watch(route, (newRoute) => {
+ redirect.value = newRoute.query && newRoute.query.redirect
+}, { immediate: true })
function handleLogin() {
proxy.$refs.loginRef.validate(valid => {
if (valid) {
- loading.value = true;
+ loading.value = true
// 鍕鹃�変簡闇�瑕佽浣忓瘑鐮佽缃湪 cookie 涓缃浣忕敤鎴峰悕鍜屽瘑鐮�
- if (loginForm.value.rememberMe) {
- Cookies.set("username", loginForm.value.username, { expires: 30 });
- Cookies.set("password", encrypt(loginForm.value.password), { expires: 30 });
- Cookies.set("rememberMe", loginForm.value.rememberMe, { expires: 30 });
- } else {
- // 鍚﹀垯绉婚櫎
- Cookies.remove("username");
- Cookies.remove("password");
- Cookies.remove("rememberMe");
- }
- // 璋冪敤action鐨勭櫥褰曟柟娉�
- userStore.login(loginForm.value).then(() => {
- router.push({ path: redirect.value || "/" });
+ Cookies.set("username", loginForm.value.username, { expires: 30 })
+ Cookies.set("password", encrypt(loginForm.value.password), { expires: 30 })
+ Cookies.set("rememberMe", loginForm.value.rememberMe, { expires: 30 })
+ 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 })
}).catch(() => {
- loading.value = false;
+ loading.value = false
// 閲嶆柊鑾峰彇楠岃瘉鐮�
if (captchaEnabled.value) {
- getCode();
+ getCode()
}
- });
+ })
}
- });
+ })
}
function getCode() {
getCodeImg().then(res => {
- captchaEnabled.value = res.captchaEnabled === undefined ? true : res.captchaEnabled;
+ captchaEnabled.value = res.captchaEnabled === undefined ? true : res.captchaEnabled
if (captchaEnabled.value) {
- codeUrl.value = "data:image/gif;base64," + res.img;
- loginForm.value.uuid = res.uuid;
+ codeUrl.value = "data:image/gif;base64," + res.img
+ loginForm.value.uuid = res.uuid
}
- });
+ })
}
function getCookie() {
- const username = Cookies.get("username");
- const password = Cookies.get("password");
- const rememberMe = Cookies.get("rememberMe");
+ const username = Cookies.get("username")
+ const password = Cookies.get("password")
+ const rememberMe = Cookies.get("rememberMe")
loginForm.value = {
username: username === undefined ? loginForm.value.username : username,
password: password === undefined ? loginForm.value.password : decrypt(password),
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
- };
+ }
}
-getCode();
-getCookie();
+function getUserLoginFacotryList() {
+ if(loginForm.value.username){
+ userLoginFacotryList({userName:loginForm.value.username}).then(res => {
+ console.log('res', res)
+ factoryList.value = res.data
+ })
+ }else {
+ factoryList.value = []
+ }
+}
+
+getCode()
+getCookie()
+getUserLoginFacotryList()
</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;
+ box-shadow: 0 0 5px 1px #ccc;
.el-input {
height: 40px;
input {
@@ -212,4 +247,9 @@
height: 40px;
padding-left: 12px;
}
+:deep() {
+ .el-form-item--default {
+ margin-bottom: 36px;
+ }
+}
</style>
--
Gitblit v1.9.3