ruoyi/RuoYi
1
0
Fork 0
mirror of https://github.com/yangzongzhuan/RuoYi.git synced 2025-10-20 04:27:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
RuoYi
2018-06-15 15:25:59 +08:00
parent 81b1d1c219
commit 5f0fa0d42f
60 changed files with 169 additions and 671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/resources/templates/system/config/add.html
View File

@@ -47,7 +47,6 @@
</form>
</div>
<div th:include="include::footer"></div>
<script src="/ruoyi/system/config/add.js" th:src="@{/ruoyi/system/config/add.js}">
</script>
<script th:src="@{/ruoyi/system/config/add.js}"></script>
</body>
</html>

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

@@ -16,7 +16,7 @@
</table>
</div>
<div th:include="include :: footer"></div>
<script src="/ruoyi/system/config/config.js" th:src="@{/ruoyi/system/config/config.js}"></script>
<script th:src="@{/ruoyi/system/config/config.js}"></script>
<script th:inline="javascript">
var editFlag = [[${@permissionService.hasPermi('system:config:edit')}]];
var removeFlag = [[${@permissionService.hasPermi('system:config:remove')}]];

3
src/main/resources/templates/system/config/edit.html
View File

@@ -48,7 +48,6 @@
</form>
</div>
<div th:include="include::footer"></div>
<script src="/ruoyi/system/config/edit.js" th:src="@{/ruoyi/system/config/edit.js}">
</script>
<script th:src="@{/ruoyi/system/config/edit.js}"></script>
</body>
</html>

3
src/main/resources/templates/system/dept/add.html
View File

@@ -61,7 +61,6 @@
</form>
</div>
<div th:include="include::footer"></div>
<script src="/ruoyi/system/dept/add.js" th:src="@{/ruoyi/system/dept/add.js}">
</script>
<script th:src="@{/ruoyi/system/dept/add.js}"></script>
</body>
</html>

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

@@ -16,7 +16,7 @@
</table>
</div>
<div th:include="include :: footer"></div>
<script src="/ruoyi/system/dept/dept.js" th:src="@{/ruoyi/system/dept/dept.js}"></script>
<script th:src="@{/ruoyi/system/dept/dept.js}"></script>
<script th:inline="javascript">
var addFlag = [[${@permissionService.hasPermi('system:dept:add')}]];
var editFlag = [[${@permissionService.hasPermi('system:dept:edit')}]];

3
src/main/resources/templates/system/dept/edit.html
View File

@@ -61,7 +61,6 @@
</form>
</div>
<div th:include="include::footer"></div>
<script src="/ruoyi/system/dept/edit.js" th:src="@{/ruoyi/system/dept/edit.js}">
</script>
<script th:src="@{/ruoyi/system/dept/edit.js}"></script>
</body>
</html>

4
src/main/resources/templates/system/dept/tree.html
View File

@@ -30,8 +30,8 @@ button{font-family: "SimSun","Helvetica Neue",Helvetica,Arial;}
<a class="layui-layer-btn1" th:onclick="'javascript:layer_close()'"><i class="fa fa-close"></i> 关闭</a>
</div>
<div th:include="include::footer"></div>
<script src="/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js" th:src="@{/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js}"></script>
<script src="/ruoyi/system/dept/tree.js" th:src="@{/ruoyi/system/dept/tree.js}"></script>
<script th:src="@{/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js}"></script>
<script th:src="@{/ruoyi/system/dept/tree.js}"></script>
<script th:inline="javascript">
var treeName = [[${treeName}]];
$("#treeName").val(treeName);

2
src/main/resources/templates/system/dict/data/add.html
View File

@@ -69,6 +69,6 @@
</form>
</div>
<div th:include="include::footer"></div>
<script src="/ruoyi/system/dict/data/add.js" th:src="@{/ruoyi/system/dict/data/add.js}"></script>
<script th:src="@{/ruoyi/system/dict/data/add.js}"></script>
</body>
</html>

2
src/main/resources/templates/system/dict/data/data.html
View File

