From 856f0767b4ada087e9e2cb33f373e23dbcf39b85 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 07 三月 2023 17:56:59 +0800
Subject: [PATCH] update 同步 ruoyi * update element-ui 2.15.10 => 2.15.12 * update 优化 tagsView右选框，首页不应该存在关闭左侧选项 * update copyright 2023 * update 优化 监控页面图标显示 * update 优化 日志注解支持排除指定的请求参数 * update 优化 业务校验优化代码 * fix 修复 优化文件下载出现的异常 * fix 修复 修改密码日志存储明文问题 * add 新增 操作日志消耗时间属性 * update 优化 日志管理使用索引提升查询性能 * update 优化 框架时间检索使用时间默认值 00:00:00 - 23:59:59
---
ruoyi-ui/src/views/register.vue | 36 +++++++++++++++++++++++++++---------
1 files changed, 27 insertions(+), 9 deletions(-)
diff --git a/ruoyi-ui/src/views/register.vue b/ruoyi-ui/src/views/register.vue
index 393f100..478c164 100644
--- a/ruoyi-ui/src/views/register.vue
+++ b/ruoyi-ui/src/views/register.vue
@@ -2,6 +2,16 @@
<div class="register">
<el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
<h3 class="title">RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺</h3>
+ <el-form-item prop="tenantId">
+ <el-input
+ v-model="loginForm.tenantId"
+ type="text"
+ auto-complete="off"
+ placeholder="绉熸埛缂栧彿"
+ >
+ <svg-icon slot="prefix" icon-class="input" class="el-input__icon input-icon" />
+ </el-input>
+ </el-form-item>
<el-form-item prop="username">
<el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="璐﹀彿">
<svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@@ -29,7 +39,7 @@
<svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
</el-input>
</el-form-item>
- <el-form-item prop="code" v-if="captchaOnOff">
+ <el-form-item prop="code" v-if="captchaEnabled">
<el-input
v-model="registerForm.code"
auto-complete="off"
@@ -61,7 +71,7 @@
</el-form>
<!-- 搴曢儴 -->
<div class="el-register-footer">
- <span>Copyright 漏 2018-2021 ruoyi.vip All Rights Reserved.</span>
+ <span>Copyright 漏 2018-2023 ruoyi.vip All Rights Reserved.</span>
</div>
</div>
</template>
@@ -82,13 +92,18 @@
return {
codeUrl: "",
registerForm: {
+ tenantId: "",
username: "",
password: "",
confirmPassword: "",
code: "",
- uuid: ""
+ uuid: "",
+ userType: "sys_user"
},
registerRules: {
+ tenantId: [
+ { required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勭鎴风紪鍙�" }
+ ],
username: [
{ required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勮处鍙�" },
{ min: 2, max: 20, message: '鐢ㄦ埛璐﹀彿闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿', trigger: 'blur' }
@@ -104,7 +119,7 @@
code: [{ required: true, trigger: "change", message: "璇疯緭鍏ラ獙璇佺爜" }]
},
loading: false,
- captchaOnOff: true
+ captchaEnabled: true
};
},
created() {
@@ -113,8 +128,8 @@
methods: {
getCode() {
getCodeImg().then(res => {
- this.captchaOnOff = res.data.captchaOnOff === undefined ? true : res.data.captchaOnOff;
- if (this.captchaOnOff) {
+ this.captchaEnabled = res.data.captchaEnabled === undefined ? true : res.data.captchaEnabled;
+ if (this.captchaEnabled) {
this.codeUrl = "data:image/gif;base64," + res.data.img;
this.registerForm.uuid = res.data.uuid;
}
@@ -124,16 +139,19 @@
this.$refs.registerForm.validate(valid => {
if (valid) {
this.loading = true;
- register(this.registerForm).then(res => {
+ let registerForm = this.registerForm;
+ registerForm.userType = "sys_user"
+ register(registerForm).then(res => {
const username = this.registerForm.username;
this.$alert("<font color='red'>鎭枩浣狅紝鎮ㄧ殑璐﹀彿 " + username + " 娉ㄥ唽鎴愬姛锛�</font>", '绯荤粺鎻愮ず', {
- dangerouslyUseHTMLString: true
+ dangerouslyUseHTMLString: true,
+ type: 'success'
}).then(() => {
this.$router.push("/login");
}).catch(() => {});
}).catch(() => {
this.loading = false;
- if (this.captchaOnOff) {
+ if (this.captchaEnabled) {
this.getCode();
}
})
--
Gitblit v1.9.3