diff --git a/src/assets/scss/common-dai.scss b/src/assets/scss/common-dai.scss index c3f74d824..60412b81e 100644 --- a/src/assets/scss/common-dai.scss +++ b/src/assets/scss/common-dai.scss @@ -505,6 +505,7 @@ img { z-index: 1; width: $sidebar--width; height: 100%; + padding-top: 58px; padding-bottom: 15px; overflow-x: hidden; overflow-y: auto; @@ -529,7 +530,7 @@ img { .el-submenu__title { height: $sidebar--menu-item-height; line-height: $sidebar--menu-item-height; - color: #333; + color: rgba(0, 0, 0, 0.65); } } &__menu-icon { @@ -570,7 +571,7 @@ img { position: fixed; top: $navbar--height; right: 0; - z-index: 931; + z-index: 1051; min-width: $content--tabs-header-height; height: $content--tabs-header-height; padding: 0 12px; @@ -589,9 +590,10 @@ img { > .el-tabs__header { position: fixed; top: $navbar--height; - left: $sidebar--width + $sidebar--width-fold; + left: $sidebar--width-fold; + // left: $sidebar--width + $sidebar--width-fold; right: 0; - z-index: 930; + z-index: 1050; padding: 0 55px 0 15px; margin: 0; box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05); @@ -656,7 +658,7 @@ img { } } .el-tabs__nav.is-top { - padding: 3px; + padding: 4px; .el-tabs__item { margin-left: 3px !important; height: 32px !important; diff --git a/src/router/index.js b/src/router/index.js index 1241c89a5..b4011d678 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -98,7 +98,7 @@ export const moduleRoutes = { children: [ { path: "/home", - component: () => import("@/views/modules/home"), + component: () => import("@/views/modules/home/index"), name: "home", meta: { title: "首页", diff --git a/src/views/main-shuju/main-navbar.vue b/src/views/main-shuju/main-navbar.vue index 2672b6952..386734a2e 100644 --- a/src/views/main-shuju/main-navbar.vue +++ b/src/views/main-shuju/main-navbar.vue @@ -180,7 +180,7 @@ export default { computed: {}, methods: { toIndexPage() { - this.$router.replace("/indexWork"); + this.$router.replace("/home"); }, // 通过menuId与动态(菜单)路由进行匹配跳转至指定路由 gotoRouteHandle(menuId, idx) { diff --git a/src/views/main-sidebar.vue b/src/views/main-sidebar.vue index 435ba6322..0bbb8baf5 100644 --- a/src/views/main-sidebar.vue +++ b/src/views/main-sidebar.vue @@ -25,7 +25,12 @@ {{ menu.name }} +
+ @@ -194,13 +199,24 @@ export default { .nav { color: rgba(#ffffff, 0.85); + + .nav-div { + margin: 20px auto; + width: 28px; + height: 1px; + background: #ffffff; + border-radius: 1px; + opacity: 0.45; + } .nav-item { font-size: 13px; text-align: center; padding: 11px 0 9px 0; cursor: pointer; .icon-svg { - font-size: 22px; + margin: 0 auto; + font-size: 24px; + width: 20px !important; } span { display: block;