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 | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/views/LoginView.vue b/north-glass-erp/northglass-erp/src/views/LoginView.vue
index 8f8e5b4..7e663b6 100644
--- a/north-glass-erp/northglass-erp/src/views/LoginView.vue
+++ b/north-glass-erp/northglass-erp/src/views/LoginView.vue
@@ -1,12 +1,15 @@
<script lang="ts" setup>
import {onMounted, onUnmounted, reactive, ref} from "vue"
-import {useRoute, useRouter} from 'vue-router'
+import {useRouter,useRoute } from 'vue-router'
import type {FormInstance, FormRules} from 'element-plus'
-import {ElMessage} from "element-plus";
-import {Avatar, Lock} from '@element-plus/icons-vue'
+import { ElMessage } from "element-plus";
+import { Lock,Avatar } from '@element-plus/icons-vue'
import request from '@/utils/request'
import userInfo from '@/stores/userInfo'
-import {useI18n} from 'vue-i18n'
+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')
@@ -14,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
@@ -56,7 +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 {
@@ -68,6 +75,8 @@
ElMessage.error(t('login.connectErr'))
loginLoadings.value=false
return false
+ }).then(() => {
+ userForm.pass = atob(userForm.pass)
})
}
})
@@ -85,7 +94,7 @@
const keyDown = (e) => {
// 鍥炶溅鍒欐墽琛岀櫥褰曟柟娉� enter閿殑ASCII鏄�13
- if (e.keyCode == 13 || e.keyCode == 100) {
+ if (e.keyCode == 13 ) {
submitForm(ruleFormRef.value)
}
}
@@ -98,6 +107,15 @@
const changeLanguage = () =>{
localStorage.setItem('lang',language.value)
location.reload()
+}
+
+//娉ㄥ唽鎸夐挳鐨勬樉绀�
+const changeRegister = ()=>{
+ if(userForm.pass=='admin'){
+ registerState.value =false
+ }else {
+ registerState.value =true
+ }
}
</script>
@@ -113,8 +131,9 @@
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>
<el-form
@@ -136,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"
@@ -145,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