From 100405e0805020ab1dd5be03e21202fe1c62cb86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com>
Date: Fri, 18 Nov 2022 12:21:35 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/AppMain.vue          |  2 +-
 src/layout/components/NavHeader/index.vue  |  4 +--
 src/layout/components/NavLeft/Logo.vue     |  4 +--
 src/layout/components/NavLeft/index.vue    | 17 ++++++-----
 src/layout/components/Page/PageHeading.vue | 25 +++++++++-------
 src/styles/default-theme.scss              | 34 ++++++++++++----------
 src/styles/menu.scss                       | 24 ++++++++-------
 src/styles/variables.scss                  |  1 +
 8 files changed, 62 insertions(+), 49 deletions(-)

diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 7d1f4caba..bf46813ff 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -32,7 +32,7 @@ export default {
   /*padding: 10px 20px 10px;*/
 }
 .fixed-header+.app-main {
-  padding-top: 55px;
+  padding-top: 52px;
 }
 .hasTagsView {
   .app-main {
diff --git a/src/layout/components/NavHeader/index.vue b/src/layout/components/NavHeader/index.vue
index 3aa7c3df6..b1e385c51 100644
--- a/src/layout/components/NavHeader/index.vue
+++ b/src/layout/components/NavHeader/index.vue
@@ -88,7 +88,7 @@ export default {
 <style lang="scss" scoped>
   @import "~@/styles/variables.scss";
 
-  $header-height: 55px;
+  $header-height: 52px;
   .navbar {
     position: relative;
     height: $header-height;
@@ -104,7 +104,7 @@ export default {
         display: inline-block;
         vertical-align: middle;
 
-        & > > > .el-submenu__title {
+        & >>> .el-submenu__title {
           font-family: "open sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
           padding: 0 8px;
           line-height: $header-height;
diff --git a/src/layout/components/NavLeft/Logo.vue b/src/layout/components/NavLeft/Logo.vue
index 3ce272450..bf02e0477 100644
--- a/src/layout/components/NavLeft/Logo.vue
+++ b/src/layout/components/NavLeft/Logo.vue
@@ -55,8 +55,8 @@ export default {
 .sidebar-logo-container {
   position: relative;
   width: 100%;
-  height: 55px;
-  line-height: 55px;
+  height: 52px;
+  line-height: 52px;
   // background: #2b2f3a;
   text-align: center;
   overflow: hidden;
diff --git a/src/layout/components/NavLeft/index.vue b/src/layout/components/NavLeft/index.vue
index 5455ebdf0..44c9d5c91 100644
--- a/src/layout/components/NavLeft/index.vue
+++ b/src/layout/components/NavLeft/index.vue
@@ -126,22 +126,23 @@ export default {
   @import "~@/styles/variables.scss";
   .nav-header {
     overflow: hidden;
-    background: $subMenuBg url('~@/assets/img/header-profile.png') no-repeat center center;
+    background-color: var(--color-primary);
   }
 
   .nav-logo {
-    height: 55px;
+    height: 52px;
   }
 
   .nav-title {
     box-sizing: border-box;
-    margin: 17px 0 17px 20px;
-    font-size: 15px;
-    font-weight: 460;
-    color: #fff;
+    padding: 17px 0 17px 20px;
+    font-size: 16px;
+    font-weight: 500;
+    color: #1F2329;
     overflow: hidden;
     white-space: nowrap;
     cursor: pointer;
+    background-color: var(--menu-bg);
   }
 
   .collapsed {
@@ -155,8 +156,10 @@ export default {
   .nav-footer {
     display: block;
     width: 100%;
-    height: 40px;
+    height: 48px;
+    line-height: 48px;
     background-color: $subMenuBg;
+    border: 1px solid red;
 
     .toggle-bar {
       width: 55px;
diff --git a/src/layout/components/Page/PageHeading.vue b/src/layout/components/Page/PageHeading.vue
index 3ed1f7b02..dd73d4ae7 100644
--- a/src/layout/components/Page/PageHeading.vue
+++ b/src/layout/components/Page/PageHeading.vue
@@ -38,21 +38,26 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
   .page-heading {
-    border-top: 0;
-    padding: 12px 30px 13px 25px;
+    position: relative;
+    height: 52px;
+    line-height: 52px;
     background-color: #ffffff;
-    min-height: 1px;
+    .el-row {
+      width: 100%;
+      position: absolute;
+      top: 50%;
+      transform: translateY(-50%);
+      padding-left: 24px;
+    }
   }
 
   .page-heading-left, h2 {
-    font-size: 18px;
-    font-weight: 300;
-    line-height: 1.5;
-    /*margin-bottom: 12px;*/
-    height: 30px;
-    max-height: 32px;
+    font-size: 16px;
+    font-weight: 500;
+    line-height: 24px;
+    color: #1F2329;
   }
 
   .page-heading-right {
diff --git a/src/styles/default-theme.scss b/src/styles/default-theme.scss
index e4f902e24..02410b2ef 100644
--- a/src/styles/default-theme.scss
+++ b/src/styles/default-theme.scss
@@ -1,29 +1,31 @@
 :root {
-  --color-primary: #1ab394;
+  --color-primary: #2b937c;
   --color-success: #2793d7;
   --color-info: #1c84c6;
   --color-warning: #f8ac59;
   --color-danger: #ed5565;
-  --menu-bg: #2f4050;
-  --menu-text: #a7b1c2;
-  --menu-hover: #293846;
-  --submenu-bg: #1f2d3d;
-  --submenu-hover: #001528;
-  --menu-active-text: white;
-  --menu-active-left: #1ab394;
+  --menu-bg: #ffffff;
+  --menu-text: #646A73;
+  --menu-hover: #f4faf9;
+  --submenu-bg: #ffffff;
+  --submenu-hover: #f4faf9;
+  --submenu-active-text: #2b937c;
+  --menu-active-text: #1F2329;
+  --menu-active-left: #2b937c;
 }
 
 :export {
-  --color-primary: #1ab394;
+  --color-primary: #2b937c;
   --color-success: #2793d7;
   --color-info: #1c84c6;
   --color-warning: #f8ac59;
   --color-danger: #ed5565;
-  --menu-bg: #2f4050;
-  --menu-text: #a7b1c2;
-  --menu-hover: #293846;
-  --submenu-bg: #1f2d3d;
-  --submenu-hover: #001528;
-  --menu-active-text: white;
-  --menu-active-left: #1ab394;
+  --menu-bg: #ffffff;
+  --menu-text: #646A73;
+  --menu-hover: #f4faf9;
+  --submenu-bg: #ffffff;
+  --submenu-hover: #f4faf9;
+  --submenu-active-text: #2b937c;
+  --menu-active-text: #1F2329;
+  --menu-active-left: #2b937c;
 }
diff --git a/src/styles/menu.scss b/src/styles/menu.scss
index 3daea47d3..5f88c1157 100644
--- a/src/styles/menu.scss
+++ b/src/styles/menu.scss
@@ -15,7 +15,7 @@
         color: $menuActiveText;
       }
       i {
-        color: $menuText;
+        color: $menuActiveText;
       }
     }
   }
@@ -23,11 +23,11 @@
     background-color: $subMenuBg;
     color: $menuText;
     &.is-active{
-      color: $menuActiveText;
+      color: $subMenuActiveText;
     }
     &:hover {
       background-color: $subMenuHover;
-      color: $menuActiveText;
+      color: $--color-primary;
     }
     i {
       color: $menuText;
@@ -44,15 +44,15 @@
   }
 
   .el-submenu .el-menu-item {
-    height: 32px;
-    line-height: 2;
+    height: 48px;
+    line-height: 48px;
     padding: 0 52px;
     min-width: 200px;
   }
 
   .nest-menu .el-submenu__title {
-    height: 32px;
-    line-height: 2;
+    height: 48px;
+    line-height: 48px;
     padding: 0 52px;
     min-width: 200px;
   }
@@ -62,12 +62,14 @@
   }
 
   .el-menu-item, .el-submenu__title {
-    height: 46px;
-    line-height: 46px;
+    height: 48px;
+    line-height: 48px;
+    font-weight: 400;
+    font-size: 14px;
   }
 
   .el-menu-item:hover, .el-menu-item:focus {
-    color: white;
+    color: $subMenuActiveText;
   }
 
   .navbar li.is-active, .navbar li.is-opened {
@@ -87,7 +89,7 @@
   }
 
   .el-submenu.is-opened {
-    background-color: $subMenuBg ;
+    background-color: $subMenuBg;
     .el-submenu__title {
       background-color: $subMenuBg!important;
     }
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 4557a7c8a..da2b7f762 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -23,6 +23,7 @@ $menuTextWeight: 600;
 $menuHover: var(--menu-hover);
 $subMenuBg: var(--submenu-bg);
 $subMenuHover: var(--submenu-hover);
+$subMenuActiveText: var(--submenu-active-text);
 $sideBarWidth: 220px;
 
 :export {