From d760cd6f05bef16df824fa91a39a099add7fa96e Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期五, 16 一月 2026 11:10:31 +0800
Subject: [PATCH] 设备管理-备件管理 调整页面字段
---
src/views/login.vue | 90 ++++++++-------------------------------------
1 files changed, 16 insertions(+), 74 deletions(-)
diff --git a/src/views/login.vue b/src/views/login.vue
index 1cc6cfd..6217877 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -59,27 +59,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 +67,10 @@
</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"
const title = import.meta.env.VITE_APP_TITLE
const userStore = useUserStore()
@@ -101,15 +79,9 @@
const { proxy } = getCurrentInstance()
const loginForm = ref({
- username: "admin",
- password: "admin123",
+ username: "",
+ password: "",
rememberMe: false,
- // code: "",
- uuid: ""
-})
-
-const factoryCommitForm = ref({
- deptId:''
})
const loginRules = {
@@ -126,11 +98,6 @@
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
}, { immediate: true })
@@ -140,24 +107,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 +127,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 })
})
}
@@ -203,11 +149,6 @@
password: password === undefined ? loginForm.value.password : decrypt(password),
rememberMe: rememberMe === undefined ? false : Boolean(rememberMe)
}
-}
-
-function cancelLogin() {
- modalView.value = false
- loading.value = false
}
getCode()
@@ -240,6 +181,7 @@
height: 500px;
padding: 40px;
z-index: 1;
+ box-shadow: 0 0 5px 1px #ccc;
.el-input {
height: 40px;
input {
--
Gitblit v1.9.3