diff --git a/src/assets/img/choicepart/ArtManager.png b/src/assets/img/choicepart/ArtManager.png deleted file mode 100644 index ae31964..0000000 Binary files a/src/assets/img/choicepart/ArtManager.png and /dev/null differ diff --git a/src/assets/img/choicepart/Log Management.png b/src/assets/img/choicepart/Log Management.png index 8f18d70..ae31964 100644 Binary files a/src/assets/img/choicepart/Log Management.png and b/src/assets/img/choicepart/Log Management.png differ diff --git a/src/assets/img/choicepart/Log Management2.png b/src/assets/img/choicepart/Log Management2.png new file mode 100644 index 0000000..8f18d70 Binary files /dev/null and b/src/assets/img/choicepart/Log Management2.png differ diff --git a/src/assets/img/choicepart/日志管理.png b/src/assets/img/choicepart/日志管理.png index 8f18d70..ae31964 100644 Binary files a/src/assets/img/choicepart/日志管理.png and b/src/assets/img/choicepart/日志管理.png differ diff --git a/src/assets/img/choicepart/日志管理2.png b/src/assets/img/choicepart/日志管理2.png new file mode 100644 index 0000000..8f18d70 Binary files /dev/null and b/src/assets/img/choicepart/日志管理2.png differ diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss index fde7116..9da9c1f 100644 --- a/src/assets/scss/common.scss +++ b/src/assets/scss/common.scss @@ -254,6 +254,9 @@ img { margin-right: 0; font-size: 18px; } + &__close { + width: 0px; + } } .aui-content { &__wrapper { @@ -278,7 +281,19 @@ img { align-items: stretch; height: $navbar--height; background-color: $--color-primary; - box-shadow: 0 1px 0 0 rgba(0, 0, 0, .05); + box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.05); + .home { + position: fixed; + top: 0; + right: 0; + left: 0; + z-index: 1030; + display: flex; + align-items: stretch; + height: $navbar--height; + background-color: #409EFF; + box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.05); + } &--colorful { .aui-navbar__body { // navbar body颜色 @@ -396,9 +411,13 @@ img { .el-menu-item.is-active, .el-submenu.is-active > .el-submenu__title { color: $--color-text-secondary; + // background-color: rgb(13,43,104); &:focus, &:hover { + // 点击之后图标颜色亮度 color: $--color-text-primary; + // color: #fff; + // background-color: rgb(13,43,104); } } .el-menu-item { @@ -533,6 +552,10 @@ img { overflow-y: scroll; transition: width .3s; } + .close { + width: 0px; + margin-left: 0 !important; + } &__menu { width: $sidebar--width; border-right: 0; @@ -564,6 +587,7 @@ img { min-height: calc(100vh - #{$navbar--height}); &__wrapper { position: relative; + // 注释掉可隐藏侧边栏,但需要在main.vue中加入main-content的限制条件 margin-left: $sidebar--width; min-height: calc(100vh - #{$navbar--height}); background-color: $content--background-color; diff --git a/src/assets/scss/modules/home.scss b/src/assets/scss/modules/home.scss index f4f5866..ef0f8f1 100644 --- a/src/assets/scss/modules/home.scss +++ b/src/assets/scss/modules/home.scss @@ -1,6 +1,7 @@ .mod-home { table { width: 100%; + height: 10px; border: 1px solid $--border-color-lighter; border-collapse: collapse; th, diff --git a/src/assets/scss/variables.scss b/src/assets/scss/variables.scss index 623778c..bfbf904 100644 --- a/src/assets/scss/variables.scss +++ b/src/assets/scss/variables.scss @@ -9,13 +9,15 @@ $navbar--height: 50px; $sidebar--width: 248px; $sidebar--width-fold: 64px; // $sidebar--background-color-dark: #263238; -$sidebar--background-color-dark: #001529; +// $sidebar--background-color-dark: #001529; +$sidebar--background-color-dark: #304156; $sidebar--text-color-dark: #8a979e; $sidebar--menu-item-height: 48px; // Content $content--padding: 15px; -$content--background-color: #f1f4f5; +// $content--background-color: #f1f4f5; +$content--background-color: #fff; $content--card-header-height: 60px; $content--tabs-header-height: 38px; // Content, 填充整屏高度(非tabs状态) = 整屏高度 - 导航条高度 - aui-content上下内边距高度 diff --git a/src/components/base-table/index.vue b/src/components/base-table/index.vue index e864e95..104ba28 100644 --- a/src/components/base-table/index.vue +++ b/src/components/base-table/index.vue @@ -1,16 +1,41 @@