ruoyi
/
RuoYi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

描述修改

This commit is contained in:
RuoYi 2018-03-10 17:01:28 +08:00
parent 0ef5ccfe00
commit 684d37c1e8
10 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
README.md
View File

@ -18,6 +18,8 @@
2018/03/08 更新部分功能   1.0.3 新增用户管理(新增、删除、修改、查询、部门选择) 2018/03/08 更新部分功能   1.0.3 新增用户管理(新增、删除、修改、查询、部门选择)
2018/03/11 更新部分功能   1.0.4 新增角色管理(新增、删除、修改、查询、菜单选择)
## 内置功能 ## 内置功能
1. 用户管理：用户是系统操作者。 1. 用户管理：用户是系统操作者。
@ -59,7 +61,7 @@
* 框架：Bootstrap * 框架：Bootstrap
* 数据表格：Bootstrap Table * 数据表格：Bootstrap Table
* 客户端验证：JQuery Validation * 客户端验证：JQuery Validation
* 树结构控件：JQuery TreeGrid * 树结构控件：zTree
* 弹出层：layer * 弹出层：layer
3、平台 3、平台
@ -78,13 +80,17 @@
![操作日志](https://static.oschina.net/uploads/space/2018/0303/011028_xWoa_1438828.png) ![操作日志](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)
## 若依交流群 ## 若依交流群

0
src/main/resources/static/js/plugins/jqTreeGrid/jquery.treegrid.bootstrap3.js → src/main/resources/static/ajax/libs/jqTreeGrid/jquery.treegrid.bootstrap3.js
View File

2
src/main/resources/static/js/plugins/jqTreeGrid/jquery.treegrid.css → src/main/resources/static/ajax/libs/jqTreeGrid/jquery.treegrid.css
View File

@ -8,7 +8,7 @@
.treegrid-table{border:0 !important;margin-bottom:0} .treegrid-table{border:0 !important;margin-bottom:0}
.treegrid-table tbody {display:block;height:auto;overflow-y:auto;} .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-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-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; .treegrid-tbody td{border: 0 !important;border-left:1px solid #e7eaec !important;border-bottom:1px solid #e7eaec !important;overflow: hidden;
white-space: nowrap; white-space: nowrap;

0
src/main/resources/static/js/plugins/jqTreeGrid/jquery.treegrid.extension.js → src/main/resources/static/ajax/libs/jqTreeGrid/jquery.treegrid.extension.js
View File

0
src/main/resources/static/js/plugins/jqTreeGrid/jquery.treegrid.js → src/main/resources/static/ajax/libs/jqTreeGrid/jquery.treegrid.js
View File

0
src/main/resources/static/js/plugins/jqTreeGrid/jquery.treegrid.min.js → src/main/resources/static/ajax/libs/jqTreeGrid/jquery.treegrid.min.js vendored
View File

0
src/main/resources/static/js/plugins/jqTreeGrid/tree.table.js → src/main/resources/static/ajax/libs/jqTreeGrid/tree.table.js
View File

11
src/main/resources/static/ruoyi/system/role/edit.js
View File

@ -8,17 +8,6 @@ var setting = {
var menuTrees = $.fn.zTree.getZTreeObj(treeId); var menuTrees = $.fn.zTree.getZTreeObj(treeId);
menuTrees.checkNode(treeNode, !treeNode.checked, true, true); menuTrees.checkNode(treeNode, !treeNode.checked, true, true);
return false; 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(){ }, menuTrees, loadTree = function(){

13
src/main/resources/templates/include.html
View File

@ -9,8 +9,7 @@
<link href="/css/font-awesome.css" rel="stylesheet"> <link href="/css/font-awesome.css" rel="stylesheet">
<!-- bootstrap-table 表格插件样式 --> <!-- bootstrap-table 表格插件样式 -->
<link href="/ajax/libs/bootstrap-table/bootstrap-table.min.css" rel="stylesheet"> <link href="/ajax/libs/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
<link href="/css/plugins/jsTree/style.min.css" rel="stylesheet"> <link href="/ajax/libs/jqTreeGrid/jquery.treegrid.css" rel="stylesheet">
<link href="/css/plugins/jqTreeGrid/jquery.treegrid.css" rel="stylesheet">
<link href="/css/animate.css" rel="stylesheet"> <link href="/css/animate.css" rel="stylesheet">
<link href="/css/style.css" rel="stylesheet"> <link href="/css/style.css" rel="stylesheet">
</head> </head>
@ -24,13 +23,13 @@
<script src="/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script> <script src="/ajax/libs/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
<script src="/ajax/libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script> <script src="/ajax/libs/bootstrap-table/extensions/mobile/bootstrap-table-mobile.min.js"></script>
<script src="/ajax/libs/bootstrap-table/extensions/toolbar/bootstrap-table-toolbar.min.js"></script> <script src="/ajax/libs/bootstrap-table/extensions/toolbar/bootstrap-table-toolbar.min.js"></script>
<!-- jquery-validate 表单验证插件 -->
<script src="/ajax/libs/validate/jquery.validate.min.js"></script> <script src="/ajax/libs/validate/jquery.validate.min.js"></script>
<script src="/ajax/libs/validate/messages_zh.min.js"></script> <script src="/ajax/libs/validate/messages_zh.min.js"></script>
<script src="/js/plugins/jsTree/jstree.min.js"></script> <!-- jquery-validate 表单树插件 -->
<script src="/js/plugins/jqTreeGrid/jquery.treegrid.min.js"></script> <script src="/ajax/libs/jqTreeGrid/jquery.treegrid.min.js"></script>
<script src="/js/plugins/jqTreeGrid/jquery.treegrid.extension.js"></script> <script src="/ajax/libs/jqTreeGrid/jquery.treegrid.extension.js"></script>
<script src="/js/plugins/jqTreeGrid/jquery.treegrid.bootstrap3.js"></script> <script src="/ajax/libs/jqTreeGrid/jquery.treegrid.bootstrap3.js"></script>
<script src="/ajax/libs/layer/layer.min.js"></script> <script src="/ajax/libs/layer/layer.min.js"></script>
<script src="/ruoyi/js/common.js?v=1.0.1"></script> <script src="/ruoyi/js/common.js?v=1.0.1"></script>
<script src="http://tajs.qq.com/stats?sId=62048022"></script> <script src="http://tajs.qq.com/stats?sId=62048022"></script>

2
src/main/resources/templates/system/dept/dept.html
View File

@ -3,7 +3,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<head th:include="include :: header"></head> <head th:include="include :: header"></head>
<body class="gray-bg"> <body class="gray-bg">
<div class="wrapper wrapper-content "> <div class="wrapper wrapper-content">
<table class="bootstrap-table" data-mobile-responsive="true"> <table class="bootstrap-table" data-mobile-responsive="true">
</table> </table>
</div> </div>