diff --git a/vue-admin-wonderful-next/src/router/index.ts b/vue-admin-wonderful-next/src/router/index.ts index 0d241923..0f3ed893 100644 --- a/vue-admin-wonderful-next/src/router/index.ts +++ b/vue-admin-wonderful-next/src/router/index.ts @@ -54,123 +54,6 @@ const staticRoutes: Array = [ title: '文档3', index: 4 } - }, - { - path: '/docs4', - name: 'docs4', - component: () => import('/@/views/docs copy 4/index.vue'), - meta: { - title: '文档4', - index: 5 - } - }, - { - path: '/docs5', - name: 'docs5', - component: () => import('/@/views/docs copy 5/index.vue'), - meta: { - title: '文档5', - index: 6 - } - }, - { - path: '/docs6', - name: 'docs6', - component: () => import('/@/views/docs copy 6/index.vue'), - meta: { - title: '文档6', - index: 7 - } - }, - { - path: '/docs7', - name: 'docs7', - component: () => import('/@/views/docs copy 7/index.vue'), - meta: { - title: '文档7', - index: 8 - } - }, - { - path: '/docs8', - name: 'docs8', - component: () => import('/@/views/docs copy 8/index.vue'), - meta: { - title: '文档8', - index: 9 - } - }, - { - path: '/docs9', - name: 'docs9', - component: () => import('/@/views/docs copy 9/index.vue'), - meta: { - title: '文档9', - index: 10 - } - }, - { - path: '/docs10', - name: 'docs10', - component: () => import('/@/views/docs copy 10/index.vue'), - meta: { - title: '文档10', - index: 11 - } - }, - { - path: '/docs11', - name: 'docs11', - component: () => import('/@/views/docs copy 11/index.vue'), - meta: { - title: '文档11', - index: 12 - } - }, - { - path: '/docs12', - name: 'docs12', - component: () => import('/@/views/docs copy 12/index.vue'), - meta: { - title: '文档12', - index: 13 - } - }, - { - path: '/docs13', - name: 'docs13', - component: () => import('/@/views/docs copy 13/index.vue'), - meta: { - title: '文档13', - index: 14 - } - }, - { - path: '/docs14', - name: 'docs14', - component: () => import('/@/views/docs copy 14/index.vue'), - meta: { - title: '文档14', - index: 15 - } - }, - { - path: '/docs15', - name: 'docs15', - component: () => import('/@/views/docs copy 15/index.vue'), - meta: { - title: '文档15', - index: 16 - } - }, - { - path: '/docs16', - name: 'docs16', - component: () => import('/@/views/docs copy 16/index.vue'), - meta: { - title: '文档16', - index: 17 - } }] }, { diff --git a/vue-admin-wonderful-next/src/theme/app.scss b/vue-admin-wonderful-next/src/theme/app.scss index 2cbba896..25c1cb15 100644 --- a/vue-admin-wonderful-next/src/theme/app.scss +++ b/vue-admin-wonderful-next/src/theme/app.scss @@ -29,9 +29,11 @@ body, width: 100%; height: 100%; .el-aside { - background: #29384d; - border-right: 1px solid rgb(230, 230, 230); + background: var(--bg-menuBar); + box-shadow: 2px 0 6px rgb(0 21 41 / 1%); height: inherit; + position: relative; + z-index: 1; } .el-header { box-shadow: 0 1px 4px rgb(0 21 41 / 8%); diff --git a/vue-admin-wonderful-next/src/theme/common/transition.scss b/vue-admin-wonderful-next/src/theme/common/transition.scss index 891d5a76..03c816ca 100644 --- a/vue-admin-wonderful-next/src/theme/common/transition.scss +++ b/vue-admin-wonderful-next/src/theme/common/transition.scss @@ -10,11 +10,11 @@ } .slide-right-enter-from { opacity: 0; - transform: translateX(-30px); + transform: translateX(-20px); } .slide-right-leave-to { opacity: 0; - transform: translateX(30px); + transform: translateX(20px); } .slide-left-enter-from { @extend .slide-right-leave-to; @@ -27,7 +27,7 @@ ------------------------------- */ .breadcrumb-enter-active, .breadcrumb-leave-active { - transition: all 0.2s ease; + transition: all 0.3s ease; position: absolute; } .breadcrumb-enter-from, diff --git a/vue-admin-wonderful-next/src/theme/common/var.scss b/vue-admin-wonderful-next/src/theme/common/var.scss index f073fc00..d44ba2de 100644 --- a/vue-admin-wonderful-next/src/theme/common/var.scss +++ b/vue-admin-wonderful-next/src/theme/common/var.scss @@ -58,6 +58,10 @@ $--color-danger-light-6: mix($--color-whites, $--color-danger, 60%) !default; $--color-danger-light-7: mix($--color-whites, $--color-danger, 70%) !default; $--color-danger-light-8: mix($--color-whites, $--color-danger, 80%) !default; $--color-danger-light-9: mix($--color-whites, $--color-danger, 90%) !default; +$--bg-topBar: #ffffff; +$--bg-menuBar: #29384d; +$--bg-topBarColor: #606266; +$--bg-menuBarColor: #e6e6e6; /* 赋值给:root ------------------------------- */ @@ -114,4 +118,8 @@ $--color-danger-light-9: mix($--color-whites, $--color-danger, 90%) !default; --color-danger-light-7: #{$--color-danger-light-7}; --color-danger-light-8: #{$--color-danger-light-8}; --color-danger-light-9: #{$--color-danger-light-9}; + --bg-topBar: #{$--bg-topBar}; + --bg-menuBar: #{$--bg-menuBar}; + --bg-topBarColor: #{$--bg-topBarColor}; + --bg-menuBarColor: #{$--bg-menuBarColor}; } diff --git a/vue-admin-wonderful-next/src/theme/element.scss b/vue-admin-wonderful-next/src/theme/element.scss index 9dc0361b..c48f45dd 100644 --- a/vue-admin-wonderful-next/src/theme/element.scss +++ b/vue-admin-wonderful-next/src/theme/element.scss @@ -666,37 +666,55 @@ /* NavMenu 导航菜单 ------------------------------- */ +// 默认样式修改 .el-menu { border-right: none !important; } -.el-menu-item.is-active, -.el-submenu.is-active .el-submenu__title { +.el-menu-item, +.el-submenu__title { + height: 50px !important; + line-height: 50px !important; + color: var(--bg-menuBarColor); +} +// horizontal 水平方向时 +.el-menu--horizontal > .el-menu-item.is-active, +.el-menu--horizontal > .el-submenu.is-active .el-submenu__title { border-bottom-color: set-color(primary); color: set-color(primary); } -.el-menu-item:not(.is-disabled):focus, -.el-menu-item:not(.is-disabled):hover, -.el-submenu:focus .el-submenu__title, -.el-submenu:hover .el-submenu__title, -.el-menu .el-menu-item.is-active, -.el-menu .el-submenu.is-active > .el-submenu__title { +.el-menu--horizontal .el-menu-item:not(.is-disabled):focus, +.el-menu--horizontal .el-menu-item:not(.is-disabled):hover, +.el-menu--horizontal > .el-submenu:focus .el-submenu__title, +.el-menu--horizontal > .el-submenu:hover .el-submenu__title, +.el-menu--horizontal .el-menu .el-menu-item.is-active, +.el-menu--horizontal .el-menu .el-submenu.is-active > .el-submenu__title { color: set-color(primary); } +// 外部链接时 .el-menu-item a, -.el-menu-item a:hover { +.el-menu-item a:hover, +.el-menu-item i, +.el-submenu__title i { color: inherit; text-decoration: none; } -// default -.el-menu-item.is-active { - color: set-color(primary); - background-color: set-color(primary-light-9); -} -.el-menu-item:focus, + +// 默认 hover 时 .el-menu-item:hover, -.el-submenu__title:focus, .el-submenu__title:hover { - background-color: set-color(primary-light-9); + color: set-color(primary) !important; + background-color: transparent !important; + i { + color: set-color(primary); + } +} +// 高亮时 +.el-menu-item.is-active { + color: #ffffff !important; + background-color: set-color(primary) !important; + i { + color: #ffffff !important; + } } /* Tabs 标签页 @@ -721,7 +739,7 @@ } .el-breadcrumb__inner a, .el-breadcrumb__inner.is-link { - color: #303133; + color: var(--bg-topBarColor); font-weight: normal; } diff --git a/vue-admin-wonderful-next/src/views/docs copy 10/index.vue b/vue-admin-wonderful-next/src/views/docs copy 10/index.vue deleted file mode 100644 index 822eeafe..00000000 --- a/vue-admin-wonderful-next/src/views/docs copy 10/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/views/docs copy 11/index.vue b/vue-admin-wonderful-next/src/views/docs copy 11/index.vue deleted file mode 100644 index 822eeafe..00000000 --- a/vue-admin-wonderful-next/src/views/docs copy 11/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/views/docs copy 12/index.vue b/vue-admin-wonderful-next/src/views/docs copy 12/index.vue deleted file mode 100644 index 822eeafe..00000000 --- a/vue-admin-wonderful-next/src/views/docs copy 12/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/views/docs copy 13/index.vue b/vue-admin-wonderful-next/src/views/docs copy 13/index.vue deleted file mode 100644 index 822eeafe..00000000 --- a/vue-admin-wonderful-next/src/views/docs copy 13/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/views/docs copy 14/index.vue b/vue-admin-wonderful-next/src/views/docs copy 14/index.vue deleted file mode 100644 index 822eeafe..00000000 --- a/vue-admin-wonderful-next/src/views/docs copy 14/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/views/docs copy 15/index.vue b/vue-admin-wonderful-next/src/views/docs copy 15/index.vue deleted file mode 100644 index 822eeafe..00000000 --- a/vue-admin-wonderful-next/src/views/docs copy 15/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/views/docs copy 16/index.vue b/vue-admin-wonderful-next/src/views/docs copy 16/index.vue deleted file mode 100644 index 822eeafe..00000000 --- a/vue-admin-wonderful-next/src/views/docs copy 16/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/views/docs copy 4/index.vue b/vue-admin-wonderful-next/src/views/docs copy 4/index.vue deleted file mode 100644 index 822eeafe..00000000 --- a/vue-admin-wonderful-next/src/views/docs copy 4/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/views/docs copy 5/index.vue b/vue-admin-wonderful-next/src/views/docs copy 5/index.vue deleted file mode 100644 index 822eeafe..00000000 --- a/vue-admin-wonderful-next/src/views/docs copy 5/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/views/docs copy 6/index.vue b/vue-admin-wonderful-next/src/views/docs copy 6/index.vue deleted file mode 100644 index 822eeafe..00000000 --- a/vue-admin-wonderful-next/src/views/docs copy 6/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/views/docs copy 7/index.vue b/vue-admin-wonderful-next/src/views/docs copy 7/index.vue deleted file mode 100644 index 822eeafe..00000000 --- a/vue-admin-wonderful-next/src/views/docs copy 7/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/views/docs copy 8/index.vue b/vue-admin-wonderful-next/src/views/docs copy 8/index.vue deleted file mode 100644 index 822eeafe..00000000 --- a/vue-admin-wonderful-next/src/views/docs copy 8/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/views/docs copy 9/index.vue b/vue-admin-wonderful-next/src/views/docs copy 9/index.vue deleted file mode 100644 index 822eeafe..00000000 --- a/vue-admin-wonderful-next/src/views/docs copy 9/index.vue +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/views/layout/component/aside.vue b/vue-admin-wonderful-next/src/views/layout/component/aside.vue index 146933d6..67bf855b 100644 --- a/vue-admin-wonderful-next/src/views/layout/component/aside.vue +++ b/vue-admin-wonderful-next/src/views/layout/component/aside.vue @@ -23,9 +23,16 @@ export default { }, children: [ { - path: "/docs3", + path: "/home", meta: { - title: "文档3", + title: "微软", + icon: "el-icon-s-flag", + }, + }, + { + path: "/docs", + meta: { + title: "文档", icon: "el-icon-s-flag", }, }, @@ -36,111 +43,20 @@ export default { icon: "el-icon-s-flag", }, }, - { - path: "/docs2", - meta: { - title: "文档2", - icon: "el-icon-s-flag", - }, - }, ], }, { - path: "/docs", + path: "/docs2", meta: { - title: "文档", + title: "文档2", icon: "el-icon-s-management", isLink: "https://www.ele.me", }, }, { - path: "/docs4", + path: "/docs3", meta: { - title: "文档4", - icon: "el-icon-s-management", - }, - }, - { - path: "/docs5", - meta: { - title: "文档5", - icon: "el-icon-s-management", - }, - }, - { - path: "/docs6", - meta: { - title: "文档6", - icon: "el-icon-s-management", - }, - }, - { - path: "/docs7", - meta: { - title: "文档7", - icon: "el-icon-s-management", - }, - }, - { - path: "/docs8", - meta: { - title: "文档8", - icon: "el-icon-s-management", - }, - }, - { - path: "/docs9", - meta: { - title: "文档9", - icon: "el-icon-s-management", - }, - }, - { - path: "/docs10", - meta: { - title: "文档10", - icon: "el-icon-s-management", - }, - }, - { - path: "/docs11", - meta: { - title: "文档11", - icon: "el-icon-s-management", - }, - }, - { - path: "/docs12", - meta: { - title: "文档12", - icon: "el-icon-s-management", - }, - }, - { - path: "/docs13", - meta: { - title: "文档13", - icon: "el-icon-s-management", - }, - }, - { - path: "/docs14", - meta: { - title: "文档14", - icon: "el-icon-s-management", - }, - }, - { - path: "/docs15", - meta: { - title: "文档15", - icon: "el-icon-s-management", - }, - }, - { - path: "/docs16", - meta: { - title: "文档16", + title: "文档3", icon: "el-icon-s-management", }, }, diff --git a/vue-admin-wonderful-next/src/views/layout/fashion.vue b/vue-admin-wonderful-next/src/views/layout/defaults.vue similarity index 100% rename from vue-admin-wonderful-next/src/views/layout/fashion.vue rename to vue-admin-wonderful-next/src/views/layout/defaults.vue diff --git a/vue-admin-wonderful-next/src/views/layout/index.vue b/vue-admin-wonderful-next/src/views/layout/index.vue index 2ddcb5af..588392c3 100644 --- a/vue-admin-wonderful-next/src/views/layout/index.vue +++ b/vue-admin-wonderful-next/src/views/layout/index.vue @@ -1,11 +1,11 @@ \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/breadcrumb.vue b/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/breadcrumb.vue index 325912a4..a54ed791 100644 --- a/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/breadcrumb.vue +++ b/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/breadcrumb.vue @@ -55,9 +55,14 @@ export default { cursor: pointer; font-size: 18px; margin-right: 15px; + color: var(--bg-topBarColor); } .layout-navbars-breadcrumb-span { - opacity: 0.8; + opacity: 0.7; + color: var(--bg-topBarColor); + } + :deep .el-breadcrumb__separator { + @extend .layout-navbars-breadcrumb-span; } } \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/index.vue b/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/index.vue index 31af29fd..f506179f 100644 --- a/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/index.vue +++ b/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/index.vue @@ -21,5 +21,6 @@ export default { align-items: center; border-bottom: 1px solid rgb(230, 230, 230); padding: 0 15px; + background-color: var(--bg-topBar); } \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/setings.vue b/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/setings.vue index bc06234e..9b4d7581 100644 --- a/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/setings.vue +++ b/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/setings.vue @@ -7,43 +7,77 @@
primary
- + +
success
- + +
info
- + +
warning
- + +
danger
- + +
+ 菜单 / 顶栏
顶栏背景
- + +
菜单背景
- + + +
+
+
+
顶栏默认字体颜色
+
+ + +
+
+
+
菜单默认字体颜色
+
+ + +
+
+
+
顶栏背景渐变
+
+ +
+
+
+
菜单背景渐变
+
+
@@ -134,7 +168,7 @@ -
+
水印文案
@@ -143,9 +177,9 @@ 布局切换 -
- -
+
+ +
@@ -155,12 +189,12 @@
-

时尚

+

默认

-
+
@@ -176,8 +210,8 @@
- -
+ +
@@ -188,12 +222,12 @@
-

典雅

+

横向

- -
+ +
@@ -204,7 +238,7 @@
-

科技

+

分栏

@@ -224,6 +258,7 @@