diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js
index f69b5193..ad39b2fd 100644
--- a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js
+++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSession/add.js
@@ -11,6 +11,8 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
window.classList = Common.postAjax('/jlw/teacherOpenCourseScheduleSessionClass/levelList.json').data;
var teacherOpenCourseScheduleSessionId = $("input[name='teacherOpenCourseScheduleSessionId']").val();//排课id
+
+
//?universitySystemId=TODO姚丹,这里要获取教师所在的专业ID
var classData = Common.getAjax('/jlw/schoolClass/getValues.json').data;//上课班级多选框data
@@ -57,12 +59,14 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
item.teacherOpenCourseScheduleSessionClassId = '';
});
var kkJieciTableValue = $('#kkJieciTable').data('value');
+
if (!$.isEmpty(kkJieciTableValue)) {
if (Object.keys(kkJieciTableValue).length > 1) {
$("#moreRoom").attr('checked', 'true');
} else {
$("#oneRoom").attr('checked', 'true');
}
+ var teacherOpenCourseScheduleSessionClassIdValue='';
var data = Object.values(kkJieciTableValue);
kkJieciTableData.forEach(function (item, index) {
data.forEach(function (t, i) {
@@ -70,11 +74,15 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
if (item.teacherOpenCourseScheduleSessionTagName == e.teacherOpenCourseScheduleSessionTagName) {
item.teacherOpenCourseScheduleSessionTagStartTime = e.teacherOpenCourseScheduleSessionTagStartTime;
item.teacherOpenCourseScheduleSessionTagEndTime = e.teacherOpenCourseScheduleSessionTagEndTime;
- item.teacherOpenCourseScheduleSessionClassId = Object.keys(kkJieciTableValue)[i]
+ item.teacherOpenCourseScheduleSessionClassId = Object.keys(kkJieciTableValue)[i];
item.LAY_CHECKED = true;
}
+ if(Object.keys(kkJieciTableValue).length == 1){
+ item.teacherOpenCourseScheduleSessionClassId = Object.keys(kkJieciTableValue)[0]
+ }
});
});
+
});
if (Object.keys(kkJieciTableValue).length === 0) {
merge(kkJieciTableData)
@@ -110,13 +118,15 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
field: 'teacherOpenCourseScheduleSessionTagStartTime',
title: '开始时间',
align: "center",
- edit: 'text'
+ templet: StartTime,
+ event: "startTime"
},
{
field: 'teacherOpenCourseScheduleSessionTagEndTime',
title: '结束时间',
align: "center",
- edit: 'text'
+ templet: EndTime,
+ event: "endTime"
},
{
field: 'teacherOpenCourseScheduleSessionClassId',
@@ -163,6 +173,7 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
}
};
+ /*教师关联班级下拉选项*/
form.on('select(select_teacherId)', function (obj) {
classData = Common.getAjax('/jlw/schoolClass/getValues.json', {teacherId: obj.value}).data;//上课班级多选框data
demo1.update({
@@ -221,7 +232,7 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
offset: 'auto',
title: '设置时间',
shadeClose: 'true',
- area: ['700px', '260px'],
+ area: ['700px', '280px'],
scrollbar: 'false',
btnAlign: 'c',
content: $("#setTime_demo"),
@@ -310,16 +321,83 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
});
});
+ /*表单编辑*/
+ function StartTime(obj) {
+ var teacherOpenCourseScheduleSessionTagStartTime = obj.teacherOpenCourseScheduleSessionTagStartTime;
+ var id = "startTime" + obj.LAY_INDEX;
+ return '';
+ }
+
+ function EndTime(obj) {
+ var teacherOpenCourseScheduleSessionTagEndTime = obj.teacherOpenCourseScheduleSessionTagEndTime;
+ var id = "endTime" + obj.LAY_INDEX;
+ return '';
+ }
+
/*表格编辑*/
- /*table.on('edit(kkJieciTable)', function (obj) { //注：edit是固定事件名，test是table原始容器的属性 lay-filter="对应的值"
- (obj.value); //得到修改后的值
- (obj.field); //当前编辑的字段名
- (obj.data); //所在行的所有相关数据
- (table.cache["kkJieciTable"])
- (kkJieciTableData)
- kkJieciTableData.forEach(function (item, index) {
- });
- });*/
+ table.on('tool(kkJieciTable)', function (obj) { //注：edit是固定事件名，test是table原始容器的属性 lay-filter="对应的值"
+ /* (obj.value); //得到修改后的值
+ (obj.field); //当前编辑的字段名
+ (obj.data); //所在行的所有相关数据
+ (table.cache["kkJieciTable"])
+ (kkJieciTableData)
+ kkJieciTableData.forEach(function (item, index) {
+ });*/
+ var data = obj.data;
+ var index = Number($(obj.tr[0]).attr('data-index'));
+ if (obj.event === 'startTime') {
+ var id = '#startTime' + (index + 1);
+ laydate.render({
+ elem: id
+ , type: 'time'
+ , trigger: 'click'
+ , format: 'HH:mm'
+ , done: function (value, date, endDate) {
+ kkJieciTableData[index].teacherOpenCourseScheduleSessionTagStartTime = value;
+ var endTime = data.teacherOpenCourseScheduleSessionTagEndTime;
+ var eHh = 0;
+ var eMm = 0;
+ if (!$.isEmpty(endTime)) {
+ eHh = Number(endTime.split(":")[0]);
+ eMm = Number(endTime.split(":")[1]);
+ }
+ var starDate = new Date(date.year, date.month, date.date, date.hours, date.minutes, 0); //开始时间
+ var endDate = new Date(date.year, date.month, date.date, eHh, eMm, 0); //结束时间
+ var resultDate = endDate.getTime() - starDate.getTime() //时间差的毫秒数
+ var minutes = Math.floor(resultDate / (60 * 1000));
+ kkJieciTableData[index].teacherOpenCourseScheduleSessionTagDuration = minutes;
+ table.reload('kkJieciTable', {data: kkJieciTableData});
+ }
+ });
+ } else if (obj.event == 'endTime') {
+ var id = '#endTime' + (index + 1);
+ laydate.render({
+ elem: id
+ , type: 'time'
+ , trigger: 'click'
+ , format: 'HH:mm'
+ , min: data.teacherOpenCourseScheduleSessionTagStartTime
+ , show: true
+ , done: function (value, date, endDate) {
+ kkJieciTableData[index].teacherOpenCourseScheduleSessionTagEndTime = value;
+ var starTime = data.teacherOpenCourseScheduleSessionTagStartTime;
+ var starHh = 0;
+ var starMm = 0;
+ if (!$.isEmpty(starTime)) {
+ starHh = Number(starTime.split(":")[0]);
+ starMm = Number(starTime.split(":")[1]);
+ }
+ var endDate = new Date(date.year, date.month, date.date, date.hours, date.minutes, 0); //开始时间
+ var starDate = new Date(date.year, date.month, date.date, starHh, starMm, 0); //结束时间
+ var resultDate = endDate.getTime() - starDate.getTime() //时间差的毫秒数
+ var minutes = Math.floor(resultDate / (60 * 1000));
+ kkJieciTableData[index].teacherOpenCourseScheduleSessionTagDuration = minutes;
+ table.reload('kkJieciTable', {data: kkJieciTableData});
+
+ }
+ });
+ }
+ });
/*课程时间增加*/
$("#add").click(function () {
@@ -392,7 +470,7 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
$("#teacherId option[value='" + data.teacherId + "']").attr("selected", "selected");
var xmSeValue = data.schoolClassIds;
- if(!$.isEmpty(xmSeValue)){
+ if (!$.isEmpty(xmSeValue)) {
demo1.setValue(xmSeValue.split(","))//xmselect多选下拉 取值 回显
}
@@ -413,7 +491,7 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
//课程来源：0：教师开课课程，1：授权课程
var courseType = $("#addForm select[name='teacherOpenCourseId']").find("option:selected").attr("status");
var teacherOpenCourseId = $("#addForm select[name='teacherOpenCourseId']").val();
- if(!$.isEmpty(teacherOpenCourseId_default)){
+ if (!$.isEmpty(teacherOpenCourseId_default)) {
teacherOpenCourseId = teacherOpenCourseId_default;
courseType = '0';
}
@@ -493,7 +571,6 @@ layui.define(['form', 'laydate', 'table', 'xmSelect', 'teacherOpenCourseSchedule
return;
}
-
var param = {
scheduleSessionTitle: scheduleSessionTitle,
teacherOpenCourseScheduleSessionId: teacherOpenCourseScheduleSessionId,
diff --git a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSessionTag/initSetCourseScheduleCondition.js b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSessionTag/initSetCourseScheduleCondition.js
index d3252a64..c8a191e1 100644
--- a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSessionTag/initSetCourseScheduleCondition.js
+++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSessionTag/initSetCourseScheduleCondition.js
@@ -286,8 +286,7 @@ layui.define(['laydate', 'layer', 'form', 'table', 'treetable', 'element'], func
submitTag(teacherOpenCourseScheduleSessionTagId, data);//修改课次
}
});
- }
- if (obj.event == 'endTime') {
+ }else if (obj.event == 'endTime') {
var id = '#endTime' + (Number($(obj.tr[0]).attr('data-index')) + 1);
laydate.render({
elem: id
diff --git a/web/src/main/resources/templates/jlw/teacher/statisticalReport.html b/web/src/main/resources/templates/jlw/teacher/statisticalReport.html
index 5e46376e..17916f2a 100644
--- a/web/src/main/resources/templates/jlw/teacher/statisticalReport.html
+++ b/web/src/main/resources/templates/jlw/teacher/statisticalReport.html
@@ -169,7 +169,7 @@
hide: "${isSignRole.get()!''}" != 2 ? false : true,
},
{
- field: 'loginCount', title: '登录人数', align: "center"
+ field: 'loginCount', title: '登录人次', align: "center"
},
{
field: 'onLineCount', title: '实时在线人数', align: "center"
@@ -196,10 +196,10 @@
type: 'numbers', title: '序号', align: "center",
},
{
- field: 'secondName', title: '子系统名称', align: "center",
+ field: 'secondName', title: '子系统名称', align: "center",hide:'false'
},
{
- field: 'firstName', title: '归属模块', align: "center",
+ field: 'firstName', title: '模块名称', align: "center",
},
{
field: 'universitiesCollegesName', title: '使用院校', align: "center",
diff --git a/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html b/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html
index d18c4d11..fe84057b 100644
--- a/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html
+++ b/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html
@@ -135,13 +135,13 @@
hide: "${isSignRole.get()!''}" != 2 ? true: false
},
{
- field: 'platform', title: '使用子系统名称', align: "center",
+ field: 'platform', title: '使用模块名称', align: "center",
},
{
- field: 'loginTime', title: '登入子系统时间', align: "center",
+ field: 'loginTime', title: '登入时间', align: "center",
},
{
- field: 'logoutTime', title: '登出子系统时间', align: "center",
+ field: 'logoutTime', title: '登出时间', align: "center",
},
{
field: 'onlineDuration', title: '使用时长', align: "center",
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
index fea1f84e..977a6f4b 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
@@ -238,10 +238,9 @@
{{# layui.each(window.classList, function(index, item){ }}
{{# layui.each(item.children, function(i, e){ }}
-
+
{{# }); }}
{{# }); }}