From e62bd05ceb1cb9b1958d2e530bc8a7a00ae893b7 Mon Sep 17 00:00:00 2001
From: zhujunjieit <zhujunjie>
Date: Mon, 24 Dec 2018 23:03:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TrainCourseSectionController.java         |  5 +-
 .../train/course/trainCourse/trainCourse.html | 12 ++-
 .../train/course/trainCourseSection/add.html  | 32 +-------
 .../train/course/trainCourseSection/edit.html | 32 +-------
 .../trainCourseSection.html                   | 82 ++++++-------------
 .../train/courseware/category/add.html        | 12 +--
 .../train/courseware/category/category.html   |  2 +-
 .../train/courseware/category/edit.html       |  8 +-
 8 files changed, 50 insertions(+), 135 deletions(-)

diff --git a/ruoyi-train/src/main/java/com/ruoyi/train/course/controller/TrainCourseSectionController.java b/ruoyi-train/src/main/java/com/ruoyi/train/course/controller/TrainCourseSectionController.java
index dc3d99b36..c364d2f22 100644
--- a/ruoyi-train/src/main/java/com/ruoyi/train/course/controller/TrainCourseSectionController.java
+++ b/ruoyi-train/src/main/java/com/ruoyi/train/course/controller/TrainCourseSectionController.java
@@ -30,15 +30,16 @@ import com.ruoyi.common.utils.ExcelUtil;
 @RequestMapping("/train/trainCourseSection")
 public class TrainCourseSectionController extends BaseController
 {
-    private String prefix = "train/trainCourseSection";
+    private String prefix = "train/course/trainCourseSection";
 	
 	@Autowired
 	private ITrainCourseSectionService trainCourseSectionService;
 	
 	@RequiresPermissions("train:trainCourseSection:view")
 	@GetMapping()
-	public String trainCourseSection()
+	public String trainCourseSection(String trainCourseId, ModelMap mmap)
 	{
+		mmap.put("courseId", trainCourseId);
 	    return prefix + "/trainCourseSection";
 	}
 	
diff --git a/ruoyi-train/src/main/resources/templates/train/course/trainCourse/trainCourse.html b/ruoyi-train/src/main/resources/templates/train/course/trainCourse/trainCourse.html
index ec8e55700..77e937197 100644
--- a/ruoyi-train/src/main/resources/templates/train/course/trainCourse/trainCourse.html
+++ b/ruoyi-train/src/main/resources/templates/train/course/trainCourse/trainCourse.html
@@ -126,6 +126,7 @@
                         formatter: function(value, row, index) {
                             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="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>');
                             return actions.join('');
                         }
@@ -167,9 +168,14 @@
         });
         /*用户管理-部门*/
         function category() {
-            var url = ctx + "system/dept";
-            createMenuItem(url, "部门管理");
+            var url ="/train/course/category";
+            createMenuItem(url, "分类管理");
+        }
+        function courseSection(id) {
+            var url =  "/train/trainCourseSection?trainCourseId="+id;
+            createMenuItem(url, "课程内容");
         }
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>
+
diff --git a/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/add.html b/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/add.html
index f1113b87e..d19748a3b 100644
--- a/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/add.html
+++ b/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/add.html
@@ -24,37 +24,7 @@
 				</div>
 			</div>
 			<div class="form-group">	
-				<label class="col-sm-3 control-label">删除标志（0代表存在 2代表删除）：</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>
+				<label class="col-sm-3 control-label">章节介绍：</label>
 				<div class="col-sm-8">
 					<input id="remark" name="remark" class="form-control" type="text">
 				</div>
diff --git a/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/edit.html b/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/edit.html
index f69211825..22a29b8e5 100644
--- a/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/edit.html
+++ b/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/edit.html
@@ -25,37 +25,7 @@
 				</div>
 			</div>
 			<div class="form-group">	
-				<label class="col-sm-3 control-label">删除标志（0代表存在 2代表删除）：</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>
+				<label class="col-sm-3 control-label">章节介绍：</label>
 				<div class="col-sm-8">
 					<input id="remark" name="remark" th:field="*{remark}" class="form-control" type="text">
 				</div>
diff --git a/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/trainCourseSection.html b/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/trainCourseSection.html
index 6a076715f..ac2c4f3f0 100644
--- a/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/trainCourseSection.html
+++ b/ruoyi-train/src/main/resources/templates/train/course/trainCourseSection/trainCourseSection.html
@@ -2,50 +2,37 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <meta charset="utf-8">
 <head th:include="include :: header"></head>
+<link th:href="@{/ajax/libs/jquery-layout/jquery.layout-latest.css}" rel="stylesheet"/>
 <body class="gray-bg">
-    
-     <div class="container-div">
+	<div class="ui-layout-west">
+		<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="col-sm-12 search-collapse">
 				<form id="formId">
 					<div class="select-list">
 						<ul>
-							<li>
-								课程ID：<input type="text" name="trainCourseId"/>
-							</li>
-
 							<li>
 								章节名称：<input type="text" name="name"/>
 							</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>
 								<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>