@@ -20,7 +20,7 @@
</table>
</div>
<div th:include="include :: footer"></div>
<script src="/ruoyi/system/dict/data/data.js" th:src="@{/ruoyi/system/dict/data/data.js}"></script>
<script th:src="@{/ruoyi/system/dict/data/data.js}"></script>
<script th:inline="javascript">
var editFlag = [[${@permissionService.hasPermi('system:dict:edit')}]];
var removeFlag = [[${@permissionService.hasPermi('system:dict:remove')}]];

2
src/main/resources/templates/system/dict/data/edit.html
View File

@@ -70,6 +70,6 @@
</form>
</div>
<div th:include="include::footer"></div>
<script src="/ruoyi/system/dict/data/edit.js" th:src="@{/ruoyi/system/dict/data/edit.js}"></script>
<script th:src="@{/ruoyi/system/dict/data/edit.js}"></script>
</body>
</html>

2
src/main/resources/templates/system/dict/type/add.html
View File

@@ -42,6 +42,6 @@
</form>
</div>
<div th:include="include::footer"></div>
<script src="/ruoyi/system/dict/type/add.js" th:src="@{/ruoyi/system/dict/type/add.js}"></script>
<script th:src="@{/ruoyi/system/dict/type/add.js}"></script>
</body>
</html>

2
src/main/resources/templates/system/dict/type/edit.html
View File

@@ -43,6 +43,6 @@
</form>
</div>
<div th:include="include::footer"></div>
<script src="/ruoyi/system/dict/type/edit.js" th:src="@{/ruoyi/system/dict/type/edit.js}"></script>
<script th:src="@{/ruoyi/system/dict/type/edit.js}"></script>
</body>
</html>

2
src/main/resources/templates/system/dict/type/type.html
View File

@@ -19,7 +19,7 @@
</table>
</div>
<div th:include="include :: footer"></div>
<script src="/ruoyi/system/dict/type/type.js" th:src="@{/ruoyi/system/dict/type/type.js}"></script>
<script th:src="@{/ruoyi/system/dict/type/type.js}"></script>
<script th:inline="javascript">
var editFlag = [[${@permissionService.hasPermi('system:dict:edit')}]];
var listFlag = [[${@permissionService.hasPermi('system:dict:list')}]];

4
src/main/resources/templates/system/menu/add.html
View File

@@ -74,8 +74,8 @@
</form>
</div>
<div th:include="include::footer"></div>
<script src="/ruoyi/system/menu/add.js" th:src="@{/ruoyi/system/menu/add.js}"></script>
<script src="/ajax/libs/iCheck/icheck.min.js" th:src="@{/ajax/libs/iCheck/icheck.min.js}"></script>
<script th:src="@{/ruoyi/system/menu/add.js}"></script>
<script th:src="@{/ajax/libs/iCheck/icheck.min.js}"></script>
<script>
$(document).ready(function(){$(".i-checks").iCheck({checkboxClass:"icheckbox_square-green",radioClass:"iradio_square-green",})});
</script>

4
src/main/resources/templates/system/menu/edit.html
View File

@@ -75,8 +75,8 @@
</form>
</div>
<div th:include="include::footer"></div>
<script src="/ruoyi/system/menu/edit.js" th:src="@{/ruoyi/system/menu/edit.js}"></script>
<script src="/ajax/libs/iCheck/icheck.min.js" th:src="@{/ajax/libs/iCheck/icheck.min.js}"></script>
<script th:src="@{/ruoyi/system/menu/edit.js}"></script>
<script th:src="@{/ajax/libs/iCheck/icheck.min.js}"></script>
<script>
$(document).ready(function(){$(".i-checks").iCheck({checkboxClass:"icheckbox_square-green",radioClass:"iradio_square-green",})});
</script>

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

@@ -15,7 +15,7 @@
</table>
</div>
<div th:include="include :: footer"></div>
<script src="/ruoyi/system/menu/menu.js" th:src="@{/ruoyi/system/menu/menu.js}"></script>
<script th:src="@{/ruoyi/system/menu/menu.js}"></script>
<script th:inline="javascript">
var addFlag = [[${@permissionService.hasPermi('system:menu:add')}]];
var editFlag = [[${@permissionService.hasPermi('system:menu:edit')}]];

