diff --git a/nezha-fronted/src/assets/css/components/layout/header.scss b/nezha-fronted/src/assets/css/components/layout/header.scss index 7b921b0b4..778bcf2f0 100644 --- a/nezha-fronted/src/assets/css/components/layout/header.scss +++ b/nezha-fronted/src/assets/css/components/layout/header.scss @@ -4,6 +4,8 @@ background-color: $--background-color-empty; box-sizing: border-box; border-bottom: 1px solid $--border-color-light; + padding-left: 20px; + box-sizing: border-box; .personal-avatar { cursor: pointer; span { @@ -102,7 +104,7 @@ transition: all .4s; height: 100%; line-height: 50px; - margin-left: 20px; + margin-right: 15px; i { transform: rotateY(0); transition: transform .4s; @@ -125,9 +127,7 @@ a.link-title:hover{ color: $--color-primary !important; } .nz-breakcrumb { - padding-left: 15px; line-height: 50px; - .el-breadcrumb__item { .el-breadcrumb__inner, .el-breadcrumb__separator { color: $--color-text-secondary; diff --git a/nezha-fronted/src/assets/css/components/layout/home.scss b/nezha-fronted/src/assets/css/components/layout/home.scss index 102a9cc15..2a25db94d 100644 --- a/nezha-fronted/src/assets/css/components/layout/home.scss +++ b/nezha-fronted/src/assets/css/components/layout/home.scss @@ -3,7 +3,7 @@ transition: all .2s; background-color: $--background-color-empty; .body { - flex: 1; + height: 100%; display: flex; flex-direction: column; width: calc(100% - 240px); @@ -20,3 +20,37 @@ font-size: 12px; position: fixed; } + +.home.tv,.home.se{ + .left-menu{ + display: none; + } + .body{ + width: 100%; + .header{ + display: none; + } + .container{ + height: 100%; + .main-container{ + &>.panel-top-tools{ + padding-left: 10px; + } + &>.table-list{ + padding-left: 0; + } + } + } + } +} +.home.se{ + .main-container{ + &>.panel-top-tools{ + display: none; + } + &>.table-list{ + height: 100%; + padding-left: 0; + } + } +} diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss b/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss index be565bf46..a01db999b 100644 --- a/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss +++ b/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss @@ -8,7 +8,7 @@ } .panel.list-page { .table-list { - height: calc(100% - 58px); + height: calc(100% - 60px); padding-left: 10px; } .no-data { @@ -126,6 +126,7 @@ .select-panel-title{ font-weight: bold; font-size: 14px; + color:$--color-text-primary; } /* end-chart list*/ .panel-loading { @@ -148,9 +149,3 @@ vertical-align: bottom; color: $--color-text-primary; } - -.starred-pop{ - padding: 8px 12px; - margin-bottom: 8px; - min-width: auto; -} \ No newline at end of file diff --git a/nezha-fronted/src/components/chart/chart/grid/GridLayout.vue b/nezha-fronted/src/components/chart/chart/grid/GridLayout.vue index f84176bd7..406c96f78 100644 --- a/nezha-fronted/src/components/chart/chart/grid/GridLayout.vue +++ b/nezha-fronted/src/components/chart/chart/grid/GridLayout.vue @@ -11,10 +11,10 @@ diff --git a/nezha-fronted/src/store/panel.js b/nezha-fronted/src/store/panel.js index 1ed9d207a..bccb95813 100644 --- a/nezha-fronted/src/store/panel.js +++ b/nezha-fronted/src/store/panel.js @@ -17,7 +17,9 @@ const panel = { y: 0 }, topologyShow: false, - topologyChartInfo: {} + topologyChartInfo: {}, + // 查看模式 + mode: '' }, mutations: { setShowRightBox (state, flag) { @@ -67,6 +69,10 @@ const panel = { }, setTopologyChartInfo (state, topologyChartInfo) { state.topologyChartInfo = topologyChartInfo + }, + // 设置查看模式 + setMode (state, mode) { + state.mode = mode } }, getters: {