diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs index b5530e75b..44366a619 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/ArrangeLessonTermController.cs @@ -304,7 +304,7 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers 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"); var timeTableList = new List(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTerm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTerm.cshtml index b2ed41f8a..6b3e66195 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTerm.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTerm.cshtml @@ -78,7 +78,7 @@ border-left: 1px solid #333; border-top: 1px solid #333; padding: 1px; - width: 9%; + width: 6.6%; font-size: 12px; } .perFestivalsBox table { @@ -118,7 +118,7 @@ height: 100%; } .leftDiv { - width: 80%; + width: 100%; float: left; } .rightDiv { @@ -140,7 +140,7 @@ } .perFestivalsBox td { padding: 1px; - width: 9%; + width: 6.6%; } .WeekTimes { text-align: left; @@ -186,7 +186,7 @@
-
+ @*
@@ -196,7 +196,7 @@
-
+
*@ diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTerm.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTerm.js index 397d036f5..7f9032631 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTerm.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/ArrangeLessonTerm/IndexLessonTerm.js @@ -13,7 +13,7 @@ var bootstrap = function ($, learun) { function (data) { //console.log('res', data); // 数据处理 - var html = '节次/星期星期一星期二星期三星期四星期五星期六星期日星期八星期九星期十'; + var html = '节次/第几天第1天第2天第3天第4天第5天第6天第7天第8天第9天第10天第11天第12天第13天第14天'; var weekLists = data.weekList; //十节课 2022.6.14 修改为一天十一节课 for (var i = 1; i < 12; i++) { @@ -60,7 +60,7 @@ var bootstrap = function ($, learun) { //某节课空 function tdHandle() { var html = ''; - for (var j = 0; j < 11; j++) { + for (var j = 0; j < 15; j++) { html += '
'; } return html; @@ -69,7 +69,7 @@ var bootstrap = function ($, learun) { //某节课不空 function tdHandles(lists) { var html = ''; - for (var k = 1; k < 12; k++) { + for (var k = 1; k < 16; k++) { (function (arg) { var args = arg - 1; var datas = flogs2(arg, lists, 'day');