4
src/main/resources/templates/system/menu/tree.html
View File

@@ -30,8 +30,8 @@ button{font-family: "SimSun","Helvetica Neue",Helvetica,Arial;}
<a class="layui-layer-btn1" th:onclick="'javascript:layer_close()'"><i class="fa fa-close"></i> 关闭</a>
</div>
<div th:include="include::footer"></div>
<script src="/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js" th:src="@{/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js}"></script>
<script src="/ruoyi/system/menu/tree.js" th:src="@{/ruoyi/system/menu/tree.js}"></script>
<script th:src="@{/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js}"></script>
<script th:src="@{/ruoyi/system/menu/tree.js}"></script>
<script th:inline="javascript">
var treeName = [[${treeName}]];
$("#treeName").val(treeName);

3
src/main/resources/templates/system/post/add.html
View File

@@ -47,7 +47,6 @@
</form>
</div>
<div th:include="include::footer"></div>
<script src="/ruoyi/system/post/add.js" th:src="@{/ruoyi/system/post/add.js}">
</script>
<script th:src="@{/ruoyi/system/post/add.js}"></script>
</body>
</html>

3
src/main/resources/templates/system/post/edit.html
View File

@@ -48,7 +48,6 @@
</form>
</div>
<div th:include="include::footer"></div>
<script src="/ruoyi/system/post/edit.js" th:src="@{/ruoyi/system/post/edit.js}">
</script>
<script th:src="@{/ruoyi/system/post/edit.js}"></script>
</body>
</html>

5
src/main/resources/templates/system/role/add.html
View File

@@ -57,8 +57,7 @@
</form>
</div>
<div th:include="include::footer"></div>
<script src="/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js" th:src="@{/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js}"></script>
<script src="/ruoyi/system/role/add.js" th:src="@{/ruoyi/system/role/add.js}">
</script>
<script th:src="@{/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js}"></script>
<script th:src="@{/ruoyi/system/role/add.js}"></script>
</body>
</html>

4
src/main/resources/templates/system/role/edit.html
View File

@@ -58,8 +58,8 @@
</form>
</div>
<div th:include="include::footer"></div>
<script src="/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js" th:src="@{/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js}"></script>
<script src="/ruoyi/system/role/edit.js" th:src="@{/ruoyi/system/role/edit.js}">
<script th:src="@{/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js}"></script>
<script th:src="@{/ruoyi/system/role/edit.js}">
</script>
</body>
</html>

77
src/main/resources/templates/system/role/role.html
View File

