From ece2dfeb926d728b10db38038e4d12e9e9851c24 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期五, 06 六月 2025 17:38:10 +0800
Subject: [PATCH] 分页修改
---
src/views/login.vue | 98 +++++++++++++++---------------------------------
1 files changed, 31 insertions(+), 67 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 1cc6cfd..a3c8613 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-->
@@ -59,27 +65,6 @@
</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>-->
@@ -88,11 +73,11 @@
</template>
<script setup>
-import {getCodeImg, loginCheckFactory} 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 {userDeptList} from "@/api/system/user.js"
+import {userLoginFacotryList} from "@/api/system/user.js"
const title = import.meta.env.VITE_APP_TITLE
const userStore = useUserStore()
@@ -104,12 +89,7 @@
username: "admin",
password: "admin123",
rememberMe: false,
- // code: "",
- uuid: ""
-})
-
-const factoryCommitForm = ref({
- deptId:''
+ currentFatoryId:'',
})
const loginRules = {
@@ -126,8 +106,6 @@
const register = ref(false)
const redirect = ref(undefined)
-const modalView = ref(false)
-
const factoryList = ref([])
const currentFatoryId = ref('')
@@ -140,24 +118,18 @@
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.loginCheck(loginForm.value).then(res => {
- // 鏌ヨ鐢ㄦ埛閮ㄩ棬
- userDeptList(res.data).then(res => {
- factoryList.value = res.data
- modalView.value = true
- })
-
+ 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
// 閲嶆柊鑾峰彇楠岃瘉鐮�
@@ -166,21 +138,6 @@
}
})
}
- })
-}
-
-// 褰撳墠鐧诲綍鍏徃/閮ㄩ棬纭
-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 })
})
}
@@ -205,13 +162,20 @@
}
}
-function cancelLogin() {
- modalView.value = false
- loading.value = false
+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>
--
Gitblit v1.9.3