From 65c02912475a4af70f413ad653a620c6589bf72e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Tue, 25 Jun 2024 14:59:37 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=91=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/assets/img/dylogo.svg               |  1 +
 fe/PC/src/layout/components/Sidebar/Logo.vue  | 10 +++++-----
 fe/PC/src/layout/components/Sidebar/index.vue | 11 +++++++----
 fe/PC/src/styles/sidebar.scss                 |  4 ++--
 fe/PC/src/styles/variables.scss               | 11 +++++++----
 5 files changed, 22 insertions(+), 15 deletions(-)
 create mode 100644 fe/PC/src/assets/img/dylogo.svg

diff --git a/fe/PC/src/assets/img/dylogo.svg b/fe/PC/src/assets/img/dylogo.svg
new file mode 100644
index 000000000..65441646b
--- /dev/null
+++ b/fe/PC/src/assets/img/dylogo.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="56" height="14" viewBox="0 0 56 14"><g><g><path d="M55.90162444458008,0.158866C56.10502444458008,0.0779458,55.93452444458008,0.030578,55.90552444458008,0.0226833Q29.44872444458008,-0.563493,14.268024444580078,13.9982L21.70916444458008,13.9982C32.29342444458008,3.19435,51.07842444458008,0.648333,55.89962444458008,0.160839L55.90162444458008,0.158866Z" fill="#F6AD3C" fill-opacity="1"/></g><g><g><path d="M15.998484018554688,4.264873012638092L17.63789401855469,1.7583270126380919L19.09119401855469,1.166229012638092L19.09699401855469,1.166229012638092L19.09699401855469,1.164256012638092L19.098994018554688,1.164256012638092L19.09699401855469,1.164256012638092L19.224894018554686,0.844523012638092L18.236594018554687,0.844523012638092L16.170944018554685,0.844523012638092L8.547654018554688,0.844523012638092L6.3094940185546875,4.264873012638092L9.237504018554688,4.264873012638092L15.998484018554688,4.264873012638092Z" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M15.5721,6.525857107334137L15.5721,6.521910107334137L15.5741,6.521910107334137L15.5721,6.521910107334137L15.7,6.202177107334137L14.4909,6.202177107334137L12.4755,6.202177107334137L5.11579,6.202177107334137L0,13.998127107334138L4.72629,13.998127107334138L7.57679,9.656077107334138L12.2256,9.656077107334138L13.8766,7.139665107334137L15.5683,6.525857107334137L15.5721,6.525857107334137Z" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M34.86294579711914,6.858187065982818L32.60153579711914,13.99887706598282L37.83746579711914,13.99887706598282L37.71732579711914,13.669277065982818L36.96158579711914,13.296257065982818L36.96158579711914,13.290337065982818L39.44777579711914,5.123337065982819L39.51172579711914,4.902287065982819L39.47297579711914,4.918076365982818C37.92660579711914,5.480569065982818,36.32792579711914,6.112137065982819,34.86294579711914,6.858187065982818Z" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M28.73754616699219,1.708986012638092L30.026246166992188,1.166229012638092L30.03204616699219,1.166229012638092L30.03204616699219,1.164256012638092L30.15794616699219,0.844523012638092L21.930096166992186,0.844523012638092L15.500483266992187,11.573323012638092C15.481105576992187,11.606923012638092,15.421032866992187,11.723323012638092,15.577995166992187,11.705523012638093C18.064186166992187,9.416123012638092,20.451556166992187,8.18258301263809,23.07145616699219,6.633263012638092L24.313586166992188,4.262903012638092L25.173976166992187,4.262903012638092L25.230166166992188,5.695773012638092C26.36574616699219,5.176703012638092,27.586546166992186,4.663553012638092,28.898446166992187,4.166193012638092L28.73754616699219,1.708986012638092Z" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M30.241287924804688,13.676321376590728L30.254847924804686,13.668421376590729L29.499107924804687,13.295401376590728L29.268517924804687,9.632291376590729C27.03423792480469,11.045431376590729,25.642895924804687,12.33620137659073,25.507247924804688,12.446731376590728L25.538253424804687,14.000001376590728L30.37499792480469,14.000001376590728L30.24903792480469,13.678291376590728L30.243227924804685,13.678291376590728L30.241287924804688,13.676321376590728Z" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M50.065011225585934,1.410691261291504L49.208501225585934,2.389626261291504L46.26886122558594,5.794191261291504L45.17594122558594,3.287641261291504C43.98032122558594,3.585661261291504,42.50953322558594,4.027761261291504,41.52513122558594,4.361311261291504L43.56175122558594,9.090201261291504L42.13359922558594,13.998691261291503L47.563311225585934,13.998691261291503L47.44510122558594,13.669091261291504L46.68936122558594,13.296091261291505L46.68936122558594,13.282291261291505L47.77259122558594,9.151381261291505L53.272031225585934,2.823831261291504L54.96373122558594,2.208049261291504L54.96763122558594,2.208049261291504L54.96763122558594,2.206076261291504L55.39203122558594,1.4126649612915039L50.06695122558594,1.4126649612915039L50.065011225585934,1.410691261291504Z" fill="#FFFFFF" fill-opacity="1"/></g></g></g></svg>
\ No newline at end of file
diff --git a/fe/PC/src/layout/components/Sidebar/Logo.vue b/fe/PC/src/layout/components/Sidebar/Logo.vue
index 61548ab82..ded55d94b 100644
--- a/fe/PC/src/layout/components/Sidebar/Logo.vue
+++ b/fe/PC/src/layout/components/Sidebar/Logo.vue
@@ -14,9 +14,9 @@
 </template>
 
 <script>
