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 { .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;

2
nezha-fronted/src/components/common/language/en.js
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',

30
nezha-fronted/src/components/common/table/settings/operationLogTable.vue
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
} }
] ]
} }

2
nezha-fronted/src/components/page/config/operationRecord.vue
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>
<!-- 分页组件 --> <!-- 分页组件 -->

8
nezha-fronted/src/components/page/config/profile.vue
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 {

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

@@ -1,7 +1,8 @@
<template> <template>
<div class="profile-change__Pin"> <div class="profile-change">
<div class="profile-change__Pin-from"> <div class="profile-change__Pin">
<el-form :model="user" label-position = "top" label-width="150px" :rules="rules" ref="changePinForm"> <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-form-item class="profile-change__Pin-input" :label="$t('profile.oldPassword')" prop="pin">
<el-input v-model="user.pin" type="password" size="small"/> <el-input v-model="user.pin" type="password" size="small"/>
</el-form-item> </el-form-item>
@@ -11,19 +12,20 @@
<el-form-item class="profile-change__Pin-input" :label="$t('profile.confirmPassword')" prop="confirmPin"> <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-input v-model="user.confirmPin" type="password" size="small"/>
</el-form-item> </el-form-item>
</el-form> </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>
</div> </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> </div>
</template> </template>
@@ -121,56 +123,66 @@ export default {
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
.profile-change__Pin { .profile-change {
.profile-change__Pin-from { height: 100%;
.profile-change__Pin-input >>> .el-form-item__label{ margin: 0 0 0 50px;
padding: 0 !important; width: calc(100% - 50px);
line-height: 32px; overflow: hidden auto;
height: 32px; .profile-change__Pin {
} min-width: 300px;
.el-form-item { max-width: 600px;
margin-bottom: 15px; width: calc(100% - 100px);
} .profile-change__Pin-from {
} .profile-change__Pin-input >>> .el-form-item__label{
.profile-change__Pin-button { padding: 0 !important;
text-align: center; line-height: 32px;
margin-top: 40px; height: 32px;
padding: 0 30px 0 15px; }
.footer__btn { .el-form-item {
margin: 0 10px; margin-bottom: 15px;
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__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) { .footer__btn:hover:not(.footer__btn--disabled) {
background-color: var(--theme-color-light-20); background-color: var(--theme-color-light-20);
} }
.footer__btn--light { .footer__btn--light {
background-color: white; background-color: white;
border: 1px solid $--primary-border-color; border: 1px solid $--primary-border-color;
color: #333; color: #333;
} }
.footer__btn.footer__btn--light:hover:not(.footer__btn--disabled) { .footer__btn.footer__btn--light:hover:not(.footer__btn--disabled) {
background-color: white; background-color: white;
border-color: var(--theme-color-light-50); border-color: var(--theme-color-light-50);
color: var(--theme-color); color: var(--theme-color);
} }
.footer__btn--disabled { .footer__btn--disabled {
opacity: .6; opacity: .6;
cursor: default; cursor: default;
}
} }
} }
} }