@@ -3,71 +3,22 @@
xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<meta charset="utf-8">
<head th:include="include :: header"></head>
<body class="white-bg">
<div class="row col-sm-12">
<div class="ibox float-e-margins">
<div class="ibox-title">
<h5>角色管理</h5>
<div class="ibox-tools">
<a href="javascript:add()" shiro:hasPermission="system:role:add">
<i class="fa fa-plus"></i>新增
</a>
<a href="javascript:batchRemove()" shiro:hasPermission="system:role:batchRemove">
<i class="fa fa-trash-o"></i>删除
</a>
</div>
</div>
<div class="ibox-content">
<div class="row">
<div class="col-xs-3">
<div class="input-group">
<div class="input-group-btn">
<button class="btn btn-white" type="button">角色名称</button>
</div>
<input type="text" class="form-control" id="roleName" placeholder="角色名称">
</div>
</div>
<div class="col-xs-3">
<div class="input-group">
<div class="input-group-btn">
<button class="btn btn-white" type="button">权限字符</button>
</div>
<input type="text" class="form-control" id="roleKey" placeholder="权限字符">
</div>
</div>
<div class="col-xs-3">
<div class="input-group">
<div class="input-group-btn">
<button class="btn btn-white" type="button">角色状态</button>
</div>
<select class="form-control input-s-sm inline" id="status" th:with="type=${@dictService.selectDictData('sys_normal_disable')}">
<option value="">请选择</option>
<option th:each="e : ${type}" th:text="${e['dictLabel']}" th:value="${e['dictValue']}"></option>
</select>
</div>
</div>
<div class="col-xs-3">
<div class="col-lg-12 col-sm-12">
<button type="button" class="btn btn-primary" onclick="search()" id=""><i class="fa fa-search"></i>&nbsp;搜索</button>
</div>
</div>
</div>
<div class="table-responsive">
<table class="bootstrap-table" data-mobile-responsive="true"
data-sort-name="role_sort" data-sort-order="asc">
</table>
</div>
</div>
</div>
<body class="gray-bg">
<div class="wrapper wrapper-content">
<div class="btn-group hidden-xs" id="toolbar" role="group">
<button class="btn btn-outline btn-default" onclick="javascript:add()" shiro:hasPermission="system:role:add">
<i class="fa fa-plus"></i> 新增
</button>
<button class="btn btn-outline btn-default" onclick="javascript:batchRemove()" shiro:hasPermission="system:role:batchRemove">
<i class="fa fa-trash-o"></i> 删除
</button>
</div>
<table class="bootstrap-table" data-mobile-responsive="true"
data-sort-name="role_sort" data-sort-order="asc">
</table>
</div>
<div th:include="include :: footer"></div>
<script src="../static/ruoyi/js/ry-table.js?v=1.1.6" th:src="@{/ruoyi/js/ry-table.js?v=1.1.6}"></script>
<script src="/ruoyi/system/role/role.js" th:src="@{/ruoyi/system/role/role.js}"></script>
<script th:src="@{/ruoyi/system/role/role.js}"></script>
<script th:inline="javascript">
var editFlag = [[${@permissionService.hasPermi('system:role:edit')}]];
var removeFlag = [[${@permissionService.hasPermi('system:role:remove')}]];

7
src/main/resources/templates/system/user/add.html
View File

@@ -92,10 +92,9 @@
</form>
</div>
<div th:include="include::footer"></div>
<script src="/ruoyi/system/user/add.js" th:src="@{/ruoyi/system/user/add.js}">
</script>
<script src="/ajax/libs/iCheck/icheck.min.js" th:src="@{/ajax/libs/iCheck/icheck.min.js}"></script>
<script src="/ajax/libs/select/select2.js" th:src="@{/ajax/libs/select/select2.js}"></script>
<script th:src="@{/ruoyi/system/user/add.js}"></script>
<script th:src="@{/ajax/libs/iCheck/icheck.min.js}"></script>
<script th:src="@{/ajax/libs/select/select2.js}"></script>
<script>
$(document).ready(function(){$(".i-checks").iCheck({checkboxClass:"icheckbox_square-green",radioClass:"iradio_square-green",})});
</script>

7
src/main/resources/templates/system/user/edit.html
View File

@@ -87,10 +87,9 @@
</form>
</div>
<div th:include="include::footer"></div>
<script src="/ruoyi/system/user/edit.js" th:src="@{/ruoyi/system/user/edit.js}">
</script>
<script src="/ajax/libs/iCheck/icheck.min.js" th:src="@{/ajax/libs/iCheck/icheck.min.js}"></script>
<script src="/ajax/libs/select/select2.js" th:src="@{/ajax/libs/select/select2.js}"></script>
<script th:src="@{/ruoyi/system/user/edit.js}"></script>
<script th:src="@{/ajax/libs/iCheck/icheck.min.js}"></script>
<script th:src="@{/ajax/libs/select/select2.js}"></script>
<script>
$(document).ready(function(){$(".i-checks").iCheck({checkboxClass:"icheckbox_square-green",radioClass:"iradio_square-green",})});
</script>

2
src/main/resources/templates/system/user/profile/avatar.html
View File

