From d809ecd16cbb23f5aad86a6844f51ffea0455fe8 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期五, 06 九月 2024 16:53:55 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/LoginView.vue | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/LoginView.vue b/north-glass-erp/northglass-erp/src/views/LoginView.vue
index fa8e2a4..7e663b6 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,11 +17,15 @@
let ruleFormRef = ref<FormInstance>()
const router = useRouter()
const route = useRoute()
+const orderInfo = userOrderInfo()
+
const userForm = reactive({
userId: '',
pass: ''
})
+
+let registerState = ref(true)
if (typeof(route.query.id) != "undefined"){
userForm.userId = <string>route.query.id
@@ -58,6 +63,7 @@
userForm).then((res) => {
if(res['code']==200 && res['data']){
store.$patch({user:res.data})
+ orderInfo.clearSelectDate()
router.push('/main')
ElMessage.success(t('login.loginSuccessful'))
} else {
@@ -69,6 +75,8 @@
ElMessage.error(t('login.connectErr'))
loginLoadings.value=false
return false
+ }).then(() => {
+ userForm.pass = atob(userForm.pass)
})
}
})
@@ -100,6 +108,15 @@
localStorage.setItem('lang',language.value)
location.reload()
}
+
+//娉ㄥ唽鎸夐挳鐨勬樉绀�
+const changeRegister = ()=>{
+ if(userForm.pass=='admin'){
+ registerState.value =false
+ }else {
+ registerState.value =true
+ }
+}
</script>
<template>
@@ -114,8 +131,8 @@
v-model="language"
placeholder=" "
style="float: right;width: 6rem">
- <el-option value="zh" label="涓枃" />
- <el-option value="en" label="English" />
+ <el-option value="zh-CN" label="涓枃" />
+ <el-option value="en-US" label="English" />
<el-option value="ru" label="袪褍褋褋泻懈泄 褟蟹褘泻" />
</el-select>
<h2>{{$t('login.SysName')}}</h2>
@@ -138,6 +155,7 @@
<el-form-item :label="$t('login.password')+':'" prop="pass">
<el-input
v-model="userForm.pass"
+ @blur="changeRegister"
type="password"
autocomplete="off"
:prefix-icon="Lock"
@@ -147,6 +165,7 @@
<el-form-item id="submitForm">
<el-button
:loading="registerLoadings"
+ :disabled="registerState"
type="primary"
@click="register"
>{{$t('login.register')}}
--
Gitblit v1.8.0