From 8ab31157536e116dba27e942a05a20e3caaa4812 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 28 八月 2024 09:22:52 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 admin/src/components/common/Menu.vue |   70 ++++++++++++++++++++--------------
 1 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/admin/src/components/common/Menu.vue b/admin/src/components/common/Menu.vue
index b928666..0b0df39 100644
--- a/admin/src/components/common/Menu.vue
+++ b/admin/src/components/common/Menu.vue
@@ -1,18 +1,23 @@
 <template>
-  <div class="menu" :class="{collapse: menuData.collapse}">
+  <div class="menu" :class="{ collapse: menuData.collapse }">
     <scrollbar>
       <el-menu
         ref="menu"
         :default-active="activeIndex"
-        text-color="#fff"
-        active-text-color="#fff"
+        text-color="#333333"
+        active-text-color="#207FF7"
         :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"/>
+        <MenuItems
+          v-for="menu in menuData.list"
+          :key="menu.index"
+          :menu="menu"
+          :is-root-menu="true"
+        />
       </el-menu>
     </scrollbar>
   </div>
@@ -28,50 +33,54 @@
   computed: {
     ...mapState(['menuData']),
     // 閫変腑鐨勮彍鍗昳ndex
-    activeIndex () {
+    activeIndex() {
       let path = this.$route.path
       if (path.endsWith('/')) {
         path = path.substring(0, path.length - 1)
       }
-      const menuConfig = this.__getMenuConfig(path, 'url', this.menuData.list)
+      const menuConfig = this.__getMenuConfig(path, 'index', this.menuData.list)
       if (menuConfig == null) {
         return null
       } else {
-        this.$store.commit("pushtags", menuConfig)
+        this.$store.commit('pushtags', menuConfig)
       }
       // console.log(menuConfig.index);
       return menuConfig.index
     },
     // 榛樿灞曞紑鐨勮彍鍗昳ndex
-    defaultOpeneds () {
+    defaultOpeneds() {
       // return this.menuData.list.map(menu => menu.index)
-      
+
       return [this.menuData.list[0].index]
     }
   },
   methods: {
     // 澶勭悊鑿滃崟閫変腑
-    handleSelect (menuIndex) {
+    handleSelect(menuIndex) {
       const menuConfig = this.__getMenuConfig(menuIndex, 'index', this.menuData.list)
       // 鎵句笉鍒伴〉闈�
       try {
         require('@/views' + menuConfig.url)
       } catch (e) {
         this.$tip.error('鏈壘鍒伴〉闈㈡枃浠禓/views' + menuConfig.url + '.vue锛岃妫�鏌ヨ彍鍗曡矾寰勬槸鍚︽纭�')
+        return
       }
       // 鐐瑰嚮褰撳墠鑿滃崟涓嶅仛澶勭悊
-      if (menuConfig.url === this.$route.path) {
+      if (menuConfig.url === this.$route.path && (menuConfig.params == null || menuConfig.params == undefined || menuConfig.params == '' || menuConfig.params === this.$route.query.param)) {
         return
       }
       if (menuConfig.url == null || menuConfig.url.trim().length === 0) {
         return
       }
-      
-      this.$router.push(menuConfig.url)
-      this.$store.commit("pushtags", menuConfig)
+      if (menuConfig.params != null && menuConfig.params != '') {
+        this.$router.push({ path: menuConfig.url, query: { index: menuConfig.index, param: menuConfig.params } })
+      } else {
+        this.$router.push(menuConfig.url)
+      }
+      this.$store.commit('pushtags', menuConfig)
     },
     // 鑾峰彇鑿滃崟閰嶇疆
-    __getMenuConfig (value, key, menus) {
+    __getMenuConfig(value, key, menus) {
       for (const menu of menus) {
         if (menu[key] === value) {
           return menu
@@ -103,46 +112,49 @@
 .el-menu {
   border-right: 0 !important;
   user-select: none;
-  background: $primary-color !important;
+  background: #fff !important;
   .el-menu-item {
-    background: $primary-color;
+    background: #fff;
+    height: 48px;
+    line-height: 48px;
     // 閫変腑鐘舵��
     &.is-active {
-      background: $primary-color-sel !important;
+      background: #eff5fe !important;
     }
     // 鎮诞
     &:hover {
-      background-color: $primary-color-hover;
+      background-color: #eff5fe;
     }
     &:focus {
-      background: $primary-color;
+      background: #eff5fe;
     }
   }
   // 瀛愯彍鍗�
   .el-submenu {
-    .el-submenu__title{
-      background-color: $primary-color;
+    .el-submenu__title {
+      background-color: #fff;
     }
     &.is-active {
-      .el-submenu__title{
-        background-color: $icon-background-color;
+      .el-submenu__title {
+        background-color: #fff;
       }
-      .el-menu .el-menu-item{
-        background-color: $icon-background-color;
+      .el-menu .el-menu-item {
+        background-color: #fff;
         // 鎮诞
         &:hover {
-          background-color: $icon-background-color;
+          background-color: #eff5fe;
         }
       }
     }
     // 鑿滃崟涓婁笅绠ご
     .el-submenu__title i {
-      color: #f7f7f7;
+      color: #979797;
+      font-size: 14px;
     }
   }
   // 鑿滃崟鍥炬爣
   i:not(.el-submenu__icon-arrow) {
-    color: #f7f7f7 !important;
+    color: #333333 !important;
     position: relative;
     top: -1px;
     // 鑷畾涔夊浘鏍�

--
Gitblit v1.9.3