@@ -23,7 +23,7 @@
<div class="cropped"></div>
</div>
<div th:include="include::footer"></div>
<script src="/ajax/libs/cropbox/cropbox.js" th:src="@{/ajax/libs/cropbox/cropbox.js}"></script>
<script th:src="@{/ajax/libs/cropbox/cropbox.js}"></script>
<script type="text/javascript">
$(window).load(function() {
var options = {

47
src/main/resources/templates/system/user/user.html
View File

@@ -6,8 +6,6 @@
<link href="/ruoyi/css/RuoYi.css" th:href="@{/ruoyi/css/RuoYi.css}" rel="stylesheet"/>
<link href="/ajax/libs/jquery-layout/jquery.layout-latest.css" th:href="@{/ajax/libs/jquery-layout/jquery.layout-latest.css}" rel="stylesheet"/>
<link href="/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css" th:href="@{/ajax/libs/jquery-ztree/3.5/css/metro/zTreeStyle.css}" rel="stylesheet"/>
<!-- 文件输入框-->
<link href="/css/plugins/fileinput/fileinput.min.css" th:href="@{/css/plugins/fileinput/fileinput.min.css}" rel="stylesheet"/>
<body class="white-bg">
<div class="ui-layout-west">
@@ -36,10 +34,6 @@
<button class="btn btn-outline btn-default" onclick="javascript:add()" shiro:hasPermission="system:user:add">
<i class="fa fa-plus"></i> 新增
</button>
<button class="btn btn-outline btn-default" data-toggle="modal" data-target="#exampleModal" shiro:hasPermission="system:user:batchAdd">
<i class="fa fa-plus-square"></i> 批量新增
</button>
<button class="btn btn-outline btn-default" onclick="javascript:batchRemove()" shiro:hasPermission="system:user:batchRemove">
<i class="fa fa-trash-o"></i> 删除
</button>
@@ -50,46 +44,11 @@
data-sort-name="create_time" data-sort-order="desc">
</table>
</div>
<!-- Modal -->
<div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h3 class="modal-title" id="exampleModalLabel">导入Execl表</h3>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
<a class="btn" style="font-size:15px" href="../static/template/用户导入模板.xlsx" th:href="@{/template/用户导入模板.xlsx}">
用户导入模板.xlsx
</a>
</div>
<div class="modal-body">
<div class="file-loading">
<input id="uploadfile" name="uploadfile" multiple type="file" accept=".xls,.xlsx">
</div>
<div id="upload-file-errors"></div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">关闭</button>
<button type="button" class="btn btn-primary" onclick="javascript:batchAdd()">保存</button>
</div>
</div>
</div>
</div>
</div>
<div th:include="include :: footer"></div>
<script src="/ruoyi/system/user/user.js" th:src="@{/ruoyi/system/user/user.js}"></script>
<script src="/ajax/libs/jquery-layout/jquery.layout-latest.js" th:src="@{/ajax/libs/jquery-layout/jquery.layout-latest.js}"></script>
<script src="/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js" th:src="@{/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js}"></script>
<!-- 文件输入框-->
<script src="/js/plugins/fileinput/fileinput.min.js" th:src="@{/js/plugins/fileinput/fileinput.min.js}"></script>
<script src="/js/plugins/fileinput/locales/zh.js" th:src="@{/js/plugins/fileinput/locales/zh.js}"></script>
<script src="/js/plugins/fileinput/plugins/piexif.js" th:src="@{/js/plugins/fileinput/plugins/piexif.js}"></script>
<script src="/js/plugins/fileinput/plugins/purify.js" th:src="@{/js/plugins/fileinput/plugins/purify.js}"></script>
<script src="/js/plugins/fileinput/plugins/sortable.js" th:src="@{/js/plugins/fileinput/plugins/sortable.js}"></script>
<script th:src="@{/ruoyi/system/user/user.js}"></script>
<script th:src="@{/ajax/libs/jquery-layout/jquery.layout-latest.js}"></script>
<script th:src="@{/ajax/libs/jquery-ztree/3.5/js/jquery.ztree.all-3.5.js}"></script>
<script th:inline="javascript">
var editFlag = [[${@permissionService.hasPermi('system:user:edit')}]];
var removeFlag = [[${@permissionService.hasPermi('system:user:remove')}]];