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 c8a191e1..8c1f2b58 100644 --- a/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSessionTag/initSetCourseScheduleCondition.js +++ b/web/src/main/resources/static/js/jlw/teacherOpenCourseScheduleSessionTag/initSetCourseScheduleCondition.js @@ -104,7 +104,7 @@ layui.define(['laydate', 'layer', 'form', 'table', 'treetable', 'element'], func align: "center", edit: "text", hideField: false, - /* style:"border: 2px solid #F6F6F6;",*/ + style:"color: #009688;", hide: $.isEmpty(sx_['teacherOpenCourseScheduleSessionTagName']) ? false : sx_['teacherOpenCourseScheduleSessionTagName'], }, { @@ -176,6 +176,7 @@ layui.define(['laydate', 'layer', 'form', 'table', 'treetable', 'element'], func title: '教学楼', align: "center", hideField: false, + style:"color:#4478bbee", hide: $.isEmpty(sx_['teacherOpenCourseScheduleSessionClassName']) ? false : sx_['teacherOpenCourseScheduleSessionClassName'], templet: function (d) { return d.teacherOpenCourseScheduleSessionClassParentId === '0' ? d.teacherOpenCourseScheduleSessionClassName : ""; @@ -186,6 +187,7 @@ layui.define(['laydate', 'layer', 'form', 'table', 'treetable', 'element'], func title: '教室号', align: "center", hideField: false, + style:"color:#01AAED", hide: $.isEmpty(sx_['teacherOpenCourseScheduleSessionClassName']) ? false : sx_['teacherOpenCourseScheduleSessionClassName'], templet: function (d) { return d.teacherOpenCourseScheduleSessionClassParentId === '0' ? "" : d.teacherOpenCourseScheduleSessionClassName; @@ -218,7 +220,13 @@ layui.define(['laydate', 'layer', 'form', 'table', 'treetable', 'element'], func }); table.on('edit(teacherOpenCourseScheduleSessionTagTable)', function (obj) { //注:edit是固定事件名,test是table原始容器的属性 lay-filter="对应的值" var id = obj.data.teacherOpenCourseScheduleSessionTagId; - submitTag(id, obj.data); + var param = { + teacherOpenCourseScheduleSessionTagId:id, + teacherOpenCourseScheduleSessionTagName:obj.data.teacherOpenCourseScheduleSessionTagName, + teacherOpenCourseScheduleSessionTagEndTime:obj.data.teacherOpenCourseScheduleSessionTagEndTime, + teacherOpenCourseScheduleSessionTagStartTime:obj.data.teacherOpenCourseScheduleSessionTagStartTime + } + submitTag(id, param); }); }, @@ -230,7 +238,7 @@ layui.define(['laydate', 'layer', 'form', 'table', 'treetable', 'element'], func toolbar = { class_add: function () { let newRow = { - "teacherOpenCourseScheduleSessionClassName": "", + "teacherOpenCourseScheduleSessionClassName": "请 ’编辑’ 教学楼名称", "teacherOpenCourseScheduleSessionClassParentId": "0", }; submitClassRoom('', newRow) @@ -240,7 +248,7 @@ layui.define(['laydate', 'layer', 'form', 'table', 'treetable', 'element'], func Common.openDlg(url,"课次管理>新增");*/ var data = table.cache["teacherOpenCourseScheduleSessionTagTable"]; let newRow = { - "teacherOpenCourseScheduleSessionTagName": "", + "teacherOpenCourseScheduleSessionTagName": "请输入课次名称", "teacherOpenCourseScheduleSessionTagStartTime": "00:00", "teacherOpenCourseScheduleSessionTagEndTime": "00:00", }; @@ -283,7 +291,27 @@ layui.define(['laydate', 'layer', 'form', 'table', 'treetable', 'element'], func , format: 'HH:mm' , done: function (value, date, endDate) { data.teacherOpenCourseScheduleSessionTagStartTime = value; - submitTag(teacherOpenCourseScheduleSessionTagId, data);//修改课次 + /*var endTime = data.teacherOpenCourseScheduleSessionTagEndTime; + var endHh = 0; + var endMm = 0; + if (!$.isEmpty(endTime)) { + endHh = Number(endTime.split(":")[0]); + endMm = Number(endTime.split(":")[1]); + } + var endDate = new Date(date.year, date.month, date.date, endHh, endMm, 0); //开始时间 + var starDate = new Date(date.year, date.month, date.date, date.hours, date.minutes, 0); //结束时间 + var resultDate = endDate.getTime() - starDate.getTime() //时间差的毫秒数 + var minutes = Math.floor(resultDate / (60 * 1000)); + if(minutes <= 0 && (data.teacherOpenCourseScheduleSessionTagEndTime != "00:00")){ + Common.info("开始时间大于等于结束时间,请重新选择!"); + return; + }*/ + var param = { + teacherOpenCourseScheduleSessionTagId:teacherOpenCourseScheduleSessionTagId, + teacherOpenCourseScheduleSessionTagStartTime:value, + teacherOpenCourseScheduleSessionTagEndTime:data.teacherOpenCourseScheduleSessionTagEndTime + } + submitTag(teacherOpenCourseScheduleSessionTagId, param);//修改课次 } }); }else if (obj.event == 'endTime') { @@ -297,7 +325,32 @@ layui.define(['laydate', 'layer', 'form', 'table', 'treetable', 'element'], func , show: true , done: function (value, date, endDate) { data.teacherOpenCourseScheduleSessionTagEndTime = value; - submitTag(teacherOpenCourseScheduleSessionTagId, data);//修改课次 + 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)); + if(minutes <= 0 && (data.teacherOpenCourseScheduleSessionTagStartTime != "00:00")){ + Common.info("结束时间小于等于开始时间,请重新选择!"); + return; + } + if(data.teacherOpenCourseScheduleSessionTagStartTime === "00:00"){ + //console.log(data) + alert(data.teacherOpenCourseScheduleSessionTagStartTime) + return; + } + var param = { + teacherOpenCourseScheduleSessionTagId:teacherOpenCourseScheduleSessionTagId, + teacherOpenCourseScheduleSessionTagStartTime:data.teacherOpenCourseScheduleSessionTagStartTime, + teacherOpenCourseScheduleSessionTagEndTime:value + } + submitTag(teacherOpenCourseScheduleSessionTagId, param);//修改课次 } }); } @@ -402,12 +455,12 @@ layui.define(['laydate', 'layer', 'form', 'table', 'treetable', 'element'], func url = "/jlw/teacherOpenCourseScheduleSessionTag/edit.json" } var ret = Common.postAjax(url, param); - layer.closeAll('loading'); //关闭loading layer.msg(ret.code == 0 ? "操作成功!" : ret.msg, { offset: ['50%'], icon: ret.code == 0 ? 1 : 2, time: 1500 //2秒关闭(如果不配置,默认是3秒) }, function () { + layer.closeAll('loading'); //关闭loading if (ret.code == 0) { parent.Lib.tableRefresh(); teacherOpenCourseScheduleSessionTagTable(); @@ -424,12 +477,12 @@ layui.define(['laydate', 'layer', 'form', 'table', 'treetable', 'element'], func url = "/jlw/teacherOpenCourseScheduleSessionClass/edit.json" } var ret = Common.postAjax(url, param); - layer.closeAll('loading'); //关闭loading layer.msg(ret.code == 0 ? "操作成功!" : ret.msg, { offset: ['50%'], icon: ret.code == 0 ? 1 : 2, time: 1500 //2秒关闭(如果不配置,默认是3秒) }, function () { + layer.closeAll('loading'); //关闭loading if (ret.code == 0) { parent.Lib.tableRefresh(); teacherOpenCourseScheduleSessionClassTable(); diff --git a/web/src/main/resources/templates/jlw/handsOn/add.html b/web/src/main/resources/templates/jlw/handsOn/add.html index 59c372c1..8d7b2ca6 100644 --- a/web/src/main/resources/templates/jlw/handsOn/add.html +++ b/web/src/main/resources/templates/jlw/handsOn/add.html @@ -186,8 +186,8 @@ '3'?'理论测评':item.taskType == '4'?'实训操作步骤':item.taskType == '5'?'报告撰写':'其他'}}