From c93c13d1cfe288d431109ae1eafd7a9fc6d58746 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 13 六月 2023 10:23:17 +0800
Subject: [PATCH] 1.递交

---
 src/layout/components/Sidebar/index.vue |   60 +++++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index eb4bfcf..99e2f7e 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -3,16 +3,23 @@
 
     <logo v-if="showLogo" :collapse="isCollapse" />
 
-    <div v-if="$store.state.app.sidebar.opened" class="layoutLogo" />
+    <div
+      v-if="$store.state.app.sidebar.opened&&!$store.state.settings.menuIsHorizontal"
+      :class="{'leftBackgroundColorValue':!$store.state.settings.leftBackgroundColorValue,
+               'leftBackgroundLogo':!$store.state.settings.leftBackgroundColorValue}"
+      class="layoutLogo"
+    />
+
     <el-scrollbar wrap-class="scrollbar-wrapper" class="scrollbarWrapperClass">
       <el-menu
+        v-if="!$store.state.settings.menuIsHorizontal"
         :default-active="activeMenu"
         :collapse="isCollapse"
-        :background-color="variables.menuBg"
-        :text-color="variables.menuText"
-        :unique-opened="false"
+        :background-color="!$store.state.settings.leftBackgroundColorValue?'#f8f8fa':variables.menuBg"
+        :text-color="!$store.state.settings.leftBackgroundColorValue?`rgb(48, 65, 86,0.8)`:variables.menuText"
         :active-text-color="variables.menuActiveText"
         :collapse-transition="false"
+        :unique-opened="false"
         mode="vertical"
       >
         <!--        <sidebar-item-->
@@ -32,10 +39,10 @@
 
       </el-menu>
     </el-scrollbar>
-    <div style="position: absolute;bottom: 20px;left: 30px;">
+    <div v-if="!$store.state.settings.menuIsHorizontal" style="position: absolute;bottom: 20px;left: 30px;">
       <div>
         <el-button v-if="$store.state.app.sidebar.opened" type="text" style="font-size: 14px;cursor: pointer">
-          鏂板嚡杩埗閫燰1.0.01
+          鏂板嚡杩埗閫燰1.5.31
         </el-button>
         <!--        <el-button type="text"><a href="http://www.ykxkd.com/" target="_blank">鏂板嚡杩埗閫燰1.0.01</a></el-button>-->
       </div>
@@ -76,15 +83,31 @@
       if (meta.activeMenu) {
         return meta.activeMenu
       }
+
+      if (path.indexOf('kanbanManager') !== -1) { // 褰撶偣鍑绘櫤鎱х湅鏉跨殑鏃跺��
+        const url = this.$router.resolve({
+          path
+          // query: { id: 123 }
+        })
+
+        const t = url.href.split('/')
+        // console.log(t, 't')
+        window.open('#/' + t[2], '_blank')
+      }
+
       return path
     },
     showLogo() {
       return this.$store.state.settings.sidebarLogo
     },
     variables() {
-      console.log(variables, 2333)
+      // console.log(variables, 2333)
       // 鍏堣緭鍑鸿繖涓獀ariables鍊�  鐒跺悗淇敼鍏跺睘鎬у��
       variables.menuActiveText = this.$store.state.settings.theme
+      // console.log(!this.$store.state.settings.menuIsHorizontal && !this.$store.state.settings.leftBackgroundColorValue, 1)
+      if ((!this.$store.state.settings.menuIsHorizontal && !this.$store.state.settings.leftBackgroundColorValue)) {
+        variables.menuHover = '#eee'
+      }
 
       return variables
     },
@@ -104,7 +127,15 @@
   left: 5px;
   width: 200px;
   height: 90px;
-  background: url("../../../assets/images/layout_logo.png") no-repeat;
+  background: url("../../../assets/images/layout_3.png") no-repeat;
+}
+
+.leftBackgroundLogo {
+  background: url("../../../assets/images/layout_2.png") no-repeat;
+}
+
+.leftBackgroundColorValue {
+  background-color: #f8f8fa;
 }
 
 .scrollbarWrapperClass {
@@ -119,7 +150,6 @@
 
 .el-button--text:focus {
   color: white;
-
 }
 
 //#app .sidebar-container .el-submenu .el-menu-item {
@@ -127,9 +157,9 @@
 //}
 
 //#app .sidebar-container .el-submenu .el-menu-item.is-active {
-  //background: $main_color !important;
-  //color: #fff !important;
-  //font-weight: bolder !important;
+//background: $main_color !important;
+//color: #fff !important;
+//font-weight: bolder !important;
 //}
 //
 //#app .sidebar-container .el-submenu .el-menu-item:hover {
@@ -166,7 +196,7 @@
   cursor: default;
 }
 
-.el-menu {
-  background-color: #213145 !important;
-}
+//.el-menu {
+//  background-color: #213145 !important;
+//}
 </style>

--
Gitblit v1.9.3