From 2780cb79b2239d64f4578e30c255fbd751e12c62 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 12 三月 2024 08:17:01 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/LoginView.vue | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/LoginView.vue b/north-glass-erp/northglass-erp/src/views/LoginView.vue
index 154d12b..fd328cc 100644
--- a/north-glass-erp/northglass-erp/src/views/LoginView.vue
+++ b/north-glass-erp/northglass-erp/src/views/LoginView.vue
@@ -7,6 +7,9 @@
import request from '@/utils/request'
import userInfo from '@/stores/userInfo'
import { sendSock, createWebSocket, closeSock,global_callback1 } from "@/utils/webSocket"
+import { useI18n } from 'vue-i18n'
+//璇█鑾峰彇
+const { t } = useI18n()
const store=userInfo()
let ruleFormRef = ref<FormInstance>()
@@ -24,7 +27,7 @@
const validateUser = (rule: any, value: any, callback: any) => {
if (value === '') {
- callback(new Error('璇疯緭鍏ヤ綘鐨勮处鍙�'))
+ callback(new Error(t('login.userErr')))
} else {
callback()
}
@@ -32,7 +35,7 @@
const validatePass = (rule: any, value: any, callback: any) => {
if (value === '') {
- callback(new Error('璇疯緭鍏ヤ綘鐨勫瘑鐮�'))
+ callback(new Error(t('login.psErr')))
} else {
callback()
}
@@ -55,14 +58,14 @@
store.$patch({user:res.data})
router.push('/main')
- ElMessage.success(`鐧诲綍鎴愬姛`)
+ ElMessage.success(t('login.loginSuccessful'))
} else {
ElMessage.error(res['msg'])
loginLoadings.value=false
return false
}
}).catch(error => {
- ElMessage.error("鏈嶅姟鍣ㄨ繛鎺ュけ璐�")
+ ElMessage.error(t('login.connectErr'))
loginLoadings.value=false
return false
})
@@ -102,7 +105,7 @@
<img id="img-pic" src="@/assets/img.png" alt="">
</div>
<div id="div-login">
- <h2>鍖楃幓鑷姩鍖朎RP绠＄悊绯荤粺</h2>
+ <h2>{{$t('login.SysName')}}</h2>
<el-form
@submit.native.prevent
ref="ruleFormRef"
@@ -110,22 +113,22 @@
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">
@@ -133,7 +136,7 @@
:loading="registerLoadings"
type="primary"
@click="register"
- >娉ㄥ唽
+ >{{$t('login.register')}}
</el-button>
<el-button
:loading="loginLoadings"
@@ -141,7 +144,7 @@
native-type="submit"
@click="submitForm(ruleFormRef)"
@keyup.enter.native="keyDown(e)"
- >鐧诲綍
+ >{{$t('login.login')}}
</el-button>
</el-form-item>
--
Gitblit v1.8.0