feat(系统设置): 页面布局调整
This commit is contained in:
parent
811f9b77f9
commit
f68fb91a5b
|
@ -1,14 +1,12 @@
|
||||||
<template>
|
<template>
|
||||||
<ms-container :is-show-warning="isShowWarning && isSystemGroup">
|
<ms-container :is-show-warning="isShowWarning && isSystemGroup">
|
||||||
|
|
||||||
<ms-aside-container>
|
<ms-aside-container>
|
||||||
<ms-current-user/>
|
|
||||||
<el-divider/>
|
|
||||||
<h1>{{ $t('commons.setting') }}</h1>
|
|
||||||
<ms-setting-menu/>
|
<ms-setting-menu/>
|
||||||
</ms-aside-container>
|
</ms-aside-container>
|
||||||
|
|
||||||
<ms-main-container>
|
<ms-main-container>
|
||||||
|
<div class="ms-system-header">
|
||||||
|
<ms-header-right-menus/>
|
||||||
|
</div>
|
||||||
<keep-alive>
|
<keep-alive>
|
||||||
<router-view/>
|
<router-view/>
|
||||||
</keep-alive>
|
</keep-alive>
|
||||||
|
@ -24,10 +22,11 @@ import MsContainer from "../common/components/MsContainer";
|
||||||
import MsMainContainer from "../common/components/MsMainContainer";
|
import MsMainContainer from "../common/components/MsMainContainer";
|
||||||
import {getCurrentUser} from "@/common/js/utils";
|
import {getCurrentUser} from "@/common/js/utils";
|
||||||
import {GROUP_SYSTEM} from "@/common/js/constants";
|
import {GROUP_SYSTEM} from "@/common/js/constants";
|
||||||
|
import MsHeaderRightMenus from "@/business/components/layout/HeaderRightMenus";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "MsSetting",
|
name: "MsSetting",
|
||||||
components: {MsMainContainer, MsContainer, MsAsideContainer, MsSettingMenu, MsCurrentUser},
|
components: {MsMainContainer, MsContainer, MsAsideContainer, MsSettingMenu, MsCurrentUser, MsHeaderRightMenus},
|
||||||
computed: {
|
computed: {
|
||||||
isShowWarning() {
|
isShowWarning() {
|
||||||
return this.$store.state.showLicenseCountWarning;
|
return this.$store.state.showLicenseCountWarning;
|
||||||
|
@ -47,11 +46,12 @@ export default {
|
||||||
<style scoped>
|
<style scoped>
|
||||||
.ms-aside-container {
|
.ms-aside-container {
|
||||||
height: calc(100vh) !important;
|
height: calc(100vh) !important;
|
||||||
padding: 20px;
|
padding: 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ms-main-container {
|
.ms-main-container {
|
||||||
height: calc(100vh) !important;
|
height: calc(100vh) !important;
|
||||||
|
padding: 2px;
|
||||||
}
|
}
|
||||||
|
|
||||||
h1 {
|
h1 {
|
||||||
|
@ -59,5 +59,12 @@ h1 {
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.ms-system-header {
|
||||||
|
width: 400px;
|
||||||
|
position: fixed;
|
||||||
|
right: 0px;
|
||||||
|
z-index: 666;
|
||||||
|
top: 6px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue