From 5060ec9ef8db47aff6848cc46c5688b8a3a3dfea Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Fri, 22 May 2020 14:57:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8D=E5=90=8C=E5=8C=BB?= =?UTF-8?q?=E9=99=A2=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E5=86=99=E6=AD=BB=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=97=A0=E6=9D=83=E9=99=90=E3=80=82=E4=BF=AE=E6=94=B9=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=A1=A8=E6=A0=BC=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/manage/controller/FontController.java | 1 - .../com/manage/controller/PageController.java | 4 +-- .../com/manage/controller/UserController.java | 1 - .../webapp/WEB-INF/views/loginDir/index.jsp | 3 +- power-admin/src/main/webapp/static/js/dept.js | 2 +- power-admin/src/main/webapp/static/js/menu.js | 30 +++++++++++++++++++ power-admin/src/main/webapp/static/js/role.js | 2 +- power-admin/src/main/webapp/static/js/user.js | 2 +- .../com/manage/service/webSocket/WsPool.java | 1 - 9 files changed, 36 insertions(+), 10 deletions(-) diff --git a/power-admin/src/main/java/com/manage/controller/FontController.java b/power-admin/src/main/java/com/manage/controller/FontController.java index d8f7a4b..b96bfd1 100644 --- a/power-admin/src/main/java/com/manage/controller/FontController.java +++ b/power-admin/src/main/java/com/manage/controller/FontController.java @@ -541,7 +541,6 @@ public class FontController { * @Description: 给病案管理系统发送审批通知 * @Param applyType 申请类型 * @Param count 新的待审批份数 - * @Param count 新的待审批份数 * @Returnt Msg * @Author: 曾文和 * @CreateDate: 2020-04-24 diff --git a/power-admin/src/main/java/com/manage/controller/PageController.java b/power-admin/src/main/java/com/manage/controller/PageController.java index ef56ed0..cb5badf 100644 --- a/power-admin/src/main/java/com/manage/controller/PageController.java +++ b/power-admin/src/main/java/com/manage/controller/PageController.java @@ -83,7 +83,7 @@ public class PageController { model.addAttribute("WEBSOCKET_URLHEAD",WEBSOCKET_URLHEAD); model.addAttribute("STR_SPLIT",STR_SPLIT); CacheManager.addExcCount("noExc"); - Set menus = new TreeSet<>(); + /*Set menus = new TreeSet<>(); List list = null; if (user.getRoleId().equals(0) || user.getRoleId().equals(-100)) { list = powerMenuService.queryAllPowerMenu(null,user.getRoleId()); @@ -97,7 +97,7 @@ public class PageController { } } } - user.setMenus(menus); + user.setMenus(menus);*/ return "/loginDir/index"; } diff --git a/power-admin/src/main/java/com/manage/controller/UserController.java b/power-admin/src/main/java/com/manage/controller/UserController.java index ee2a2fb..b050041 100644 --- a/power-admin/src/main/java/com/manage/controller/UserController.java +++ b/power-admin/src/main/java/com/manage/controller/UserController.java @@ -51,7 +51,6 @@ public class UserController { private Power_DeptService deptService; @Autowired private Power_User_DictMapper userDictMapper; - @RequiresPermissions(value="/user/pageUI") @ResponseBody @RequestMapping("/pageList") public PageHelper list(Power_UserVo powerUser, HttpServletRequest request){ diff --git a/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp b/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp index 352c3e1..6385fb6 100644 --- a/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp +++ b/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp @@ -270,8 +270,7 @@
- +
diff --git a/power-admin/src/main/webapp/static/js/dept.js b/power-admin/src/main/webapp/static/js/dept.js index 41eafb2..746777c 100644 --- a/power-admin/src/main/webapp/static/js/dept.js +++ b/power-admin/src/main/webapp/static/js/dept.js @@ -389,7 +389,7 @@ $('#queryBtn').click(function () { }) //获取table的高度 function getHeight() { - return $(window).height() * 0.8; + return $(window).height() * 0.7; } //刷新表格 function refresh() { diff --git a/power-admin/src/main/webapp/static/js/menu.js b/power-admin/src/main/webapp/static/js/menu.js index 211f425..f921dac 100644 --- a/power-admin/src/main/webapp/static/js/menu.js +++ b/power-admin/src/main/webapp/static/js/menu.js @@ -49,6 +49,12 @@ function menuRoleFun(menuArr) { var menuLiArr=[]; /*菜单*/ if(menuArr!=null){ + //定义首个链接 + var firstLink = ''; + //定义是否有/user/pageUI权限 + var userPageUI = ''; + //定义是否有/user/pageUI1权限 + var userPageUI1 = ''; /*系统目录menuArr.length*/ for (var i = 0; i < menuArr.length; i++) { if ( menuArr[i].menuUrl == null || menuArr[i].menuUrl == '' || menuArr[i].menuUrl == '#') { @@ -57,6 +63,18 @@ function menuRoleFun(menuArr) { for (var j = 0; j < menuArr.length; j++) { if ((menuArr[j].menuUrl != null || menuArr[j].menuUrl != '')&&menuArr[i].menuId==menuArr[j].parentId) { menuLiArr.push(menuArr[j]); + //接收第一个链接 + if(firstLink == ''){ + firstLink = menuArr[j].menuUrl; + } + //接收通用的用户列表链接 + if(userPageUI == '' && menuArr[j].menuUrl == '/user/pageUI'){ + userPageUI = menuArr[j].menuUrl; + } + //接收脐血库的用户列表链接 + if(userPageUI1 == '' && menuArr[j].menuUrl == '/user/pageUI1'){ + userPageUI1 = menuArr[j].menuUrl; + } } } if (menuLiArr != null) { @@ -69,6 +87,18 @@ function menuRoleFun(menuArr) { muluArr.push(mulu); } } + //动态修改iframe首页链接 + var url = ''; + if(userPageUI != ''){ + url = userPageUI; + }else if(userPageUI1 != ''){ + url = userPageUI1; + }else{ + url = firstLink; + } + if(url != ''){ + $("#iFrame1").prop("src",path+url); + } } return muluArr; } diff --git a/power-admin/src/main/webapp/static/js/role.js b/power-admin/src/main/webapp/static/js/role.js index ed0d42f..d5d8b55 100644 --- a/power-admin/src/main/webapp/static/js/role.js +++ b/power-admin/src/main/webapp/static/js/role.js @@ -317,7 +317,7 @@ $('#queryBtn').click(function () { }) //获取table的高度 function getHeight() { - return $(window).height() * 0.8; + return $(window).height() * 0.7; } //刷新表格 function refresh() { diff --git a/power-admin/src/main/webapp/static/js/user.js b/power-admin/src/main/webapp/static/js/user.js index b0e272f..67a64a7 100644 --- a/power-admin/src/main/webapp/static/js/user.js +++ b/power-admin/src/main/webapp/static/js/user.js @@ -472,7 +472,7 @@ function saveForm(){ } //获取table的高度 function getHeight() { - return $(window).height() * 0.8; + return $(window).height() * 0.7; } //刷新表格 function refresh() { diff --git a/power-service/src/main/java/com/manage/service/webSocket/WsPool.java b/power-service/src/main/java/com/manage/service/webSocket/WsPool.java index 673af35..1d5222c 100644 --- a/power-service/src/main/java/com/manage/service/webSocket/WsPool.java +++ b/power-service/src/main/java/com/manage/service/webSocket/WsPool.java @@ -41,7 +41,6 @@ public class WsPool { * */ public static void addUser(String userName, WebSocket conn) { - wsUserMap.put(conn, userName); // 添加连接 }