From 8f0327604fdabf1810fef232b901621f050fc197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Sat, 1 Oct 2022 15:04:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=8A=A8=E6=80=81=E5=A4=9A=E7=BA=A7=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yi-sqlsugar-dev.db | Bin 172032 -> 180224 bytes .../Yi.Framework.Model/MenuEntity.cs | 11 +- .../Yi.Framework.Model/SeedData/MenuSeed.cs | 104 ++++++++++++++++++ Yi.Vue3.X.RuoYi/src/permission.js | 2 +- 4 files changed, 115 insertions(+), 2 deletions(-) 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 1b1873d2a08cc24d6a49e1abcecb5e7cc417b98e..01c5beddbeda4bac04c828c0de093b4b05df451f 100644 GIT binary patch literal 180224 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 Mmvv0rWKPBZ2apHztN;K2 literal 172032 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 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*/