diff --git a/admin-core/src/main/resources/templates/common/container.html b/admin-core/src/main/resources/templates/common/container.html
index 38b1e9c3..bf316cf1 100644
--- a/admin-core/src/main/resources/templates/common/container.html
+++ b/admin-core/src/main/resources/templates/common/container.html
@@ -6,7 +6,7 @@
 	<title>
 		金融虚拟仿真实验课程平台
 	</title>
-	<link rel="shortcut icon" href="${ctxPath}/plugins/logo2.ico" type="image/x-icon">
+	<link rel="shortcut icon" href="${ctxPath}/plugins/logo.ico" type="image/x-icon">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
 	<meta http-equiv ="Pragma" content = "no-cache"/>
 	<meta http-equiv="Cache-Control" content="no cache" />
diff --git a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
index 55f4718c..cfffa4df 100644
--- a/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
+++ b/web/src/main/resources/templates/jlw/teacherOpenCourseScheduleSession/add.html
@@ -9,6 +9,19 @@
 	.layui-table-body, .layui-table-box, .layui-table-cell{
 		overflow:visible;
 	}
+
+	.layui-laydate-content > .layui-laydate-list {
+		padding-bottom: 0px;
+		overflow: hidden;
+	}
+
+	.layui-laydate-content > .layui-laydate-list > li {
+		width: 50%;
+	}
+
+	.laydate-time-list ol li {
+		padding-left: 54px;
+	}
 </style>
 <form class="layui-form" id="addForm">
 	<div class="layui-row" style="margin-left: 40px;">
@@ -352,57 +365,98 @@
 						elem: '#teacherOpenCourseScheduleSessionTagStartTime'
 						, type: 'time'
 						, trigger: 'click'
