From 05cf6324ea8322164d99a3d3d4161fe374534b3b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期日, 18 二月 2024 15:22:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 platform/src/components/common/Menu.vue |   55 ++++++++++++++-----------------------------------------
 1 files changed, 14 insertions(+), 41 deletions(-)

diff --git a/platform/src/components/common/Menu.vue b/platform/src/components/common/Menu.vue
index 6411793..b928666 100644
--- a/platform/src/components/common/Menu.vue
+++ b/platform/src/components/common/Menu.vue
@@ -1,9 +1,5 @@
 <template>
   <div class="menu" :class="{collapse: menuData.collapse}">
-    <div class="logo">
-      <div><img src="@/assets/logo.png"></div>
-      <h1 :class="{ hidden: menuData.collapse }">浜戞槗淇濆鎴锋湇鍔＄郴缁�</h1>
-    </div>
     <scrollbar>
       <el-menu
         ref="menu"
@@ -13,6 +9,7 @@
         :collapse="menuData.collapse"
         :default-openeds="defaultOpeneds"
         :collapse-transition="false"
+        unique-opened
         @select="handleSelect"
       >
         <MenuItems v-for="menu in menuData.list" :key="menu.index" :menu="menu" :is-root-menu="true"/>
@@ -39,12 +36,17 @@
       const menuConfig = this.__getMenuConfig(path, 'url', this.menuData.list)
       if (menuConfig == null) {
         return null
+      } else {
+        this.$store.commit("pushtags", menuConfig)
       }
+      // console.log(menuConfig.index);
       return menuConfig.index
     },
     // 榛樿灞曞紑鐨勮彍鍗昳ndex
     defaultOpeneds () {
-      return this.menuData.list.map(menu => menu.index)
+      // return this.menuData.list.map(menu => menu.index)
+      
+      return [this.menuData.list[0].index]
     }
   },
   methods: {
@@ -64,7 +66,9 @@
       if (menuConfig.url == null || menuConfig.url.trim().length === 0) {
         return
       }
+      
       this.$router.push(menuConfig.url)
+      this.$store.commit("pushtags", menuConfig)
     },
     // 鑾峰彇鑿滃崟閰嶇疆
     __getMenuConfig (value, key, menus) {
@@ -91,37 +95,6 @@
   height: 100%;
   display: flex;
   flex-direction: column;
-  // LOGO
-  .logo {
-    height: 60px;
-    flex-shrink: 0;
-    line-height: 60px;
-    overflow: hidden;
-    display: flex;
-    background: $primary-color - 20;
-    padding: 0 16px;
-    & > div {
-      width: 32px;
-      flex-shrink: 0;
-      margin-right: 12px;
-      img {
-        width: 100%;
-        flex-shrink: 0;
-        vertical-align: middle;
-        position: relative;
-        top: -2px;
-      }
-    }
-    h1 {
-      font-size: 16px;
-      font-weight: 500;
-      transition: opacity ease .3s;
-      overflow: hidden;
-      &.hidden {
-        opacity: 0;
-      }
-    }
-  }
 }
 </style>
 <style lang="scss">
@@ -135,11 +108,11 @@
     background: $primary-color;
     // 閫変腑鐘舵��
     &.is-active {
-      background: $primary-color - 40 !important;
+      background: $primary-color-sel !important;
     }
     // 鎮诞
     &:hover {
-      background-color: $primary-color - 12;
+      background-color: $primary-color-hover;
     }
     &:focus {
       background: $primary-color;
@@ -152,13 +125,13 @@
     }
     &.is-active {
       .el-submenu__title{
-        background-color: $primary-color - 20;
+        background-color: $icon-background-color;
       }
       .el-menu .el-menu-item{
-        background-color: $primary-color - 20;
+        background-color: $icon-background-color;
         // 鎮诞
         &:hover {
-          background-color: $primary-color - 30;
+          background-color: $icon-background-color;
         }
       }
     }

--
Gitblit v1.9.3