From bc2cda03481cd62a1b04959d2653678053e60b18 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 31 五月 2024 18:23:35 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
admin/src/components/common/Menu.vue | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/admin/src/components/common/Menu.vue b/admin/src/components/common/Menu.vue
index b928666..0a5b41e 100644
--- a/admin/src/components/common/Menu.vue
+++ b/admin/src/components/common/Menu.vue
@@ -33,11 +33,11 @@
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
@@ -45,7 +45,7 @@
// 榛樿灞曞紑鐨勮彍鍗昳ndex
defaultOpeneds () {
// return this.menuData.list.map(menu => menu.index)
-
+
return [this.menuData.list[0].index]
}
},
@@ -55,20 +55,24 @@
const menuConfig = this.__getMenuConfig(menuIndex, 'index', this.menuData.list)
// 鎵句笉鍒伴〉闈�
try {
- require('@/views' + menuConfig.url)
+ 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 === 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) {
--
Gitblit v1.9.3