gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 个人中心样式修复

Browse Source
This commit is contained in:
@changcode
2021-08-24 11:07:14 +08:00
parent d46b8eaaf5
commit b7d891eecc
6 changed files with 100 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nezha-fronted/src/assets/css/common/tableCommon.scss
View File

@@ -364,12 +364,12 @@
}
}
.profile {
.main-list {
height: calc(100% + 13px);
}
.top-tools {
padding: 0 20px 14px 20px;
}
.main-container {
padding: 0;
}
.list-page .nz-table2 .el-table:not(.chart-table) .gutter {
position: fixed;
right: 31px;

2
nezha-fronted/src/components/common/language/en.js
View File

@@ -1648,7 +1648,7 @@ const en = {
oldPassword: 'Old password',
newPassword: 'New password',
confirmPassword: 'Confirm password',
lastLoginIp: 'Last login Ip',
lastLoginIp: 'Last login IP',
lastLoginTime: 'Last login time',
role: 'Role',
email: 'Email',

30
nezha-fronted/src/components/common/table/settings/operationLogTable.vue
View File

@@ -63,27 +63,32 @@ export default {
}, {
label: this.$t('config.operationlog.username'),
prop: 'username',
show: true
show: true,
minWidth: 80
},
{
label: this.$t('config.operationlog.ip'),
prop: 'ip',
show: true
show: true,
minWidth: 80
},
{
label: this.$t('config.operationlog.operation'),
prop: 'operation',
show: true
show: true,
minWidth: 140
},
{
label: this.$t('config.operationlog.type'),
prop: 'type',
show: true
show: true,
minWidth: 80
},
{
label: this.$t('config.operationlog.state'),
prop: 'state',
show: true
show: true,
minWidth: 80
},
// {
// label: this.$t('config.operationlog.userId'),
@@ -93,29 +98,34 @@ export default {
{
label: this.$t('config.operationlog.operaId'),
prop: 'operaId',
show: false
show: false,
minWidth: 140
},
{
label: this.$t('config.operationlog.createDate'),
prop: 'createDate',
show: true
show: true,
minWidth: 80
},
{
label: this.$t('config.operationlog.time'),
prop: 'time',
show: false
show: false,
minWidth: 80
},
{
label: this.$t('config.operationlog.params'),
prop: 'params',
show: false,
ShowOverflowTooltip: true
ShowOverflowTooltip: true,
minWidth: 80
},
{
label: this.$t('config.operationlog.response'),
prop: 'response',
show: false,
ShowOverflowTooltip: true
ShowOverflowTooltip: true,
minWidth: 140
}
]
}

2
nezha-fronted/src/components/page/config/operationRecord.vue
View File

@@ -30,7 +30,7 @@
@selectionChange="selectionChange"
@showBottomBox="(targetTab, object) => { $refs.dataList.showBottomBox(targetTab, object) }"></operation-log-table>
<template v-else>
<profileChangePin style="width: 640px; padding: 20px 0 0 20px"/>
<profileChangePin/>
</template>
</template>
<!-- 分页组件 -->

8
nezha-fronted/src/components/page/config/profile.vue
View File

@@ -67,9 +67,7 @@
</div>
</div>
</div>
<div style="width: calc(100% - 370px);">
<operation-record />
</div>
<operation-record style="width: calc(100% - 370px);padding: 11px 10px 8px 10px;pxbox-shadow: 0 1px 2px 0 rgba(0,0,0,0.06);border-radius: 2px;" />
<el-dialog :visible.sync="authBindShow" :title="$t('login.verifyDialogTitle')" :modal-append-to-body='false'
:show-close="true" width="620px" class="nz-dialog" @closed="closeDialog">
@@ -335,13 +333,13 @@ export default {
<style lang="scss" scoped>
.profile {
display: flex;
height: calc(100% - 20px);
height: calc(100% - 10px);
.profile-left {
margin: 10px 0 10px 10px;
background: #FFFFFF;
box-shadow: 0 1px 2px 0 rgba(0,0,0,0.06);
border-radius: 2px;
height: 100%;
height: calc(100% - 10px);
width: 360px;
overflow: auto;
.profile-left__header {

132
nezha-fronted/src/components/page/config/profileChangePin.vue
View File

@@ -1,7 +1,8 @@
<template>
<div class="profile-change__Pin">
<div class="profile-change__Pin-from">
<el-form :model="user" label-position = "top" label-width="150px" :rules="rules" ref="changePinForm">
<div class="profile-change">
<div class="profile-change__Pin">
<div class="profile-change__Pin-from">
<el-form :model="user" label-position = "top" label-width="150px" :rules="rules" ref="changePinForm">
<el-form-item class="profile-change__Pin-input" :label="$t('profile.oldPassword')" prop="pin">
<el-input v-model="user.pin" type="password" size="small"/>
</el-form-item>
@@ -11,19 +12,20 @@
<el-form-item class="profile-change__Pin-input" :label="$t('profile.confirmPassword')" prop="confirmPin">
<el-input v-model="user.confirmPin" type="password" size="small"/>
</el-form-item>
</el-form>
</div>
<!-- 底部按钮 -->
<template>
<div class="profile-change__Pin-button">
<button @click="clear" id="profile-close" class="footer__btn footer__btn--light">
<span>{{$t('profile.clear')}}</span>
</button>
<button @click="changePin" id="profile-update" class="footer__btn">
<span>{{$t('profile.update')}}</span>
</button>
</el-form>
</div>
</template>
<!-- 底部按钮 -->
<template>
<div class="profile-change__Pin-button">
<button @click="clear" id="profile-close" class="footer__btn footer__btn--light">
<span>{{$t('profile.clear')}}</span>
</button>
<button @click="changePin" id="profile-update" class="footer__btn">
<span>{{$t('profile.update')}}</span>
</button>
</div>
</template>
</div>
</div>
</template>
@@ -121,56 +123,66 @@ export default {
}
</style>
<style lang="scss" scoped>
.profile-change__Pin {
.profile-change__Pin-from {
.profile-change__Pin-input >>> .el-form-item__label{
padding: 0 !important;
line-height: 32px;
height: 32px;
}
.el-form-item {
margin-bottom: 15px;
}
}
.profile-change__Pin-button {
text-align: center;
margin-top: 40px;
padding: 0 30px 0 15px;
.footer__btn {
margin: 0 10px;
height: 30px;
min-width: 74px;
padding: 0 10px;
color: white;
background-color: var(--theme-color);
border: none;
border-radius: 4px;
outline: none;
box-sizing: border-box;
font-size: 14px;
cursor: pointer;
transition: background-color linear .2s, color linear .1s;
.profile-change {
height: 100%;
margin: 0 0 0 50px;
width: calc(100% - 50px);
overflow: hidden auto;
.profile-change__Pin {
min-width: 300px;
max-width: 600px;
width: calc(100% - 100px);
.profile-change__Pin-from {
.profile-change__Pin-input >>> .el-form-item__label{
padding: 0 !important;
line-height: 32px;
height: 32px;
}
.el-form-item {
margin-bottom: 15px;
}
}
.profile-change__Pin-button {
display: flex;
align-items: center;
justify-content: center;
padding: 20px 0;
.footer__btn {
margin: 0 10px;
height: 30px;
min-width: 74px;
padding: 0 10px;
color: white;
background-color: var(--theme-color);
border: none;
border-radius: 4px;
outline: none;
box-sizing: border-box;
font-size: 14px;
cursor: pointer;
transition: background-color linear .2s, color linear .1s;
}
.footer__btn:hover:not(.footer__btn--disabled) {
background-color: var(--theme-color-light-20);
}
.footer__btn:hover:not(.footer__btn--disabled) {
background-color: var(--theme-color-light-20);
}
.footer__btn--light {
background-color: white;
border: 1px solid $--primary-border-color;
color: #333;
}
.footer__btn--light {
background-color: white;
border: 1px solid $--primary-border-color;
color: #333;
}
.footer__btn.footer__btn--light:hover:not(.footer__btn--disabled) {
background-color: white;
border-color: var(--theme-color-light-50);
color: var(--theme-color);
}
.footer__btn.footer__btn--light:hover:not(.footer__btn--disabled) {
background-color: white;
border-color: var(--theme-color-light-50);
color: var(--theme-color);
}
.footer__btn--disabled {
opacity: .6;
cursor: default;
.footer__btn--disabled {
opacity: .6;
cursor: default;
}
}
}
}