-						, done: function (value, date) {
+						, format: 'HH:mm'
+						, change: function (value, date) {
+							if (!$.isEmpty($("#teacherOpenCourseScheduleSessionTagEndTime").val())) {
+								return;
+							}
 							var mine = Number($("input[name=teacherOpenCourseScheduleSessionTagDuration]").val());
 							if (!$.isEmpty(mine)) {
-								var hours = date.hours + Math.floor((mine + date.minutes) / 60);
-								var minutes = date.minutes + (mine + date.minutes) % 60;
-								var seconds = date.seconds;
-								if (hours < 10) {
-									hours = "0" + hours;
-								}
-								if (minutes < 10) {
-									minutes = "0" + minutes;
-								}
-								if (seconds < 10) {
-									seconds = "0" + seconds;
-								}
-								var endTime = hours + ":" + minutes + ":" + seconds;
-								$("#teacherOpenCourseScheduleSessionTagEndTime").val(endTime)
+								var time = getTime(date.hours, date.minutes, mine);
+								$("#teacherOpenCourseScheduleSessionTagEndTime").val(time)
 							}
-							min = value;
 						}
 					});
 					/*下课时间*/
 					laydate.render({
 						elem: '#teacherOpenCourseScheduleSessionTagEndTime'
 						, type: 'time'
+						, format: 'HH:mm'
 						, trigger: 'click'
-						, min:"'"+min+"'"
-						, done: function (value, date) {
-
+						, change: function (value, date) {
 							var startTime = $("#teacherOpenCourseScheduleSessionTagStartTime").val();
 							if (!$.isEmpty(startTime)) {
-								var dd = Common.GetDateDiff(min, value, "minute")
-
+								return;
+							}
+							var mine = Number($("input[name=teacherOpenCourseScheduleSessionTagDuration]").val());
+							if (!$.isEmpty(mine)) {
+								var time = getTime(date.hours, date.minutes, -mine);
+								$("#teacherOpenCourseScheduleSessionTagStartTime").val(time)
 							}
 						}
 					});
 				},
 				yes: function (index, layero) {
-					//layer.load();
-					var startTime = $("#teacherOpenCourseScheduleSessionTagStartTime$").val();
+					layer.load();
+					var startTime = $("#teacherOpenCourseScheduleSessionTagStartTime").val();
 					var endTime = $("#teacherOpenCourseScheduleSessionTagEndTime").val();
-					if (endTime) {
-
+					var mine = Number($("input[name=teacherOpenCourseScheduleSessionTagDuration]").val());
+					if ($.isEmpty(startTime) || $.isEmpty(endTime)) {
+						Common.info("请选择上课时间或下课时间！！");
+						return;
 					}
-					kkJieciTableData = [];
-					kkJieciTableData = Common.getAjax('/jlw/teacherOpenCourseScheduleSessionTag/getValues.json').data;//开课节次数据表格
+					var break1 = 10;//课间休息10分钟
+					var break2 = 20;//课间休息20分钟
 					kkJieciTableData.forEach(function (item, index) {
-						item.teacherOpenCourseScheduleSessionClassName = '';
+						var hours = Number(startTime.split(":")[0]);
+						var minutes = Number(startTime.split(":")[1]);
+						if (index < 2|| index == 3) {
+							console.log("早上课",index)
+							item.teacherOpenCourseScheduleSessionTagStartTime = getTime(hours, minutes, mine * index + break1 * index);
+							item.teacherOpenCourseScheduleSessionTagEndTime = getTime(hours, minutes, mine * (index + 1) + break1 * index);
+						}
+						if (index == 2) {
+							console.log("商务课间课",index)
+							var hours = Number(startTime.split(":")[0]);
+							var minutes = Number(startTime.split(":")[1]);
+							item.teacherOpenCourseScheduleSessionTagStartTime = getTime(hours, minutes, mine * index + break1 * (index + 1));
+							item.teacherOpenCourseScheduleSessionTagEndTime = getTime(hours, minutes, mine * (index + 1) + break1 * (index + 1));
+						}
+						/*下午课*/
+						if (4 <= index && index <= 7) {
+							var hours1 = 14;
+							var minutes1 = 0;
+							console.log("下午课",index)
+							item.teacherOpenCourseScheduleSessionTagStartTime = getTime(hours1, minutes1, mine * index + break1 * index);
+							item.teacherOpenCourseScheduleSessionTagEndTime = getTime(hours1, minutes1, mine * (index + 1) + break1 * index);
+						}
+						/*if (8 <= index) {
+							var hours2 = 19;
+							var minutes2 = 0;
+							console.log("晚自习",index)
+							item.teacherOpenCourseScheduleSessionTagStartTime = getTime(hours2, minutes2, mine * index + break1 * index);
+							item.teacherOpenCourseScheduleSessionTagEndTime = getTime(hours2, minutes2, mine * (index + 1) + break1 * index);
+						}*/
+						/*if (index == 0) {
+                            item.teacherOpenCourseScheduleSessionTagStartTime = getTime(hours,minutes,mine*0+break1*0);
+                            item.teacherOpenCourseScheduleSessionTagEndTime = getTime(hours,minutes,mine*1);
+                        }
+                        if (item.teacherOpenCourseScheduleSessionTagName == "第二节") {
+                            item.teacherOpenCourseScheduleSessionTagStartTime = getTime(hours,minutes,mine*1+break1*1);
+                            item.teacherOpenCourseScheduleSessionTagEndTime = getTime(hours,minutes,mine*2+break1);
+                        }
+                        if (item.teacherOpenCourseScheduleSessionTagName == "第三节") {
+                            item.teacherOpenCourseScheduleSessionTagStartTime = getTime(hours,minutes,mine*2+break1*3);
+                            item.teacherOpenCourseScheduleSessionTagEndTime = getTime(hours,minutes,mine*3+break1*3);
+                        }
+                        if (item.teacherOpenCourseScheduleSessionTagName == "第四节") {
+                            item.teacherOpenCourseScheduleSessionTagStartTime = getTime(hours,minutes,mine*3+break1*4);
+                            item.teacherOpenCourseScheduleSessionTagEndTime = getTime(hours,minutes,mine*4+break1*4);
+                        }*/
 					});
+					console.log(kkJieciTableData)
 					table.reload('kkJieciTable', {data: kkJieciTableData});
-					//layer.closeAll();
+					layer.closeAll();
 				},
 				btn2: function (index, layero) {
 					layer.close(index);
@@ -433,25 +487,41 @@
 		/*课程时长input失去焦点事件*/
 		$("#teacherOpenCourseScheduleSessionTagDuration").blur(function () {
 			var mine = Number($("input[name=teacherOpenCourseScheduleSessionTagDuration]").val());
-			var startTime = $("input[name=teacherOpenCourseScheduleSessionTagStartTime]").val().split(":");
+			var startTime = $("input[name=teacherOpenCourseScheduleSessionTagStartTime]").val();
+			var endTime = $("#teacherOpenCourseScheduleSessionTagEndTime").val();
 			if (!$.isEmpty(startTime)) {
-				var hours = Number(startTime[0]) + Math.floor((mine + Number(startTime[1])) / 60);
-				var minutes = Number(startTime[1]) + (mine + Number(startTime[1])) % 60;
-				var seconds = Number(startTime[2]);
-				if (hours < 10) {
-					hours = "0" + hours;
-				}
-				if (minutes < 10) {
-					minutes = "0" + minutes;
+				if (!$.isEmpty(endTime)) {
+					return;
 				}
-				if (seconds < 10) {
-					seconds = "0" + seconds;
+				var hours = Number(startTime.split(":")[0]);
+				var minutes = Number(startTime.split(":")[1]);
+				var endTime = getTime(hours, minutes, mine);
+				$("#teacherOpenCourseScheduleSessionTagEndTime").val(endTime)
+			}
+			if (!$.isEmpty(endTime)) {
+				if (!$.isEmpty(startTime)) {
+					return;
 				}
-				var endTime = hours + ":" + minutes + ":" + seconds;
+				var hours = Number(endTime.split(":")[0]);
+				var minutes = Number(endTime.split(":")[1]);
+				var endTime = getTime(hours, minutes, mine);
 				$("#teacherOpenCourseScheduleSessionTagEndTime").val(endTime)
 			}
 		});
 
+		function getTime(hours, minutes, addTime) {
+			var hours = Math.abs(hours + Math.floor((minutes + addTime) / 60));
+			var minutes = Math.abs((minutes + addTime) % 60);
+
+			if (hours < 10) {
+				hours = "0" + hours;
+			}
+			if (minutes < 10) {
+				minutes = "0" + minutes;
+			}
+			var time = hours + ":" + minutes;
+			return time
+		}
 		teacherOpenCourseScheduleSessionAdd.init();
 });
 </script>