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

优化

This commit is contained in:
zhujunjieit 2018-12-24 23:03:39 +08:00
parent 9421179880
commit e62bd05ceb
8 changed files with 50 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-train/src/main/java/com/ruoyi/train/course/controller/TrainCourseSectionController.java
View File

@ -30,15 +30,16 @@ import com.ruoyi.common.utils.ExcelUtil;
@RequestMapping("/train/trainCourseSection") @RequestMapping("/train/trainCourseSection")
public class TrainCourseSectionController extends BaseController public class TrainCourseSectionController extends BaseController
{ {
private String prefix = "train/trainCourseSection"; private String prefix = "train/course/trainCourseSection";
@Autowired @Autowired
private ITrainCourseSectionService trainCourseSectionService; private ITrainCourseSectionService trainCourseSectionService;
@RequiresPermissions("train:trainCourseSection:view") @RequiresPermissions("train:trainCourseSection:view")
@GetMapping() @GetMapping()
public String trainCourseSection() public String trainCourseSection(String trainCourseId, ModelMap mmap)
{ {
mmap.put("courseId", trainCourseId);
return prefix + "/trainCourseSection"; return prefix + "/trainCourseSection";
} }

10
ruoyi-train/src/main/resources/templates/train/course/trainCourse/trainCourse.html
View File

@ -126,6 +126,7 @@
formatter: function(value, row, index) { formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="courseSection(\'' + row.id + '\')"><i class="fa fa-edit"></i>课程内容</a> ');
actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>'); actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
return actions.join(''); return actions.join('');
} }
@ -167,9 +168,14 @@
}); });
/*用户管理-部门*/ /*用户管理-部门*/
function category() { function category() {
var url = ctx + "system/dept"; var url ="/train/course/category";
createMenuItem(url, "部门管理"); createMenuItem(url, "分类管理");
}
function courseSection(id) {
var url = "/train/trainCourseSection?trainCourseId="+id;
createMenuItem(url, "课程内容");
} }
</script> </script>
</body> </body>
</html> </html>

32
ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/add.html
View File

@ -24,37 +24,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">删除标志（0代表存在 2代表删除）：</label> <label class="col-sm-3 control-label">章节介绍：</label>
<div class="col-sm-8">
<input id="delFlag" name="delFlag" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">创建者：</label>
<div class="col-sm-8">
<input id="createBy" name="createBy" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">创建时间：</label>
<div class="col-sm-8">
<input id="createTime" name="createTime" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">更新者：</label>
<div class="col-sm-8">
<input id="updateBy" name="updateBy" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">更新时间：</label>
<div class="col-sm-8">
<input id="updateTime" name="updateTime" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input id="remark" name="remark" class="form-control" type="text"> <input id="remark" name="remark" class="form-control" type="text">
</div> </div>

32
ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/edit.html
View File

@ -25,37 +25,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">删除标志（0代表存在 2代表删除）：</label> <label class="col-sm-3 control-label">章节介绍：</label>
<div class="col-sm-8">
<input id="delFlag" name="delFlag" th:field="*{delFlag}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">创建者：</label>
<div class="col-sm-8">
<input id="createBy" name="createBy" th:field="*{createBy}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">创建时间：</label>
<div class="col-sm-8">
<input id="createTime" name="createTime" th:field="*{createTime}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">更新者：</label>
<div class="col-sm-8">
<input id="updateBy" name="updateBy" th:field="*{updateBy}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">更新时间：</label>
<div class="col-sm-8">
<input id="updateTime" name="updateTime" th:field="*{updateTime}" class="form-control" type="text">
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">备注：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input id="remark" name="remark" th:field="*{remark}" class="form-control" type="text"> <input id="remark" name="remark" th:field="*{remark}" class="form-control" type="text">
</div> </div>

80
ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/trainCourseSection.html
View File

