From 9aac65ff328fde857c76726da0677021cc5980ca Mon Sep 17 00:00:00 2001 From: RuoYi Date: Mon, 12 Apr 2021 09:54:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8F=9C=E5=8D=95=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E6=98=BE=E7=A4=BA=E9=A3=8E=E6=A0=BCTopNav=EF=BC=88fal?= =?UTF-8?q?se=E4=B8=BA=E5=B7=A6=E4=BE=A7=E5=AF=BC=E8=88=AA=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=EF=BC=8Ctrue=E4=B8=BA=E9=A1=B6=E9=83=A8=E5=AF=BC?= =?UTF-8?q?=E8=88=AA=E8=8F=9C=E5=8D=95=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/assets/styles/ruoyi.scss | 6 + ruoyi-ui/src/assets/styles/sidebar.scss | 3 - ruoyi-ui/src/components/TopNav/index.vue | 143 ++++++++++++++++++ ruoyi-ui/src/layout/components/Navbar.vue | 10 +- .../src/layout/components/Settings/index.vue | 19 +++ ruoyi-ui/src/settings.js | 5 + ruoyi-ui/src/store/getters.js | 2 + ruoyi-ui/src/store/modules/permission.js | 21 ++- ruoyi-ui/src/store/modules/settings.js | 3 +- 9 files changed, 204 insertions(+), 8 deletions(-) create mode 100644 ruoyi-ui/src/components/TopNav/index.vue diff --git a/ruoyi-ui/src/assets/styles/ruoyi.scss b/ruoyi-ui/src/assets/styles/ruoyi.scss index 55118fad..579e82db 100644 --- a/ruoyi-ui/src/assets/styles/ruoyi.scss +++ b/ruoyi-ui/src/assets/styles/ruoyi.scss @@ -176,6 +176,12 @@ color: #FFFFFF; } +/* submenu item */ +.el-menu--horizontal > .el-submenu .el-submenu__title { + height: 50px !important; + line-height: 50px !important; +} + /* text color */ .text-navy { color: #1ab394; diff --git a/ruoyi-ui/src/assets/styles/sidebar.scss b/ruoyi-ui/src/assets/styles/sidebar.scss index 9fad7998..3f45751e 100644 --- a/ruoyi-ui/src/assets/styles/sidebar.scss +++ b/ruoyi-ui/src/assets/styles/sidebar.scss @@ -135,9 +135,6 @@ margin-left: 20px; } - .el-submenu__icon-arrow { - display: none; - } } } diff --git a/ruoyi-ui/src/components/TopNav/index.vue b/ruoyi-ui/src/components/TopNav/index.vue new file mode 100644 index 00000000..fb15c59e --- /dev/null +++ b/ruoyi-ui/src/components/TopNav/index.vue @@ -0,0 +1,143 @@ + + + + + diff --git a/ruoyi-ui/src/layout/components/Navbar.vue b/ruoyi-ui/src/layout/components/Navbar.vue index db46ec55..db69e1df 100644 --- a/ruoyi-ui/src/layout/components/Navbar.vue +++ b/ruoyi-ui/src/layout/components/Navbar.vue @@ -2,7 +2,8 @@