Commit a7602454 authored by 黄奎's avatar 黄奎

页面修改

parent f9bbce67
...@@ -2036,7 +2036,7 @@ namespace Edu.Module.Course ...@@ -2036,7 +2036,7 @@ namespace Edu.Module.Course
{ {
var ClassDate = startTime.AddDays(i); var ClassDate = startTime.AddDays(i);
List<object> subList = new List<object>(); List<object> subList = new List<object>();
var tempList = list.Where(qitem => qitem.ClassDate == ClassDate); var tempList = list.Where(qitem => qitem.ClassDate == ClassDate).OrderBy(qitem=>qitem.StartTime);
foreach (var subItem in tempList) foreach (var subItem in tempList)
{ {
var tempTimeList = timeList?.Where(qitem => qitem.ClassPlanId == subItem.ClassPlanId)?.ToList()?.OrderBy(qitem => qitem.StartTime); var tempTimeList = timeList?.Where(qitem => qitem.ClassPlanId == subItem.ClassPlanId)?.ToList()?.OrderBy(qitem => qitem.StartTime);
......
...@@ -610,11 +610,12 @@ namespace Edu.Module.Duty ...@@ -610,11 +610,12 @@ namespace Edu.Module.Duty
var pObj = new var pObj = new
{ {
Id = item?.Id ?? 0, Id = item?.Id ?? 0,
item.ItemId, item?.ItemId,
ItemName = c_itemModel?.ItemName ?? "", ItemName = c_itemModel?.ItemName ?? "",
ItemType = c_itemModel?.ItemType ?? ItemTypeEnum.FillIn, ItemType = c_itemModel?.ItemType ?? ItemTypeEnum.FillIn,
IsChecked = workIsFinish, IsChecked = workIsFinish,
WorkContent = item?.WorkContent ?? "", WorkContent = item?.WorkContent ?? "",
item?.FileList,
}; };
pList.Add(pObj); pList.Add(pObj);
......
...@@ -56,7 +56,8 @@ namespace Edu.WebApi ...@@ -56,7 +56,8 @@ namespace Edu.WebApi
"http://jiahe.oytour.com", "http://jiahe.oytour.com",
"http://jiahe.oytour.com", "http://jiahe.oytour.com",
"http://www.kookaku.com", "http://www.kookaku.com",
"http://www.kookaku.cn" "http://www.kookaku.cn",
"http://kookaku.com"
}; };
services.AddCors(options => options.AddPolicy("AllowCors", policy => policy.AllowAnyHeader().AllowAnyMethod().AllowCredentials().WithOrigins(corsArray.ToArray()))); services.AddCors(options => options.AddPolicy("AllowCors", policy => policy.AllowAnyHeader().AllowAnyMethod().AllowCredentials().WithOrigins(corsArray.ToArray())));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment