Skip to content

Commit 55c3a44

Browse files
committed
fix: 优化页面布局,去除面包屑,腾出更多页面空间等;
1 parent 1a26cf3 commit 55c3a44

File tree

5 files changed

+36
-30
lines changed

5 files changed

+36
-30
lines changed

packages/devops-admin/src/components/Breadcrumb/index.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export default {
7171
.app-breadcrumb.el-breadcrumb {
7272
display: inline-block;
7373
font-size: 14px;
74-
line-height: 50px;
74+
line-height: 30px;
7575
margin-left: 8px;
7676
7777
.no-redirect {

packages/devops-admin/src/layout/components/Navbar.vue

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
<template>
22
<div class="navbar">
3-
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
3+
<!-- <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" /> -->
44

5-
<breadcrumb id="breadcrumb-container" class="breadcrumb-container" />
5+
<!-- <breadcrumb id="breadcrumb-container" class="breadcrumb-container" /> -->
66

77
<div class="right-menu">
88
<template v-if="device!=='mobile'">
99

10+
<hamburger id="hamburger-container" :is-active="sidebar.opened" class="right-menu-item" @toggleClick="toggleSideBar" />
11+
1012
<error-log class="errLog-container right-menu-item hover-effect" />
1113

1214
<screenfull id="screenfull" class="right-menu-item hover-effect" />
1315

14-
<el-tooltip content="Global Size" effect="dark" placement="bottom">
16+
<!-- <el-tooltip content="Global Size" effect="dark" placement="bottom">
1517
<size-select id="size-select" class="right-menu-item hover-effect" />
16-
</el-tooltip>
18+
</el-tooltip> -->
1719

1820
</template>
1921

@@ -23,10 +25,7 @@
2325
<i class="el-icon-caret-bottom" />
2426
</div>
2527
<el-dropdown-menu slot="dropdown">
26-
<router-link to="/">
27-
<el-dropdown-item>数据看板</el-dropdown-item>
28-
</router-link>
29-
<a target="_blank" href="https://github.com/Maslow/less-admin/">
28+
<a target="_blank" href="https://github.com/Maslow/less-framework/">
3029
<el-dropdown-item>Github</el-dropdown-item>
3130
</a>
3231
<el-dropdown-item divided @click.native="logout">
@@ -40,19 +39,19 @@
4039

4140
<script>
4241
import { mapGetters } from 'vuex'
43-
import Breadcrumb from '@/components/Breadcrumb'
42+
// import Breadcrumb from '@/components/Breadcrumb'
4443
import Hamburger from '@/components/Hamburger'
4544
import ErrorLog from '@/components/ErrorLog'
4645
import Screenfull from '@/components/Screenfull'
47-
import SizeSelect from '@/components/SizeSelect'
46+
// import SizeSelect from '@/components/SizeSelect'
4847
4948
export default {
5049
components: {
51-
Breadcrumb,
50+
// Breadcrumb,
5251
Hamburger,
5352
ErrorLog,
54-
Screenfull,
55-
SizeSelect
53+
Screenfull
54+
// SizeSelect
5655
},
5756
computed: {
5857
...mapGetters([
@@ -79,7 +78,8 @@ export default {
7978
overflow: hidden;
8079
position: relative;
8180
background: #fff;
82-
box-shadow: 0 1px 4px rgba(0,21,41,.08);
81+
border-bottom: 1px solid #d8dce5;
82+
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
8383
8484
.hamburger-container {
8585
line-height: 46px;
@@ -139,16 +139,16 @@ export default {
139139
140140
.user-avatar {
141141
cursor: pointer;
142-
width: 40px;
143-
height: 40px;
142+
width: 32px;
143+
height: 32px;
144144
border-radius: 10px;
145145
}
146146
147147
.el-icon-caret-bottom {
148148
cursor: pointer;
149149
position: absolute;
150150
right: -20px;
151-
top: 25px;
151+
top: 20px;
152152
font-size: 12px;
153153
}
154154
}

packages/devops-admin/src/layout/components/Sidebar/index.vue

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<el-scrollbar wrap-class="scrollbar-wrapper">
55
<el-menu
66
:default-active="activeMenu"
7+
:default-openeds="openeds"
78
:collapse="isCollapse"
89
:background-color="variables.menuBg"
910
:text-color="variables.menuText"
@@ -31,6 +32,9 @@ export default {
3132
'permission_routes',
3233
'sidebar'
3334
]),
35+
openeds() {
36+
return this.permission_routes.map(route => route.path)
37+
},
3438
activeMenu() {
3539
const route = this.$route
3640
const { meta, path } = route

packages/devops-admin/src/layout/components/TagsView/index.vue

+4-3
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,9 @@ export default {
199199

200200
<style lang="scss" scoped>
201201
.tags-view-container {
202-
height: 34px;
202+
height: 50px;
203203
width: 100%;
204+
padding-top: 14px;
204205
background: #fff;
205206
border-bottom: 1px solid #d8dce5;
206207
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
@@ -209,8 +210,8 @@ export default {
209210
display: inline-block;
210211
position: relative;
211212
cursor: pointer;
212-
height: 26px;
213-
line-height: 26px;
213+
height: 28px;
214+
line-height: 28px;
214215
border: 1px solid #d8dce5;
215216
color: #495060;
216217
background: #fff;

packages/devops-admin/src/layout/index.vue

+10-9
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,22 @@
33
<div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
44
<sidebar class="sidebar-container" />
55
<div :class="{hasTagsView:needTagsView}" class="main-container">
6-
<div :class="{'fixed-header':fixedHeader}">
7-
<navbar />
8-
<tags-view v-if="needTagsView" />
6+
<div :class="{'fixed-header':fixedHeader}" style="display: flex; justify-content: space-between">
7+
<tags-view v-if="needTagsView" style="" />
8+
9+
<navbar style="width: 220px" />
910
</div>
1011
<app-main />
11-
<right-panel v-if="showSettings">
12+
<!-- <right-panel v-if="showSettings">
1213
<settings />
13-
</right-panel>
14+
</right-panel> -->
1415
</div>
1516
</div>
1617
</template>
1718

1819
<script>
19-
import RightPanel from '@/components/RightPanel'
20-
import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
20+
// import RightPanel from '@/components/RightPanel'
21+
import { AppMain, Navbar, Sidebar, TagsView } from './components'
2122
import ResizeMixin from './mixin/ResizeHandler'
2223
import { mapState } from 'vuex'
2324
@@ -26,8 +27,8 @@ export default {
2627
components: {
2728
AppMain,
2829
Navbar,
29-
RightPanel,
30-
Settings,
30+
// RightPanel,
31+
// Settings,
3132
Sidebar,
3233
TagsView
3334
},

0 commit comments

Comments
 (0)