diff --git a/package.json b/package.json index 07ff7ed816e4fc367df8f8a2fa8226584375ca87..1556e797381f7f43a6e3c8b6eb259d484218b7a2 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "codemirror": "5.26.0", "dropzone": "5.1.0", "echarts": "3.6.1", - "element-ui": "1.4.0", + "element-ui": "1.4.1", "file-saver": "1.3.3", "jquery": "3.1.1", "js-cookie": "2.1.4", diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss index c04166e77acaa781b95997630c46c7e373d0c5be..4775b47637ea60c1f8c1b2dcec29c7eeb89e0846 100644 --- a/src/styles/sidebar.scss +++ b/src/styles/sidebar.scss @@ -11,6 +11,11 @@ margin-right: 0; } +.hideSidebar .el-submenu>.el-submenu__title, +.hideSidebar .submenu-title-noDropdown { + padding-left: 10px!important; +} + .hideSidebar .submenu-title-noDropdown span, .hideSidebar .el-submenu>.el-submenu__title span { height: 0; @@ -22,6 +27,7 @@ .hideSidebar .nest-menu .el-submenu__title { text-align: initial!important; + padding-left: 20px!important; span { height: auto; width: auto; @@ -69,4 +75,3 @@ .el-submenu .el-menu-item { min-width: 180px!important; } - diff --git a/src/views/layout/Layout.vue b/src/views/layout/Layout.vue index 32a8820ad59932c0b5e70ce7759e1e72b53abc5d..b30a4be7b430a982dd25bc7df17cbc95c479cdf7 100644 --- a/src/views/layout/Layout.vue +++ b/src/views/layout/Layout.vue @@ -35,35 +35,25 @@ width: 100%; &.hideSidebar { .sidebar-container{ - width:56px; + width:36px; } .main-container { - margin-left: 56px; + margin-left: 36px; } - // .sidebar-wrapper { - // transform: translate(-140px, 0); - // .sidebar-container { - // transform: translate(132px, 0); - // } - // &:hover { - // transform: translate(0, 0); - // .sidebar-container { - // transform: translate(0, 0); - // } - // } - // } - } .sidebar-container { transition: all .28s ease-out; width: 180px; - height: 1000px; + height: 100%; position: fixed; top: 0; bottom: 0; left: 0; z-index: 1001; background: red; + // overflow-y: auto; + &::-webkit-scrollbar {display:none} + } .main-container { min-height: 100%;