@@ -304,7 +304,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers | |||||
startDate = StartTime.ToString("yyyy-MM-dd"); | startDate = StartTime.ToString("yyyy-MM-dd"); | ||||
} | } | ||||
endDate = Common.CalculateFirstDateOfWeek(StartTime.AddDays(((curWeek - 1) * 14))).AddDays(10) | |||||
endDate = Common.CalculateFirstDateOfWeek(StartTime.AddDays(((curWeek - 1) * 14))).AddDays(13) | |||||
.ToString("yyyy-MM-dd");// StartTime.AddDays(((curWeek - 1) * 14)).AddDays(10).ToString("yyyy-MM-dd"); | .ToString("yyyy-MM-dd");// StartTime.AddDays(((curWeek - 1) * 14)).AddDays(10).ToString("yyyy-MM-dd"); | ||||
var timeTableList = new List<TimeTable>(); | var timeTableList = new List<TimeTable>(); | ||||
@@ -78,7 +78,7 @@ | |||||
border-left: 1px solid #333; | border-left: 1px solid #333; | ||||
border-top: 1px solid #333; | border-top: 1px solid #333; | ||||
padding: 1px; | padding: 1px; | ||||
width: 9%; | |||||
width: 6.6%; | |||||
font-size: 12px; | font-size: 12px; | ||||
} | } | ||||
.perFestivalsBox table { | .perFestivalsBox table { | ||||
@@ -118,7 +118,7 @@ | |||||
height: 100%; | height: 100%; | ||||
} | } | ||||
.leftDiv { | .leftDiv { | ||||
width: 80%; | |||||
width: 100%; | |||||
float: left; | float: left; | ||||
} | } | ||||
.rightDiv { | .rightDiv { | ||||
@@ -140,7 +140,7 @@ | |||||
} | } | ||||
.perFestivalsBox td { | .perFestivalsBox td { | ||||
padding: 1px; | padding: 1px; | ||||
width: 9%; | |||||
width: 6.6%; | |||||
} | } | ||||
.WeekTimes { | .WeekTimes { | ||||
text-align: left; | text-align: left; | ||||
@@ -186,7 +186,7 @@ | |||||
<table id="lessonTermTable" cellspacing="0" border="0" style="width: 100%"></table> | <table id="lessonTermTable" cellspacing="0" border="0" style="width: 100%"></table> | ||||
</div> | </div> | ||||
</div> | </div> | ||||
<div class="rightDiv"> | |||||
@*<div class="rightDiv"> | |||||
<input id="ALTId" hidden="hidden" /> | <input id="ALTId" hidden="hidden" /> | ||||
<div class="rdiv" id="LessonInfo"></div> | <div class="rdiv" id="LessonInfo"></div> | ||||
<div class="rdiv" id="EmpInfo"></div> | <div class="rdiv" id="EmpInfo"></div> | ||||
@@ -196,7 +196,7 @@ | |||||
<div class="rdiv" id="NodeSelect"></div> | <div class="rdiv" id="NodeSelect"></div> | ||||
<button class="btn btn-default dbtn" id="delete">删除</button> | <button class="btn btn-default dbtn" id="delete">删除</button> | ||||
<button class="btn btn-default ebtn" id="edit">修改</button> | <button class="btn btn-default ebtn" id="edit">修改</button> | ||||
</div> | |||||
</div>*@ | |||||
</div> | </div> | ||||
</div> | </div> | ||||
@@ -13,7 +13,7 @@ var bootstrap = function ($, learun) { | |||||
function (data) { | function (data) { | ||||
//console.log('res', data); | //console.log('res', data); | ||||
// 数据处理 | // 数据处理 | ||||
var html = '<tr style="height: 30px;"><td>节次/星期</td><td>星期一</td><td>星期二</td><td>星期三</td><td>星期四</td><td>星期五</td><td>星期六</td><td>星期日</td><td>星期八</td><td>星期九</td><td>星期十</td></tr>'; | |||||
var html = '<tr style="height: 30px;"><td>节次/第几天</td><td>第1天</td><td>第2天</td><td>第3天</td><td>第4天</td><td>第5天</td><td>第6天</td><td>第7天</td><td>第8天</td><td>第9天</td><td>第10天</td><td>第11天</td><td>第12天</td><td>第13天</td><td>第14天</td></tr>'; | |||||
var weekLists = data.weekList; | var weekLists = data.weekList; | ||||
//十节课 2022.6.14 修改为一天十一节课 | //十节课 2022.6.14 修改为一天十一节课 | ||||
for (var i = 1; i < 12; i++) { | for (var i = 1; i < 12; i++) { | ||||
@@ -60,7 +60,7 @@ var bootstrap = function ($, learun) { | |||||
//某节课空 | //某节课空 | ||||
function tdHandle() { | function tdHandle() { | ||||
var html = ''; | var html = ''; | ||||
for (var j = 0; j < 11; j++) { | |||||
for (var j = 0; j < 15; j++) { | |||||
html += '<td class="active" id="" num="' + (j + 1) + '"><div></div><div></div><div></div><div></div></td>'; | html += '<td class="active" id="" num="' + (j + 1) + '"><div></div><div></div><div></div><div></div></td>'; | ||||
} | } | ||||
return html; | return html; | ||||
@@ -69,7 +69,7 @@ var bootstrap = function ($, learun) { | |||||
//某节课不空 | //某节课不空 | ||||
function tdHandles(lists) { | function tdHandles(lists) { | ||||
var html = ''; | var html = ''; | ||||
for (var k = 1; k < 12; k++) { | |||||
for (var k = 1; k < 16; k++) { | |||||
(function (arg) { | (function (arg) { | ||||
var args = arg - 1; | var args = arg - 1; | ||||
var datas = flogs2(arg, lists, 'day'); | var datas = flogs2(arg, lists, 'day'); | ||||