tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

Browse Source
beetlsql3-dev
wgf 2 years ago
parent 108ffd9073 6b007f1f8f
commit 863571b651
18 changed files with 91 additions and 46 deletions
Show Stats Download Patch File Download Diff File

4
web/src/main/java/com/ibeetl/jlw/web/QuestionLogSummaryController.java
Unescape Escape View File

@ -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;
}

15
web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseHandsOnController.java
Unescape Escape View File

@ -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;
}

3
web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninLogController.java
Unescape Escape View File

@ -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;
}

19
web/src/main/resources/static/js/jlw/handsOnSimulationTasks/add.js
Unescape Escape View File

@ -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);
}
}
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,6 +625,17 @@ 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){
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), //考核题目
@ -626,9 +643,11 @@ layui.define([ 'form','laytpl', 'laydate', 'table','element','handsOnSimulationT
handsOnSimulationTasksAssessmentScore:"", //考核分值
})
}
}
}else{
tableData4 = [];
}
console.log(tableData4)
var getTpl = tableData4_demo.innerHTML
,view = document.getElementById('tableData4_view');
laytpl(getTpl).render({list:tableData4}, function(html){

3
web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOn/index.js
Unescape Escape View File

@ -11,6 +11,9 @@ layui.define([ 'form', 'laydate', 'table','laytpl' ], function(exports) {
var ret = Common.getAjax("/jlw/teacherOpenCourseHandsOn/getHandsOnListCount.do?teacherOpenCourseId="+teacherOpenCourseId);
if(ret.code==0){
data = ret.data;
for(var i in data){
data[i] = (parseInt(data[i] * 100) / 100).toFixed(2); // 输出结果为 15.77
}
}else {
Common.info(ret.msg);
}

14
web/src/main/resources/static/js/jlw/teacherOpenCourseHandsOnSimulationTasks/add.js
Unescape Escape View File

@ -593,6 +593,9 @@ 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){
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), //考核题目
@ -600,6 +603,15 @@ layui.define([ 'form', 'laydate', 'table','teacherOpenCourseHandsOnSimulationTas
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();
});
/*资源库上传弹出框*/

2
web/src/main/resources/templates/jlw/handsOnSimulationTasks/add.html
Unescape Escape View File

@ -369,7 +369,7 @@
<label class="layui-form-label">考核内容：</label>
<div class="layui-input-block">
<div id="test-editor">
<textarea style="display:none;">${handsOnSimulationTasks.assessmentContent}</textarea>
<textarea style="display:none;" id="assessmentContent">${handsOnSimulationTasks.assessmentContent}</textarea>
</div>
</div>
</div>

17
web/src/main/resources/templates/jlw/questionLogSummary/homeworkIndex.html
Unescape Escape View File

@ -16,7 +16,7 @@
<div class="layui-row" id="view">
<h2 style="float: left">作业汇总：【
合计平均得分：<span id="avgStudentScore"></span>
合计及格率：<span id="avgQuestionLogSummaryIsPass"></span>
;合计及格率：<span id="avgQuestionLogSummaryIsPass"></span>%
】
</h2>
<div class="layui-inline" style="float: right">
@ -77,23 +77,26 @@
teacherOpenCourseId: teacherOpenCourseId,
questionSettingType: questionSettingType
};
if(questionSettingType == "HOMEWORK_QUESTION"){//"作业-题目类型
url = '/jlw/teacherOpenCourseQuestionSetting/analysis.json';
/*if(questionSettingType == "HOMEWORK_QUESTION"){//"作业-题目类型
url = '/jlw/teacherOpenCourseQuestionSetting/analysis.json';
}else if(questionSettingType == "HOMEWORK_FILE"){//作业-附件类型
url = '/jlw/teacherOpenCourseQuestionSetting/analysis.json'
}
}*/
var ret = Common.postAjax(url, param);
if (ret.code == 0) {
var data = ret.data;
if($.isEmpty(data)){
data = {
avgStudentScore:'0',
avgQuestionLogSummaryIsPass:'0'
avgStudentScore:'0.00',
avgQuestionLogSummaryIsPass:'0.00'
}
}
$("#avgStudentScore").html(data.avgStudentScore);
$("#avgQuestionLogSummaryIsPass").html(data.avgQuestionLogSummaryIsPass);
let avgStudentScore = data.avgStudentScore || 0.00;
let avgQuestionLogSummaryIsPass = data.avgQuestionLogSummaryIsPass || 0.00;
$("#avgStudentScore").html(avgStudentScore);
$("#avgQuestionLogSummaryIsPass").html(avgQuestionLogSummaryIsPass);
}
}

6
web/src/main/resources/templates/jlw/questionLogSummary/index.html
Unescape Escape View File

@ -14,7 +14,7 @@
合计练习题目数量: {{!$.isEmpty(d.questionTotalCount)?d.questionTotalCount:"0"}};
合计平均答对数量：{{!$.isEmpty(d.avgCorrectCount)?d.avgCorrectCount:"0"}};
合计平均答错数量：{{!$.isEmpty(d.avgWrongCount)?d.avgWrongCount:"0"}};
合计平均得分：{{!$.isEmpty(d.avgStudentScore)?d.avgStudentScore:"0"}}
合计平均得分：{{!$.isEmpty(d.avgStudentScore)?d.avgStudentScore:"0.00"}}
】
</h2>
</script>
@ -24,8 +24,8 @@
合计考试题目数量: {{!$.isEmpty(d.questionTotalCount)?d.questionTotalCount:"0"}};
合计平均答对数量：{{!$.isEmpty(d.avgCorrectCount)?d.avgCorrectCount:"0"}};
合计平均答错数量：{{!$.isEmpty(d.avgWrongCount)?d.avgWrongCount:"0"}};
合计平均准确率：{{!$.isEmpty(d.avgQuestionLogSummarySuccessRate)?d.avgQuestionLogSummarySuccessRate:"0"}};
合计平均得分：{{!$.isEmpty(d.avgStudentScore)?d.avgStudentScore:"0"}}
合计平均准确率：{{!$.isEmpty(d.avgQuestionLogSummarySuccessRate)?d.avgQuestionLogSummarySuccessRate:"0.00"}}%;
合计平均得分：{{!$.isEmpty(d.avgStudentScore)?d.avgStudentScore:"0.00"}}
】
</h2>
</script>

2
web/src/main/resources/templates/jlw/questionLogSummary/indexInfo.html
Unescape Escape View File

@ -6,7 +6,7 @@
<div class="layui-form" id="studentForm">
<div class="layui-inline">
<label class="layui-form-label">选择班级：</label>
<layui:simpleDictSelect style='layui-input-block' type="school_class.class_name.class_status=1"
<layui:simpleDictSelect style='layui-input-inline' type="school_class.class_name.class_status=1,org_id=${orgId}"
id="classId" name="classId"/>
</div>
<div class="layui-inline" style="padding-top: 10px">

10
web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/index.html
Unescape Escape View File

@ -10,11 +10,11 @@
</div>
<script type="text/html" id="demo">
<h2 style="float: left">课程实操汇总：【
观看视频平均得分: {{!$.isEmpty(d)?d.videoAvgScore:"0"}};
观看ppt平均得分：{{!$.isEmpty(d)?d.pptAvgScore:"0"}};
理论测评平均得分：{{!$.isEmpty(d)?d.theoryAvgScore:"0"}};
实训操作步骤平均得分：{{!$.isEmpty(d)?d.stepAvgScore:"0"}}
报告撰写平均得分：{{!$.isEmpty(d)?d.reportAvgScore:"0"}}
观看视频平均得分: {{!$.isEmpty(d)?d.videoAvgScore:"0.00"}};
观看ppt平均得分：{{!$.isEmpty(d)?d.pptAvgScore:"0.00"}};
理论测评平均得分：{{!$.isEmpty(d)?d.theoryAvgScore:"0.00"}};
实训操作步骤平均得分：{{!$.isEmpty(d)?d.stepAvgScore:"0.00"}};
报告撰写平均得分：{{!$.isEmpty(d)?d.reportAvgScore:"0.00"}}
】
</h2>
</script>

2
web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoP.html
Unescape Escape View File

@ -6,7 +6,7 @@
<div class="layui-form" id="studentForm">
<div class="layui-inline">
<label class="layui-form-label">选择班级：</label>
<layui:simpleDictSelect style='layui-input-block' type="school_class.class_name.class_status=1"
<layui:simpleDictSelect style='layui-input-inline' type="school_class.class_name.class_status=1,org_id=${orgId}"
id="classId" name="classId"/>
</div>
<div class="layui-inline" style="padding-top: 10px">

2
web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoR.html
Unescape Escape View File

@ -6,7 +6,7 @@
<div class="layui-form" id="studentForm">
<div class="layui-inline">
<label class="layui-form-label">选择班级：</label>
<layui:simpleDictSelect style='layui-input-block' type="school_class.class_name.class_status=1"
<layui:simpleDictSelect style='layui-input-inline' type="school_class.class_name.class_status=1,org_id=${orgId}"
id="classId" name="classId"/>
</div>
<div class="layui-inline" style="padding-top: 10px">

2
web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoS.html
Unescape Escape View File

@ -6,7 +6,7 @@
<div class="layui-form" id="studentForm">
<div class="layui-inline">
<label class="layui-form-label">选择班级：</label>
<layui:simpleDictSelect style='layui-input-block' type="school_class.class_name.class_status=1"
<layui:simpleDictSelect style='layui-input-inline' type="school_class.class_name.class_status=1,org_id=${orgId}"
id="classId" name="classId"/>
</div>
<div class="layui-inline" style="padding-top: 10px">

2
web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoT.html
Unescape Escape View File

@ -6,7 +6,7 @@
<div class="layui-form" id="studentForm">
<div class="layui-inline">
<label class="layui-form-label">选择班级：</label>
<layui:simpleDictSelect style='layui-input-block' type="school_class.class_name.class_status=1"
<layui:simpleDictSelect style='layui-input-inline' type="school_class.class_name.class_status=1,org_id=${orgId}"
id="classId" name="classId"/>
</div>
<div class="layui-inline" style="padding-top: 10px">

2
web/src/main/resources/templates/jlw/teacherOpenCourseHandsOn/indexInfoV.html
Unescape Escape View File

@ -6,7 +6,7 @@
<div class="layui-form" id="studentForm">
<div class="layui-inline">
<label class="layui-form-label">选择班级：</label>
<layui:simpleDictSelect style='layui-input-block' type="school_class.class_name.class_status=1"
<layui:simpleDictSelect style='layui-input-inline' type="school_class.class_name.class_status=1,org_id=${orgId}"
id="classId" name="classId"/>
</div>
<div class="layui-inline" style="padding-top: 10px">

2
web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninLog/index.html
Unescape Escape View File

@ -6,7 +6,7 @@
<div class="layui-form" id="studentForm">
<div class="layui-inline">
<label class="layui-form-label">选择班级：</label>
<layui:simpleDictSelect style='layui-input-block' type="school_class.class_name.class_status=1"
<layui:simpleDictSelect style='layui-input-inline' type="school_class.class_name.class_status=1,org_id=${orgId}"
id="classId" name="classId"/>
</div>
<div class="layui-inline" style="padding-top: 10px">

2
web/src/main/resources/templates/jlw/teacherOpenCourseStudentSigninSetting/index.html
Unescape Escape View File

@ -13,7 +13,7 @@
合计签到次数: {{!$.isEmpty(d.totalSigninCount)?d.totalSigninCount:"0"}}次;
合计签到人数：{{!$.isEmpty(d.totalSigninNumber)?d.totalSigninNumber:"0"}}人;
合计缺勤：{{!$.isEmpty(d.totalUnSigninNumber)?d.totalUnSigninNumber:"0"}}人;
合计到课率：{{!$.isEmpty(d.totalAttendanceRate)?d.totalAttendanceRate:"0"}}%
合计到课率：{{!$.isEmpty(d.TotalAttendanceRate)?d.TotalAttendanceRate:"0"}}%
】
</h2>
</script>

Write Preview
Loading…
Cancel
Save