From fd1757e40590e7d0c50e914717ca9a2545da7462 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 06 九月 2024 14:33:29 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/northglass-erp/src/views/LoginView.vue | 17 +++++++++++++++--
north-glass-erp/northglass-erp/src/lang/index.js | 6 +++---
north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java | 5 ++++-
3 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/north-glass-erp/northglass-erp/src/lang/index.js b/north-glass-erp/northglass-erp/src/lang/index.js
index c2d4b83..6d0a4c4 100644
--- a/north-glass-erp/northglass-erp/src/lang/index.js
+++ b/north-glass-erp/northglass-erp/src/lang/index.js
@@ -5,13 +5,13 @@
import ru from "./ru"
let messages = {
- zh:zh,
- en: en,
+ 'zh-CN':zh,
+ 'en-US': en,
ru: ru
}
const i18n = createI18n({
- locale: localStorage.getItem('lang') || 'zh', // 璁剧疆褰撳墠璇█绫诲瀷
+ locale: localStorage.getItem('lang') || 'zh-CN', // 璁剧疆褰撳墠璇█绫诲瀷
legacy: false, // 濡傛灉瑕佹敮鎸乧ompositionAPI锛屾椤瑰繀椤昏缃负false;
globalInjection: true, // 鍏ㄥ眬娉ㄥ唽$t鏂规硶
messages
diff --git a/north-glass-erp/northglass-erp/src/views/LoginView.vue b/north-glass-erp/northglass-erp/src/views/LoginView.vue
index f79117f..7e663b6 100644
--- a/north-glass-erp/northglass-erp/src/views/LoginView.vue
+++ b/north-glass-erp/northglass-erp/src/views/LoginView.vue
@@ -25,6 +25,8 @@
pass: ''
})
+let registerState = ref(true)
+
if (typeof(route.query.id) != "undefined"){
userForm.userId = <string>route.query.id
}
@@ -106,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>
@@ -120,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>
@@ -144,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"
@@ -153,6 +165,7 @@
<el-form-item id="submitForm">
<el-button
:loading="registerLoadings"
+ :disabled="registerState"
type="primary"
@click="register"
>{{$t('login.register')}}
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
index d3ffa44..e5d3c54 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
@@ -130,7 +130,10 @@
/*----------------鏂扮増鏈櫥闄�*/
public UserDTO doLogin(UserDTO userDTO) {
User user = userMapper.selectOne(new QueryWrapper<User>().
- eq("login_name", userDTO.getUserId()).eq("password", userDTO.getPass()));
+ eq("login_name", userDTO.getUserId())
+ .eq("password", userDTO.getPass())
+ .eq("state",1)
+ );
if(user!=null){
//妫�鏌ユ槸璁╂湁鐧诲綍锛屾湁鐧诲綍鐩存帴閫�鍑�
StpUtil.logout(user.getId());
--
Gitblit v1.8.0