dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(frontend):登陆页调整

Browse Source
This commit is contained in:
junjie 2021-05-18 12:25:48 +08:00
parent f988c74beb
commit 58620d20e3
5 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
frontend/src/assets/DataEase-color.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 13 KiB

4
frontend/src/lang/en.js
View File

@ -82,7 +82,9 @@ export default {
thirdparty: 'Or connect with',
thirdpartyTips: 'Can not be simulated on local, so please combine you own business simulation! ! !',
expires: 'Login token expired, please login again',
tokenError: 'Token error, please login again'
tokenError: 'Token error, please login again',
username_error: 'Please enter the correct user name',
password_error: 'The password can not be less than 6 digits'
},
commons: {
all: 'All',

4
frontend/src/lang/tw.js
View File

@ -82,7 +82,9 @@ export default {
thirdparty: '第三方登陸',
thirdpartyTips: '本地不能模拟，请结合自己业务进行模拟！！！',
expires: '登陸信息过期，请重新登陸',
tokenError: '信息错误，请重新登陸'
tokenError: '信息错误，请重新登陸',
username_error: '請輸入正確的用戶名',
password_error: '密碼不小於6位'
},
commons: {
all: '全部',

4
frontend/src/lang/zh.js
View File

@ -82,7 +82,9 @@ export default {
thirdparty: '第三方登录',
thirdpartyTips: '本地不能模拟，请结合自己业务进行模拟！！！',
expires: '登录token过期，请重新登录',
tokenError: 'token错误，请重新登录'
tokenError: 'token错误，请重新登录',
username_error: '请输入正确的用户名',
password_error: '密码不小于6位'
},
commons: {
all: '全部',

24
frontend/src/views/login/index.vue
View File

@ -5,12 +5,12 @@
<el-col :span="12">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" size="default">
<div class="login-logo">
<img v-if="!loginLogoUrl" src="@/assets/DataEase-black.png" alt="">
<img v-if="!loginLogoUrl" src="@/assets/DataEase-color.png" alt="">
<img v-else :src="loginLogoUrl" alt="">
</div>
<div class="login-title">
{{ uiInfo && uiInfo['ui.loginTitle'] && uiInfo['ui.loginTitle'].paramValue || $t('login.title') }}
</div>
<!-- <div class="login-title">-->
<!-- &lt;!&ndash; {{ uiInfo && uiInfo['ui.loginTitle'] && uiInfo['ui.loginTitle'].paramValue || $t('login.title') }}&ndash;&gt;-->
<!-- </div>-->
<div class="login-border" />
<div class="login-welcome">
{{ $t('login.welcome') + (uiInfo && uiInfo['ui.title'] && uiInfo['ui.title'].paramValue || 'DATAEASE') }}
@ -64,10 +64,10 @@ export default {
if (res.data) {
callback()
} else {
callback(new Error('Please enter the correct user name'))
callback(this.$t('login.username_error'))
}
}).catch(() => {
callback(new Error('Please enter the correct user name'))
callback(this.$t('login.username_error'))
})
// if (!validUsername(value)) {
// callback(new Error('Please enter the correct user name'))
@ -77,7 +77,7 @@ export default {
}
const validatePassword = (rule, value, callback) => {
if (value.length < 6) {
callback(new Error('The password can not be less than 6 digits'))
callback(this.$t('login.password_error'))
} else {
callback()
}
@ -178,8 +178,8 @@ export default {
}
.login-logo {
margin-top: 30px;
margin-left: 30px;
margin-top: 50px;
text-align: center;
@media only screen and (max-width: 1280px) {
margin-top: 20px;
}
@ -208,7 +208,7 @@ export default {
width: 80px;
background: $--color-primary;
@media only screen and (max-width: 1280px) {
margin: 10px auto 10px;
margin: 20px auto 20px;
}
}
@ -225,11 +225,11 @@ export default {
}
.login-form {
margin-top: 30px;
margin-top: 40px;
padding: 0 40px;
@media only screen and (max-width: 1280px) {
margin-top: 10px;
margin-top: 20px;
}
& ::v-deep .el-input__inner {