Browse Source

Revert "Revert "优化框架""

This reverts commit f8a5cdfb2b.
V1.0
马魁 3 years ago
parent
commit
4e572aefe4
  1. 12
      src/assets/scss/common-dai.scss
  2. 2
      src/router/index.js
  3. 2
      src/views/main-shuju/main-navbar.vue
  4. 18
      src/views/main-sidebar.vue

12
src/assets/scss/common-dai.scss

@ -505,6 +505,7 @@ img {
z-index: 1; z-index: 1;
width: $sidebar--width; width: $sidebar--width;
height: 100%; height: 100%;
padding-top: 58px;
padding-bottom: 15px; padding-bottom: 15px;
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;
@ -529,7 +530,7 @@ img {
.el-submenu__title { .el-submenu__title {
height: $sidebar--menu-item-height; height: $sidebar--menu-item-height;
line-height: $sidebar--menu-item-height; line-height: $sidebar--menu-item-height;
color: #333; color: rgba(0, 0, 0, 0.65);
} }
} }
&__menu-icon { &__menu-icon {
@ -570,7 +571,7 @@ img {
position: fixed; position: fixed;
top: $navbar--height; top: $navbar--height;
right: 0; right: 0;
z-index: 931; z-index: 1051;
min-width: $content--tabs-header-height; min-width: $content--tabs-header-height;
height: $content--tabs-header-height; height: $content--tabs-header-height;
padding: 0 12px; padding: 0 12px;
@ -589,9 +590,10 @@ img {
> .el-tabs__header { > .el-tabs__header {
position: fixed; position: fixed;
top: $navbar--height; top: $navbar--height;
left: $sidebar--width + $sidebar--width-fold; left: $sidebar--width-fold;
// left: $sidebar--width + $sidebar--width-fold;
right: 0; right: 0;
z-index: 930; z-index: 1050;
padding: 0 55px 0 15px; padding: 0 55px 0 15px;
margin: 0; margin: 0;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05); box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
@ -656,7 +658,7 @@ img {
} }
} }
.el-tabs__nav.is-top { .el-tabs__nav.is-top {
padding: 3px; padding: 4px;
.el-tabs__item { .el-tabs__item {
margin-left: 3px !important; margin-left: 3px !important;
height: 32px !important; height: 32px !important;

2
src/router/index.js

@ -98,7 +98,7 @@ export const moduleRoutes = {
children: [ children: [
{ {
path: "/home", path: "/home",
component: () => import("@/views/modules/home"), component: () => import("@/views/modules/home/index"),
name: "home", name: "home",
meta: { meta: {
title: "首页", title: "首页",

2
src/views/main-shuju/main-navbar.vue

@ -180,7 +180,7 @@ export default {
computed: {}, computed: {},
methods: { methods: {
toIndexPage() { toIndexPage() {
this.$router.replace("/indexWork"); this.$router.replace("/home");
}, },
// menuId() // menuId()
gotoRouteHandle(menuId, idx) { gotoRouteHandle(menuId, idx) {

18
src/views/main-sidebar.vue

@ -25,7 +25,12 @@
<span>{{ menu.name }}</span> <span>{{ menu.name }}</span>
</div> </div>
<div class="nav-div"></div>
<div class="nav-item" @click="$router.push({ name: 'main-shuju' })"> <div class="nav-item" @click="$router.push({ name: 'main-shuju' })">
<svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true">
<use xlink:href="#icon-stock" />
</svg>
<span>可视化</span> <span>可视化</span>
</div> </div>
</div> </div>
@ -194,13 +199,24 @@ export default {
.nav { .nav {
color: rgba(#ffffff, 0.85); color: rgba(#ffffff, 0.85);
.nav-div {
margin: 20px auto;
width: 28px;
height: 1px;
background: #ffffff;
border-radius: 1px;
opacity: 0.45;
}
.nav-item { .nav-item {
font-size: 13px; font-size: 13px;
text-align: center; text-align: center;
padding: 11px 0 9px 0; padding: 11px 0 9px 0;
cursor: pointer; cursor: pointer;
.icon-svg { .icon-svg {
font-size: 22px; margin: 0 auto;
font-size: 24px;
width: 20px !important;
} }
span { span {
display: block; display: block;

Loading…
Cancel
Save