From 50f83b2714ff78a9627b2a71b08fae3115948f6f Mon Sep 17 00:00:00 2001 From: icewint Date: Thu, 29 Jan 2026 13:07:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=AF=8F=E4=B8=AA=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E7=9A=84=E6=9D=83=E9=99=90=E5=A2=9E=E5=88=A0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/AppBaseMenuPermissionMapper.java | 9 + .../mapper/impl/AppBaseMenuPermissionDao.java | 93 +++++++++++ .../intf/AppBaseMenuPermissionService.java | 15 ++ .../dto/serve/menu/AddBaseMenuPermission.java | 37 +++++ .../model/po/app/AppBaseMenuPermission.java | 57 +++++++ .../model/vo/serve/menu/MenuPermissionVo.java | 29 ++++ .../serve/controller/app/MenuController.java | 32 ++++ .../wcs/serve/service/impl/MenuService.java | 92 ++++++++++- .../wcs/serve/service/intf/IMenuService.java | 6 + wcs_web/src/api/menu.ts | 14 ++ .../page/menu/MenuDetailComponent.vue | 156 ++++++++++++++---- .../src/model/table/IBaseMenuPermissionVo.ts | 13 ++ wcs_web/src/views/tabs/MenuManage.vue | 14 +- 13 files changed, 525 insertions(+), 42 deletions(-) create mode 100644 wcs/src/main/java/org/wcs/mapper/AppBaseMenuPermissionMapper.java create mode 100644 wcs/src/main/java/org/wcs/mapper/impl/AppBaseMenuPermissionDao.java create mode 100644 wcs/src/main/java/org/wcs/mapper/intf/AppBaseMenuPermissionService.java create mode 100644 wcs/src/main/java/org/wcs/model/dto/serve/menu/AddBaseMenuPermission.java create mode 100644 wcs/src/main/java/org/wcs/model/po/app/AppBaseMenuPermission.java create mode 100644 wcs/src/main/java/org/wcs/model/vo/serve/menu/MenuPermissionVo.java create mode 100644 wcs_web/src/model/table/IBaseMenuPermissionVo.ts diff --git a/wcs/src/main/java/org/wcs/mapper/AppBaseMenuPermissionMapper.java b/wcs/src/main/java/org/wcs/mapper/AppBaseMenuPermissionMapper.java new file mode 100644 index 0000000..74d32b8 --- /dev/null +++ b/wcs/src/main/java/org/wcs/mapper/AppBaseMenuPermissionMapper.java @@ -0,0 +1,9 @@ +package org.wcs.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; +import org.wcs.model.po.app.AppBaseMenuPermission; + +@Mapper +public interface AppBaseMenuPermissionMapper extends BaseMapper { +} diff --git a/wcs/src/main/java/org/wcs/mapper/impl/AppBaseMenuPermissionDao.java b/wcs/src/main/java/org/wcs/mapper/impl/AppBaseMenuPermissionDao.java new file mode 100644 index 0000000..7ff7605 --- /dev/null +++ b/wcs/src/main/java/org/wcs/mapper/impl/AppBaseMenuPermissionDao.java @@ -0,0 +1,93 @@ +package org.wcs.mapper.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; +import org.wcs.mapper.AppBaseMenuPermissionMapper; +import org.wcs.mapper.intf.AppBaseMenuPermissionService; +import org.wcs.model.bo.db.DataBaseActionResult; +import org.wcs.model.po.app.AppBaseMenuPermission; + +import java.util.List; + +/** + * 菜单权限数据访问层 + */ +@Service +public class AppBaseMenuPermissionDao extends ServiceImpl implements AppBaseMenuPermissionService { + + /** + * 根据菜单ID查询菜单权限 + * @param menuId 菜单ID + * @return 菜单权限列表 + */ + @Override + public List queryByMenuId(String menuId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(menuId != null, AppBaseMenuPermission::getMenuId, menuId); + queryWrapper.orderByAsc(AppBaseMenuPermission::getPermissionId); + try{ + return super.list(queryWrapper); + } catch (Exception e) { + return null; + } + } + + /** + * 根据权限ID查询菜单权限 + * @param permissionId 权限ID + * @return 菜单权限列表 + */ + @Override + public List queryByPermissionId(String permissionId) { + if(permissionId == null) { + return null; + } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(AppBaseMenuPermission::getPermissionId, permissionId); + queryWrapper.orderByAsc(AppBaseMenuPermission::getPermissionId); + try{ + return super.list(queryWrapper); + } catch (Exception e) { + return null; + } + } + + /** + * 添加菜单权限 + * @param appBaseMenuPermission 菜单权限 + * @return 添加结果 + */ + @Override + public DataBaseActionResult insert(AppBaseMenuPermission appBaseMenuPermission) { + if(appBaseMenuPermission == null) { + return new DataBaseActionResult<>(0, new Exception("菜单权限不能为空")); + } + try { + int insert = super.baseMapper.insert(appBaseMenuPermission); + return new DataBaseActionResult<>(insert); + } catch (Exception e) { + return new DataBaseActionResult<>(0, e); + } + } + + /** + * 根据权限ID删除菜单权限 + * @param permissionId 权限ID + * @return 删除结果 + */ + @Override + public DataBaseActionResult deleteByPermissionId(String permissionId) { + if(permissionId == null) { + return new DataBaseActionResult<>(0, new Exception("菜单ID不能为空")); + } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(AppBaseMenuPermission::getPermissionId, permissionId); + try { + int delete = super.baseMapper.delete(queryWrapper); + return new DataBaseActionResult<>(delete); + } catch (Exception e) { + return new DataBaseActionResult<>(0, e); + } + } +} diff --git a/wcs/src/main/java/org/wcs/mapper/intf/AppBaseMenuPermissionService.java b/wcs/src/main/java/org/wcs/mapper/intf/AppBaseMenuPermissionService.java new file mode 100644 index 0000000..0681f8b --- /dev/null +++ b/wcs/src/main/java/org/wcs/mapper/intf/AppBaseMenuPermissionService.java @@ -0,0 +1,15 @@ +package org.wcs.mapper.intf; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.wcs.model.bo.db.DataBaseActionResult; +import org.wcs.model.po.app.AppBaseMenuPermission; + +import java.util.List; + +public interface AppBaseMenuPermissionService extends IService { + + List queryByMenuId(String menuId); // 查询菜单权限 + List queryByPermissionId(String permissionId); // 查询权限菜单 + DataBaseActionResult insert(AppBaseMenuPermission appBaseMenuPermission); // 添加菜单权限 + DataBaseActionResult deleteByPermissionId(String permissionId); +} diff --git a/wcs/src/main/java/org/wcs/model/dto/serve/menu/AddBaseMenuPermission.java b/wcs/src/main/java/org/wcs/model/dto/serve/menu/AddBaseMenuPermission.java new file mode 100644 index 0000000..6395407 --- /dev/null +++ b/wcs/src/main/java/org/wcs/model/dto/serve/menu/AddBaseMenuPermission.java @@ -0,0 +1,37 @@ +package org.wcs.model.dto.serve.menu; + +import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; + +/** + * 添加菜单权限参数 + */ +@Getter +@Setter +public class AddBaseMenuPermission { + + /** + * 菜单ID + */ + @NotBlank(message = "菜单ID不能为空") + @JsonProperty("menuId") + private String menuId; + + /** + * 权限ID + */ + @NotBlank(message = "权限ID不能为空") + @JsonProperty("permissionId") + private String permissionId; + + /** + * 权限名称 + */ + @NotBlank(message = "权限名称不能为空") + @JsonProperty("permissionName") + private String permissionName; + + +} diff --git a/wcs/src/main/java/org/wcs/model/po/app/AppBaseMenuPermission.java b/wcs/src/main/java/org/wcs/model/po/app/AppBaseMenuPermission.java new file mode 100644 index 0000000..5f2a5b5 --- /dev/null +++ b/wcs/src/main/java/org/wcs/model/po/app/AppBaseMenuPermission.java @@ -0,0 +1,57 @@ +package org.wcs.model.po.app; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; + +/** + * 菜单对应的基础权限 + */ +@Getter +@Setter +@TableName("t_app_base_menu_permission") +public class AppBaseMenuPermission { + + /** + * 权限id + */ + @TableId("permission_id") + private String permissionId; + + /** + * 权限名称 + */ + @TableField("permission_name") + private String permissionName; + + /** + * 菜单id + */ + @TableField("menu_id") + private String menuId; + + /** + * 创建人 + */ + @TableField("create_person") + private String createPerson; + + /** + * 创建时间 + */ + @TableField("create_time") + private LocalDateTime createTime; + + /** + * 备注 + */ + @TableField("remark") + private String remark; + + + +} diff --git a/wcs/src/main/java/org/wcs/model/vo/serve/menu/MenuPermissionVo.java b/wcs/src/main/java/org/wcs/model/vo/serve/menu/MenuPermissionVo.java new file mode 100644 index 0000000..8142afc --- /dev/null +++ b/wcs/src/main/java/org/wcs/model/vo/serve/menu/MenuPermissionVo.java @@ -0,0 +1,29 @@ +package org.wcs.model.vo.serve.menu; + +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class MenuPermissionVo { + + /** + * 权限ID + */ + @JsonProperty("permissionId") + private String permissionId; + + /** + * 权限名称 + */ + @JsonProperty("permissionName") + private String permissionName; + + /** + * 菜单ID + */ + @JsonProperty("menuId") + private String menuId; + +} diff --git a/wcs/src/main/java/org/wcs/serve/controller/app/MenuController.java b/wcs/src/main/java/org/wcs/serve/controller/app/MenuController.java index aaa49c1..11653a2 100644 --- a/wcs/src/main/java/org/wcs/serve/controller/app/MenuController.java +++ b/wcs/src/main/java/org/wcs/serve/controller/app/MenuController.java @@ -4,11 +4,13 @@ import jakarta.validation.constraints.NotBlank; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import org.wcs.model.dto.serve.menu.AddBaseMenuPermission; import org.wcs.model.dto.serve.menu.AddMenuReq; import org.wcs.model.dto.serve.menu.UpdateMenuReq; import org.wcs.model.vo.serve.AppServeDataResponse; import org.wcs.model.dto.serve.menu.QueryMenuReq; import org.wcs.model.vo.serve.AppServeResponse; +import org.wcs.model.vo.serve.menu.MenuPermissionVo; import org.wcs.model.vo.serve.menu.QueryMenuResp; import org.wcs.serve.service.intf.IMenuService; @@ -65,5 +67,35 @@ public class MenuController { return menuService.updateMenu(updateMenuReq); } + /** + * 查询菜单权限 + * @param menuId 菜单ID + * @return 菜单权限列表 + */ + @GetMapping("/queryMenuPermission/{menuId}") + public AppServeDataResponse> queryMenuPermission(@PathVariable String menuId) { + return menuService.queryMenuPermission(menuId); + } + + /** + * 添加菜单权限 + * @param request 添加的数据 + * @return 添加结果 + */ + @PostMapping("/addBaseMenuPermission") + public AppServeResponse addBaseMenuPermission(@RequestBody @Validated AddBaseMenuPermission request) { + return menuService.addBaseMenuPermission(request); + } + + /** + * 删除菜单权限 + * @param permissionId 菜单权限ID + * @return 删除结果 + */ + @DeleteMapping("/deleteBaseMenuPermission/{permissionId}") + public AppServeResponse deleteBaseMenuPermission(@PathVariable @NotBlank(message = "权限ID不能为空") String permissionId) { + return menuService.deleteBaseMenuPermission(permissionId); + } + } diff --git a/wcs/src/main/java/org/wcs/serve/service/impl/MenuService.java b/wcs/src/main/java/org/wcs/serve/service/impl/MenuService.java index c9bb0af..3357377 100644 --- a/wcs/src/main/java/org/wcs/serve/service/impl/MenuService.java +++ b/wcs/src/main/java/org/wcs/serve/service/impl/MenuService.java @@ -1,27 +1,36 @@ package org.wcs.serve.service.impl; +import cn.dev33.satoken.stp.StpUtil; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.wcs.factory.AppServeResponseFactory; +import org.wcs.mapper.intf.AppBaseMenuPermissionService; import org.wcs.mapper.intf.AppBaseMenuService; +import org.wcs.model.dto.serve.menu.AddBaseMenuPermission; import org.wcs.model.dto.serve.menu.AddMenuReq; import org.wcs.model.dto.serve.menu.UpdateMenuReq; +import org.wcs.model.po.app.AppBaseMenuPermission; import org.wcs.model.vo.serve.AppServeDataResponse; import org.wcs.model.dto.serve.menu.QueryMenuReq; import org.wcs.model.vo.serve.AppServeResponse; +import org.wcs.model.vo.serve.menu.MenuPermissionVo; import org.wcs.model.vo.serve.menu.QueryMenuResp; import org.wcs.model.po.app.AppBaseMenu; import org.wcs.serve.service.intf.IMenuService; import org.wcs.utils.AppBeanUtils; +import org.wcs.utils.AppStringUtils; import java.time.LocalDateTime; import java.util.List; +@Slf4j @Service @RequiredArgsConstructor public class MenuService implements IMenuService { - private final AppBaseMenuService appBaseMenuService; + private final AppBaseMenuService appBaseMenuService; // 菜单服务 + private final AppBaseMenuPermissionService baseMenuPermissionService; // 菜单权限服务 /** * 查询菜单 @@ -130,4 +139,85 @@ public class MenuService implements IMenuService { } return AppServeResponseFactory.success(String.format("更新成功，更新了 %d 条记录", updateResult)); } + + /** + * 查询菜单权限 + * @param menuId 菜单ID + * @return 菜单权限列表 + */ + @Override + public AppServeDataResponse> queryMenuPermission(String menuId) { + List menuPermissions = baseMenuPermissionService.queryByMenuId(menuId); + if(menuPermissions == null) { + return AppServeResponseFactory.internalServerError("数据服务异常", null); + } + List returnMenuPermissions = AppBeanUtils.copyListProperties(menuPermissions, MenuPermissionVo::new); + return AppServeResponseFactory.success("查询成功", returnMenuPermissions); + } + + /** + * 添加菜单权限 + * @param request 添加参数 + * @return 添加结果 + */ + @Override + public AppServeResponse addBaseMenuPermission(AddBaseMenuPermission request) { + Object userIdObj = StpUtil.getLoginId(); + if(userIdObj == null) { + return AppServeResponseFactory.unauthorized("用户未登录"); + } + String userId = userIdObj.toString(); + if(AppStringUtils.isEmpty(userId)) { + return AppServeResponseFactory.unauthorized("未检索到您的登录信息或者登录已经过期"); + } + List menuPermissions = baseMenuPermissionService.queryByPermissionId(request.getPermissionId()); + if(menuPermissions == null) { + return AppServeResponseFactory.fail("数据服务异常"); + } + if(!menuPermissions.isEmpty()) { + return AppServeResponseFactory.fail(String.format("权限ID %s 已存在", request.getPermissionId())); + } + AppBaseMenuPermission insertValue = new AppBaseMenuPermission(); + insertValue.setPermissionId(request.getPermissionId()); + insertValue.setPermissionName(request.getPermissionName()); + insertValue.setMenuId(request.getMenuId()); + insertValue.setCreatePerson(userId); + insertValue.setCreateTime(LocalDateTime.now()); + Integer insertCount = baseMenuPermissionService.insert(insertValue).result(); + if(insertCount > 0) { + log.info("用户：{} 添加菜单权限基础资料成功，数据：{}", userId, AppStringUtils.objectToString(insertValue)); + return AppServeResponseFactory.success(String.format("添加成功，添加了 %d 条记录", insertCount)); + } + return AppServeResponseFactory.fail("数据服务异常"); + } + + /** + * 删除菜单权限 + * @param permissionId 菜单权限ID + * @return 删除结果 + */ + @Override + public AppServeResponse deleteBaseMenuPermission(String permissionId) { + Object userIdObj = StpUtil.getLoginId(); + if(userIdObj == null) { + return AppServeResponseFactory.unauthorized("用户未登录"); + } + String userId = userIdObj.toString(); + if(AppStringUtils.isEmpty(userId)) { + return AppServeResponseFactory.unauthorized("未检索到您的登录信息或者登录已经过期"); + } + List menuPermissions = baseMenuPermissionService.queryByPermissionId(permissionId); + if(menuPermissions == null) { + return AppServeResponseFactory.fail("数据服务异常"); + } + if(menuPermissions.isEmpty()) { + return AppServeResponseFactory.fail(String.format("权限ID %s 不存在", permissionId)); + } + Integer deleteCount = baseMenuPermissionService.deleteByPermissionId(permissionId).result(); + if(deleteCount > 0) { + log.info("用户：{} 删除菜单权限基础资料成功，权限ID：{}", userId, menuPermissions); + return AppServeResponseFactory.success(String.format("删除成功，删除了 %d 条记录", deleteCount)); + } + return AppServeResponseFactory.fail("数据服务异常"); + } } diff --git a/wcs/src/main/java/org/wcs/serve/service/intf/IMenuService.java b/wcs/src/main/java/org/wcs/serve/service/intf/IMenuService.java index 0fb543a..d5cef80 100644 --- a/wcs/src/main/java/org/wcs/serve/service/intf/IMenuService.java +++ b/wcs/src/main/java/org/wcs/serve/service/intf/IMenuService.java @@ -1,10 +1,12 @@ package org.wcs.serve.service.intf; +import org.wcs.model.dto.serve.menu.AddBaseMenuPermission; import org.wcs.model.dto.serve.menu.AddMenuReq; import org.wcs.model.dto.serve.menu.UpdateMenuReq; import org.wcs.model.vo.serve.AppServeDataResponse; import org.wcs.model.dto.serve.menu.QueryMenuReq; import org.wcs.model.vo.serve.AppServeResponse; +import org.wcs.model.vo.serve.menu.MenuPermissionVo; import org.wcs.model.vo.serve.menu.QueryMenuResp; import java.util.List; @@ -14,4 +16,8 @@ public interface IMenuService { AppServeResponse addMenu(AddMenuReq addMenuReq); // 添加菜单 AppServeResponse deleteMenu(String menuId); // 删除菜单 AppServeResponse updateMenu(UpdateMenuReq updateMenuReq); // 更新菜单 + + AppServeDataResponse> queryMenuPermission(String menuId); // 查询菜单权限 + AppServeResponse addBaseMenuPermission(AddBaseMenuPermission request); // 添加菜单权限 + AppServeResponse deleteBaseMenuPermission(String permissionId); // 删除菜单权限 } diff --git a/wcs_web/src/api/menu.ts b/wcs_web/src/api/menu.ts index ed7b4f3..a09f47b 100644 --- a/wcs_web/src/api/menu.ts +++ b/wcs_web/src/api/menu.ts @@ -1,6 +1,7 @@ import axiosInstance from "@/api/axios.ts"; import type {IMenuSearch} from "@/interface/page/menu/IMenuSearch.ts"; import type {IAppBaseMenu} from "@/model/table/IAppBaseMenu.ts"; +import type {IBaseMenuPermissionVo} from "@/model/table/IBaseMenuPermissionVo.ts"; export default class MenuApi { // 模糊查询菜单 @@ -19,4 +20,17 @@ export default class MenuApi { static updateMenu(menuData: IAppBaseMenu) { return axiosInstance.post("/app/menu/updateMenu", menuData); } + // 查询菜单权限 + static queryMenuPermission(menuId?: string) { + return axiosInstance.get("/app/menu/queryMenuPermission/" + menuId); + } + // 添加菜单权限 + static addMenuPermission(menuPermissionData: IBaseMenuPermissionVo) { + return axiosInstance.post("/app/menu/addBaseMenuPermission", menuPermissionData); + } + // 删除菜单权限 + static deleteMenuPermission(permissionId: string) { + return axiosInstance.delete("/app/menu/deleteBaseMenuPermission/" + permissionId); + } + } \ No newline at end of file diff --git a/wcs_web/src/components/page/menu/MenuDetailComponent.vue b/wcs_web/src/components/page/menu/MenuDetailComponent.vue index 847875c..cc2439e 100644 --- a/wcs_web/src/components/page/menu/MenuDetailComponent.vue +++ b/wcs_web/src/components/page/menu/MenuDetailComponent.vue @@ -6,6 +6,9 @@ import MessageUtils from "@/utils/MessageUtils.ts"; import MenuApi from "@/api/menu.ts"; import type {AppServeResponse} from "@/interface/api/AppServeResponse.ts"; import {AppServeResponseCodeEnum} from "@/constant/enums/AppServeResponseCodeEnum.ts"; +import StringUtils from "@/utils/StringUtils.ts"; +import type {IBaseMenuPermissionVo} from "@/model/table/IBaseMenuPermissionVo.ts"; +import type {AppServeDataResponse} from "@/interface/api/AppServeDataResponse.ts"; const modelValue = defineModel('modelValue', {required: true, default: false}); const props = defineProps(['formData']); @@ -14,6 +17,8 @@ const close = () => { modelValue.value = false; } const formData = computed(() => props.formData); +const permissionList = ref([]); // 子权限列表 +const addPermissionData = ref({}); // 新增子权限数据 // 删除菜单 const deleteMenu = () => { @@ -50,46 +55,129 @@ const save = () => { loading.close(); }) }).catch(() => {}); +} +// 查询子权限 +const queryMenuPermission = () => { + const loading = MessageUtils.loading("正在请求服务器"); + MenuApi.queryMenuPermission(formData.value.menuId).then(res => { + const response = JSON.parse(JSON.stringify(res.data)) as AppServeDataResponse; + if(response.code == AppServeResponseCodeEnum.SUCCESS && response.data != undefined) { + permissionList.value = response.data; + MessageUtils.successMessage('查询成功'); + return; + } + MessageUtils.warningMessageBox(response.msg, '警告'); + }).catch(() => {}).finally(() => { + loading.close(); + }) +} +// 新增子权限 +const addMenuPermission = () => { + MessageUtils.confirmMessageBox('确定添加上述数据？','添加确认').then(()=>{ + const loading = MessageUtils.loading(); + addPermissionData.value.menuId = formData.value.menuId; + MenuApi.addMenuPermission(addPermissionData.value).then(res => { + const response = JSON.parse(JSON.stringify(res.data)) as AppServeResponse; + if(response.code == AppServeResponseCodeEnum.SUCCESS) { + MessageUtils.successMessage("添加成功"); + queryMenuPermission(); + return; + } + MessageUtils.warningMessageBox(response.msg, '警告'); + }).catch(() => {}).finally(() => { + loading.close(); + }) + }).catch(()=>{}); +} +// 删除子权限 +const deleteMenuPermission = (row: any) => { + MessageUtils.confirmMessageBox('确定要删除这个子权限吗？','删除二次确认').then(()=>{ + const loading = MessageUtils.loading(); + MenuApi.deleteMenuPermission(row.permissionId).then(res => { + const response = JSON.parse(JSON.stringify(res.data)) as AppServeResponse; + if(response.code == AppServeResponseCodeEnum.SUCCESS) { + MessageUtils.successMessage("删除成功"); + queryMenuPermission(); + return; + } + MessageUtils.warningMessageBox(response.msg, '警告'); + }).catch(() => {}).finally(() => { + loading.close(); + }) + }).catch(()=>{}); } diff --git a/wcs_web/src/model/table/IBaseMenuPermissionVo.ts b/wcs_web/src/model/table/IBaseMenuPermissionVo.ts new file mode 100644 index 0000000..09daf06 --- /dev/null +++ b/wcs_web/src/model/table/IBaseMenuPermissionVo.ts @@ -0,0 +1,13 @@ +/** + * 界面子权限 + */ +export interface IBaseMenuPermissionVo { + + // 权限id + permissionId?: string; + // 权限名称 + permissionName?: string; + // 菜单id + menuId?: string; + +} \ No newline at end of file diff --git a/wcs_web/src/views/tabs/MenuManage.vue b/wcs_web/src/views/tabs/MenuManage.vue index 9ab2dfb..727f845 100644 --- a/wcs_web/src/views/tabs/MenuManage.vue +++ b/wcs_web/src/views/tabs/MenuManage.vue @@ -98,8 +98,8 @@ const handleEdit = (index: number, row: any) => { - - + + - + - - - - + + + +