diff --git a/web/src/main/java/com/ibeetl/jlw/entity/HandsOn.java b/web/src/main/java/com/ibeetl/jlw/entity/HandsOn.java index 0fca8a3e..8310583e 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/HandsOn.java +++ b/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 ; //归属课程 diff --git a/web/src/main/java/com/ibeetl/jlw/entity/HandsOnSimulationTasks.java b/web/src/main/java/com/ibeetl/jlw/entity/HandsOnSimulationTasks.java index 646a5baa..e508fe1e 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/HandsOnSimulationTasks.java +++ b/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(关联主表) diff --git a/web/src/main/java/com/ibeetl/jlw/service/HandsOnService.java b/web/src/main/java/com/ibeetl/jlw/service/HandsOnService.java index 46647b6e..2b312269 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/HandsOnService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/HandsOnService.java @@ -98,11 +98,9 @@ public class HandsOnService extends CoreBaseService{ 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()); diff --git a/web/src/main/java/com/ibeetl/jlw/service/HandsOnSimulationTasksService.java b/web/src/main/java/com/ibeetl/jlw/service/HandsOnSimulationTasksService.java index cdf71945..003f6a30 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/HandsOnSimulationTasksService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/HandsOnSimulationTasksService.java @@ -100,11 +100,9 @@ public class HandsOnSimulationTasksService extends CoreBaseService 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()); - handsOnQuery.setOrgId(coreUser.getOrgId()); - handsOnQuery.setUserId(coreUser.getId()); - return handsOnService.add(handsOnQuery); + handsOn.setAddTime(new Date()); + handsOn.setOrgId(coreUser.getOrgId()); + handsOn.setUserId(coreUser.getId()); + return handsOnService.add(handsOn); } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/HandsOnSimulationTasksController.java b/web/src/main/java/com/ibeetl/jlw/web/HandsOnSimulationTasksController.java index dd94dacb..31557408 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/HandsOnSimulationTasksController.java +++ b/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()); - handsOnSimulationTasksQuery.setOrgId(coreUser.getOrgId()); - return handsOnSimulationTasksService.add(handsOnSimulationTasksQuery); + handsOnSimulationTasks.setUserId(coreUser.getId()); + handsOnSimulationTasks.setOrgId(coreUser.getOrgId()); + return handsOnSimulationTasksService.add(handsOnSimulationTasks); } } diff --git a/web/src/main/resources/static/js/jlw/handsOn/add.js b/web/src/main/resources/static/js/jlw/handsOn/add.js index d22cf603..44b574e5 100644 --- a/web/src/main/resources/static/js/jlw/handsOn/add.js +++ b/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); diff --git a/web/src/main/resources/static/js/jlw/handsOn/index.js b/web/src/main/resources/static/js/jlw/handsOn/index.js index dc495bc1..0aed9228 100644 --- a/web/src/main/resources/static/js/jlw/handsOn/index.js +++ b/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 = ''; - htm += '' - htm += '' + var htm = ''; + htm += '' + htm += '' htm += '' - htm += '' - htm += '' + htm += '' + htm += '' ; return htm; } diff --git a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js index 90026da5..7ea40ed5 100644 --- a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js +++ b/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); }); diff --git a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/handsOnSimulationTasksApi.js b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/handsOnSimulationTasksApi.js index 618d7788..08e347b5 100644 --- a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/handsOnSimulationTasksApi.js +++ b/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(){ diff --git a/web/src/main/resources/templates/jlw/handsOn/add.html b/web/src/main/resources/templates/jlw/handsOn/add.html index baf2dd8d..aa489964 100644 --- a/web/src/main/resources/templates/jlw/handsOn/add.html +++ b/web/src/main/resources/templates/jlw/handsOn/add.html @@ -135,7 +135,6 @@
-
@@ -159,14 +158,20 @@ + + - - - - + ${item.taskOrder} + ${item.taskTitle} + ${item.taskType == '1'?'观看视频':item.taskType == '2'?'观看PPT': item.taskType == '3'?'理论测评':item.taskType == '4'?'实训操作步骤':item.taskType == '5'?'报告撰写':'其他'} + ${item.taskScore} 编辑 删除 + + + 暂无实训任务... + 合计： diff --git a/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html b/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html index 94c6f291..0495cd31 100644 --- a/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html +++ b/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html @@ -1,5 +1,9 @@ - + + + + +
@@ -36,7 +40,7 @@
@@ -46,7 +50,7 @@
@@ -56,7 +60,7 @@
@@ -99,10 +103,10 @@ -
-
-
考核任务添加视频
-
+
+
+
考核任务添加视频
+
@@ -120,7 +124,7 @@
@@ -130,7 +134,7 @@
@@ -140,7 +144,7 @@
@@ -181,10 +185,10 @@
-
-
-
考核任务添加文档
-
+
+
+
考核任务添加文档
+
@@ -202,7 +206,7 @@
@@ -212,21 +216,199 @@
- +
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
题型选题量分值合计
单选题
多选题
分值
合计
暂无实训任务...
+
+
+
- 实训步骤 +
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+
+ +
+
+
+
+
+ +
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
考核题目考核答案分值
总分
+
+
+
- 报告撰写 +
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+
+ + +
+
+
+
+
+
+ +
+ +
+
+
+
+
+
报告参考模板
+
+
+ +
+ +

+
+
+
+
+
-
\ +
@@ -238,3 +420,5 @@ handsOnSimulationTasksAdd.init(); }); + +