@ -2,50 +2,37 @@
<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro"> <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<meta charset="utf-8"> <meta charset="utf-8">
<head th:include="include :: header"></head> <head th:include="include :: header"></head>
<link th:href="@{/ajax/libs/jquery-layout/jquery.layout-latest.css}" rel="stylesheet"/>
<body class="gray-bg"> <body class="gray-bg">
<div class="ui-layout-west">
<div class="container-div"> <div class="main-content">
<div class="box box-main">
<div class="box-header">
<div class="box-title">
<i class="fa icon-grid"></i> 课程章节
</div>
<div class="box-tools pull-right">
<a type="button" class="btn btn-box-tool menuItem" href="#" onclick="category()" title="管理分类"><i class="fa fa-edit"></i></a>
<button type="button" class="btn btn-box-tool" id="btnExpand" title="展开" style="display:none;"><i class="fa fa-chevron-up"></i></button>
<button type="button" class="btn btn-box-tool" id="btnCollapse" title="折叠"><i class="fa fa-chevron-down"></i></button>
<button type="button" class="btn btn-box-tool" id="btnRefresh" title="刷新分类"><i class="fa fa-refresh"></i></button>
</div>
</div>
<div class="ui-layout-content">
<div id="tree" class="ztree"></div>
</div>
</div>
</div>
</div>
<div class="container-div ui-layout-center">
<div class="row"> <div class="row">
<div class="col-sm-12 search-collapse"> <div class="col-sm-12 search-collapse">
<form id="formId"> <form id="formId">
<div class="select-list"> <div class="select-list">
<ul> <ul>
<li>
课程ID：<input type="text" name="trainCourseId"/>
</li>
<li> <li>
章节名称：<input type="text" name="name"/> 章节名称：<input type="text" name="name"/>
</li> </li>
<li>
显示顺序：<input type="text" name="orderNum"/>
</li>
<li>
删除标志（0代表存在 2代表删除）：<input type="text" name="delFlag"/>
</li>
<li>
创建者：<input type="text" name="createBy"/>
</li>
<li>
创建时间：<input type="text" name="createTime"/>
</li>
<li>
更新者：<input type="text" name="updateBy"/>
</li>
<li>
更新时间：<input type="text" name="updateTime"/>
</li>
<li>
备注：<input type="text" name="remark"/>
</li>
<li> <li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a> <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a> <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@ -75,12 +62,13 @@
</div> </div>
</div> </div>
<div th:include="include :: footer"></div> <div th:include="include :: footer"></div>
<script th:src="@{/ajax/libs/jquery-layout/jquery.layout-latest.js}"></script>
<script th:inline="javascript"> <script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('train:trainCourseSection:edit')}]]; var editFlag = [[${@permission.hasPermi('train:trainCourseSection:edit')}]];
var removeFlag = [[${@permission.hasPermi('train:trainCourseSection:remove')}]]; var removeFlag = [[${@permission.hasPermi('train:trainCourseSection:remove')}]];
var prefix = ctx + "train/trainCourseSection"; var prefix = ctx + "train/trainCourseSection";
$(function() { $(function() {
$('body').layout({ west__size: 185 });
var options = { var options = {
url: prefix + "/list", url: prefix + "/list",
createUrl: prefix + "/add", createUrl: prefix + "/add",
@ -113,11 +101,6 @@
title : '显示顺序', title : '显示顺序',
sortable: true sortable: true
}, },
{
field : 'delFlag',
title : '删除标志（0代表存在 2代表删除）',
sortable: true
},
{ {
field : 'createBy', field : 'createBy',
title : '创建者', title : '创建者',
@ -128,21 +111,6 @@
title : '创建时间', title : '创建时间',
sortable: true sortable: true
}, },
{
field : 'updateBy',
title : '更新者',
sortable: true
},
{
field : 'updateTime',
title : '更新时间',
sortable: true
},
{
field : 'remark',
title : '备注',
sortable: true
},
{ {
title: '操作', title: '操作',
align: 'center', align: 'center',

12
ruoyi-train/src/main/resources/templates/train/courseware/category/add.html
View File

@ -7,13 +7,13 @@
<form class="form-horizontal m" id="form-category-add"> <form class="form-horizontal m" id="form-category-add">
<input id="treeId" name="parentId" type="hidden" th:value="${category.id}" /> <input id="treeId" name="parentId" type="hidden" th:value="${category.id}" />
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label ">上级部门：</label> <label class="col-sm-3 control-label ">上级分类：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" type="text" onclick="selectCategoryTree()" id="treeName" readonly="true" th:value="${category.name}"/> <input class="form-control" type="text" onclick="selectCategoryTree()" id="treeName" readonly="true" th:value="${category.name}"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">部门名称：</label> <label class="col-sm-3 control-label">分类名称：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<input class="form-control" type="text" name="name" id="name"> <input class="form-control" type="text" name="name" id="name">
</div> </div>
@ -25,7 +25,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label">部门状态：</label> <label class="col-sm-3 control-label">分类状态：</label>
<div class="col-sm-8"> <div class="col-sm-8">
<div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}"> <div class="radio-box" th:each="dict : ${@dict.getType('sys_normal_disable')}">
<input type="radio" th:id="${dict.dictCode}" name="delFlag" th:value="${dict.dictValue}" th:checked="${dict.isDefault == 'Y' ? true : false}"> <input type="radio" th:id="${dict.dictCode}" name="delFlag" th:value="${dict.dictValue}" th:checked="${dict.isDefault == 'Y' ? true : false}">
@ -73,7 +73,7 @@
}, },
messages: { messages: {
"name": { "name": {
remote: "部门已经存在" remote: "分类已经存在"
} }
} }
}); });
@ -84,10 +84,10 @@
} }
} }
/*部门管理-新增-选择父部门树*/ /*分类管理-新增-选择父分类树*/
function selectCategoryTree() { function selectCategoryTree() {
var options = { var options = {
title: '部门选择', title: '分类选择',
width: "380", width: "380",
url: prefix + "/selectCategoryTree/" + $("#treeId").val(), url: prefix + "/selectCategoryTree/" + $("#treeId").val(),
callBack: doSubmit callBack: doSubmit

2
ruoyi-train/src/main/resources/templates/train/courseware/category/category.html
View File

@ -55,7 +55,7 @@
createUrl: prefix + "/add/{id}", createUrl: prefix + "/add/{id}",
updateUrl: prefix + "/edit/{id}", updateUrl: prefix + "/edit/{id}",
removeUrl: prefix + "/remove/{id}", removeUrl: prefix + "/remove/{id}",
modalName: "部门", modalName: "分类",
columns: [{ columns: [{
field: 'selectItem', field: 'selectItem',
radio: true radio: true

8
ruoyi-train/src/main/resources/templates/train/courseware/category/edit.html
View File

@ -77,7 +77,7 @@
}, },
messages: { messages: {
"name": { "name": {
remote: "部门已经存在" remote: "分类已经存在"
} }
} }
}); });
@ -88,19 +88,19 @@
} }
} }
/*部门管理-修改-选择部门树*/ /*分类管理-修改-选择分类树*/
function selectCategoryTree() { function selectCategoryTree() {
var id = $("#treeId").val(); var id = $("#treeId").val();
if(id > 0) { if(id > 0) {
var options = { var options = {
title: '部门选择', title: '分类选择',
width: "380", width: "380",
url: prefix + "/selectCategoryTree/" + $("#treeId").val(), url: prefix + "/selectCategoryTree/" + $("#treeId").val(),
callBack: doSubmit callBack: doSubmit
}; };
$.modal.openOptions(options); $.modal.openOptions(options);
} else { } else {
$.modal.alertError("父部门不能选择"); $.modal.alertError("父分类不能选择");
} }
} }