biss/Academic-Affairs-System
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 9 Wiki Activity

实验排课

Browse Source
This commit is contained in:
biss
2026-08-09 12:30:33 +08:00 Unverified
parent 1229f3163d
commit c692002676
25 changed files with 21294 additions and 1189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Jiaowu.Api/Controllers/BaseDataController.cs
+9
View File
@@ -491,6 +491,7 @@ public sealed class BaseDataController(AppDbContext db, IAppCache cache) : Contr
x.Building.Campus!.Name,
x.Capacity,
x.RoomType,
x.TeachingVenueNature,
x.Equipment,
x.IsEnabled,
x.SortOrder))
@@ -557,6 +558,9 @@ public sealed class BaseDataController(AppDbContext db, IAppCache cache) : Contr
BuildingId = request.BuildingId,
Capacity = request.Capacity,
RoomType = request.RoomType.Trim(),
TeachingVenueNature = request.TeachingVenueNature == 0
? TeachingVenueNature.GeneralClassroom
: request.TeachingVenueNature,
Equipment = request.Equipment?.Trim(),
SortOrder = request.SortOrder,
IsEnabled = request.IsEnabled
@@ -577,6 +581,9 @@ public sealed class BaseDataController(AppDbContext db, IAppCache cache) : Contr
entity.BuildingId = request.BuildingId;
entity.Capacity = request.Capacity;
entity.RoomType = request.RoomType.Trim();
entity.TeachingVenueNature = request.TeachingVenueNature == 0
? TeachingVenueNature.GeneralClassroom
: request.TeachingVenueNature;
entity.Equipment = request.Equipment?.Trim();
await SaveAndInvalidateAsync(cancellationToken);
return entity;
@@ -728,6 +735,7 @@ public sealed record ClassroomRequest(
Guid BuildingId,
[Range(1, 1000)] int Capacity,
[Required, MaxLength(40)] string RoomType,
TeachingVenueNature TeachingVenueNature,
[MaxLength(300)] string? Equipment)
: CatalogRequest(Code, Name, SortOrder, IsEnabled);
@@ -784,6 +792,7 @@ public sealed record ClassroomListItem(
string CampusName,
int Capacity,
string RoomType,
TeachingVenueNature TeachingVenueNature,
string? Equipment,
bool IsEnabled,
int SortOrder);
src/Jiaowu.Api/Controllers/BaseDataExcelController.cs
+62 -4
View File
@@ -27,7 +27,7 @@ public sealed class BaseDataExcelController(AppDbContext db, IAppCache cache) :
["classes"] = ["编码", "名称", "所属专业编码", "年级", "辅导员工号", "排序", "状态"],
["terms"] = ["编码", "名称", "学年", "学期季", "开始日期", "结束日期", "当前学期", "状态"],
["buildings"] = ["编码", "名称", "所属校区编码", "排序", "状态"],
["classrooms"] = ["编码", "名称", "所属教学楼编码", "容量", "教室类型", "设备", "排序", "状态"],
["classrooms"] = ["编码", "名称", "所属教学楼编码", "容量", "教室类型", "教学场地性质", "设备", "排序", "状态"],
["course-categories"] = ["编码", "名称", "排序", "状态"]
};
@@ -70,7 +70,10 @@ public sealed class BaseDataExcelController(AppDbContext db, IAppCache cache) :
IReadOnlyList<ExcelRow> rows;
try
{
rows = await ExcelWorkbookHelper.ReadAsync(file, headers, cancellationToken);
var requiredHeaders = kind.Equals("classrooms", StringComparison.OrdinalIgnoreCase)
? headers.Where(x => x != "教学场地性质").ToArray()
: headers;
rows = await ExcelWorkbookHelper.ReadAsync(file, requiredHeaders, cancellationToken);
}
catch (InvalidDataException exception)
{
@@ -165,6 +168,7 @@ public sealed class BaseDataExcelController(AppDbContext db, IAppCache cache) :
"classrooms" => (await db.Classrooms.AsNoTracking().Include(x => x.Building)
.OrderBy(x => x.Code).ToListAsync(cancellationToken))
.Select(x => Row(x.Code, x.Name, x.Building!.Code, x.Capacity, x.RoomType,
VenueNatureName(x.TeachingVenueNature),
x.Equipment, x.SortOrder, Status(x.IsEnabled))).ToList(),
"course-categories" => (await db.CourseCategories.AsNoTracking()
.OrderBy(x => x.SortOrder).ThenBy(x => x.Code)
@@ -473,8 +477,9 @@ public sealed class BaseDataExcelController(AppDbContext db, IAppCache cache) :
var buildingCode = Required(row, "所属教学楼编码", errors);
var capacity = ParseInt(row, "容量", 1, 1000, errors);
var roomType = Required(row, "教室类型", errors);
var venueNature = ParseVenueNature(row, roomType, errors);
if (code is null || name is null || buildingCode is null ||
capacity is null || roomType is null) continue;
capacity is null || roomType is null || venueNature is null) continue;
if (!buildings.TryGetValue(buildingCode, out var building))
{
errors.Add($"第 {row.RowNumber} 行：所属教学楼编码“{buildingCode}”不存在。");
@@ -488,7 +493,8 @@ public sealed class BaseDataExcelController(AppDbContext db, IAppCache cache) :
Code = code,
Name = name,
BuildingId = building.Id,
RoomType = roomType
RoomType = roomType,
TeachingVenueNature = venueNature.Value
};
db.Classrooms.Add(entity);
existing[code] = entity;
@@ -499,6 +505,7 @@ public sealed class BaseDataExcelController(AppDbContext db, IAppCache cache) :
entity.BuildingId = building.Id;
entity.Capacity = capacity.Value;
entity.RoomType = roomType;
entity.TeachingVenueNature = venueNature.Value;
entity.Equipment = Optional(row, "设备");
}
return new(created, updated, rows.Count);
@@ -597,6 +604,57 @@ public sealed class BaseDataExcelController(AppDbContext db, IAppCache cache) :
return true;
}
private static TeachingVenueNature? ParseVenueNature(
ExcelRow row,
string? roomType,
List<string> errors)
{
var value = Optional(row, "教学场地性质");
if (value is null) return InferVenueNature(roomType ?? string.Empty);
var result = (TeachingVenueNature)0;
foreach (var part in value.Split(['、', '，', ',', ';', '；'],
StringSplitOptions.TrimEntries | StringSplitOptions.RemoveEmptyEntries))
{
result |= part switch
{
"普通教室" => TeachingVenueNature.GeneralClassroom,
"实验室" => TeachingVenueNature.Laboratory,
"实训室" => TeachingVenueNature.TrainingRoom,
"计算机机房" or "机房" => TeachingVenueNature.ComputerLab,
"语音室" => TeachingVenueNature.LanguageLab,
"体育场地" => TeachingVenueNature.SportsVenue,
"艺术场地" => TeachingVenueNature.ArtsVenue,
_ => (TeachingVenueNature)0
};
if (part is not ("普通教室" or "实验室" or "实训室" or "计算机机房" or "机房" or "语音室" or "体育场地" or "艺术场地"))
errors.Add($"第 {row.RowNumber} 行：“教学场地性质”包含不支持的值“{part}”。");
}
return result == 0 ? null : result;
}
private static TeachingVenueNature InferVenueNature(string roomType) =>
roomType.Contains("机房", StringComparison.OrdinalIgnoreCase)
? TeachingVenueNature.Laboratory | TeachingVenueNature.ComputerLab
: roomType.Contains("语音", StringComparison.OrdinalIgnoreCase)
? TeachingVenueNature.Laboratory | TeachingVenueNature.LanguageLab
: roomType.Contains("实训", StringComparison.OrdinalIgnoreCase)
? TeachingVenueNature.TrainingRoom
: roomType.Contains("实验", StringComparison.OrdinalIgnoreCase)
? TeachingVenueNature.Laboratory
: TeachingVenueNature.GeneralClassroom;
private static string VenueNatureName(TeachingVenueNature value) => string.Join("、",
new[]
{
(TeachingVenueNature.GeneralClassroom, "普通教室"),
(TeachingVenueNature.Laboratory, "实验室"),
(TeachingVenueNature.TrainingRoom, "实训室"),
(TeachingVenueNature.ComputerLab, "计算机机房"),
(TeachingVenueNature.LanguageLab, "语音室"),
(TeachingVenueNature.SportsVenue, "体育场地"),
(TeachingVenueNature.ArtsVenue, "艺术场地")
}.Where(x => (value & x.Item1) != 0).Select(x => x.Item2));
private static bool ParseBoolean(
ExcelRow row, string header, bool defaultValue, List<string> errors)
{
src/Jiaowu.Api/Controllers/ExperimentsController.cs
+108 -4
View File
@@ -91,6 +91,36 @@ public sealed class ExperimentsController(
.Select(item => item.AdministrativeClass!.Name)
})
.ToListAsync(cancellationToken),
ScheduleEntries = await db.ScheduleEntries.AsNoTracking()
.Where(x => x.SchedulePlan!.Status == SchedulePlanStatus.Published &&
x.Kind == ScheduleEntryKind.Experiment &&
x.ClassroomId.HasValue &&
AccessibleTeachingTasks().Select(task => task.Id)
.Contains(x.TeachingTaskId))
.Where(x => !academicTermId.HasValue ||
x.SchedulePlan!.AcademicTermId == academicTermId.Value)
.OrderBy(x => x.TeachingTask!.Course!.Code)
.ThenBy(x => x.TeachingTask!.TaskNumber)
.ThenBy(x => x.DayOfWeek)
.ThenBy(x => x.StartPeriod)
.Select(x => new
{
x.Id,
x.TeachingTaskId,
TaskNumber = x.TeachingTask!.TaskNumber,
CourseCode = x.TeachingTask.Course!.Code,
CourseName = x.TeachingTask.Course.Name,
x.DayOfWeek,
x.StartPeriod,
x.PeriodCount,
x.StartWeek,
x.EndWeek,
x.WeekPattern,
ClassroomName = x.Classroom!.Name,
BuildingName = x.Classroom.Building!.Name,
CampusName = x.Classroom.Building.Campus!.Name
})
.ToListAsync(cancellationToken),
Classrooms = await db.Classrooms.AsNoTracking()
.Where(x => x.IsEnabled)
.OrderBy(x => x.Building!.Campus!.SortOrder)
@@ -103,6 +133,7 @@ public sealed class ExperimentsController(
BuildingName = x.Building!.Name,
CampusName = x.Building.Campus!.Name,
x.Capacity
,x.TeachingVenueNature
})
.ToListAsync(cancellationToken),
Periods = periodItems
@@ -135,6 +166,7 @@ public sealed class ExperimentsController(
{
x.Id,
x.TeachingTaskId,
x.ScheduleEntryId,
x.Code,
x.Name,
x.ArrangementMode,
@@ -157,6 +189,18 @@ public sealed class ExperimentsController(
ClassNames = x.TeachingTask.Classes
.OrderBy(item => item.AdministrativeClass!.Code)
.Select(item => item.AdministrativeClass!.Name),
ScheduleEntry = x.ScheduleEntryId == null ? null : new
{
x.ScheduleEntry!.DayOfWeek,
x.ScheduleEntry.StartPeriod,
x.ScheduleEntry.PeriodCount,
x.ScheduleEntry.StartWeek,
x.ScheduleEntry.EndWeek,
x.ScheduleEntry.WeekPattern,
ClassroomName = x.ScheduleEntry.Classroom!.Name,
BuildingName = x.ScheduleEntry.Classroom.Building!.Name,
CampusName = x.ScheduleEntry.Classroom.Building.Campus!.Name
},
Sessions = x.Sessions
.OrderBy(item => item.SessionDate)
.ThenBy(item => item.StartPeriod)
@@ -209,6 +253,7 @@ public sealed class ExperimentsController(
x.Code,
x.Name,
x.ArrangementMode,
x.ScheduleEntryId,
x.Description,
x.Requirements,
x.StartDate,
@@ -222,6 +267,18 @@ public sealed class ExperimentsController(
TeacherNames = x.TeachingTask.Teachers
.OrderByDescending(item => item.IsPrimary)
.Select(item => item.Teacher!.Name),
ScheduleEntry = x.ScheduleEntryId == null ? null : new
{
x.ScheduleEntry!.DayOfWeek,
x.ScheduleEntry.StartPeriod,
x.ScheduleEntry.PeriodCount,
x.ScheduleEntry.StartWeek,
x.ScheduleEntry.EndWeek,
x.ScheduleEntry.WeekPattern,
ClassroomName = x.ScheduleEntry.Classroom!.Name,
BuildingName = x.ScheduleEntry.Classroom.Building!.Name,
CampusName = x.ScheduleEntry.Classroom.Building.Campus!.Name
},
Sessions = x.Sessions
.Where(item => item.Status == ExperimentSessionStatus.Scheduled)
.OrderBy(item => item.SessionDate)
@@ -272,6 +329,9 @@ public sealed class ExperimentsController(
var problem = ValidateProjectRequest(request, task.AcademicTerm!);
if (problem is not null) return ValidationProblem(problem);
var scheduleEntry = await ValidateScheduleEntryAsync(
request, task.Id, cancellationToken);
if (scheduleEntry.Problem is not null) return ValidationProblem(scheduleEntry.Problem);
var code = request.Code.Trim();
if (await db.ExperimentProjects.AnyAsync(x =>
@@ -283,6 +343,7 @@ public sealed class ExperimentsController(
var project = new ExperimentProject
{
TeachingTaskId = request.TeachingTaskId,
ScheduleEntryId = scheduleEntry.Entry?.Id,
Code = code,
Name = request.Name.Trim(),
ArrangementMode = request.ArrangementMode,
@@ -302,6 +363,8 @@ public sealed class ExperimentsController(
ExperimentProjectBatchRequest request,
CancellationToken cancellationToken)
{
if (request.ArrangementMode == ExperimentArrangementMode.Centralized)
return ValidationProblem("集中安排的实验项目请逐项绑定已发布课表中的实验课。");
var taskIds = request.TeachingTaskIds
.Where(x => x != Guid.Empty)
.Distinct()
@@ -387,6 +450,9 @@ public sealed class ExperimentsController(
request,
project.TeachingTask!.AcademicTerm!);
if (problem is not null) return ValidationProblem(problem);
var scheduleEntry = await ValidateScheduleEntryAsync(
request, project.TeachingTaskId, cancellationToken);
if (scheduleEntry.Problem is not null) return ValidationProblem(scheduleEntry.Problem);
var code = request.Code.Trim();
if (await db.ExperimentProjects.AnyAsync(x =>
@@ -399,6 +465,7 @@ public sealed class ExperimentsController(
project.Code = code;
project.Name = request.Name.Trim();
project.ArrangementMode = request.ArrangementMode;
project.ScheduleEntryId = scheduleEntry.Entry?.Id;
project.Description = Normalize(request.Description);
project.Requirements = Normalize(request.Requirements);
project.StartDate = request.StartDate;
@@ -438,9 +505,14 @@ public sealed class ExperimentsController(
if (project is null) return NotFound();
if (project.Status != ExperimentProjectStatus.Draft)
return ConflictProblem("只有草稿实验项目可以发布。");
if (!project.Sessions.Any(x =>
x.Status == ExperimentSessionStatus.Scheduled))
return ConflictProblem("请至少安排一个有效实验场次后再发布。");
var hasSchedule = project.ArrangementMode == ExperimentArrangementMode.Centralized
? project.ScheduleEntryId.HasValue || project.Sessions.Any(x =>
x.Status == ExperimentSessionStatus.Scheduled)
: project.Sessions.Any(x => x.Status == ExperimentSessionStatus.Scheduled);
if (!hasSchedule)
return ConflictProblem(project.ArrangementMode == ExperimentArrangementMode.Centralized
? "请先绑定已发布课表中的实验课后再发布。"
: "请至少安排一个有效实验场次后再发布。");
if (project.Sessions.Any(x =>
x.Status == ExperimentSessionStatus.Scheduled &&
(x.SessionDate < project.StartDate ||
@@ -506,6 +578,8 @@ public sealed class ExperimentsController(
if (project is null) return NotFound();
if (project.Status == ExperimentProjectStatus.Closed)
return ConflictProblem("已关闭实验项目不能再增加场次。");
if (project.ArrangementMode == ExperimentArrangementMode.Centralized)
return ConflictProblem("集中安排的实验项目直接使用已发布课表中的实验课，不能在此重复排时派地点。");
var problem = await ValidateSessionAsync(
project,
@@ -588,6 +662,9 @@ public sealed class ExperimentsController(
if (project.Status == ExperimentProjectStatus.Closed)
return ConflictProblem(
$"实验项目“{project.Name}”已关闭，不能再增加场次。");
if (project.ArrangementMode == ExperimentArrangementMode.Centralized)
return ConflictProblem(
$"实验项目“{project.Name}”为集中安排，请直接使用已发布课表中的实验课。");
var sessionRequest = item.ToSessionRequest();
var problem = await ValidateSessionAsync(
@@ -930,6 +1007,8 @@ public sealed class ExperimentsController(
x.Id == request.ClassroomId && x.IsEnabled,
cancellationToken);
if (classroom is null) return "实验教室不存在或已停用。";
if (!TeachingVenueNatureRules.SupportsExperiment(classroom.TeachingVenueNature))
return "所选场地未标注实验教学性质。";
if (request.Capacity > classroom.Capacity)
return $"场次容量不能超过教室容量 {classroom.Capacity} 人。";
if (project.ArrangementMode ==
@@ -1173,6 +1252,30 @@ public sealed class ExperimentsController(
return null;
}
private async Task<(ScheduleEntry? Entry, string? Problem)> ValidateScheduleEntryAsync(
ExperimentProjectRequest request,
Guid teachingTaskId,
CancellationToken cancellationToken)
{
if (request.ArrangementMode == ExperimentArrangementMode.SelfScheduled)
return request.ScheduleEntryId.HasValue
? (null, "自行安排的实验项目不能绑定课表实验课。")
: (null, null);
if (!request.ScheduleEntryId.HasValue)
return (null, "集中安排的实验项目必须绑定已发布课表中的实验课。");
var entry = await db.ScheduleEntries
.Include(x => x.SchedulePlan)
.FirstOrDefaultAsync(x => x.Id == request.ScheduleEntryId, cancellationToken);
if (entry is null || entry.SchedulePlan!.Status != SchedulePlanStatus.Published ||
entry.Kind != ScheduleEntryKind.Experiment || !entry.ClassroomId.HasValue ||
entry.TeachingTaskId != teachingTaskId)
return (null, "只能绑定本教学任务已发布、已安排实验室的实验课。");
if (!await AccessibleTeachingTasks().AnyAsync(x => x.Id == teachingTaskId, cancellationToken))
return (null, "该教学任务不在当前管理范围内。");
return (entry, null);
}
private static string? Normalize(string? value) =>
string.IsNullOrWhiteSpace(value) ? null : value.Trim();
@@ -1193,7 +1296,8 @@ public sealed record ExperimentProjectRequest(
[MaxLength(1000)] string? Description,
[MaxLength(1000)] string? Requirements,
DateOnly StartDate,
DateOnly EndDate);
DateOnly EndDate,
Guid? ScheduleEntryId = null);
public sealed record ExperimentProjectBatchRequest(
[Required] IReadOnlyList<Guid> TeachingTaskIds,
src/Jiaowu.Api/Controllers/ScheduleSettingsController.cs
+5 -2
View File
@@ -136,7 +136,8 @@ public sealed class ScheduleSettingsController(AppDbContext db, IAppCache cache)
constraint?.EarliestPeriod,
constraint?.LatestPeriod,
AllowedClassroomIds = constraint?.AllowedClassrooms
.Select(x => x.ClassroomId) ?? []
.Select(x => x.ClassroomId) ?? [],
AllowedExperimentVenueNatures = constraint?.AllowedExperimentVenueNatures ?? 0
};
}));
}
@@ -227,6 +228,7 @@ public sealed class ScheduleSettingsController(AppDbContext db, IAppCache cache)
: string.Join(',', request.AllowedDayOfWeeks.Distinct().Order());
constraint.EarliestPeriod = request.EarliestPeriod;
constraint.LatestPeriod = request.LatestPeriod;
constraint.AllowedExperimentVenueNatures = request.AllowedExperimentVenueNatures;
db.TeachingTaskAllowedClassrooms.RemoveRange(constraint.AllowedClassrooms);
constraint.AllowedClassrooms = request.RequiresClassroom
? request.AllowedClassroomIds.Distinct().Select(classroomId =>
@@ -438,7 +440,8 @@ public sealed record TeachingTaskScheduleConstraintRequest(
IReadOnlyList<Guid> AllowedClassroomIds,
IReadOnlyList<int> AllowedDayOfWeeks,
[Range(1, 30)] int? EarliestPeriod,
[Range(1, 30)] int? LatestPeriod);
[Range(1, 30)] int? LatestPeriod,
TeachingVenueNature AllowedExperimentVenueNatures = 0);
public sealed record TeachingTaskScheduleConstraintBatchRequest(
Guid AcademicTermId,
src/Jiaowu.Api/Controllers/SchedulesController.cs
+7 -7
View File
@@ -581,9 +581,9 @@ public sealed class SchedulesController(
cancellationToken);
if (classroom is null) return ValidationProblem("所选教室不存在或已停用。");
if (request.Kind == ScheduleEntryKind.Experiment &&
!IsExperimentRoom(classroom.RoomType))
!TeachingVenueNatureRules.SupportsExperiment(classroom.TeachingVenueNature))
return ValidationProblem(
$"实验课必须安排在实验室、实训室或机房；“{classroom.Name}”的场地类型为“{classroom.RoomType}”。");
$"实验课必须安排在具有实验教学性质的场地；“{classroom.Name}”未标注实验室、实训室、机房或语音室性质。 ");
if (constraint?.RequiredCampusId is Guid campusId &&
classroom.Building!.CampusId != campusId)
return ValidationProblem("所选教室不在该课程指定的校区。");
@@ -596,6 +596,11 @@ public sealed class SchedulesController(
if (allowedClassroomIds.Count > 0 &&
!allowedClassroomIds.Contains(classroom.Id))
return ValidationProblem("所选教室不在该课程指定的教室范围内。");
if (request.Kind == ScheduleEntryKind.Experiment &&
constraint?.AllowedExperimentVenueNatures is { } allowedNatures &&
allowedNatures != 0 &&
(classroom.TeachingVenueNature & allowedNatures) == 0)
return ValidationProblem("所选场地不在该实验课允许的教学场地性质范围内。");
}
var studentCount = task.Classes.Sum(x =>
x.AdministrativeClass!.Students.Count(student =>
@@ -655,11 +660,6 @@ public sealed class SchedulesController(
.Select(int.Parse)
.ToHashSet();
private static bool IsExperimentRoom(string roomType) =>
roomType.Contains("实验", StringComparison.OrdinalIgnoreCase) ||
roomType.Contains("实训", StringComparison.OrdinalIgnoreCase) ||
roomType.Contains("机房", StringComparison.OrdinalIgnoreCase) ||
roomType.Contains("语音", StringComparison.OrdinalIgnoreCase);
private async Task<ActionResult> SaveAsync(
Guid id,
src/Jiaowu.Api/Domain/Academic/ExperimentEntities.cs
+3
View File
@@ -6,6 +6,9 @@ public sealed class ExperimentProject : EntityBase
{
public Guid TeachingTaskId { get; set; }
public TeachingTask? TeachingTask { get; set; }
// 集中安排的项目复用已发布课表中的实验课，不再维护一份重复的场次。
public Guid? ScheduleEntryId { get; set; }
public ScheduleEntry? ScheduleEntry { get; set; }
public required string Code { get; set; }
public required string Name { get; set; }
public ExperimentArrangementMode ArrangementMode { get; set; }
src/Jiaowu.Api/Domain/Academic/OrganizationEntities.cs
+26
View File
@@ -46,9 +46,35 @@ public sealed class Classroom : CatalogEntity
public Building? Building { get; set; }
public int Capacity { get; set; }
public string RoomType { get; set; } = "普通教室";
public TeachingVenueNature TeachingVenueNature { get; set; } =
TeachingVenueNature.GeneralClassroom;
public string? Equipment { get; set; }
}
[Flags]
public enum TeachingVenueNature
{
GeneralClassroom = 1,
Laboratory = 2,
TrainingRoom = 4,
ComputerLab = 8,
LanguageLab = 16,
SportsVenue = 32,
ArtsVenue = 64
}
public static class TeachingVenueNatureRules
{
public const TeachingVenueNature ExperimentTeaching =
TeachingVenueNature.Laboratory |
TeachingVenueNature.TrainingRoom |
TeachingVenueNature.ComputerLab |
TeachingVenueNature.LanguageLab;
public static bool SupportsExperiment(TeachingVenueNature value) =>
(value & ExperimentTeaching) != 0;
}
public sealed class AcademicTerm : CatalogEntity
{
public required string AcademicYear { get; set; }
src/Jiaowu.Api/Domain/Academic/ScheduleEntities.cs
+1
View File
@@ -55,6 +55,7 @@ public sealed class TeachingTaskScheduleConstraint : EntityBase
public string? AllowedDayOfWeeks { get; set; }
public int? EarliestPeriod { get; set; }
public int? LatestPeriod { get; set; }
public TeachingVenueNature AllowedExperimentVenueNatures { get; set; }
public ICollection<TeachingTaskAllowedClassroom> AllowedClassrooms { get; set; } = [];
}
src/Jiaowu.Api/Infrastructure/Persistence/AppDbContext.cs
+4
View File
@@ -617,6 +617,10 @@ public sealed class AppDbContext(DbContextOptions<AppDbContext> options)
entity.HasOne(x => x.TeachingTask).WithMany()
.HasForeignKey(x => x.TeachingTaskId)
.OnDelete(DeleteBehavior.Restrict);
entity.HasIndex(x => x.ScheduleEntryId);
entity.HasOne(x => x.ScheduleEntry).WithMany()
.HasForeignKey(x => x.ScheduleEntryId)
.OnDelete(DeleteBehavior.Restrict);
});
builder.Entity<ExperimentSession>(entity =>
src/Jiaowu.Api/Infrastructure/Persistence/Migrations/MySql/20260809035913_BindCentralizedExperimentProjectsToSchedules.Designer.cs
Generated
+6561
View File
File diff suppressed because it is too large Load Diff
src/Jiaowu.Api/Infrastructure/Persistence/Migrations/MySql/20260809035913_BindCentralizedExperimentProjectsToSchedules.cs
+50
View File
@@ -0,0 +1,50 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Jiaowu.Api.Infrastructure.Persistence.Migrations.MySql
{
/// <inheritdoc />
public partial class BindCentralizedExperimentProjectsToSchedules : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<Guid>(
name: "ScheduleEntryId",
table: "ExperimentProjects",
type: "char(36)",
nullable: true);
migrationBuilder.CreateIndex(
name: "IX_ExperimentProjects_ScheduleEntryId",
table: "ExperimentProjects",
column: "ScheduleEntryId");
migrationBuilder.AddForeignKey(
name: "FK_ExperimentProjects_ScheduleEntries_ScheduleEntryId",
table: "ExperimentProjects",
column: "ScheduleEntryId",
principalTable: "ScheduleEntries",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_ExperimentProjects_ScheduleEntries_ScheduleEntryId",
table: "ExperimentProjects");
migrationBuilder.DropIndex(
name: "IX_ExperimentProjects_ScheduleEntryId",
table: "ExperimentProjects");
migrationBuilder.DropColumn(
name: "ScheduleEntryId",
table: "ExperimentProjects");
}
}
}
src/Jiaowu.Api/Infrastructure/Persistence/Migrations/MySql/20260809040612_AddTeachingVenueNatures.Designer.cs
Generated
+6564
View File
File diff suppressed because it is too large Load Diff
src/Jiaowu.Api/Infrastructure/Persistence/Migrations/MySql/20260809040612_AddTeachingVenueNatures.cs
+42
View File
@@ -0,0 +1,42 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Jiaowu.Api.Infrastructure.Persistence.Migrations.MySql
{
/// <inheritdoc />
public partial class AddTeachingVenueNatures : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "TeachingVenueNature",
table: "Classrooms",
type: "int",
nullable: false,
defaultValue: 1);
migrationBuilder.Sql("""
UPDATE `Classrooms`
SET `TeachingVenueNature` = CASE
WHEN `RoomType` LIKE '%机房%' THEN 10
WHEN `RoomType` LIKE '%语音%' THEN 18
WHEN `RoomType` LIKE '%实训%' THEN 4
WHEN `RoomType` LIKE '%实验%' THEN 2
WHEN `RoomType` LIKE '%体育%' THEN 32
WHEN `RoomType` LIKE '%艺术%' THEN 64
ELSE 1
END;
""");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "TeachingVenueNature",
table: "Classrooms");
}
}
}
src/Jiaowu.Api/Infrastructure/Persistence/Migrations/MySql/20260809042903_AddExperimentVenueNatureConstraints.Designer.cs
Generated
+6567
View File
File diff suppressed because it is too large Load Diff
src/Jiaowu.Api/Infrastructure/Persistence/Migrations/MySql/20260809042903_AddExperimentVenueNatureConstraints.cs
+29
View File
@@ -0,0 +1,29 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Jiaowu.Api.Infrastructure.Persistence.Migrations.MySql
{
/// <inheritdoc />
public partial class AddExperimentVenueNatureConstraints : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "AllowedExperimentVenueNatures",
table: "TeachingTaskScheduleConstraints",
type: "int",
nullable: false,
defaultValue: 0);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "AllowedExperimentVenueNatures",
table: "TeachingTaskScheduleConstraints");
}
}
}
src/Jiaowu.Api/Infrastructure/Persistence/Migrations/MySql/AppDbContextModelSnapshot.cs
+18
View File
@@ -525,6 +525,9 @@ namespace Jiaowu.Api.Infrastructure.Persistence.Migrations.MySql
b.Property<int>("SortOrder")
.HasColumnType("int");
b.Property<int>("TeachingVenueNature")
.HasColumnType("int");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime(6)");
@@ -2364,6 +2367,9 @@ namespace Jiaowu.Api.Infrastructure.Persistence.Migrations.MySql
.HasMaxLength(1000)
.HasColumnType("varchar(1000)");
b.Property<Guid?>("ScheduleEntryId")
.HasColumnType("char(36)");
b.Property<DateTime>("StartDate")
.HasColumnType("date");
@@ -2378,6 +2384,8 @@ namespace Jiaowu.Api.Infrastructure.Persistence.Migrations.MySql
b.HasKey("Id");
b.HasIndex("ScheduleEntryId");
b.HasIndex("TeachingTaskId", "Code")
.IsUnique();
@@ -4240,6 +4248,9 @@ namespace Jiaowu.Api.Infrastructure.Persistence.Migrations.MySql
.HasMaxLength(20)
.HasColumnType("varchar(20)");
b.Property<int>("AllowedExperimentVenueNatures")
.HasColumnType("int");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime(6)");
@@ -5621,12 +5632,19 @@ namespace Jiaowu.Api.Infrastructure.Persistence.Migrations.MySql
modelBuilder.Entity("Jiaowu.Api.Domain.Academic.ExperimentProject", b =>
{
b.HasOne("Jiaowu.Api.Domain.Academic.ScheduleEntry", "ScheduleEntry")
.WithMany()
.HasForeignKey("ScheduleEntryId")
.OnDelete(DeleteBehavior.Restrict);
b.HasOne("Jiaowu.Api.Domain.Academic.TeachingTask", "TeachingTask")
.WithMany()
.HasForeignKey("TeachingTaskId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("ScheduleEntry");
b.Navigation("TeachingTask");
});
src/Jiaowu.Api/Infrastructure/Scheduling/AutomaticScheduleGenerator.cs
+5 -6
View File
@@ -291,15 +291,14 @@ public sealed class AutomaticScheduleGenerator(AppDbContext db)
(constraint?.RequiredBuildingId is not Guid requiredBuildingId ||
room.BuildingId == requiredBuildingId) &&
(allowedRoomIds.Count == 0 || allowedRoomIds.Contains(room.Id)) &&
(kind != ScheduleEntryKind.Experiment || IsExperimentRoom(room.RoomType)))
(kind != ScheduleEntryKind.Experiment ||
TeachingVenueNatureRules.SupportsExperiment(room.TeachingVenueNature)) &&
(kind != ScheduleEntryKind.Experiment || constraint is null ||
constraint.AllowedExperimentVenueNatures == 0 ||
(room.TeachingVenueNature & constraint.AllowedExperimentVenueNatures) != 0))
.ToList();
}
private static bool IsExperimentRoom(string roomType) =>
roomType.Contains("实验", StringComparison.OrdinalIgnoreCase) ||
roomType.Contains("实训", StringComparison.OrdinalIgnoreCase) ||
roomType.Contains("机房", StringComparison.OrdinalIgnoreCase) ||
roomType.Contains("语音", StringComparison.OrdinalIgnoreCase);
private static int[] ParseAllowedDays(string? value)
{
tests/Jiaowu.Api.Tests/AutomaticScheduleGeneratorTests.cs
+2 -1
View File
@@ -171,7 +171,8 @@ public sealed class AutomaticScheduleGeneratorTests
Name = "实验室 101",
Building = building,
Capacity = 40,
RoomType = "实验室"
RoomType = "实验室",
TeachingVenueNature = TeachingVenueNature.Laboratory
};
var course = new Course
{
tests/Jiaowu.Api.Tests/ExperimentsControllerTests.cs
+40 -25
View File
@@ -20,7 +20,7 @@ public sealed class ExperimentsControllerTests
var result = await controller.CreateProjects(
fixture.BatchProjectRequest(
ExperimentArrangementMode.Centralized),
ExperimentArrangementMode.SelfScheduled),
CancellationToken.None);
Assert.IsType<CreatedResult>(result);
@@ -119,7 +119,7 @@ public sealed class ExperimentsControllerTests
}
[Fact]
public async Task CentralizedProject_PublishesAndUsesTeachingTaskRoster()
public async Task CentralizedProject_PublishesWhenBoundToPublishedExperimentSchedule()
{
await using var fixture = await ExperimentFixture.CreateAsync();
var controller = fixture.Controller(fixture.ManagerScope);
@@ -133,10 +133,7 @@ public sealed class ExperimentsControllerTests
project.Id,
fixture.SessionRequest(1, 2, 10),
CancellationToken.None);
Assert.IsType<CreatedResult>(sessionResult);
Assert.Equal(
1,
(await fixture.Db.ExperimentSessions.SingleAsync()).Capacity);
Assert.IsType<ConflictObjectResult>(sessionResult);
var published = await controller.PublishProject(
project.Id,
@@ -146,13 +143,7 @@ public sealed class ExperimentsControllerTests
ExperimentProjectStatus.Published,
(await fixture.Db.ExperimentProjects.SingleAsync()).Status);
var session = await fixture.Db.ExperimentSessions.SingleAsync();
var participants = await controller.GetParticipants(
session.Id,
CancellationToken.None);
var ok = Assert.IsType<OkObjectResult>(participants);
var rows = Assert.IsAssignableFrom<IEnumerable<object>>(ok.Value);
Assert.Single(rows);
Assert.Empty(await fixture.Db.ExperimentSessions.ToListAsync());
}
[Fact]
@@ -333,11 +324,10 @@ public sealed class ExperimentsControllerTests
CancellationToken.None);
Assert.NotNull(timetable);
Assert.Equal(2, timetable.ExperimentEntries.Count);
Assert.Contains(
timetable.ExperimentEntries,
x => x.ExperimentArrangementMode ==
ExperimentArrangementMode.Centralized);
Assert.Single(timetable.ExperimentEntries);
Assert.Equal(
ExperimentArrangementMode.SelfScheduled,
timetable.ExperimentEntries[0].ExperimentArrangementMode);
Assert.Contains(
timetable.ExperimentEntries,
x => x.Id == selfSession.Id &&
@@ -380,10 +370,7 @@ public sealed class ExperimentsControllerTests
CancellationToken.None);
Assert.NotNull(timetable);
Assert.Single(timetable.ExperimentEntries);
Assert.Equal(
ExperimentArrangementMode.Centralized,
timetable.ExperimentEntries[0].ExperimentArrangementMode);
Assert.Empty(timetable.ExperimentEntries);
}
private sealed class ExperimentFixture : IAsyncDisposable
@@ -395,6 +382,7 @@ public sealed class ExperimentsControllerTests
TeachingTask task,
Classroom classroom,
Classroom secondClassroom,
ScheduleEntry scheduleEntry,
ICurrentUserDataScope managerScope,
ICurrentUserDataScope studentScope)
{
@@ -404,6 +392,7 @@ public sealed class ExperimentsControllerTests
Task = task;
Classroom = classroom;
SecondClassroom = secondClassroom;
ScheduleEntry = scheduleEntry;
ManagerScope = managerScope;
StudentScope = studentScope;
}
@@ -414,6 +403,7 @@ public sealed class ExperimentsControllerTests
public TeachingTask Task { get; }
public Classroom Classroom { get; }
public Classroom SecondClassroom { get; }
public ScheduleEntry ScheduleEntry { get; }
public ICurrentUserDataScope ManagerScope { get; }
public ICurrentUserDataScope StudentScope { get; }
@@ -441,14 +431,16 @@ public sealed class ExperimentsControllerTests
Code = "LAB101",
Name = "实验室 101",
BuildingId = building.Id,
Capacity = 40
Capacity = 40,
TeachingVenueNature = TeachingVenueNature.Laboratory
};
var secondClassroom = new Classroom
{
Code = "LAB102",
Name = "实验室 102",
BuildingId = building.Id,
Capacity = 40
Capacity = 40,
TeachingVenueNature = TeachingVenueNature.Laboratory
};
var college = new College { Code = "CS", Name = "计算机学院" };
manager.CollegeId = college.Id;
@@ -564,6 +556,27 @@ public sealed class ExperimentsControllerTests
});
}
await db.SaveChangesAsync();
var scheduleEntry = new ScheduleEntry
{
SchedulePlan = new SchedulePlan
{
AcademicTermId = term.Id,
Name = "已发布实验课表",
Version = "LAB-1",
Status = SchedulePlanStatus.Published
},
TeachingTaskId = task.Id,
Kind = ScheduleEntryKind.Experiment,
ClassroomId = classroom.Id,
DayOfWeek = 1,
StartPeriod = 10,
PeriodCount = 2,
StartWeek = 1,
EndWeek = 8,
WeekPattern = WeekPattern.All
};
db.ScheduleEntries.Add(scheduleEntry);
await db.SaveChangesAsync();
return new ExperimentFixture(
connection,
@@ -572,6 +585,7 @@ public sealed class ExperimentsControllerTests
task,
classroom,
secondClassroom,
scheduleEntry,
Scope(
manager,
SystemRoles.CollegeAdmin,
@@ -600,7 +614,8 @@ public sealed class ExperimentsControllerTests
"完成规定实验项目。",
"携带校园卡。",
Term.StartDate,
Term.StartDate.AddDays(14));
Term.StartDate.AddDays(14),
mode == ExperimentArrangementMode.Centralized ? ScheduleEntry.Id : null);
public ExperimentProjectBatchRequest BatchProjectRequest(
ExperimentArrangementMode mode) =>
tests/Jiaowu.Api.Tests/SchedulesControllerTests.cs
+2 -1
View File
@@ -46,7 +46,8 @@ public sealed class SchedulesControllerTests
Name = "实验室 201",
Building = building,
Capacity = 40,
RoomType = "实验室"
RoomType = "实验室",
TeachingVenueNature = TeachingVenueNature.Laboratory
};
var course = new Course
{
web/package-lock.json
Generated
+1071 -1118
View File
File diff suppressed because it is too large Load Diff
web/src/auto-imports.d.ts
Vendored
+2
View File
@@ -1,5 +1,7 @@
/* eslint-disable */
/* prettier-ignore */
/* oxlint-disable */
/* oxfmt-ignore */
// @ts-nocheck
// noinspection JSUnusedGlobalSymbols
// Generated by unplugin-auto-import
web/src/views/BaseDataView.vue
+36 -3
View File
@@ -90,6 +90,19 @@ const filteredRows = computed(() => {
.filter(Boolean).some((value) => String(value).toLowerCase().includes(q)),
)
})
const venueNatureOptions = [
{ value: 1, label: '普通教室' },
{ value: 2, label: '实验室' },
{ value: 4, label: '实训室' },
{ value: 8, label: '计算机机房' },
{ value: 16, label: '语音室' },
{ value: 32, label: '体育场地' },
{ value: 64, label: '艺术场地' },
]
const venueNatureLabel = (value: number) => venueNatureOptions
.filter((item) => (Number(value) & item.value) !== 0)
.map((item) => item.label)
.join('、') || '未设置'
function resetForm(row?: Row) {
Object.keys(form).forEach((key) => delete form[key])
@@ -100,8 +113,14 @@ function resetForm(row?: Row) {
grade: new Date().getFullYear(), counselorUserId: undefined,
academicYear: `${new Date().getFullYear()}-${new Date().getFullYear() + 1}`,
season: 'Autumn', startDate: '', endDate: '', isCurrent: false,
capacity: 60, roomType: '普通教室', equipment: '',
capacity: 60, roomType: '普通教室', teachingVenueNatures: [1], equipment: '',
}, row ?? {})
if (active.value === 'classrooms') {
const value = Number((row as any)?.teachingVenueNature ?? 1)
form.teachingVenueNatures = venueNatureOptions
.filter((item) => (value & item.value) !== 0)
.map((item) => item.value)
}
}
async function load() {
@@ -192,10 +211,16 @@ async function save() {
return
}
try {
const payload = active.value === 'classrooms'
? {
...form,
teachingVenueNature: form.teachingVenueNatures.reduce((value: number, item: number) => value | item, 0),
}
: form
if (editingId.value) {
await http.put(`/base-data/${active.value}/${editingId.value}`, form)
await http.put(`/base-data/${active.value}/${editingId.value}`, payload)
} else {
await http.post(`/base-data/${active.value}`, form)
await http.post(`/base-data/${active.value}`, payload)
}
ElMessage.success(editingId.value ? '已保存修改' : `已新增${title.value}`)
dialogVisible.value = false
@@ -407,6 +432,9 @@ watch(
<el-table-column v-if="active === 'buildings'" prop="campusName" label="所属校区" min-width="140" />
<el-table-column v-if="active === 'classrooms'" prop="buildingName" label="教学楼" min-width="130" />
<el-table-column v-if="active === 'classrooms'" prop="capacity" label="容量" width="90" />
<el-table-column v-if="active === 'classrooms'" label="场地性质" min-width="180">
<template #default="{ row }">{{ venueNatureLabel(row.teachingVenueNature) }}</template>
</el-table-column>
<el-table-column label="状态" width="90">
<template #default="{ row }">
<span class="table-status" :class="{ off: !row.isEnabled }">{{ row.isEnabled ? '启用' : '停用' }}</span>
@@ -519,6 +547,11 @@ watch(
<el-form-item label="容量"><el-input-number v-model="form.capacity" :min="1" :max="1000" /></el-form-item>
<el-form-item label="教室类型"><el-input v-model="form.roomType" /></el-form-item>
</div>
<el-form-item v-if="active === 'classrooms'" label="教学场地性质" required>
<el-checkbox-group v-model="form.teachingVenueNatures">
<el-checkbox v-for="item in venueNatureOptions" :key="item.value" :value="item.value">{{ item.label }}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item v-if="active === 'classrooms'" label="设备"><el-input v-model="form.equipment" /></el-form-item>
<div class="form-grid compact">
<el-form-item label="排序"><el-input-number v-model="form.sortOrder" :min="0" /></el-form-item>
web/src/views/ExperimentsView.vue
+62 -15
View File
@@ -18,6 +18,7 @@ const termId = ref('')
const projects = ref<any[]>([])
const options = reactive({
tasks: [] as any[],
scheduleEntries: [] as any[],
classrooms: [] as any[],
periods: [] as any[],
})
@@ -28,6 +29,7 @@ const projectDialog = ref(false)
const editingProjectId = ref('')
const projectForm = reactive({
teachingTaskIds: [] as string[],
scheduleEntryId: '',
code: '',
name: '',
arrangementMode: 'Centralized',
@@ -59,8 +61,12 @@ const participantsLoading = ref(false)
const selectedTask = computed(() =>
options.tasks.find((task) => task.id === projectForm.teachingTaskIds[0]),
)
const selectedScheduleEntry = computed(() =>
options.scheduleEntries.find((entry) => entry.id === projectForm.scheduleEntryId),
)
const batchProjectOptions = computed(() =>
projects.value.filter((project) => project.status !== 'Closed'),
projects.value.filter((project) =>
project.status !== 'Closed' && project.arrangementMode === 'SelfScheduled'),
)
const activePeriods = computed(() =>
options.periods.filter((period) =>
@@ -90,6 +96,7 @@ function resetProjectForm() {
editingProjectId.value = ''
Object.assign(projectForm, {
teachingTaskIds: [],
scheduleEntryId: '',
code: '',
name: '',
arrangementMode: 'Centralized',
@@ -105,6 +112,13 @@ function onTaskChange() {
projectForm.dates = [task.termStartDate, task.termEndDate]
}
function onScheduleEntryChange() {
const entry = selectedScheduleEntry.value
if (!entry) return
projectForm.teachingTaskIds = [entry.teachingTaskId]
onTaskChange()
}
function openCreateProject() {
resetProjectForm()
projectDialog.value = true
@@ -114,6 +128,7 @@ function openEditProject(project: any) {
editingProjectId.value = project.id
Object.assign(projectForm, {
teachingTaskIds: [project.teachingTaskId],
scheduleEntryId: project.scheduleEntryId ?? '',
code: project.code,
name: project.name,
arrangementMode: project.arrangementMode,
@@ -125,13 +140,18 @@ function openEditProject(project: any) {
}
async function saveProject() {
if (!projectForm.teachingTaskIds.length || !projectForm.code.trim()
if (!projectForm.teachingTaskIds.length ||
(projectForm.arrangementMode === 'Centralized' && !projectForm.scheduleEntryId) ||
!projectForm.code.trim()
|| !projectForm.name.trim() || projectForm.dates.length !== 2) {
ElMessage.warning('请填写教学任务、项目编码、名称和开放日期')
ElMessage.warning(projectForm.arrangementMode === 'Centralized'
? '请选择课表实验课，并填写项目编码、名称和开放日期'
: '请填写教学任务、项目编码、名称和开放日期')
return
}
const payload = {
teachingTaskId: projectForm.teachingTaskIds[0],
scheduleEntryId: projectForm.scheduleEntryId || null,
code: projectForm.code,
name: projectForm.name,
arrangementMode: projectForm.arrangementMode,
@@ -144,6 +164,9 @@ async function saveProject() {
if (editingProjectId.value) {
await http.put(`/experiments/${editingProjectId.value}`, payload)
ElMessage.success('实验项目已更新')
} else if (projectForm.arrangementMode === 'Centralized') {
await http.post('/experiments', payload)
ElMessage.success('实验项目已绑定课表实验课')
} else {
await http.post('/experiments/batch', {
...payload,
@@ -404,6 +427,7 @@ async function loadOptions() {
params: { academicTermId: termId.value || undefined },
})
options.tasks = data.tasks
options.scheduleEntries = data.scheduleEntries
options.classrooms = data.classrooms
options.periods = data.periods
} catch (error) {
@@ -462,11 +486,11 @@ onMounted(async () => {
<span class="section-kicker">LABORATORY OPERATIONS</span>
<h2>{{ isStudent ? '我的实验' : '实验管理' }}</h2>
<p v-if="isStudent">查看统一安排的实验课次，或为规定实验项目选择适合自己的开放时段。</p>
<p v-else>把实验项目分成两条运行轨道：集中排入固定课次，或开放场次供学生自主预约。</p>
<p v-else>集中实验直接绑定已发布课表；仅自主预约实验需要在此开放场次。</p>
</div>
<div class="intro-actions">
<el-button v-if="!isStudent" :icon="Calendar" @click="openBatchSession">
批量排课
批量开放场次
</el-button>
<el-button v-if="!isStudent" type="primary" :icon="Plus" @click="openCreateProject">
批量设置实验任务
@@ -563,7 +587,7 @@ onMounted(async () => {
<b>{{ modeMeta[project.arrangementMode].note }}</b>
</div>
<el-button
v-if="!isStudent && project.status !== 'Closed'"
v-if="!isStudent && project.status !== 'Closed' && project.arrangementMode === 'SelfScheduled'"
size="small"
:icon="Calendar"
@click="openSession(project)"
@@ -572,7 +596,17 @@ onMounted(async () => {
</el-button>
</div>
<div v-if="project.sessions.length" class="session-grid">
<div v-if="project.arrangementMode === 'Centralized' && project.scheduleEntry" class="session-grid">
<article class="session-ticket">
<div class="ticket-date"><strong>课表</strong><span>固定</span></div>
<div class="ticket-body">
<b>星期 {{ project.scheduleEntry.dayOfWeek }} · 第 {{ project.scheduleEntry.startPeriod }}–{{ project.scheduleEntry.startPeriod + project.scheduleEntry.periodCount - 1 }} 节</b>
<span>第 {{ project.scheduleEntry.startWeek }}–{{ project.scheduleEntry.endWeek }} 周 · {{ project.scheduleEntry.campusName }} · {{ project.scheduleEntry.buildingName }} {{ project.scheduleEntry.classroomName }}</span>
</div>
<div class="ticket-action"><el-tag type="primary" size="small" effect="plain">课表已安排</el-tag></div>
</article>
</div>
<div v-else-if="project.sessions.length" class="session-grid">
<article
v-for="session in project.sessions"
:key="session.id"
@@ -653,7 +687,7 @@ onMounted(async () => {
<el-empty
v-else
:image-size="58"
:description="project.status === 'Draft' ? '尚未安排场次，安排后才能发布' : '暂无有效实验场次'"
:description="project.arrangementMode === 'Centralized' ? '尚未绑定已发布课表中的实验课' : (project.status === 'Draft' ? '尚未开放场次，安排后才能发布' : '暂无有效实验场次')"
/>
</div>
@@ -664,7 +698,9 @@ onMounted(async () => {
<el-button
size="small"
type="primary"
:disabled="!project.sessions.some((item: any) => item.status !== 'Cancelled')"
:disabled="project.arrangementMode === 'Centralized'
? !project.scheduleEntry
: !project.sessions.some((item: any) => item.status !== 'Cancelled')"
@click="publishProject(project)"
>
发布给学生
@@ -720,11 +756,22 @@ onMounted(async () => {
<el-form label-position="top" class="experiment-form">
<div class="form-section">
<header><span>PROJECT</span><b>规定实验项目</b></header>
<el-form-item :label="editingProjectId ? '所属教学任务' : '适用教学任务（可多选）'" required>
<el-form-item v-if="projectForm.arrangementMode === 'Centralized'" label="已发布课表中的实验课" required>
<el-select v-model="projectForm.scheduleEntryId" filterable :disabled="!!editingProjectId" placeholder="选择已安排实验室的实验课" @change="onScheduleEntryChange">
<el-option
v-for="entry in options.scheduleEntries"
:key="entry.id"
:label="`${entry.courseCode} · ${entry.courseName} · ${entry.taskNumber} · 星期 ${entry.dayOfWeek} 第 ${entry.startPeriod}–${entry.startPeriod + entry.periodCount - 1} 节 · ${entry.campusName} ${entry.buildingName} ${entry.classroomName}`"
:value="entry.id"
/>
</el-select>
<small class="form-help">集中实验复用课表的时间和实验室，不会再生成独立实验场次。</small>
</el-form-item>
<el-form-item v-else :label="editingProjectId ? '所属教学任务' : '适用教学任务（可多选）'" required>
<el-select
v-model="projectForm.teachingTaskIds"
filterable
multiple
:multiple="!editingProjectId"
collapse-tags
collapse-tags-tooltip
:disabled="!!editingProjectId"
@@ -757,9 +804,9 @@ onMounted(async () => {
<div class="form-section">
<header><span>ROUTE</span><b>选择运行轨道</b></header>
<el-radio-group v-model="projectForm.arrangementMode" class="mode-choice">
<el-radio-group v-model="projectForm.arrangementMode" class="mode-choice" :disabled="!!editingProjectId">
<el-radio-button value="Centralized">
<b>集中安排</b><small>统一时间，像上课一样到场</small>
<b>集中安排</b><small>复用已发布课表的实验课</small>
</el-radio-button>
<el-radio-button value="SelfScheduled">
<b>自行安排</b><small>开放多个场次，学生自主预约</small>
@@ -858,7 +905,7 @@ onMounted(async () => {
<el-form-item label="实验室" required>
<el-select v-model="sessionForm.classroomId" filterable placeholder="选择实验室或教学场所">
<el-option
v-for="room in options.classrooms"
v-for="room in options.classrooms.filter((item: any) => (Number(item.teachingVenueNature) & (2 | 4 | 8 | 16)) !== 0)"
:key="room.id"
:label="`${room.campusName} · ${room.buildingName} ${room.name} · ${room.capacity} 人`"
:value="room.id"
@@ -940,7 +987,7 @@ onMounted(async () => {
<el-input-number v-model="row.periodCount" :min="1" :max="12" controls-position="right" />
<el-select v-model="row.classroomId" filterable placeholder="实验室">
<el-option
v-for="room in options.classrooms"
v-for="room in options.classrooms.filter((item: any) => (Number(item.teachingVenueNature) & (2 | 4 | 8 | 16)) !== 0)"
:key="room.id"
:label="`${room.campusName} · ${room.buildingName} ${room.name} · ${room.capacity} 人`"
:value="room.id"
web/src/views/SchedulesView.vue
+18 -3
View File
@@ -54,6 +54,10 @@ const weekdays = [
{ value: 6, label: '星期六' },
{ value: 7, label: '星期日' },
]
const experimentVenueNatures = [
{ value: 2, label: '实验室' }, { value: 4, label: '实训室' },
{ value: 8, label: '计算机机房' }, { value: 16, label: '语音室' },
]
const periods = computed(() => {
const configured = timeSlots.value
.filter((item) => item.isEnabled)
@@ -126,7 +130,7 @@ const selectedTaskConstraint = computed(() =>
constraints.value.find((item) => item.id === entryForm.teachingTaskId),
)
const isExperimentRoom = (room: any) =>
['实验', '实训', '机房', '语音'].some((keyword) => room.roomType?.includes(keyword))
(Number(room.teachingVenueNature) & (2 | 4 | 8 | 16)) !== 0
const entryClassrooms = computed(() =>
classrooms.value.filter((room) =>
(!selectedTaskConstraint.value?.requiredCampusId
@@ -294,6 +298,9 @@ function openConstraint(item: any) {
requiredCampusId: item.requiredCampusId,
requiredBuildingId: item.requiredBuildingId,
allowedClassroomIds: [...item.allowedClassroomIds],
allowedExperimentVenueNatures: experimentVenueNatures
.filter((nature) => (Number(item.allowedExperimentVenueNatures) & nature.value) !== 0)
.map((nature) => nature.value),
allowedDayOfWeeks: item.allowedDayOfWeeks.length
? [...item.allowedDayOfWeeks]
: [1, 2, 3, 4, 5],
@@ -311,6 +318,8 @@ async function saveConstraint() {
requiredCampusId: constraintForm.requiredCampusId || null,
requiredBuildingId: constraintForm.requiredBuildingId || null,
allowedClassroomIds: constraintForm.allowedClassroomIds ?? [],
allowedExperimentVenueNatures: (constraintForm.allowedExperimentVenueNatures ?? [])
.reduce((value: number, nature: number) => value | nature, 0),
allowedDayOfWeeks: constraintForm.allowedDayOfWeeks ?? [],
earliestPeriod: constraintForm.earliestPeriod || null,
latestPeriod: constraintForm.latestPeriod || null,
@@ -1208,7 +1217,7 @@ onBeforeUnmount(() => {
</el-select>
</el-form-item>
</div>
<el-form-item label="指定可用教室">
<el-form-item label="指定可用教室">
<el-select v-model="constraintForm.allowedClassroomIds" multiple filterable collapse-tags>
<el-option
v-for="item in filteredClassrooms"
@@ -1217,7 +1226,13 @@ onBeforeUnmount(() => {
:value="item.id"
/>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item label="实验课允许的场地性质">
<el-checkbox-group v-model="constraintForm.allowedExperimentVenueNatures">
<el-checkbox v-for="nature in experimentVenueNatures" :key="nature.value" :value="nature.value">{{ nature.label }}</el-checkbox>
</el-checkbox-group>
<small class="field-hint">仅约束实验课；不勾选时可使用全部实验教学场地。</small>
</el-form-item>
</template>
<el-form-item label="允许上课日">
<el-checkbox-group v-model="constraintForm.allowedDayOfWeeks">