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 | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/LoginView.vue b/north-glass-erp/northglass-erp/src/views/LoginView.vue
index c821584..f79117f 100644
--- a/north-glass-erp/northglass-erp/src/views/LoginView.vue
+++ b/north-glass-erp/northglass-erp/src/views/LoginView.vue
@@ -7,6 +7,7 @@
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"
//璇█鑾峰彇
@@ -16,6 +17,8 @@
let ruleFormRef = ref<FormInstance>()
const router = useRouter()
const route = useRoute()
+const orderInfo = userOrderInfo()
+
const userForm = reactive({
userId: '',
@@ -54,15 +57,15 @@
if (valid) {
loginLoadings.value=true
userForm.pass = btoa(userForm.pass)
- request.post('/user/login',
+ 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(t('login.loginSuccessful'))
} else {
- ElMessage.error(res['msg'])
+ ElMessage.error(t('login.loginErr'))
loginLoadings.value=false
return false
}
@@ -70,6 +73,8 @@
ElMessage.error(t('login.connectErr'))
loginLoadings.value=false
return false
+ }).then(() => {
+ userForm.pass = atob(userForm.pass)
})
}
})
@@ -87,7 +92,7 @@
const keyDown = (e) => {
// 鍥炶溅鍒欐墽琛岀櫥褰曟柟娉� enter閿殑ASCII鏄�13
- if (e.keyCode == 13 || e.keyCode == 100) {
+ if (e.keyCode == 13 ) {
submitForm(ruleFormRef.value)
}
}
@@ -110,14 +115,15 @@
<img id="img-pic" src="@/assets/img.png" alt="">
</div>
<div id="div-login">
-<!-- <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-select>-->
+ <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
--
Gitblit v1.8.0