From a4a795a986b009779f09e9a825c0099aa0bacbb8 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 18 八月 2025 16:41:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/LoginView.vue | 30 ++++++------------------------
1 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/UI-Project/src/views/LoginView.vue b/UI-Project/src/views/LoginView.vue
index 6431f47..d01c0b3 100644
--- a/UI-Project/src/views/LoginView.vue
+++ b/UI-Project/src/views/LoginView.vue
@@ -20,11 +20,9 @@
userName: '',
password: '',
})
-
if (typeof route.query.id != 'undefined') {
userForm.userId = <string>route.query.id
}
-
const validateUser = (rule: any, value: any, callback: any) => {
if (value === '') {
callback(new Error(t('login.userErr')))
@@ -32,7 +30,6 @@
callback()
}
}
-
const validatePass = (rule: any, value: any, callback: any) => {
if (value === '') {
callback(new Error(t('login.pwErr')))
@@ -40,12 +37,10 @@
callback()
}
}
-
const rules = reactive<FormRules<typeof userForm>>({
userId: [{validator: validateUser, trigger: 'blur'}],
pass: [{validator: validatePass, trigger: 'blur'}],
})
-
//鐧婚檰鏂规硶
const submitForm = (formEl: FormInstance | undefined) => {
store.$patch({
@@ -83,16 +78,13 @@
}
})
}
-
function register() {
router.push({
path: '/register',
})
}
-
let loginLoadings = ref(false)
let registerLoadings = ref(false)
-
const keyDown = (e) => {
// 鍥炶溅鍒欐墽琛岀櫥褰曟柟娉� enter閿殑ASCII鏄�13
if (e.keyCode == 13 || e.keyCode == 100) {
@@ -106,17 +98,16 @@
window.removeEventListener('keydown', keyDown)
})
</script>
-
<template>
<div class="mainDiv">
<div id="main-login">
<!-- <img
style="width: 100%; height: 99vh"
- src="../../src/assets/background.jpg"
+ src="/background.jpg"
/> -->
<div>
<div style="position: absolute; left: 8vw; top: 6vw; ">
- <img src="../../src/assets/3.png">
+ <img src="/3.png">
</div>
<div style="position: absolute; left: 15vw; top: 22vw; font-size: 55px;color: rgba(29, 33, 41, 1);">
{{ $t('northglassMESsystem') }}
@@ -130,7 +121,9 @@
placeholder=" "
style="float: right;width: 9rem">
<el-option value="zh" label="涓枃" />
- <el-option value="en" label="袪褍褋褋泻懈泄 褟蟹褘泻" />
+ <el-option value="kr" label="頃滉淡鞏�" />
+ <el-option value="py" label="袪褍褋褋泻懈泄 褟蟹褘泻" />
+ <el-option value="en" label="English" />
</el-select>
<el-form @submit.native.prevent
ref="ruleFormRef"
@@ -172,29 +165,24 @@
@click="register"
plain>{{ $t('login.register') }}
</el-button> -->
-
</el-form-item>
</div>
</el-form>
</div>
</div>
-
</div>
</template>
-
<style scoped>
.mainDiv {
overflow: hidden;
min-width: 718px;
- background-image: url('../../src/assets/background.jpg');
+ background-image: url('/background.jpg');
}
-
#main-login {
margin: 150px auto 0 auto;
height: 70vh;
width: 80vw;
}
-
#img-div {
width: 55%;
height: 100%;
@@ -203,12 +191,10 @@
align-items: center;
float: left;
}
-
#img-pic {
max-height: 90%;
max-width: 100%;
}
-
#div-login {
margin-top: 5%;
/* margin-top: 20%; */
@@ -221,22 +207,18 @@
border-radius: 4px;
box-shadow: 0 8px 16px 0 rgba(0, 0, 0, 0), 0 6px 5px 0 rgba(0, 0, 0, 0.19);
}
-
#center {
margin-top: -30px;
}
-
.el-form {
width: 60%;
margin: 20% auto auto;
}
-
#submitForm {
display: flex;
justify-content: space-evenly;
margin-top: 2rem;
}
-
:deep(.el-form-item__content) {
flex: unset;
}
--
Gitblit v1.8.0