diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db index 1b1873d2..01c5bedd 100644 Binary files a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db differ diff --git a/Yi.Framework.Net6/Yi.Framework.Model/MenuEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/MenuEntity.cs index 446470f0..e13518dd 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/MenuEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/MenuEntity.cs @@ -38,7 +38,16 @@ namespace Yi.Framework.Model.Models { r.Redirect = "noRedirect"; r.AlwaysShow = true; - r.Component = "Layout"; + + //判断是否为最顶层的路由 + if (0==m.ParentId) + { + r.Component = "Layout"; + } + else + { + r.Component = "ParentView"; + } } if (m.MenuType == MenuTypeEnum.Menu.GetHashCode()) { diff --git a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/MenuSeed.cs b/Yi.Framework.Net6/Yi.Framework.Model/SeedData/MenuSeed.cs index de7b0767..19c53633 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/SeedData/MenuSeed.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/SeedData/MenuSeed.cs @@ -553,6 +553,110 @@ namespace Yi.Framework.Model.SeedData Entitys.Add(configRemove); + + + //日志管理 + MenuEntity log = new MenuEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + MenuName = "日志管理", + MenuType = MenuTypeEnum.Catalogue.GetHashCode(), + Router = "log", + IsShow = true, + IsLink = false, + MenuIcon = "log", + OrderNum = 100, + ParentId = system.Id, + IsDeleted = false + }; + Entitys.Add(log); + + //操作日志 + MenuEntity operationLog = new MenuEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + MenuName = "操作日志", + PermissionCode = "monitor:operlog:list", + MenuType = MenuTypeEnum.Menu.GetHashCode(), + Router = "operlog", + IsShow = true, + IsLink = false, + IsCache = true, + Component = "monitor/operlog/index", + MenuIcon = "form", + OrderNum = 100, + ParentId = log.Id, + IsDeleted = false + }; + Entitys.Add(operationLog); + + MenuEntity operationLogQuery = new MenuEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + MenuName = "操作查询", + PermissionCode = "monitor:operlog:query", + MenuType = MenuTypeEnum.Component.GetHashCode(), + OrderNum = 100, + ParentId = operationLog.Id, + IsDeleted = false + }; + Entitys.Add(operationLogQuery); + + MenuEntity operationLogRemove = new MenuEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + MenuName = "操作删除", + PermissionCode = "monitor:operlog:remove", + MenuType = MenuTypeEnum.Component.GetHashCode(), + OrderNum = 100, + ParentId = operationLog.Id, + IsDeleted = false + }; + Entitys.Add(operationLogRemove); + + + //登录日志 + MenuEntity loginLog = new MenuEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + MenuName = "登录日志", + PermissionCode = "monitor:logininfor:list", + MenuType = MenuTypeEnum.Menu.GetHashCode(), + Router = "logininfor", + IsShow = true, + IsLink = false, + IsCache = true, + Component = "monitor/logininfor/index", + MenuIcon = "logininfor", + OrderNum = 100, + ParentId = log.Id, + IsDeleted = false + }; + Entitys.Add(loginLog); + + MenuEntity loginLogQuery = new MenuEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + MenuName = "登录查询", + PermissionCode = "monitor:logininfor:query", + MenuType = MenuTypeEnum.Component.GetHashCode(), + OrderNum = 100, + ParentId = loginLog.Id, + IsDeleted = false + }; + Entitys.Add(loginLogQuery); + + MenuEntity loginLogRemove = new MenuEntity() + { + Id = SnowFlakeSingle.Instance.NextId(), + MenuName = "登录删除", + PermissionCode = "monitor:logininfor:remove", + MenuType = MenuTypeEnum.Component.GetHashCode(), + OrderNum = 100, + ParentId = loginLog.Id, + IsDeleted = false + }; + Entitys.Add(loginLogRemove); return Entitys; } } diff --git a/Yi.Vue3.X.RuoYi/src/permission.js b/Yi.Vue3.X.RuoYi/src/permission.js index 5492dda1..e6e0bdc6 100644 --- a/Yi.Vue3.X.RuoYi/src/permission.js +++ b/Yi.Vue3.X.RuoYi/src/permission.js @@ -15,7 +15,7 @@ const whiteList = ['/login', '/auth-redirect', '/bind', '/register']; router.beforeEach((to, from, next) => { NProgress.start() - +console.log(router.getRoutes() ,"123") if (getToken()) { to.meta.title && useSettingsStore().setTitle(to.meta.title) /* has token*/