From df07fa2662110d6069071e11915e2f6cea2f400b Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 18 九月 2025 13:49:55 +0800
Subject: [PATCH] Merge branch 'dev' into ywx
---
src/views/login.vue | 52 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 33 insertions(+), 19 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 29d691b..960f097 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -10,6 +10,7 @@
size="large"
auto-complete="off"
placeholder="璐﹀彿"
+ @input="getUserLoginFacotryList"
>
<template #prefix><el-icon><User /></el-icon></template>
</el-input>
@@ -26,6 +27,11 @@
>
<template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>
</el-input>
+ </el-form-item>
+ <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-form-item prop="code" v-if="captchaEnabled">-->
<!-- <el-input-->
@@ -67,10 +73,11 @@
</template>
<script setup>
-import { getCodeImg } from "@/api/login"
+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()
@@ -79,11 +86,10 @@
const { proxy } = getCurrentInstance()
const loginForm = ref({
- username: "admin",
- password: "admin123",
+ username: "",
+ password: "",
rememberMe: false,
- // code: "",
- uuid: ""
+ currentFatoryId:'',
})
const loginRules = {
@@ -100,6 +106,9 @@
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 })
@@ -109,18 +118,10 @@
if (valid) {
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(() => {
+ 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") {
@@ -161,14 +162,26 @@
}
}
+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 {
height: 100%;
- background-image: url("../assets/images/login-background.jpg");
+ background-image: url("../assets/indexViews/JZYJView.png");
background-size: cover;
position: relative;
}
@@ -183,7 +196,7 @@
.login-form {
position: absolute;
top: 50%;
- right: 19%;
+ right: 15%;
transform: translate(0, -50%);
border-radius: 6px;
background: #ffffff;
@@ -191,6 +204,7 @@
height: 500px;
padding: 40px;
z-index: 1;
+ box-shadow: 0 0 5px 1px #ccc;
.el-input {
height: 40px;
input {
--
Gitblit v1.9.3