-// todo:客户颜色
+// 客户颜色
 // import logo from "@/assets/img/menuLogo.png"
-import logo from "@/assets/img/menuLogo3.png"
+import logo from "@/assets/img/dylogo.svg"
 export default {
   name: 'SidebarLogo',
   props: {
@@ -27,7 +27,7 @@ export default {
   },
   data() {
     return {
-      title: '一汽富维东阳',
+      title: '富维东阳卓越工厂',
       logo: logo
     }
   }
@@ -58,10 +58,10 @@ export default {
     width: 100%;
 
     & .sidebar-logo {
-      width: 110px;
+      width: 65px;
       // height: 15px;
       vertical-align: middle;
-      margin-right: 12px;
+      margin-right: 8px;
     }
 
     & .sidebar-title {
diff --git a/fe/PC/src/layout/components/Sidebar/index.vue b/fe/PC/src/layout/components/Sidebar/index.vue
index e33aa38c8..2bef004f1 100644
--- a/fe/PC/src/layout/components/Sidebar/index.vue
+++ b/fe/PC/src/layout/components/Sidebar/index.vue
@@ -52,13 +52,16 @@ export default {
   }
 }
 </script>
-<style>
+<style lang="scss">
+@import "@/styles/variables.scss";
 /* 左侧选中菜单 */
 #app .el-submenu.is-active .el-menu-item.is-active,
-/* 左侧导航系统首页 */
+/* 左侧导航选中样式-系统首页 */
 #app .el-menu-item.is-active.submenu-title-noDropdown{ 
-  background-image: linear-gradient(to right, rgba(14,115,220,0.92) , rgba(14,115,220,0.07));
-  border-left: #389aff solid 2px;
+  // background-image: linear-gradient(to right, rgba(14,115,220,0.92) , rgba(14,115,220,0.07));
+  // border-left: #389aff solid 2px;
+  // 客户颜色
+  background-color: $customerBg !important;
   box-sizing: border-box;
 }
 </style>
diff --git a/fe/PC/src/styles/sidebar.scss b/fe/PC/src/styles/sidebar.scss
index 2a4136344..d479cc806 100644
--- a/fe/PC/src/styles/sidebar.scss
+++ b/fe/PC/src/styles/sidebar.scss
@@ -11,9 +11,7 @@
   .sidebar-container {
     transition: width 0.28s;
     width: $sideBarWidth !important;
-    // todo:客户颜色
     background-color: $menuBg;
-    // background-color: #bdd5f7;
     height: 100%;
     position: fixed;
     font-size: 0px;
@@ -58,6 +56,8 @@
 
     .svg-icon {
       margin-right: 16px;
+      /* 客户颜色 */
+      fill: #409EFF;
     }
 
     .sub-el-icon {
diff --git a/fe/PC/src/styles/variables.scss b/fe/PC/src/styles/variables.scss
index fa3849b10..c839acf1e 100644
--- a/fe/PC/src/styles/variables.scss
+++ b/fe/PC/src/styles/variables.scss
@@ -8,6 +8,8 @@ $tiffany: #4AB7BD;
 $yellow:#FEC171;
 $panGreen: #30B08F;
 
+// 客户颜色(主)
+$customerBg:#003a8e;
 // sidebar
 // $menuText:#bfcbd9;
 $menuText:#94a3b5;
@@ -15,12 +17,12 @@ $menuText:#94a3b5;
 $menuActiveText:#fff;
 $subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951
 
-$menuBg:#304156;
-// todo:客户颜色
-// $menuBg:rgb(0,58,142);
+// $menuBg:#304156;
+$menuBg:#2f435e;//客户颜色
 $menuHover:#263445;
 
-$subMenuBg:#1f2d3d;
+// $subMenuBg:#1f2d3d;
+$subMenuBg:#20324c;//客户颜色
 $subMenuHover:#001528;
 
 $sideBarWidth: 230px;
@@ -45,4 +47,5 @@ $navHeight:46px;
   subMenuBg: $subMenuBg;
   subMenuHover: $subMenuHover;
   sideBarWidth: $sideBarWidth;
+  customerBg: $customerBg;
 }