fix: 个人中心样式修复

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,4 +1,5 @@
<template> <template>
<div class="profile-change">
<div class="profile-change__Pin"> <div class="profile-change__Pin">
<div class="profile-change__Pin-from"> <div class="profile-change__Pin-from">
<el-form :model="user" label-position = "top" label-width="150px" :rules="rules" ref="changePinForm"> <el-form :model="user" label-position = "top" label-width="150px" :rules="rules" ref="changePinForm">
@@ -25,6 +26,7 @@
</div> </div>
</template> </template>
</div> </div>
</div>
</template> </template>
<script> <script>
@@ -121,7 +123,15 @@ export default {
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
.profile-change {
height: 100%;
margin: 0 0 0 50px;
width: calc(100% - 50px);
overflow: hidden auto;
.profile-change__Pin { .profile-change__Pin {
min-width: 300px;
max-width: 600px;
width: calc(100% - 100px);
.profile-change__Pin-from { .profile-change__Pin-from {
.profile-change__Pin-input >>> .el-form-item__label{ .profile-change__Pin-input >>> .el-form-item__label{
padding: 0 !important; padding: 0 !important;
@@ -133,9 +143,10 @@ export default {
} }
} }
.profile-change__Pin-button { .profile-change__Pin-button {
text-align: center; display: flex;
margin-top: 40px; align-items: center;
padding: 0 30px 0 15px; justify-content: center;
padding: 20px 0;
.footer__btn { .footer__btn {
margin: 0 10px; margin: 0 10px;
height: 30px; height: 30px;
@@ -174,4 +185,5 @@ export default {
} }
} }
} }
}
</style> </style>