From e87b4d8e13bc34c0382b8f3d186ea8ab40061e44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Sun, 30 Jul 2023 19:18:04 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AE=9E=E6=93=8D-?=
=?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A4=8D=E5=88=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../js/jlw/handsOnSimulationTasks/add.js | 35 ++++++++++++++-----
.../add.js | 26 ++++++++++----
.../jlw/handsOnSimulationTasks/add.html | 2 +-
3 files changed, 47 insertions(+), 16 deletions(-)
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 c691f469..6c31b7c5 100644
--- a/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js
+++ b/web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js
@@ -64,6 +64,7 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT
$(this).parents(".progressCss_file").remove();
});
}
+ var assessmentContent = $("#assessmentContent").val();
window.loadYl = function (){//富文本代码编辑器 产生变化时触发
yl();
@@ -569,8 +570,13 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT
editor.setToolbarAutoFixed(false);
}
}
- resourcesInfoShowTable.reload({data:[]});
- resourcesInfoShowPPTTable.reload({data:[]});
+ if(obj.value == "2"||obj.value == "1"){
+ if(!$.isEmpty(resourcesInfoShowTable) || !$.isEmpty(resourcesInfoShowPPTTable)){
+ resourcesInfoShowTable.reload({data:[]});
+ resourcesInfoShowPPTTable.reload({data:[]});
+ }
+ }
+
// $("input[name='taskTitle']").val("");
// $("input[name='taskScore']").val("");
// $("input[name='taskOrder']").val("");
@@ -619,16 +625,29 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT
if(tableData4.length > val.split("[---]").length - 1){
tableData4 = tableData4.slice(0,val.split("[---]").length - 1);
}else if(tableData4.length < val.split("[---]").length - 1){
- tableData4.push({
- handsOnId:$("#addForm input[name='handsOnId']").val(),//实操ID
- handsOnSimulationTasksAssessmentQuestion:Lib.chineseNum(tableData4.length,1), //考核题目
- handsOnSimulationTasksAssessmentAnswer:"", //考核答案
- handsOnSimulationTasksAssessmentScore:"", //考核分值
- })
+ if((val.split("[---]").length - 1)-tableData4.length > 1){
+ var length = (val.split("[---]").length - 1) - tableData4.length;
+ for(var i=0;i < length;i++){
+ tableData4.push({
+ handsOnId:$("#addForm input[name='handsOnId']").val(),//实操ID
+ handsOnSimulationTasksAssessmentQuestion:Lib.chineseNum(tableData4.length,1), //考核题目
+ handsOnSimulationTasksAssessmentAnswer:"", //考核答案
+ handsOnSimulationTasksAssessmentScore:"", //考核分值
+ })
+ }
+ }else{
+ tableData4.push({
+ handsOnId:$("#addForm input[name='handsOnId']").val(),//实操ID
+ handsOnSimulationTasksAssessmentQuestion:Lib.chineseNum(tableData4.length,1), //考核题目
+ handsOnSimulationTasksAssessmentAnswer:"", //考核答案
+ handsOnSimulationTasksAssessmentScore:"", //考核分值
+ })
+ }
}
}else{
tableData4 = [];
}
+ console.log(tableData4)
var getTpl = tableData4_demo.innerHTML
,view = document.getElementById('tableData4_view');
laytpl(getTpl).render({list:tableData4}, function(html){
diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOnSimulationTasks/add.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOnSimulationTasks/add.js
index d55bb001..e3b8f1bd 100644
--- a/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOnSimulationTasks/add.js
+++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOnSimulationTasks/add.js
@@ -593,12 +593,24 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
if(tableData4.length > val.split("[---]").length - 1){
tableData4 = tableData4.slice(0,val.split("[---]").length - 1);
}else if(tableData4.length < val.split("[---]").length - 1){
- tableData4.push({
- handsOnId:$("#addForm input[name='handsOnId']").val(),//实操ID
- handsOnSimulationTasksAssessmentQuestion:Lib.chineseNum(tableData4.length,1), //考核题目
- handsOnSimulationTasksAssessmentAnswer:"", //考核答案
- handsOnSimulationTasksAssessmentScore:"", //考核分值
- })
+ if((val.split("[---]").length - 1)-tableData4.length > 1){
+ var length = (val.split("[---]").length - 1) - tableData4.length;
+ for(var i=0;i < length;i++){
+ tableData4.push({
+ handsOnId:$("#addForm input[name='handsOnId']").val(),//实操ID
+ handsOnSimulationTasksAssessmentQuestion:Lib.chineseNum(tableData4.length,1), //考核题目
+ handsOnSimulationTasksAssessmentAnswer:"", //考核答案
+ handsOnSimulationTasksAssessmentScore:"", //考核分值
+ })
+ }
+ }else{
+ tableData4.push({
+ handsOnId:$("#addForm input[name='handsOnId']").val(),//实操ID
+ handsOnSimulationTasksAssessmentQuestion:Lib.chineseNum(tableData4.length,1), //考核题目
+ handsOnSimulationTasksAssessmentAnswer:"", //考核答案
+ handsOnSimulationTasksAssessmentScore:"", //考核分值
+ })
+ }
}
}else{
tableData4 = [];
@@ -618,7 +630,7 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
//PPT资源库button
$("#pptClick").click(function (obj) {
- updataResourcesOpenRe(2);
+ updataResourcesOpenRe();
});
/*资源库上传弹出框*/
diff --git a/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html b/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html
index d0678bb9..7829fc0a 100644
--- a/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html
+++ b/web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html
@@ -369,7 +369,7 @@
From cd657bff90cb2d38fa58b18e425f070c04c90340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E4=B8=B9ab?= <1421553879@qq.com>
Date: Sun, 30 Jul 2023 20:47:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=AD=98=E6=A1=A3-?=
=?UTF-8?q?=E8=AF=A6=E6=83=85-=E7=8F=AD=E7=BA=A7=E4=B8=8B=E6=8B=89?=
=?UTF-8?q?=E5=9D=90=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../jlw/web/QuestionLogSummaryController.java | 4 +++-
.../web/TeacherOpenCourseHandsOnController.java | 15 ++++++++++-----
...acherOpenCourseStudentSigninLogController.java | 3 ++-
.../jlw/questionLogSummary/indexInfo.html | 2 +-
.../jlw/teacherOpenCourseHandsOn/indexInfoP.html | 2 +-
.../jlw/teacherOpenCourseHandsOn/indexInfoR.html | 2 +-
.../jlw/teacherOpenCourseHandsOn/indexInfoS.html | 2 +-
.../jlw/teacherOpenCourseHandsOn/indexInfoT.html | 2 +-
.../jlw/teacherOpenCourseHandsOn/indexInfoV.html | 2 +-
.../teacherOpenCourseStudentSigninLog/index.html | 2 +-
10 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/web/src/main/java/com/ibeetl/jlw/web/QuestionLogSummaryController.java b/web/src/main/java/com/ibeetl/jlw/web/QuestionLogSummaryController.java
index b54ee4a3..f69f0b51 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/QuestionLogSummaryController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/QuestionLogSummaryController.java
@@ -213,12 +213,14 @@ public class QuestionLogSummaryController extends BaseController {
*/
@GetMapping(MODEL + "/indexInfo.do")
@Function("questionLogSummary.query")
- public ModelAndView indexInfo(Long teacherOpenCourseId,Long questionSettingId, @RequestParam(required = false) ResourcesQuestionSnapshotFromTypeEnum questionSettingType) {
+ public ModelAndView indexInfo(@SCoreUser CoreUser coreUser,Long teacherOpenCourseId,Long questionSettingId,
+ @RequestParam(required = false) ResourcesQuestionSnapshotFromTypeEnum questionSettingType) {
ModelAndView view = new ModelAndView("/jlw/questionLogSummary/indexInfo.html") ;
view.addObject("search", QuestionLogSummaryQuery.class.getName());
view.addObject("teacherOpenCourseId", teacherOpenCourseId);
view.addObject("questionSettingType", questionSettingType);
view.addObject("questionSettingId", questionSettingId);
+ view.addObject("orgId", coreUser.getOrgId());
return view;
}
diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java
index 952d69d0..8f5185ec 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java
@@ -135,11 +135,12 @@ public class TeacherOpenCourseHandsOnController{
*/
@GetMapping(MODEL + "/indexInfoV.do")
@Function("teacherOpenCourseHandsOn.query")
- public ModelAndView indexInfoV(Long teacherOpenCourseId,Long handsOnId) {
+ public ModelAndView indexInfoV(@SCoreUser CoreUser coreUser,Long teacherOpenCourseId,Long handsOnId) {
ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHandsOn/indexInfoV.html") ;
view.addObject("search", TeacherOpenCourseHandsOnQuery.class.getName());
view.addObject("teacherOpenCourseId", teacherOpenCourseId);
view.addObject("handsOnId", handsOnId);
+ view.addObject("orgId", coreUser.getOrgId());
return view;
}
@@ -150,11 +151,12 @@ public class TeacherOpenCourseHandsOnController{
*/
@GetMapping(MODEL + "/indexInfoP.do")
@Function("teacherOpenCourseHandsOn.query")
- public ModelAndView indexInfoP(Long teacherOpenCourseId, Long handsOnId) {
+ public ModelAndView indexInfoP(@SCoreUser CoreUser coreUser,Long teacherOpenCourseId, Long handsOnId) {
ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHandsOn/indexInfoP.html");
view.addObject("search", TeacherOpenCourseHandsOnQuery.class.getName());
view.addObject("teacherOpenCourseId", teacherOpenCourseId);
view.addObject("handsOnId", handsOnId);
+ view.addObject("orgId", coreUser.getOrgId());
return view;
}
@@ -165,11 +167,12 @@ public class TeacherOpenCourseHandsOnController{
*/
@GetMapping(MODEL + "/indexInfoT.do")
@Function("teacherOpenCourseHandsOn.query")
- public ModelAndView indexInfoT(Long teacherOpenCourseId, Long handsOnId) {
+ public ModelAndView indexInfoT(@SCoreUser CoreUser coreUser,Long teacherOpenCourseId, Long handsOnId) {
ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHandsOn/indexInfoT.html");
view.addObject("search", TeacherOpenCourseHandsOnQuery.class.getName());
view.addObject("teacherOpenCourseId", teacherOpenCourseId);
view.addObject("handsOnId", handsOnId);
+ view.addObject("orgId", coreUser.getOrgId());
return view;
}
@@ -181,11 +184,12 @@ public class TeacherOpenCourseHandsOnController{
*/
@GetMapping(MODEL + "/indexInfoS.do")
@Function("teacherOpenCourseHandsOn.query")
- public ModelAndView indexInfoS(Long teacherOpenCourseId, Long handsOnId) {
+ public ModelAndView indexInfoS(@SCoreUser CoreUser coreUser,Long teacherOpenCourseId, Long handsOnId) {
ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHandsOn/indexInfoS.html");
view.addObject("search", TeacherOpenCourseHandsOnQuery.class.getName());
view.addObject("teacherOpenCourseId", teacherOpenCourseId);
view.addObject("handsOnId", handsOnId);
+ view.addObject("orgId", coreUser.getOrgId());
return view;
}
@@ -196,11 +200,12 @@ public class TeacherOpenCourseHandsOnController{
*/
@GetMapping(MODEL + "/indexInfoR.do")
@Function("teacherOpenCourseHandsOn.query")
- public ModelAndView indexInfoR(Long teacherOpenCourseId, Long handsOnId) {
+ public ModelAndView indexInfoR(@SCoreUser CoreUser coreUser,Long teacherOpenCourseId, Long handsOnId) {
ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseHandsOn/indexInfoR.html");
view.addObject("search", TeacherOpenCourseHandsOnQuery.class.getName());
view.addObject("teacherOpenCourseId", teacherOpenCourseId);
view.addObject("handsOnId", handsOnId);
+ view.addObject("orgId", coreUser.getOrgId());
return view;
}
diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java
index 0eab945f..0563c512 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java
@@ -192,11 +192,12 @@ public class TeacherOpenCourseStudentSigninLogController{
@GetMapping(MODEL + "/index.do")
@Function("teacherOpenCourseStudentSigninLog.query")
- public ModelAndView index(Long signinSettingId,Long tOCId) {
+ public ModelAndView index(Long signinSettingId,Long tOCId,@SCoreUser CoreUser coreUser) {
ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseStudentSigninLog/index.html") ;
view.addObject("search", TeacherOpenCourseStudentSigninLogQuery.class.getName());
view.addObject("teacherOpenCourseStudentSigninSettingId", signinSettingId);
view.addObject("teacherOpenCourseId", tOCId);
+ view.addObject("orgId", coreUser.getOrgId());
return view;
}
diff --git a/web/src/main/resources/templates/jlw/questionLogSummary/indexInfo.html b/web/src/main/resources/templates/jlw/questionLogSummary/indexInfo.html
index ec5010df..5d0bbfa6 100644
--- a/web/src/main/resources/templates/jlw/questionLogSummary/indexInfo.html
+++ b/web/src/main/resources/templates/jlw/questionLogSummary/indexInfo.html
@@ -6,7 +6,7 @@