Merge remote-tracking branch 'origin/master'

This commit is contained in:
zyn
2023-12-27 10:26:37 +08:00
2 changed files with 1472 additions and 1147 deletions
File diff suppressed because it is too large Load Diff
+3 -3
View File
@@ -5111,7 +5111,7 @@ const router = new Router({
* @date: 2019/04/10 19:48:00 * @date: 2019/04/10 19:48:00
*/ */
function hasRouterPermission (menuId) { function hasRouterPermission (menuId) {
let menuList = store.getters.getMenuList || [] const menuList = store.getters.getMenuList || []
let has = false let has = false
menuList.map((menu) => { menuList.map((menu) => {
if (menu.id === menuId) { if (menu.id === menuId) {
@@ -5128,9 +5128,9 @@ function hasRouterPermission (menuId) {
*/ */
function getRedirectPath (menuId) { function getRedirectPath (menuId) {
// 全部菜单 // 全部菜单
let menuList = store.getters.getMenuList || [] const menuList = store.getters.getMenuList || []
// 用当前菜单的Id去匹配,然后找到全部子路由 // 用当前菜单的Id去匹配,然后找到全部子路由
let childMenuList = [] const childMenuList = []
menuList.map((menu) => { menuList.map((menu) => {
if (menu.parentId === menuId) { if (menu.parentId === menuId) {
return childMenuList.push(menu) return childMenuList.push(menu)