@@ -75,12 +62,13 @@
 		</div>
 	</div>
     <div th:include="include :: footer"></div>
+	<script th:src="@{/ajax/libs/jquery-layout/jquery.layout-latest.js}"></script>
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('train:trainCourseSection:edit')}]];
         var removeFlag = [[${@permission.hasPermi('train:trainCourseSection:remove')}]];
         var prefix = ctx + "train/trainCourseSection";
-
         $(function() {
+            $('body').layout({ west__size: 185 });
             var options = {
                 url: prefix + "/list",
                 createUrl: prefix + "/add",
@@ -99,7 +87,7 @@
 					visible: false
 				},
 				{
-					field : 'trainCourseId', 
+					field : 'trainCourseId',
 					title : '课程ID',
 					sortable: true
 				},
@@ -113,11 +101,6 @@
 					title : '显示顺序',
 					sortable: true
 				},
-				{
-					field : 'delFlag', 
-					title : '删除标志（0代表存在 2代表删除）',
-					sortable: true
-				},
 				{
 					field : 'createBy', 
 					title : '创建者',
@@ -128,21 +111,6 @@
 					title : '创建时间',
 					sortable: true
 				},
-				{
-					field : 'updateBy', 
-					title : '更新者',
-					sortable: true
-				},
-				{
-					field : 'updateTime', 
-					title : '更新时间',
-					sortable: true
-				},
-				{
-					field : 'remark', 
-					title : '备注',
-					sortable: true
-				},
 		        {
 		            title: '操作',
 		            align: 'center',
diff --git a/ruoyi-train/src/main/resources/templates/train/courseware/category/add.html b/ruoyi-train/src/main/resources/templates/train/courseware/category/add.html
index 3ff7e6abc..f8ba8345d 100644
--- a/ruoyi-train/src/main/resources/templates/train/courseware/category/add.html
+++ b/ruoyi-train/src/main/resources/templates/train/courseware/category/add.html
@@ -7,13 +7,13 @@
 		<form class="form-horizontal m" id="form-category-add">
 			<input id="treeId" name="parentId" type="hidden" th:value="${category.id}"   />
 			<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">
 					<input class="form-control" type="text" onclick="selectCategoryTree()" id="treeName" readonly="true" th:value="${category.name}"/>
 				</div>
 			</div>
 			<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">
 					<input class="form-control" type="text" name="name" id="name">
 				</div>
@@ -25,7 +25,7 @@
 				</div>
 			</div>
 			<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="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}">
@@ -73,7 +73,7 @@
 			},
 			messages: {
 		        "name": {
-		            remote: "部门已经存在"
+		            remote: "分类已经存在"
 		        }
 		    }
 		});
@@ -84,10 +84,10 @@
 	        }
 	    }
 	
-		/*部门管理-新增-选择父部门树*/
+		/*分类管理-新增-选择父分类树*/
 		function selectCategoryTree() {
 			var options = {
-				title: '部门选择',
+				title: '分类选择',
 				width: "380",
 				url: prefix + "/selectCategoryTree/" + $("#treeId").val(),
 				callBack: doSubmit
diff --git a/ruoyi-train/src/main/resources/templates/train/courseware/category/category.html b/ruoyi-train/src/main/resources/templates/train/courseware/category/category.html
index f20b10292..57856c5d9 100644
--- a/ruoyi-train/src/main/resources/templates/train/courseware/category/category.html
+++ b/ruoyi-train/src/main/resources/templates/train/courseware/category/category.html
@@ -55,7 +55,7 @@
 		        createUrl: prefix + "/add/{id}",
 		        updateUrl: prefix + "/edit/{id}",
 		        removeUrl: prefix + "/remove/{id}",
-		        modalName: "部门",
+		        modalName: "分类",
 		        columns: [{
                     field: 'selectItem', 
                     radio: true
diff --git a/ruoyi-train/src/main/resources/templates/train/courseware/category/edit.html b/ruoyi-train/src/main/resources/templates/train/courseware/category/edit.html
index 1d5de5441..ef76d2b0d 100644
--- a/ruoyi-train/src/main/resources/templates/train/courseware/category/edit.html
+++ b/ruoyi-train/src/main/resources/templates/train/courseware/category/edit.html
@@ -77,7 +77,7 @@
 			},
 			messages: {
 		        "name": {
-		            remote: "部门已经存在"
+		            remote: "分类已经存在"
 		        }
 		    }
 		});
@@ -88,19 +88,19 @@
 	        }
 	    }
 	
-		/*部门管理-修改-选择部门树*/
+		/*分类管理-修改-选择分类树*/
 		function selectCategoryTree() {
 			var id = $("#treeId").val();
 			if(id > 0) {
 			    var options = {
-					title: '部门选择',
+					title: '分类选择',
 					width: "380",
 					url: prefix + "/selectCategoryTree/" + $("#treeId").val(),
 					callBack: doSubmit
 				};
 				$.modal.openOptions(options);
 			} else {
-        		$.modal.alertError("父部门不能选择");
+        		$.modal.alertError("父分类不能选择");
         	}
 		}