课程实操管理-实训理论测评、实训操作步骤、报告撰写

web/src/main/java/com/ibeetl/jlw/entity/HandsOn.java

@@ -23,7 +23,7 @@ public class HandsOn extends BaseEntity{
     @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
     // @SeqID(name = ORACLE_CORE_SEQ_NAME)
     @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.HandsOn")
-
+    @AutoID
     private Long handsOnId ;
 	
     //归属课程

web/src/main/java/com/ibeetl/jlw/entity/HandsOnSimulationTasks.java

@@ -22,7 +22,7 @@ public class HandsOnSimulationTasks extends BaseEntity{
     @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class)
     // @SeqID(name = ORACLE_CORE_SEQ_NAME)
     @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.HandsOnSimulationTasks")
-
+    @AutoID
     private Long taskId ;
 	
     //实操id(关联主表)

web/src/main/java/com/ibeetl/jlw/service/HandsOnService.java

@@ -98,11 +98,9 @@ public class HandsOnService extends CoreBaseService<HandsOn>{
         return msg;
     }
 
-    public JsonResult add(HandsOnQuery handsOnQuery){
+    public JsonResult add(HandsOn handsOn){
         String msg = "";
-        HandsOn handsOn = handsOnQuery.pojo();
         handsOnDao.insert(handsOn);
-        handsOnQuery.setHandsOnId(handsOn.getHandsOnId());
         JsonResult jsonResult = new JsonResult();
         jsonResult.setData(handsOn.getHandsOnId());//自增的ID丢进去
         jsonResult.setCode(JsonReturnCode.SUCCESS.getCode());

web/src/main/java/com/ibeetl/jlw/service/HandsOnSimulationTasksService.java

@@ -100,11 +100,9 @@ public class HandsOnSimulationTasksService extends CoreBaseService<HandsOnSimula
         return msg;
     }
 
-    public JsonResult add(HandsOnSimulationTasksQuery handsOnSimulationTasksQuery){
+    public JsonResult add(HandsOnSimulationTasks handsOnSimulationTasks){
         String msg = "";
-        HandsOnSimulationTasks handsOnSimulationTasks = handsOnSimulationTasksQuery.pojo();
         handsOnSimulationTasksDao.insert(handsOnSimulationTasks);
-        handsOnSimulationTasksQuery.setTaskId(handsOnSimulationTasks.getTaskId());
         JsonResult jsonResult = new JsonResult();
         jsonResult.setData(handsOnSimulationTasks.getTaskId());//自增的ID丢进去
         jsonResult.setCode(JsonReturnCode.SUCCESS.getCode());

web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java

@@ -11,6 +11,7 @@ import com.ibeetl.admin.core.util.ConvertUtil;
 import com.ibeetl.admin.core.util.PlatformException;
 import com.ibeetl.admin.core.util.TimeTool;
 import com.ibeetl.admin.core.web.JsonResult;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -71,6 +72,8 @@ public class HandsOnController{
 
     @Resource FileService fileService;
 
+    @Resource private HandsOnSimulationTasksService handsOnSimulationTasksService;
+
     /* 前端接口 */
 
     @PostMapping(API + "/getPageList.do")
@@ -132,13 +135,18 @@ public class HandsOnController{
         ModelAndView view = new ModelAndView("/jlw/handsOn/add.html");
         if(null != handsOnId){
             HandsOn handsOn = handsOnService.queryById(handsOnId);
+            HandsOnSimulationTasksQuery tasksQuery = new HandsOnSimulationTasksQuery();
+            tasksQuery.setHandsOnId(handsOnId);
+            List<HandsOnSimulationTasks> handsOnSimulationTasks = handsOnSimulationTasksService.getValuesByQuery(tasksQuery);
             view.addObject("handsOn", handsOn);
             view.addObject("courseInfoId", handsOn.getCourseInfoId());
             view.addObject("twoChildNode", handsOn.getCourseChildNode());
+            view.addObject("handsOnSimulationTasks", CollectionUtils.isEmpty(handsOnSimulationTasks) ? "" : handsOnSimulationTasks);
         }else {
             view.addObject("handsOn", new HandsOn());
             view.addObject("courseInfoId", "");
             view.addObject("twoChildNode", "");
+            view.addObject("handsOnSimulationTasks", "");
         }
         return view;
     }
@@ -170,14 +178,14 @@ public class HandsOnController{
 
     @PostMapping(MODEL + "/add.json")
     @Function("handsOn.add")
-    public JsonResult add(@Validated(ValidateConfig.ADD.class) HandsOnQuery handsOnQuery, BindingResult result,@SCoreUser CoreUser coreUser){
+    public JsonResult add(@Validated(ValidateConfig.ADD.class) HandsOn handsOn, BindingResult result,@SCoreUser CoreUser coreUser){
         if(result.hasErrors()){
             return JsonResult.failMessage(result);
         }else{
-            handsOnQuery.setAddTime(new Date());
+            handsOn.setAddTime(new Date());
-            handsOnQuery.setOrgId(coreUser.getOrgId());
+            handsOn.setOrgId(coreUser.getOrgId());
-            handsOnQuery.setUserId(coreUser.getId());
+            handsOn.setUserId(coreUser.getId());
-            return handsOnService.add(handsOnQuery);
+            return handsOnService.add(handsOn);
         }
     }
 

web/src/main/java/com/ibeetl/jlw/web/HandsOnSimulationTasksController.java

@@ -128,13 +128,16 @@ public class HandsOnSimulationTasksController{
 
     @GetMapping(MODEL + "/add.do")
     @Function("handsOnSimulationTasks.add")
-    public ModelAndView add(Long taskId) {
+    public ModelAndView add(Long taskId, Long handsOnId) {
         ModelAndView view = new ModelAndView("/jlw/handsOnSimulationTasks/add.html");
         if(null != taskId){
             HandsOnSimulationTasks handsOnSimulationTasks = handsOnSimulationTasksService.queryById(taskId);
+            handsOnSimulationTasks.setHandsOnId(handsOnId);
             view.addObject("handsOnSimulationTasks", handsOnSimulationTasks);
         }else {
-            view.addObject("handsOnSimulationTasks", new HandsOnSimulationTasks());
+            HandsOnSimulationTasks handsOnSimulationTasks = new HandsOnSimulationTasks();
+            handsOnSimulationTasks.setHandsOnId(handsOnId);
+            view.addObject("handsOnSimulationTasks", handsOnSimulationTasks);
         }
         return view;
     }
@@ -168,13 +171,13 @@ public class HandsOnSimulationTasksController{
 
     @PostMapping(MODEL + "/add.json")
     @Function("handsOnSimulationTasks.add")
-    public JsonResult add(@Validated(ValidateConfig.ADD.class) HandsOnSimulationTasksQuery handsOnSimulationTasksQuery, BindingResult result,@SCoreUser CoreUser coreUser){
+    public JsonResult add(@Validated(ValidateConfig.ADD.class) HandsOnSimulationTasks handsOnSimulationTasks, BindingResult result,@SCoreUser CoreUser coreUser){
         if(result.hasErrors()){
             return JsonResult.failMessage(result);
         }else{
-                handsOnSimulationTasksQuery.setUserId(coreUser.getId());
+            handsOnSimulationTasks.setUserId(coreUser.getId());
-                handsOnSimulationTasksQuery.setOrgId(coreUser.getOrgId());
+            handsOnSimulationTasks.setOrgId(coreUser.getOrgId());
-            return handsOnSimulationTasksService.add(handsOnSimulationTasksQuery);
+            return handsOnSimulationTasksService.add(handsOnSimulationTasks);
         }
     }
 

web/src/main/resources/static/js/jlw/handsOn/add.js

@@ -81,7 +81,7 @@ layui.define(['form', 'laydate', 'table','upload','layedit', 'handsOnApi'], func
         Lib.getCourseInfo($("select[name='courseChildNode']"), obj.value);
     });
     $(".button_add").click(() => {
-        var url = "/jlw/handsOnSimulationTasks/add.do";
+        var url = "/jlw/handsOnSimulationTasks/add.do?handsOnId="+handsOnId;
         Common.openDlg(url,"实训任务管理>新增");
     });
     exports('add', view);

web/src/main/resources/static/js/jlw/handsOn/index.js

@@ -76,12 +76,12 @@ layui.define([ 'form', 'laydate', 'table' ], function(exports) {
                     }
                 ,{
                     field : 'operation_',title : '操作',align:"center",fixed: 'right',width: '500', templet: function (d) {
-                        var htm = '<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="edit">实操成绩</button>';
+                        var htm = '<button type="button" class="layui-btn layui-btn-normal layui-btn-xs" lay-event="result">实操成绩</button>';
-                        htm += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">评阅</button>'
+                        htm += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="review">评阅</button>'
-                        htm += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">编辑</button>'
+                        htm += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="edit">编辑</button>'
                         htm += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</button>'
-                        htm += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">绑定知识点</button>'
+                        htm += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="bindPoints">绑定知识点</button>'
-                        htm += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">查看内容</button>'
+                        htm += '<button type="button" class="layui-btn layui-btn-danger layui-btn-xs" lay-event="catContent">查看内容</button>'
                         ;
                         return htm;
                     }

web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js

@@ -1,9 +1,16 @@
-layui.define([ 'form', 'laydate', 'table','element','handsOnSimulationTasksApi', 'upload'], function(exports) {
+layui.define([ 'form', 'laydate', 'table','element','handsOnSimulationTasksApi', 'upload', 'layedit'], function(exports) {
     var form = layui.form;
     var handsOnSimulationTasksApi = layui.handsOnSimulationTasksApi;
     var index = layui.index;
-    var element = layui.element, upload = layui.upload
+    var element = layui.element, upload = layui.upload, layedit = layui.layedit
     element.render();
+    var one = layedit.build('test-editor1'); //建立编辑器
+    var editor = null;
+    // setTimeout(function (){
+    //     editor.init();
+    //     // $("#test-editor .editormd-preview").width("50%");
+    //     // $("#test-editor .CodeMirror-wrap").width("50%");
+    // },500);
 //普通图片上传
     var uploadInst = upload.render({
         elem: '#test-upload-normal'
@@ -42,13 +49,13 @@ layui.define([ 'form', 'laydate', 'table','element','handsOnSimulationTasksApi',
                      var taskId = $("#addForm input[name='taskId']").val();
                      if(!$.isEmpty(taskId)){
                          handsOnSimulationTasksApi.updateHandsOnSimulationTasks($('#addForm'),function(){
-                             parent.window.dataReload();
+                             // parent.window.dataReload();
                              Common.info("更新成功");
                              Lib.closeFrame();
                          });
                      }else{
                          handsOnSimulationTasksApi.addHandsOnSimulationTasks($('#addForm'),function(){
-                             parent.window.dataReload();
+                             // parent.window.dataReload();
                              Common.info("添加成功");
                              Lib.closeFrame();
                          });
@@ -66,6 +73,12 @@ layui.define([ 'form', 'laydate', 'table','element','handsOnSimulationTasksApi',
 
     form.on('radio(taskType)', obj => {
         element.tabChange('demo', obj.value);
+        if (obj.value === "4") {
+            if (editor === null) {
+                editor = Lib.editorMd("test-editor");
+                editor.setToolbarAutoFixed(false);
+            }
+        }
     });
     exports('add',view);
 });

web/src/main/resources/static/js/jlw/handsOnSimulationTasks/handsOnSimulationTasksApi.js

@@ -5,7 +5,16 @@ layui.define([], function(exports) {
                 Lib.submitForm("/jlw/handsOnSimulationTasks/edit.json",form,{},callback)
             },
             addHandsOnSimulationTasks:function(form,callback){
-                Lib.submitForm("/jlw/handsOnSimulationTasks/add.json",form,{},callback)
+                var formPara = form.serializeJson();
+                console.log(formPara)
+                var taskTitleElement = formPara.taskTitle[0];
+                var taskScoreElement = formPara.taskScore[0];
+                var taskOrderElement = formPara.taskOrder[0];
+                formPara.taskTitle = taskTitleElement;
+                formPara.taskScore = taskScoreElement;
+                formPara.taskOrder = taskOrderElement;
+                console.log(formPara)
+                Lib.submitForm("/jlw/handsOnSimulationTasks/add.json",form,formPara,callback)
             },
             del:function(ids,callback){
                 Common.post("/jlw/handsOnSimulationTasks/delete.json",{"ids":ids},function(){

web/src/main/resources/templates/jlw/handsOn/add.html

@@ -135,7 +135,6 @@
         </div>
     </div>
     <div class="layui-row">
-        <input name="et3QuestionIds" type="hidden" />
         <label class="layui-form-label">实训任务：</label>
         <div class="layui-input-block">
             <button type="button" class="layui-btn bg_button button_add" style="float: left"><i class="layui-icon">&#xe654;</i></button>
@@ -159,14 +158,20 @@
                     </tr>
                     </thead>
                     <tbody>
+                    <!--#if(handsOnSimulationTasks != null && handsOnSimulationTasks != ''){-->
+                    <!--# for(item in handsOnSimulationTasks){ -->
                     <tr>
-                        <td></td>
+                        <td>${item.taskOrder}</td>
-                        <td></td>
+                        <td>${item.taskTitle}</td>
-                        <td></td>
+                        <td>${item.taskType == '1'?'观看视频':item.taskType == '2'?'观看PPT': item.taskType == '3'?'理论测评':item.taskType == '4'?'实训操作步骤':item.taskType == '5'?'报告撰写':'其他'}</td>
-                        <td></td>
+                        <td>${item.taskScore}</td>
                         <td><a  class="layui-btn layui-btn-sm bg_button bj">编辑</a> <a style="background-color: red"  class="layui-btn layui-btn-sm sc">删除</a></td>
                     </tr>
+                    <!--#}-->
+                    <!--#}-->
+                    <!--#if(handsOnSimulationTasks == null || handsOnSimulationTasks == ''){-->
                     <tr><td colspan="6" class="t_c">暂无实训任务...</td></tr>
+                    <!--#}-->
                     <tr>
                         <td colspan="6" style="padding-left: 50px;">
                             合计：<span class="sxzf"></span>

web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html

@@ -1,5 +1,9 @@
 <!--# layout("/common/layout.html",{"jsBase":"/js/jlw/handsOnSimulationTasks/"}){ -->
-
+<link rel="stylesheet" type="text/css" href="${ctxPath}/css/plugin.css?v=${jsVer}" media="all"/>
+<link rel="stylesheet" href="${ctxPath}/plugins/editorMd/css/editormd.css"/>
+<script src="${ctxPath}/plugins/editorMd/editormd.min.js"></script>
+<link rel="stylesheet" href="${ctxPath}/plugins/highlight/styles/a11y-light.min.css" />
+<script type="text/javascript" src="${ctxPath}/plugins/highlight/highlight.min.js?v=${jsVer}"></script>
 <form class="layui-form" id="addForm">
     <input type="hidden" id="handsOnId" name="handsOnId" value="${handsOnSimulationTasks.handsOnId}"
            class="layui-input">
@@ -36,7 +40,7 @@
                         <label class="layui-form-label">任务标题</label>
                         <div class="layui-input-block">
                             <input type="text" name="taskTitle"
-                                   value="${handsOnSimulationTasks.taskTitle}" lay-verify="required"
+                                   value="${handsOnSimulationTasks.taskTitle}" 
                                    class="layui-input">
                         </div>
                     </div>
@@ -46,7 +50,7 @@
                         <label class="layui-form-label">任务分值</label>
                         <div class="layui-input-block">
                             <input type="text" name="taskScore"
-                                   value="${handsOnSimulationTasks.taskScore}" lay-verify="required"
+                                   value="${handsOnSimulationTasks.taskScore}" 
                                    class="layui-input">
                         </div>
                     </div>
@@ -56,7 +60,7 @@
                         <label class="layui-form-label">任务顺序</label>
                         <div class="layui-input-block">
                             <input type="text" name="taskOrder"
-                                   value="${handsOnSimulationTasks.taskOrder}" lay-verify="required"
+                                   value="${handsOnSimulationTasks.taskOrder}" 
                                    class="layui-input">
                         </div>
                     </div>
@@ -99,10 +103,10 @@
                         </div>
                     </div>
                 </div>
-                <div class="layui-row layui-col-space15">
+                <div class="layui-row">
-                    <div class="layui-col-md12" style="margin-left: 20px">
+                    <div class="layui-form-item" style="margin-left: 20px">
-                        <div class="layui-col-md1">考核任务添加视频</div>
+                        <div class="layui-form-label">考核任务添加视频</div>
-                        <div class="layui-col-md9" style="margin-left: 20px">
+                        <div class="layui-input-block" style="margin-left: 20px">
                             <div class="layui-upload">
                                 <button type="button" class="layui-btn layui-btn-primary layui-font-blue" id="test-upload-normal"><i class="layui-icon"></i>点击添加</button>
                                 <div class="layui-upload-list">
@@ -120,7 +124,7 @@
                         <label class="layui-form-label">任务标题</label>
                         <div class="layui-input-block">
                             <input type="text" id="taskTitle" name="taskTitle"
-                                   value="${handsOnSimulationTasks.taskTitle}" lay-verify="required"
+                                   value="${handsOnSimulationTasks.taskTitle}" 
                                    class="layui-input">
                         </div>
                     </div>
@@ -130,7 +134,7 @@
                         <label class="layui-form-label">任务分值</label>
                         <div class="layui-input-block">
                             <input type="text" id="taskScore" name="taskScore"
-                                   value="${handsOnSimulationTasks.taskScore}" lay-verify="required"
+                                   value="${handsOnSimulationTasks.taskScore}" 
                                    class="layui-input">
                         </div>
                     </div>
@@ -140,7 +144,7 @@
                         <label class="layui-form-label">任务顺序</label>
                         <div class="layui-input-block">
                             <input type="text" id="taskOrder" name="taskOrder"
-                                   value="${handsOnSimulationTasks.taskOrder}" lay-verify="required"
+                                   value="${handsOnSimulationTasks.taskOrder}" 
                                    class="layui-input">
                         </div>
                     </div>
@@ -181,10 +185,10 @@
                         </div>
                     </div>
                 </div>
-                <div class="layui-row layui-col-space15">
+                <div class="layui-row">
-                    <div class="layui-col-md12" style="margin-left: 20px">
+                    <div class="layui-form-item" style="margin-left: 20px">
-                        <div class="layui-col-md1">考核任务添加文档</div>
+                        <div class="layui-form-label">考核任务添加文档</div>
-                        <div class="layui-col-md9" style="margin-left: 20px">
+                        <div class="layui-input-block" style="margin-left: 20px">
                             <div class="layui-upload">
                                 <button type="button" class="layui-btn layui-btn-primary layui-font-blue" id="test-upload-normal"><i class="layui-icon"></i>点击添加</button>
                                 <div class="layui-upload-list">
@@ -202,7 +206,7 @@
                         <label class="layui-form-label">任务标题</label>
                         <div class="layui-input-block">
                             <input type="text" name="taskTitle"
-                                   value="${handsOnSimulationTasks.taskTitle}" lay-verify="required"
+                                   value="${handsOnSimulationTasks.taskTitle}" 
                                    class="layui-input">
                         </div>
                     </div>
@@ -212,21 +216,199 @@
                         <label class="layui-form-label">任务顺序</label>
                         <div class="layui-input-block">
                             <input type="text" name="taskOrder"
-                                   value="${handsOnSimulationTasks.taskOrder}" lay-verify="required"
+                                   value="${handsOnSimulationTasks.taskOrder}" 
                                    class="layui-input">
                         </div>
                     </div>
                 </div>
-
+                <div class="layui-row">
+                    <label class="layui-form-label">实训任务：</label>
+                    <div class="layui-input-block">
+                        <button type="button" class="layui-btn bg_button button_add" style="float: left"><i class="layui-icon">&#xe654;</i></button>
+                    </div>
+                    <div class="layui-row">
+                        <div class="layui-input-block">
+                            <table class="layui-table" style="width: 60%;min-width: 1000px;">
+                                <colgroup>
+                                    <col width="200">
+                                    <col>
+                                    <col>
+                                    <col width="200">
+                                </colgroup>
+                                <thead>
+                                <tr>
+                                    <th>题型</th>
+                                    <th>选题量</th>
+                                    <th>分值</th>
+                                    <th>合计</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                <tr>
+                                    <td>单选题</td>
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
+                                </tr>
+                                <tr>
+                                    <td>多选题</td>
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
+                                </tr>
+                                <tr>
+                                    <td>分值</td>
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
+                                </tr>
+                                <tr>
+                                    <td>合计</td>
+                                    <td></td>
+                                    <td></td>
+                                    <td></td>
+                                </tr>
+                                <tr><td colspan="6" class="t_c">暂无实训任务...</td></tr>
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
             </div>
             <div class="layui-tab-item">
-                实训步骤
+                <div class="layui-row">
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">任务标题</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="taskTitle"
+                                   value="${handsOnSimulationTasks.taskTitle}" 
+                                   class="layui-input">
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-row">
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">任务顺序</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="taskOrder"
+                                   value="${handsOnSimulationTasks.taskOrder}" 
+                                   class="layui-input">
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-row">
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">考核内容：</label>
+                        <div class="layui-input-block">
+                            <div id="test-editor">
+                                <textarea
+                                        style="display:none;"></textarea>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-row">
+                <label class="layui-form-label">考核题目：</label>
+                <div class="layui-input-block">
+                    <button type="button" class="layui-btn bg_button button_add" style="float: left"><i class="layui-icon">&#xe654;</i></button>
+                </div>
+                <div class="layui-row">
+                    <div class="layui-input-block">
+                        <table class="layui-table" style="width: 60%;min-width: 1000px;">
+                            <colgroup>
+                                <col width="200">
+                                <col>
+                                <col>
+                            </colgroup>
+                            <thead>
+                            <tr>
+                                <th>考核题目</th>
+                                <th>考核答案</th>
+                                <th>分值</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <tr>
+                                <td></td>
+                                <td></td>
+                                <td></td>
+                            </tr>
+                            <tr>
+                                <td></td>
+                                <td></td>
+                                <td></td>
+                            </tr>
+                            <tr>
+                                <td>总分</td>
+                                <td></td>
+                                <td></td>
+                                <td></td>
+                            </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
             </div>
             <div class="layui-tab-item">
-                报告撰写
+                <div class="layui-row">
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">任务标题</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="taskTitle"
+                                   value="${handsOnSimulationTasks.taskTitle}" 
+                                   class="layui-input">
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-row">
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">任务顺序</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="taskOrder"
+                                   value="${handsOnSimulationTasks.taskOrder}" 
+                                   class="layui-input">
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-row">
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">报告要求：</label>
+                        <div class="layui-input-block">
+                            <div style="background-color: white">
+                                <!--                    <textarea style="display:none;"></textarea>-->
+                                <textarea style="display:none;" id="test-editor1"></textarea>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-row">
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">报告分值</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="taskOrder"
+                                   value="${handsOnSimulationTasks.taskOrder}" 
+                                   class="layui-input">
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-row">
+                    <div class="layui-form-item" style="margin-left: 20px">
+                        <div class="layui-form-label">报告参考模板</div>
+                        <div class="layui-input-block" style="margin-left: 20px">
+                            <div class="layui-upload">
+                                <button type="button" class="layui-btn layui-btn-primary layui-font-blue" id="test-upload-normal"><i class="layui-icon"></i>点击添加</button>
+                                <div class="layui-upload-list">
+                                    <img class="layui-upload-img" id="test-upload-normal-img">
+                                    <p id="test-upload-demoText"></p>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
         </div>
-    </div>\
+    </div>
     <!-- 业务对象须有hidden字段，保存delFlag和version字段-->
     <input type="hidden" name="taskId" value="${handsOnSimulationTasks.taskId}"/>
     <layui:submitButtons id="addButton" buttonType="" showExamine="2"/>
@@ -238,3 +420,5 @@
         handsOnSimulationTasksAdd.init();
     });
 </script>
+<script type="text/javascript" src="${ctxPath}/plugins/simple-uploader/public/uploader.js?v=${jsVer}"></script>
+<script type="text/javascript" src="${ctxPath}/plugins/simple-uploader/public/app.js?v=${jsVer}"></script>