From 10a26b9b670efef0a2adba675c794c539846aa3c Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 06 九月 2024 10:18:10 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/LoginView.vue | 76 ++++++++++++++++++++++++++++---------
1 files changed, 57 insertions(+), 19 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/LoginView.vue b/north-glass-erp/northglass-erp/src/views/LoginView.vue
index 6c1e834..f79117f 100644
--- a/north-glass-erp/northglass-erp/src/views/LoginView.vue
+++ b/north-glass-erp/northglass-erp/src/views/LoginView.vue
@@ -1,5 +1,5 @@
<script lang="ts" setup>
-import {reactive, ref} from "vue"
+import {onMounted, onUnmounted, reactive, ref} from "vue"
import {useRouter,useRoute } from 'vue-router'
import type {FormInstance, FormRules} from 'element-plus'
import { ElMessage } from "element-plus";
@@ -7,11 +7,18 @@
import request from '@/utils/request'
import userInfo from '@/stores/userInfo'
import { sendSock, createWebSocket, closeSock,global_callback1 } from "@/utils/webSocket"
-
+import userOrderInfo from '@/stores/sd/order/orderInfo'
+import { useI18n } from 'vue-i18n'
+import i18n from "@/lang/index"
+//璇█鑾峰彇
+const { t } = useI18n()
+let language = ref(localStorage.getItem('lang') || 'zh')
const store=userInfo()
-const ruleFormRef = ref<FormInstance>()
+let ruleFormRef = ref<FormInstance>()
const router = useRouter()
const route = useRoute()
+const orderInfo = userOrderInfo()
+
const userForm = reactive({
userId: '',
@@ -24,7 +31,7 @@
const validateUser = (rule: any, value: any, callback: any) => {
if (value === '') {
- callback(new Error('璇疯緭鍏ヤ綘鐨勮处鍙�'))
+ callback(new Error(t('login.userErr')))
} else {
callback()
}
@@ -32,7 +39,7 @@
const validatePass = (rule: any, value: any, callback: any) => {
if (value === '') {
- callback(new Error('璇疯緭鍏ヤ綘鐨勫瘑鐮�'))
+ callback(new Error( t('login.pwErr') ))
} else {
callback()
}
@@ -49,22 +56,25 @@
formEl.validate((valid) => {
if (valid) {
loginLoadings.value=true
- request.post('/user/login',
+ userForm.pass = btoa(userForm.pass)
+ request.post('/userInfo/login',
userForm).then((res) => {
- if(res['code']==200){
+ if(res['code']==200 && res['data']){
store.$patch({user:res.data})
-
+ orderInfo.clearSelectDate()
router.push('/main')
- ElMessage.success(`鐧诲綍鎴愬姛`)
+ ElMessage.success(t('login.loginSuccessful'))
} else {
- ElMessage.error(res['msg'])
+ ElMessage.error(t('login.loginErr'))
loginLoadings.value=false
return false
}
}).catch(error => {
- ElMessage.error("鏈嶅姟鍣ㄨ繛鎺ュけ璐�")
+ ElMessage.error(t('login.connectErr'))
loginLoadings.value=false
return false
+ }).then(() => {
+ userForm.pass = atob(userForm.pass)
})
}
})
@@ -80,38 +90,64 @@
let loginLoadings= ref(false)
let registerLoadings= ref(false)
+const keyDown = (e) => {
+ // 鍥炶溅鍒欐墽琛岀櫥褰曟柟娉� enter閿殑ASCII鏄�13
+ if (e.keyCode == 13 ) {
+ submitForm(ruleFormRef.value)
+ }
+}
+onMounted(()=>{
+ window.addEventListener('keydown', keyDown)
+})
+onUnmounted(() => {
+ window.removeEventListener('keydown', keyDown)
+})
+const changeLanguage = () =>{
+ localStorage.setItem('lang',language.value)
+ location.reload()
+}
</script>
<template>
- <div class="mainDiv">
+ <div class="mainDiv" >
<div id="main-login">
<div id="img-div">
<img id="img-pic" src="@/assets/img.png" alt="">
</div>
<div id="div-login">
- <h2>鍖楃幓鑷姩鍖朎RP绠＄悊绯荤粺</h2>
+ <el-select
+ @change="changeLanguage"
+ v-model="language"
+ placeholder=" "
+ style="float: right;width: 6rem">
+ <el-option value="zh" label="涓枃" />
+ <el-option value="en" label="English" />
+ <el-option value="ru" label="袪褍褋褋泻懈泄 褟蟹褘泻" />
+ </el-select>
+ <h2>{{$t('login.SysName')}}</h2>
<el-form
+ @submit.native.prevent
ref="ruleFormRef"
:model="userForm"
status-icon
:rules="rules"
>
- <el-form-item label="鐢ㄦ埛锛�" prop="userId">
+ <el-form-item :label="$t('login.user')+':'" prop="userId">
<el-input
v-model="userForm.userId"
type="text"
autocomplete="off"
:prefix-icon="Avatar"
- placeholder="璇疯緭鍏ヤ綘鐨勮处鍙�"
+ :placeholder="$t('login.userErr')"
/>
</el-form-item>
- <el-form-item label="瀵嗙爜锛�" prop="pass">
+ <el-form-item :label="$t('login.password')+':'" prop="pass">
<el-input
v-model="userForm.pass"
type="password"
autocomplete="off"
:prefix-icon="Lock"
- placeholder="璇疯緭鍏ヤ綘鐨勫瘑鐮�"
+ :placeholder="$t('login.pwErr')"
/>
</el-form-item>
<el-form-item id="submitForm">
@@ -119,13 +155,15 @@
:loading="registerLoadings"
type="primary"
@click="register"
- >娉ㄥ唽
+ >{{$t('login.register')}}
</el-button>
<el-button
:loading="loginLoadings"
type="primary"
+ native-type="submit"
@click="submitForm(ruleFormRef)"
- >鐧诲綍
+ @keyup.enter.native="keyDown(e)"
+ >{{$t('login.login')}}
</el-button>
</el-form-item>
--
Gitblit v1.8.0