diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java index 5fe0de5..4cdc5a9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysMenu.java @@ -100,6 +100,11 @@ public class SysMenu extends BaseEntity { */ private String remark; + /** + * 系统编码(区分菜单所属系统) + */ + private String systemCode; + /** * 父菜单名称 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java index 118c954..95d0ba9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysMenuBo.java @@ -110,4 +110,9 @@ public class SysMenuBo extends BaseEntity { */ private String remark; + /** + * 系统编码(区分菜单所属系统) + */ + private String systemCode; + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java index 5214a33..07ce713 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysMenuVo.java @@ -96,13 +96,18 @@ public class SysMenuVo implements Serializable { /** * 创建部门 */ - private Long createDept; + private String createDept; /** * 备注 */ private String remark; + /** + * 系统编码(区分菜单所属系统) + */ + private String systemCode; + /** * 创建时间 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java index fe2f357..62c1af0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java @@ -82,6 +82,7 @@ public class SysMenuServiceImpl implements ISysMenuService { .eq(StringUtils.isNotBlank(menu.getStatus()), SysMenu::getStatus, menu.getStatus()) .eq(StringUtils.isNotBlank(menu.getMenuType()), SysMenu::getMenuType, menu.getMenuType()) .eq(ObjectUtil.isNotNull(menu.getParentId()), SysMenu::getParentId, menu.getParentId()) + .eq(StringUtils.isNotBlank(menu.getSystemCode()), SysMenu::getSystemCode, menu.getSystemCode()) .orderByAsc(SysMenu::getParentId) .orderByAsc(SysMenu::getOrderNum)); return menuList; diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/api/system/menu/types.ts b/zdxt-web-client/zdxt-admin-plus-ui/src/api/system/menu/types.ts index ca19840..e128bd2 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/api/system/menu/types.ts +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/api/system/menu/types.ts @@ -23,6 +23,7 @@ export interface MenuQuery { keywords?: string; menuName?: string; status?: string; + systemCode?: string; } /** @@ -45,6 +46,7 @@ export interface MenuVO extends BaseEntity { status: string; icon: string; remark: string; + systemCode: string; } export interface MenuForm { @@ -66,4 +68,5 @@ export interface MenuForm { remark?: string; query?: string; perms?: string; + systemCode?: string; } diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/views/system/menu/index-groupby.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/views/system/menu/index-groupby.vue new file mode 100644 index 0000000..2d1f4f0 --- /dev/null +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/views/system/menu/index-groupby.vue @@ -0,0 +1,602 @@ + + + + + + + + 系统分类 + + + + + {{ item.label }} + + + + + + + + + + + + + + + + + + + + + 搜索 + 重置 + + + + + + + + + + + 新增 + + + 级联删除 + + + + + + + + + + + + + + + + + + + + + + + {{ scope.row.createTime }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 目录 + 菜单 + 按钮 + + + + + + + + + + + + + + + + + + + + + + + + + + 是否外链 + + + + 是 + 否 + + + + + + + + + + + 路由地址 + + + + + + + + + + + + + 组件路径 + + + + + + + + + + + + + + 权限字符 + + + + + + + + + + + + + 路由参数 + + + + + + + + + + + + 是否缓存 + + + + 缓存 + 不缓存 + + + + + + + + + + + 显示状态 + + + + {{ dict.label }} + + + + + + + + + + + 菜单状态 + + + + + {{ dict.label }} + + + + + + + + + + + + 激活路由 + + + + + + + + + + + + + + + + + + + + + + + + +