From 9162d17b75667f648341d6537663c090fe6430cf Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Tue, 26 May 2020 18:03:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BD=92=E5=B1=9E=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=B7=A6=E4=BE=A7=E6=A0=91=E6=97=A0=E6=BB=9A=E5=8A=A8?= =?UTF-8?q?=E6=9D=A1,=E8=B0=83=E6=95=B4=E5=90=84=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/manage/controller/FontController.java | 4 +- .../webapp/WEB-INF/views/dictDir/dict.jsp | 14 +- .../webapp/WEB-INF/views/loginDir/index.jsp | 2 +- .../webapp/WEB-INF/views/menu/menuList.jsp | 18 +- .../WEB-INF/views/menu/rolePowerList.jsp | 2 +- .../WEB-INF/views/menu/userPowerList.jsp | 2 +- .../views/otherManage/backupDatabase.jsp | 206 ++++++++---------- .../webapp/WEB-INF/views/roleDir/role.jsp | 2 +- .../webapp/WEB-INF/views/userDir/user.jsp | 15 +- power-admin/src/main/webapp/static/js/dept.js | 2 +- power-admin/src/main/webapp/static/js/role.js | 2 +- power-admin/src/main/webapp/static/js/user.js | 2 +- 12 files changed, 120 insertions(+), 151 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 b96bfd1..5e44f50 100644 --- a/power-admin/src/main/java/com/manage/controller/FontController.java +++ b/power-admin/src/main/java/com/manage/controller/FontController.java @@ -559,7 +559,9 @@ public class FontController { String menuUrl = "/approve/updateApprove"; List users = userMapper.selectUserIdsWithApprove(menuUrl); for(Power_User user : users){ - WsPool.sendMessageToAll("emr_record_"+user.getUserId(),title+STR_SPLIT+content+STR_SPLIT+"emr_record"); + if(null != user) { + WsPool.sendMessageToAll("emr_record_" + user.getUserId(), title + STR_SPLIT + content + STR_SPLIT + "emr_record"); + } } }catch (Exception e){ e.printStackTrace(); diff --git a/power-admin/src/main/webapp/WEB-INF/views/dictDir/dict.jsp b/power-admin/src/main/webapp/WEB-INF/views/dictDir/dict.jsp index c3d6396..d5550f8 100644 --- a/power-admin/src/main/webapp/WEB-INF/views/dictDir/dict.jsp +++ b/power-admin/src/main/webapp/WEB-INF/views/dictDir/dict.jsp @@ -47,8 +47,11 @@ background-color: #fff!important; overflow: auto!important; font-size: 14rem!important; - height: 600px!important; - width: 300px!important; + height:75%!important; + width: 100%!important; + } + .zTreeDemo{ + margin-left:10%; } .treeBtn{ margin-top:-3%; @@ -81,7 +84,6 @@ .contentDiv{ float:left; width:69%; - height:100%; margin-left: 1%; background-color: #fff; overflow: auto; @@ -107,10 +109,8 @@ -
-
-
    -
    +
    +
        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 6385fb6..b85a035 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,7 +270,7 @@
        - +
        diff --git a/power-admin/src/main/webapp/WEB-INF/views/menu/menuList.jsp b/power-admin/src/main/webapp/WEB-INF/views/menu/menuList.jsp index 12e0196..4b3e55a 100644 --- a/power-admin/src/main/webapp/WEB-INF/views/menu/menuList.jsp +++ b/power-admin/src/main/webapp/WEB-INF/views/menu/menuList.jsp @@ -58,8 +58,15 @@ background-color: #fff!important; overflow: auto!important; font-size: 14rem!important; - height: 600px!important; - width: 300px!important; + height:75%!important; + width: 100%!important; + } + .zTreeDemo{ + margin-left:10%; + } + .treeBtn{ + margin-top:-3%; + padding-left:19%; } .iconSpan{ font-size:40px; @@ -87,12 +94,9 @@
      -
      -
      -
        -
        +
        +
          -
            diff --git a/power-admin/src/main/webapp/WEB-INF/views/menu/rolePowerList.jsp b/power-admin/src/main/webapp/WEB-INF/views/menu/rolePowerList.jsp index b542937..7a8db3d 100644 --- a/power-admin/src/main/webapp/WEB-INF/views/menu/rolePowerList.jsp +++ b/power-admin/src/main/webapp/WEB-INF/views/menu/rolePowerList.jsp @@ -41,7 +41,7 @@ background-color: #fff!important; overflow: auto!important; font-size: 14rem!important; - height:80%!important; + height:75%!important; width: 100%!important; } .zTreeDemo{ diff --git a/power-admin/src/main/webapp/WEB-INF/views/menu/userPowerList.jsp b/power-admin/src/main/webapp/WEB-INF/views/menu/userPowerList.jsp index 4ad500b..76edab3 100644 --- a/power-admin/src/main/webapp/WEB-INF/views/menu/userPowerList.jsp +++ b/power-admin/src/main/webapp/WEB-INF/views/menu/userPowerList.jsp @@ -41,7 +41,7 @@ background-color: #fff!important; overflow: auto!important; font-size: 14rem!important; - height:70%!important; + height:75%!important; width: 100%!important; } .zTreeDemo{ diff --git a/power-admin/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp b/power-admin/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp index e648b5a..3c3828d 100644 --- a/power-admin/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp +++ b/power-admin/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp @@ -5,7 +5,7 @@ - + 其他管理 @@ -23,158 +23,132 @@ margin-right: -15px; margin-bottom: -15px; } - .panel-heading{ + + .panel-heading { padding: 0 16px; } - hr{ - margin:0; + + hr { + margin: 0; } + /**搜索区*/ .searchDiv { margin-top: 5px; - width:100%; + width: 100%; height: 30px; } - .dateSearchDiv{ - width:29%; + + .dateSearchDiv { + width: 29%; } - .dateSearchInput{ - width:30%; - margin-left:2%; + + .dateSearchInput { + width: 30%; + margin-left: 2%; } - .dateLabelDiv{ + + .dateLabelDiv { width: 30%; text-align: right; } - .searchInput{ - width:19%; + + .searchInput { + width: 19%; margin-left: 2%; } - .searchElement{ + + .searchElement { width: 42%; } - .searchInputElement{ + + .searchInputElement { width: 58%; } - .labelDiv{ - padding-top:3px; + + .labelDiv { + padding-top: 3px; margin-left: 2%; } + /**查询按钮组*/ - .btnsDiv{ + .btnsDiv { width: 100%; - height:32px; + height: 32px; text-align: right; - padding-top:5px; - } - .pagination{ - margin:0!important; + padding-top: 5px; } + /**表格div*/ - .tableDiv{ - margin-left:14px; - margin-top: -9px!important; + .tableDiv { + margin-left: 14px; + margin-top: -9px !important; } -
            - <%--
            --%> - <%--
            --%> - <%----%> - <%--日志管理--%> - <%----%> - <%--
            --%> - <%--
            --%> -
            -

            其他管理/日志管理

            -
            - - <%-- - -
            -
            -

            数据库备份

            +
            +
            +

            其他管理/日志管理

            +
            +
            +
            +
            + +
            +
            +
            -
            --%> -
            -
            -
            - -
            -
            - -
            -
            -
            -
            - -
            -
            - -
            -
            -
            -
            - -
            -
            - -
            -
            -
            -
            - -
            -
            - -
            -
            - -
            -
            -
            - -
            -
            -
            - - - - - - -
            - -
            - -
            +
            +
            +
            +
            +
            +
            - <%--
            -

            通知管理

            +
            +
            +
            +
            -
            --%> +
            + +
            +
            +
            +
            + +
            +
            + +
            +
            + +
            +
            +
            + +
            +
            +
            + + + + + + +
            + +
            + +
            +
            +
            diff --git a/power-admin/src/main/webapp/WEB-INF/views/roleDir/role.jsp b/power-admin/src/main/webapp/WEB-INF/views/roleDir/role.jsp index ec54e14..b652e12 100644 --- a/power-admin/src/main/webapp/WEB-INF/views/roleDir/role.jsp +++ b/power-admin/src/main/webapp/WEB-INF/views/roleDir/role.jsp @@ -82,7 +82,7 @@

            基本管理/角色管理

            -
            +
            diff --git a/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp b/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp index 41467a7..bb42997 100644 --- a/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp +++ b/power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp @@ -108,10 +108,10 @@
            -
            + <%--
            -
            +
            --%>
            @@ -217,19 +217,8 @@ - <%-- --%>
            - <%----%>