diff --git a/README.md b/README.md index 3af18cabd..4608f9921 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,8 @@ 2018/03/08 更新部分功能   1.0.3 新增用户管理(新增、删除、修改、查询、部门选择) +2018/03/11 更新部分功能   1.0.4 新增角色管理(新增、删除、修改、查询、菜单选择) + ## 内置功能 1. 用户管理：用户是系统操作者。 @@ -59,7 +61,7 @@ * 框架：Bootstrap * 数据表格：Bootstrap Table * 客户端验证：JQuery Validation -* 树结构控件：JQuery TreeGrid +* 树结构控件：zTree * 弹出层：layer 3、平台 @@ -78,13 +80,17 @@ ![操作日志](https://static.oschina.net/uploads/space/2018/0303/011028_xWoa_1438828.png) -![部门管理](https://static.oschina.net/uploads/space/2018/0304/133113_AJe1_1438828.png) +![部门管理](https://static.oschina.net/uploads/space/2018/0310/164721_eMTZ_1438828.png) -![用户管理](https://static.oschina.net/uploads/space/2018/0307/222556_93xK_1438828.png) +![用户管理](https://static.oschina.net/uploads/space/2018/0310/164711_C31O_1438828.png) -![用户修改](https://static.oschina.net/uploads/space/2018/0307/223430_cSVy_1438828.png) +![用户修改](https://static.oschina.net/uploads/space/2018/0310/164705_GKde_1438828.png) -![部门选择](https://static.oschina.net/uploads/space/2018/0307/222938_AGLO_1438828.png) +![部门选择](https://static.oschina.net/uploads/space/2018/0310/164657_sNRt_1438828.png) + +![角色管理](https://static.oschina.net/uploads/space/2018/0310/164633_mmv5_1438828.png) + +![角色修改](https://static.oschina.net/uploads/space/2018/0310/164644_Jsre_1438828.png) ## 若依交流群 diff --git a/src/main/resources/static/js/plugins/jqTreeGrid/jquery.treegrid.bootstrap3.js b/src/main/resources/static/ajax/libs/jqTreeGrid/jquery.treegrid.bootstrap3.js similarity index 100% rename from src/main/resources/static/js/plugins/jqTreeGrid/jquery.treegrid.bootstrap3.js rename to src/main/resources/static/ajax/libs/jqTreeGrid/jquery.treegrid.bootstrap3.js diff --git a/src/main/resources/static/js/plugins/jqTreeGrid/jquery.treegrid.css b/src/main/resources/static/ajax/libs/jqTreeGrid/jquery.treegrid.css similarity index 85% rename from src/main/resources/static/js/plugins/jqTreeGrid/jquery.treegrid.css rename to src/main/resources/static/ajax/libs/jqTreeGrid/jquery.treegrid.css index 39a4b700f..6bbe14d5b 100644 --- a/src/main/resources/static/js/plugins/jqTreeGrid/jquery.treegrid.css +++ b/src/main/resources/static/ajax/libs/jqTreeGrid/jquery.treegrid.css @@ -8,7 +8,7 @@ .treegrid-table{border:0 !important;margin-bottom:0} .treegrid-table tbody {display:block;height:auto;overflow-y:auto;} .treegrid-table thead, .treegrid-table tbody tr {display:table;width:100%;table-layout:fixed;} -.treegrid-thead th{line-height:40px;border: 0 !important;background:#fff !important;border-radius: 4px;border-left:1px solid #e7eaec !important;border-bottom:2px solid #e7eaec !important;text-align: center;} +.treegrid-thead th{line-height:40px;border: 0 !important;background:#f3f3f4 !important;border-radius: 4px;border-left:1px solid #e7eaec !important;border-bottom:2px solid #e7eaec !important;text-align: center;} .treegrid-thead tr :first-child{border-left:0 !important} .treegrid-tbody td{border: 0 !important;border-left:1px solid #e7eaec !important;border-bottom:1px solid #e7eaec !important;overflow: hidden; white-space: nowrap; diff --git a/src/main/resources/static/js/plugins/jqTreeGrid/jquery.treegrid.extension.js b/src/main/resources/static/ajax/libs/jqTreeGrid/jquery.treegrid.extension.js similarity index 100% rename from src/main/resources/static/js/plugins/jqTreeGrid/jquery.treegrid.extension.js rename to src/main/resources/static/ajax/libs/jqTreeGrid/jquery.treegrid.extension.js diff --git a/src/main/resources/static/js/plugins/jqTreeGrid/jquery.treegrid.js b/src/main/resources/static/ajax/libs/jqTreeGrid/jquery.treegrid.js similarity index 100% rename from src/main/resources/static/js/plugins/jqTreeGrid/jquery.treegrid.js rename to src/main/resources/static/ajax/libs/jqTreeGrid/jquery.treegrid.js diff --git a/src/main/resources/static/js/plugins/jqTreeGrid/jquery.treegrid.min.js b/src/main/resources/static/ajax/libs/jqTreeGrid/jquery.treegrid.min.js similarity index 100% rename from src/main/resources/static/js/plugins/jqTreeGrid/jquery.treegrid.min.js rename to src/main/resources/static/ajax/libs/jqTreeGrid/jquery.treegrid.min.js diff --git a/src/main/resources/static/js/plugins/jqTreeGrid/tree.table.js b/src/main/resources/static/ajax/libs/jqTreeGrid/tree.table.js similarity index 100% rename from src/main/resources/static/js/plugins/jqTreeGrid/tree.table.js rename to src/main/resources/static/ajax/libs/jqTreeGrid/tree.table.js diff --git a/src/main/resources/static/ruoyi/system/role/edit.js b/src/main/resources/static/ruoyi/system/role/edit.js index 7b5a8a161..5e1483875 100644 --- a/src/main/resources/static/ruoyi/system/role/edit.js +++ b/src/main/resources/static/ruoyi/system/role/edit.js @@ -8,17 +8,6 @@ var setting = { var menuTrees = $.fn.zTree.getZTreeObj(treeId); menuTrees.checkNode(treeNode, !treeNode.checked, true, true); return false; - }, - onCheck: function (event, treeId, treeNode){ - var tid = treeNode.tId; - if(!treeNode.checked){ - $(".checkall[value="+treeId+"]").each(function(){ - if(this.checked){ - $(this).removeAttr("checked").iCheck('update'); - } - return false; - }); - } } } }, menuTrees, loadTree = function(){ diff --git a/src/main/resources/templates/include.html b/src/main/resources/templates/include.html index b59801a75..1f5a89362 100644 --- a/src/main/resources/templates/include.html +++ b/src/main/resources/templates/include.html @@ -9,8 +9,7 @@ - - + @@ -24,13 +23,13 @@ - + - - - - + + + + diff --git a/src/main/resources/templates/system/dept/dept.html b/src/main/resources/templates/system/dept/dept.html index b3a689ca6..d9137b730 100644 --- a/src/main/resources/templates/system/dept/dept.html +++ b/src/main/resources/templates/system/dept/dept.html @@ -3,7 +3,7 @@ -
+