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