ERP_override.git

			@@ -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, // 如果要支持compositionAPI，此项必须设置为false;
			globalInjection: true, // 全局注册$t方法
			messages

			@@ -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')}}

			@@ -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());

	north-glass-erp/northglass-erp/src/lang/index.js	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/northglass-erp/src/views/LoginView.vue	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史