支持为同一学期、同一课程的多个教学任务批量创建相同实验项目。
新增批量排课表,可为多个实验项目分别设置日期、节次、实验室和容量。 批量排课采用原子事务:任一项目发生教室、教师、班级或课表冲突,整批不写入。 已发布项目批量新增场次时,继续按原逻辑通知学生。 后端继续执行管理范围、教学任务状态、开放日期和容量校验。 页面在 390px 手机宽度下无横向溢出。
This commit is contained in:
@@ -75,6 +75,7 @@ public sealed class ExperimentsController(
|
|||||||
x.TaskNumber,
|
x.TaskNumber,
|
||||||
x.Name,
|
x.Name,
|
||||||
x.AcademicTermId,
|
x.AcademicTermId,
|
||||||
|
x.CourseId,
|
||||||
TermName = x.AcademicTerm!.Name,
|
TermName = x.AcademicTerm!.Name,
|
||||||
TermStartDate = x.AcademicTerm.StartDate,
|
TermStartDate = x.AcademicTerm.StartDate,
|
||||||
TermEndDate = x.AcademicTerm.EndDate,
|
TermEndDate = x.AcademicTerm.EndDate,
|
||||||
@@ -295,6 +296,78 @@ public sealed class ExperimentsController(
|
|||||||
return Created(string.Empty, new { project.Id });
|
return Created(string.Empty, new { project.Id });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[HttpPost("batch")]
|
||||||
|
[Authorize(Roles = Managers)]
|
||||||
|
public async Task<ActionResult> CreateProjects(
|
||||||
|
ExperimentProjectBatchRequest request,
|
||||||
|
CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var taskIds = request.TeachingTaskIds
|
||||||
|
.Where(x => x != Guid.Empty)
|
||||||
|
.Distinct()
|
||||||
|
.ToList();
|
||||||
|
if (taskIds.Count == 0)
|
||||||
|
return ValidationProblem("请至少选择一个教学任务。");
|
||||||
|
if (taskIds.Count > 100)
|
||||||
|
return ValidationProblem("单次最多为 100 个教学任务创建实验项目。");
|
||||||
|
|
||||||
|
var tasks = await AccessibleTeachingTasks().AsNoTracking()
|
||||||
|
.Include(x => x.AcademicTerm)
|
||||||
|
.Where(x =>
|
||||||
|
taskIds.Contains(x.Id) &&
|
||||||
|
x.Status == TeachingTaskStatus.Published)
|
||||||
|
.OrderBy(x => x.TaskNumber)
|
||||||
|
.ToListAsync(cancellationToken);
|
||||||
|
if (tasks.Count != taskIds.Count)
|
||||||
|
return ValidationProblem("部分教学任务不存在、未发布或不在当前管理范围内。");
|
||||||
|
|
||||||
|
var first = tasks[0];
|
||||||
|
if (tasks.Any(x =>
|
||||||
|
x.AcademicTermId != first.AcademicTermId ||
|
||||||
|
x.CourseId != first.CourseId))
|
||||||
|
return ValidationProblem("批量设置仅支持同一学期、同一课程的教学任务。");
|
||||||
|
|
||||||
|
var code = request.Code.Trim();
|
||||||
|
var conflictingTaskNumbers = await db.ExperimentProjects.AsNoTracking()
|
||||||
|
.Where(x =>
|
||||||
|
taskIds.Contains(x.TeachingTaskId) &&
|
||||||
|
x.Code == code)
|
||||||
|
.Select(x => x.TeachingTask!.TaskNumber)
|
||||||
|
.OrderBy(x => x)
|
||||||
|
.ToListAsync(cancellationToken);
|
||||||
|
if (conflictingTaskNumbers.Count > 0)
|
||||||
|
return ConflictProblem(
|
||||||
|
$"以下教学任务已存在实验项目编码 {code}:{string.Join("、", conflictingTaskNumbers)}。");
|
||||||
|
|
||||||
|
var projects = new List<ExperimentProject>(tasks.Count);
|
||||||
|
foreach (var task in tasks)
|
||||||
|
{
|
||||||
|
var item = request.ForTeachingTask(task.Id);
|
||||||
|
var problem = ValidateProjectRequest(item, task.AcademicTerm!);
|
||||||
|
if (problem is not null) return ValidationProblem(problem);
|
||||||
|
|
||||||
|
projects.Add(new ExperimentProject
|
||||||
|
{
|
||||||
|
TeachingTaskId = task.Id,
|
||||||
|
Code = code,
|
||||||
|
Name = request.Name.Trim(),
|
||||||
|
ArrangementMode = request.ArrangementMode,
|
||||||
|
Description = Normalize(request.Description),
|
||||||
|
Requirements = Normalize(request.Requirements),
|
||||||
|
StartDate = request.StartDate,
|
||||||
|
EndDate = request.EndDate
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
db.ExperimentProjects.AddRange(projects);
|
||||||
|
await db.SaveChangesAsync(cancellationToken);
|
||||||
|
return Created(string.Empty, new
|
||||||
|
{
|
||||||
|
Count = projects.Count,
|
||||||
|
ProjectIds = projects.Select(x => x.Id)
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
[HttpPut("{id:guid}")]
|
[HttpPut("{id:guid}")]
|
||||||
[Authorize(Roles = Managers)]
|
[Authorize(Roles = Managers)]
|
||||||
public async Task<ActionResult> UpdateProject(
|
public async Task<ActionResult> UpdateProject(
|
||||||
@@ -478,6 +551,101 @@ public sealed class ExperimentsController(
|
|||||||
return Created(string.Empty, new { session.Id });
|
return Created(string.Empty, new { session.Id });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[HttpPost("sessions/batch")]
|
||||||
|
[Authorize(Roles = Managers)]
|
||||||
|
public Task<ActionResult> CreateSessions(
|
||||||
|
ExperimentSessionBatchRequest request,
|
||||||
|
CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
if (request.Items.Count == 0)
|
||||||
|
return Task.FromResult<ActionResult>(
|
||||||
|
ValidationProblem("请至少添加一条实验排课。"));
|
||||||
|
if (request.Items.Count > 100)
|
||||||
|
return Task.FromResult<ActionResult>(
|
||||||
|
ValidationProblem("单次最多安排 100 条实验场次。"));
|
||||||
|
if (request.Items.Any(x => x.ProjectId == Guid.Empty) ||
|
||||||
|
request.Items.Select(x => x.ProjectId).Distinct().Count() !=
|
||||||
|
request.Items.Count)
|
||||||
|
return Task.FromResult<ActionResult>(
|
||||||
|
ValidationProblem("同一批次中每个实验项目只能安排一个场次。"));
|
||||||
|
|
||||||
|
return db.ExecuteInRetriableTransactionAsync<ActionResult>(
|
||||||
|
async transaction =>
|
||||||
|
{
|
||||||
|
var projectIds = request.Items.Select(x => x.ProjectId).ToList();
|
||||||
|
var projects = await ScopedProjects()
|
||||||
|
.Include(x => x.TeachingTask)
|
||||||
|
.ThenInclude(x => x!.AcademicTerm)
|
||||||
|
.Where(x => projectIds.Contains(x.Id))
|
||||||
|
.ToDictionaryAsync(x => x.Id, cancellationToken);
|
||||||
|
if (projects.Count != projectIds.Count)
|
||||||
|
return ValidationProblem(
|
||||||
|
"部分实验项目不存在或不在当前管理范围内。");
|
||||||
|
|
||||||
|
var createdSessions = new List<(ExperimentProject Project, ExperimentSession Session)>(
|
||||||
|
request.Items.Count);
|
||||||
|
foreach (var item in request.Items)
|
||||||
|
{
|
||||||
|
var project = projects[item.ProjectId];
|
||||||
|
if (project.Status == ExperimentProjectStatus.Closed)
|
||||||
|
return ConflictProblem(
|
||||||
|
$"实验项目“{project.Name}”已关闭,不能再增加场次。");
|
||||||
|
|
||||||
|
var sessionRequest = item.ToSessionRequest();
|
||||||
|
var problem = await ValidateSessionAsync(
|
||||||
|
project,
|
||||||
|
sessionRequest,
|
||||||
|
cancellationToken);
|
||||||
|
if (problem is not null)
|
||||||
|
return ConflictProblem(
|
||||||
|
$"实验项目“{project.Name}”:{problem}");
|
||||||
|
|
||||||
|
var session = new ExperimentSession
|
||||||
|
{
|
||||||
|
ExperimentProjectId = project.Id,
|
||||||
|
ClassroomId = item.ClassroomId,
|
||||||
|
SessionDate = item.SessionDate,
|
||||||
|
StartPeriod = item.StartPeriod,
|
||||||
|
PeriodCount = item.PeriodCount,
|
||||||
|
Capacity = await ResolveSessionCapacityAsync(
|
||||||
|
project,
|
||||||
|
item.Capacity,
|
||||||
|
cancellationToken),
|
||||||
|
Notes = Normalize(item.Notes)
|
||||||
|
};
|
||||||
|
db.ExperimentSessions.Add(session);
|
||||||
|
await db.SaveChangesAsync(cancellationToken);
|
||||||
|
createdSessions.Add((project, session));
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var (project, session) in createdSessions.Where(x =>
|
||||||
|
x.Project.Status == ExperimentProjectStatus.Published))
|
||||||
|
{
|
||||||
|
var userIds = await RosterUserIdsAsync(
|
||||||
|
project.TeachingTaskId,
|
||||||
|
cancellationToken);
|
||||||
|
if (userIds.Count == 0) continue;
|
||||||
|
await NotificationService.SendToUserIdsAsync(
|
||||||
|
db,
|
||||||
|
userIds,
|
||||||
|
"新增实验场次",
|
||||||
|
$"“{project.Name}”新增 {session.SessionDate:yyyy-MM-dd} 第 {session.StartPeriod}—{session.StartPeriod + session.PeriodCount - 1} 节场次,请查看实验安排。",
|
||||||
|
"/experiments",
|
||||||
|
cancellationToken,
|
||||||
|
NotificationCategory.Schedule);
|
||||||
|
}
|
||||||
|
|
||||||
|
await transaction.CommitAsync(cancellationToken);
|
||||||
|
return Created(string.Empty, new
|
||||||
|
{
|
||||||
|
Count = createdSessions.Count,
|
||||||
|
SessionIds = createdSessions.Select(x => x.Session.Id)
|
||||||
|
});
|
||||||
|
},
|
||||||
|
cancellationToken,
|
||||||
|
IsolationLevel.Serializable);
|
||||||
|
}
|
||||||
|
|
||||||
[HttpDelete("sessions/{id:guid}")]
|
[HttpDelete("sessions/{id:guid}")]
|
||||||
[Authorize(Roles = Managers)]
|
[Authorize(Roles = Managers)]
|
||||||
public async Task<ActionResult> CancelSession(
|
public async Task<ActionResult> CancelSession(
|
||||||
@@ -1029,6 +1197,28 @@ public sealed record ExperimentProjectRequest(
|
|||||||
DateOnly StartDate,
|
DateOnly StartDate,
|
||||||
DateOnly EndDate);
|
DateOnly EndDate);
|
||||||
|
|
||||||
|
public sealed record ExperimentProjectBatchRequest(
|
||||||
|
[Required] IReadOnlyList<Guid> TeachingTaskIds,
|
||||||
|
[Required, MaxLength(40)] string Code,
|
||||||
|
[Required, MaxLength(120)] string Name,
|
||||||
|
ExperimentArrangementMode ArrangementMode,
|
||||||
|
[MaxLength(1000)] string? Description,
|
||||||
|
[MaxLength(1000)] string? Requirements,
|
||||||
|
DateOnly StartDate,
|
||||||
|
DateOnly EndDate)
|
||||||
|
{
|
||||||
|
public ExperimentProjectRequest ForTeachingTask(Guid teachingTaskId) =>
|
||||||
|
new(
|
||||||
|
teachingTaskId,
|
||||||
|
Code,
|
||||||
|
Name,
|
||||||
|
ArrangementMode,
|
||||||
|
Description,
|
||||||
|
Requirements,
|
||||||
|
StartDate,
|
||||||
|
EndDate);
|
||||||
|
}
|
||||||
|
|
||||||
public sealed record ExperimentSessionRequest(
|
public sealed record ExperimentSessionRequest(
|
||||||
Guid ClassroomId,
|
Guid ClassroomId,
|
||||||
DateOnly SessionDate,
|
DateOnly SessionDate,
|
||||||
@@ -1037,6 +1227,28 @@ public sealed record ExperimentSessionRequest(
|
|||||||
[Range(1, 10000)] int Capacity,
|
[Range(1, 10000)] int Capacity,
|
||||||
[MaxLength(500)] string? Notes);
|
[MaxLength(500)] string? Notes);
|
||||||
|
|
||||||
|
public sealed record ExperimentSessionBatchRequest(
|
||||||
|
[Required] IReadOnlyList<ExperimentSessionBatchItem> Items);
|
||||||
|
|
||||||
|
public sealed record ExperimentSessionBatchItem(
|
||||||
|
Guid ProjectId,
|
||||||
|
Guid ClassroomId,
|
||||||
|
DateOnly SessionDate,
|
||||||
|
[Range(1, 30)] int StartPeriod,
|
||||||
|
[Range(1, 30)] int PeriodCount,
|
||||||
|
[Range(1, 10000)] int Capacity,
|
||||||
|
[MaxLength(500)] string? Notes)
|
||||||
|
{
|
||||||
|
public ExperimentSessionRequest ToSessionRequest() =>
|
||||||
|
new(
|
||||||
|
ClassroomId,
|
||||||
|
SessionDate,
|
||||||
|
StartPeriod,
|
||||||
|
PeriodCount,
|
||||||
|
Capacity,
|
||||||
|
Notes);
|
||||||
|
}
|
||||||
|
|
||||||
public sealed record ExperimentPeriodOption(
|
public sealed record ExperimentPeriodOption(
|
||||||
Guid AcademicTermId,
|
Guid AcademicTermId,
|
||||||
int PeriodNumber,
|
int PeriodNumber,
|
||||||
|
|||||||
@@ -12,6 +12,112 @@ namespace Jiaowu.Api.Tests;
|
|||||||
|
|
||||||
public sealed class ExperimentsControllerTests
|
public sealed class ExperimentsControllerTests
|
||||||
{
|
{
|
||||||
|
[Fact]
|
||||||
|
public async Task BatchProjects_CreateSameDefinitionForSameCourseTasks()
|
||||||
|
{
|
||||||
|
await using var fixture = await ExperimentFixture.CreateAsync();
|
||||||
|
var controller = fixture.Controller(fixture.ManagerScope);
|
||||||
|
|
||||||
|
var result = await controller.CreateProjects(
|
||||||
|
fixture.BatchProjectRequest(
|
||||||
|
ExperimentArrangementMode.Centralized),
|
||||||
|
CancellationToken.None);
|
||||||
|
|
||||||
|
Assert.IsType<CreatedResult>(result);
|
||||||
|
var projects = await fixture.Db.ExperimentProjects
|
||||||
|
.OrderBy(x => x.TeachingTaskId)
|
||||||
|
.ToListAsync();
|
||||||
|
Assert.Equal(2, projects.Count);
|
||||||
|
Assert.Equal(2, projects.Select(x => x.TeachingTaskId).Distinct().Count());
|
||||||
|
Assert.All(projects, project =>
|
||||||
|
{
|
||||||
|
Assert.Equal("LAB-BATCH", project.Code);
|
||||||
|
Assert.Equal("公共实验任务", project.Name);
|
||||||
|
Assert.Equal(ExperimentProjectStatus.Draft, project.Status);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task BatchSessions_RollsBackAllRowsWhenOneConflicts()
|
||||||
|
{
|
||||||
|
await using var fixture = await ExperimentFixture.CreateAsync();
|
||||||
|
var controller = fixture.Controller(fixture.ManagerScope);
|
||||||
|
await controller.CreateProjects(
|
||||||
|
fixture.BatchProjectRequest(
|
||||||
|
ExperimentArrangementMode.SelfScheduled),
|
||||||
|
CancellationToken.None);
|
||||||
|
var projectIds = await fixture.Db.ExperimentProjects
|
||||||
|
.OrderBy(x => x.TeachingTaskId)
|
||||||
|
.Select(x => x.Id)
|
||||||
|
.ToListAsync();
|
||||||
|
|
||||||
|
var result = await controller.CreateSessions(
|
||||||
|
new ExperimentSessionBatchRequest(
|
||||||
|
[
|
||||||
|
new ExperimentSessionBatchItem(
|
||||||
|
projectIds[0],
|
||||||
|
fixture.Classroom.Id,
|
||||||
|
fixture.Term.StartDate,
|
||||||
|
1,
|
||||||
|
2,
|
||||||
|
20,
|
||||||
|
null),
|
||||||
|
new ExperimentSessionBatchItem(
|
||||||
|
projectIds[1],
|
||||||
|
fixture.Classroom.Id,
|
||||||
|
fixture.Term.StartDate,
|
||||||
|
1,
|
||||||
|
2,
|
||||||
|
20,
|
||||||
|
null)
|
||||||
|
]),
|
||||||
|
CancellationToken.None);
|
||||||
|
|
||||||
|
Assert.IsType<ConflictObjectResult>(result);
|
||||||
|
fixture.Db.ChangeTracker.Clear();
|
||||||
|
Assert.Empty(await fixture.Db.ExperimentSessions.ToListAsync());
|
||||||
|
}
|
||||||
|
|
||||||
|
[Fact]
|
||||||
|
public async Task BatchSessions_CreatesRowsAtomicallyWhenAllAreValid()
|
||||||
|
{
|
||||||
|
await using var fixture = await ExperimentFixture.CreateAsync();
|
||||||
|
var controller = fixture.Controller(fixture.ManagerScope);
|
||||||
|
await controller.CreateProjects(
|
||||||
|
fixture.BatchProjectRequest(
|
||||||
|
ExperimentArrangementMode.SelfScheduled),
|
||||||
|
CancellationToken.None);
|
||||||
|
var projectIds = await fixture.Db.ExperimentProjects
|
||||||
|
.OrderBy(x => x.TeachingTaskId)
|
||||||
|
.Select(x => x.Id)
|
||||||
|
.ToListAsync();
|
||||||
|
|
||||||
|
var result = await controller.CreateSessions(
|
||||||
|
new ExperimentSessionBatchRequest(
|
||||||
|
[
|
||||||
|
new ExperimentSessionBatchItem(
|
||||||
|
projectIds[0],
|
||||||
|
fixture.Classroom.Id,
|
||||||
|
fixture.Term.StartDate,
|
||||||
|
1,
|
||||||
|
2,
|
||||||
|
20,
|
||||||
|
null),
|
||||||
|
new ExperimentSessionBatchItem(
|
||||||
|
projectIds[1],
|
||||||
|
fixture.SecondClassroom.Id,
|
||||||
|
fixture.Term.StartDate,
|
||||||
|
1,
|
||||||
|
2,
|
||||||
|
20,
|
||||||
|
null)
|
||||||
|
]),
|
||||||
|
CancellationToken.None);
|
||||||
|
|
||||||
|
Assert.IsType<CreatedResult>(result);
|
||||||
|
Assert.Equal(2, await fixture.Db.ExperimentSessions.CountAsync());
|
||||||
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public async Task CentralizedProject_PublishesAndUsesTeachingTaskRoster()
|
public async Task CentralizedProject_PublishesAndUsesTeachingTaskRoster()
|
||||||
{
|
{
|
||||||
@@ -421,6 +527,15 @@ public sealed class ExperimentsControllerTests
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
|
var secondTask = new TeachingTask
|
||||||
|
{
|
||||||
|
TaskNumber = "2099-1-CSLAB-02",
|
||||||
|
Name = "系统实验教学班 02",
|
||||||
|
AcademicTermId = term.Id,
|
||||||
|
CourseId = course.Id,
|
||||||
|
Capacity = 40,
|
||||||
|
Status = TeachingTaskStatus.Published
|
||||||
|
};
|
||||||
db.AddRange(
|
db.AddRange(
|
||||||
manager,
|
manager,
|
||||||
studentUser,
|
studentUser,
|
||||||
@@ -435,7 +550,8 @@ public sealed class ExperimentsControllerTests
|
|||||||
teacher,
|
teacher,
|
||||||
term,
|
term,
|
||||||
course,
|
course,
|
||||||
task);
|
task,
|
||||||
|
secondTask);
|
||||||
for (var period = 1; period <= 12; period++)
|
for (var period = 1; period <= 12; period++)
|
||||||
{
|
{
|
||||||
db.ScheduleTimeSlots.Add(new ScheduleTimeSlot
|
db.ScheduleTimeSlots.Add(new ScheduleTimeSlot
|
||||||
@@ -486,6 +602,21 @@ public sealed class ExperimentsControllerTests
|
|||||||
Term.StartDate,
|
Term.StartDate,
|
||||||
Term.StartDate.AddDays(14));
|
Term.StartDate.AddDays(14));
|
||||||
|
|
||||||
|
public ExperimentProjectBatchRequest BatchProjectRequest(
|
||||||
|
ExperimentArrangementMode mode) =>
|
||||||
|
new(
|
||||||
|
Db.TeachingTasks
|
||||||
|
.OrderBy(x => x.TaskNumber)
|
||||||
|
.Select(x => x.Id)
|
||||||
|
.ToList(),
|
||||||
|
"LAB-BATCH",
|
||||||
|
"公共实验任务",
|
||||||
|
mode,
|
||||||
|
"多个教学任务共用的实验内容。",
|
||||||
|
"携带校园卡。",
|
||||||
|
Term.StartDate,
|
||||||
|
Term.StartDate.AddDays(14));
|
||||||
|
|
||||||
public ExperimentSessionRequest SessionRequest(
|
public ExperimentSessionRequest SessionRequest(
|
||||||
int startPeriod,
|
int startPeriod,
|
||||||
int periodCount,
|
int periodCount,
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ const statusFilter = ref('')
|
|||||||
const projectDialog = ref(false)
|
const projectDialog = ref(false)
|
||||||
const editingProjectId = ref('')
|
const editingProjectId = ref('')
|
||||||
const projectForm = reactive({
|
const projectForm = reactive({
|
||||||
teachingTaskId: '',
|
teachingTaskIds: [] as string[],
|
||||||
code: '',
|
code: '',
|
||||||
name: '',
|
name: '',
|
||||||
arrangementMode: 'Centralized',
|
arrangementMode: 'Centralized',
|
||||||
@@ -47,13 +47,20 @@ const sessionForm = reactive({
|
|||||||
notes: '',
|
notes: '',
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const batchSessionDialog = ref(false)
|
||||||
|
const batchSessionProjectIds = ref<string[]>([])
|
||||||
|
const batchSessionRows = ref<any[]>([])
|
||||||
|
|
||||||
const participantsDialog = ref(false)
|
const participantsDialog = ref(false)
|
||||||
const participantSession = ref<any>(null)
|
const participantSession = ref<any>(null)
|
||||||
const participants = ref<any[]>([])
|
const participants = ref<any[]>([])
|
||||||
const participantsLoading = ref(false)
|
const participantsLoading = ref(false)
|
||||||
|
|
||||||
const selectedTask = computed(() =>
|
const selectedTask = computed(() =>
|
||||||
options.tasks.find((task) => task.id === projectForm.teachingTaskId),
|
options.tasks.find((task) => task.id === projectForm.teachingTaskIds[0]),
|
||||||
|
)
|
||||||
|
const batchProjectOptions = computed(() =>
|
||||||
|
projects.value.filter((project) => project.status !== 'Closed'),
|
||||||
)
|
)
|
||||||
const activePeriods = computed(() =>
|
const activePeriods = computed(() =>
|
||||||
options.periods.filter((period) =>
|
options.periods.filter((period) =>
|
||||||
@@ -82,7 +89,7 @@ const statusLabels: Record<string, string> = {
|
|||||||
function resetProjectForm() {
|
function resetProjectForm() {
|
||||||
editingProjectId.value = ''
|
editingProjectId.value = ''
|
||||||
Object.assign(projectForm, {
|
Object.assign(projectForm, {
|
||||||
teachingTaskId: '',
|
teachingTaskIds: [],
|
||||||
code: '',
|
code: '',
|
||||||
name: '',
|
name: '',
|
||||||
arrangementMode: 'Centralized',
|
arrangementMode: 'Centralized',
|
||||||
@@ -106,7 +113,7 @@ function openCreateProject() {
|
|||||||
function openEditProject(project: any) {
|
function openEditProject(project: any) {
|
||||||
editingProjectId.value = project.id
|
editingProjectId.value = project.id
|
||||||
Object.assign(projectForm, {
|
Object.assign(projectForm, {
|
||||||
teachingTaskId: project.teachingTaskId,
|
teachingTaskIds: [project.teachingTaskId],
|
||||||
code: project.code,
|
code: project.code,
|
||||||
name: project.name,
|
name: project.name,
|
||||||
arrangementMode: project.arrangementMode,
|
arrangementMode: project.arrangementMode,
|
||||||
@@ -118,13 +125,13 @@ function openEditProject(project: any) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function saveProject() {
|
async function saveProject() {
|
||||||
if (!projectForm.teachingTaskId || !projectForm.code.trim()
|
if (!projectForm.teachingTaskIds.length || !projectForm.code.trim()
|
||||||
|| !projectForm.name.trim() || projectForm.dates.length !== 2) {
|
|| !projectForm.name.trim() || projectForm.dates.length !== 2) {
|
||||||
ElMessage.warning('请填写教学任务、项目编码、名称和开放日期')
|
ElMessage.warning('请填写教学任务、项目编码、名称和开放日期')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
const payload = {
|
const payload = {
|
||||||
teachingTaskId: projectForm.teachingTaskId,
|
teachingTaskId: projectForm.teachingTaskIds[0],
|
||||||
code: projectForm.code,
|
code: projectForm.code,
|
||||||
name: projectForm.name,
|
name: projectForm.name,
|
||||||
arrangementMode: projectForm.arrangementMode,
|
arrangementMode: projectForm.arrangementMode,
|
||||||
@@ -138,8 +145,12 @@ async function saveProject() {
|
|||||||
await http.put(`/experiments/${editingProjectId.value}`, payload)
|
await http.put(`/experiments/${editingProjectId.value}`, payload)
|
||||||
ElMessage.success('实验项目已更新')
|
ElMessage.success('实验项目已更新')
|
||||||
} else {
|
} else {
|
||||||
await http.post('/experiments', payload)
|
await http.post('/experiments/batch', {
|
||||||
ElMessage.success('实验项目已创建')
|
...payload,
|
||||||
|
teachingTaskId: undefined,
|
||||||
|
teachingTaskIds: projectForm.teachingTaskIds,
|
||||||
|
})
|
||||||
|
ElMessage.success(`已为 ${projectForm.teachingTaskIds.length} 个教学任务创建实验项目`)
|
||||||
}
|
}
|
||||||
projectDialog.value = false
|
projectDialog.value = false
|
||||||
await load()
|
await load()
|
||||||
@@ -148,6 +159,78 @@ async function saveProject() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function openBatchSession() {
|
||||||
|
batchSessionProjectIds.value = []
|
||||||
|
batchSessionRows.value = []
|
||||||
|
batchSessionDialog.value = true
|
||||||
|
}
|
||||||
|
|
||||||
|
function syncBatchSessionRows() {
|
||||||
|
const existing = new Map(batchSessionRows.value.map((row) => [row.projectId, row]))
|
||||||
|
batchSessionRows.value = batchSessionProjectIds.value.map((projectId) => {
|
||||||
|
const current = existing.get(projectId)
|
||||||
|
if (current) return current
|
||||||
|
const project = projects.value.find((item) => item.id === projectId)
|
||||||
|
const firstPeriod = options.periods.find((item) =>
|
||||||
|
item.academicTermId === project?.academicTermId,
|
||||||
|
)
|
||||||
|
return {
|
||||||
|
projectId,
|
||||||
|
classroomId: '',
|
||||||
|
sessionDate: project?.startDate ?? '',
|
||||||
|
startPeriod: firstPeriod?.periodNumber,
|
||||||
|
periodCount: 2,
|
||||||
|
capacity: 30,
|
||||||
|
notes: '',
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
function applyFirstBatchTime() {
|
||||||
|
const first = batchSessionRows.value[0]
|
||||||
|
if (!first) return
|
||||||
|
batchSessionRows.value.slice(1).forEach((row) => {
|
||||||
|
row.sessionDate = first.sessionDate
|
||||||
|
row.startPeriod = first.startPeriod
|
||||||
|
row.periodCount = first.periodCount
|
||||||
|
})
|
||||||
|
ElMessage.success('已套用首行的日期和节次,请分别选择不冲突的实验室')
|
||||||
|
}
|
||||||
|
|
||||||
|
function batchProject(projectId: string) {
|
||||||
|
return projects.value.find((project) => project.id === projectId)
|
||||||
|
}
|
||||||
|
|
||||||
|
function periodsForProject(projectId: string) {
|
||||||
|
const project = batchProject(projectId)
|
||||||
|
return options.periods.filter((period) =>
|
||||||
|
period.academicTermId === project?.academicTermId,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
async function saveBatchSessions() {
|
||||||
|
if (!batchSessionRows.value.length) {
|
||||||
|
ElMessage.warning('请至少选择一个实验项目')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (batchSessionRows.value.some((row) =>
|
||||||
|
!row.classroomId || !row.sessionDate || !row.startPeriod || !row.periodCount,
|
||||||
|
)) {
|
||||||
|
ElMessage.warning('请完整填写每个项目的日期、节次、实验室和容量')
|
||||||
|
return
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
await http.post('/experiments/sessions/batch', {
|
||||||
|
items: batchSessionRows.value,
|
||||||
|
})
|
||||||
|
batchSessionDialog.value = false
|
||||||
|
ElMessage.success(`已批量安排 ${batchSessionRows.value.length} 个实验场次`)
|
||||||
|
await load()
|
||||||
|
} catch (error) {
|
||||||
|
ElMessage.error(apiErrorMessage(error))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function openSession(project: any) {
|
function openSession(project: any) {
|
||||||
selectedProject.value = project
|
selectedProject.value = project
|
||||||
const firstPeriod = options.periods.find((item) =>
|
const firstPeriod = options.periods.find((item) =>
|
||||||
@@ -382,8 +465,11 @@ onMounted(async () => {
|
|||||||
<p v-else>把实验项目分成两条运行轨道:集中排入固定课次,或开放场次供学生自主预约。</p>
|
<p v-else>把实验项目分成两条运行轨道:集中排入固定课次,或开放场次供学生自主预约。</p>
|
||||||
</div>
|
</div>
|
||||||
<div class="intro-actions">
|
<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">
|
<el-button v-if="!isStudent" type="primary" :icon="Plus" @click="openCreateProject">
|
||||||
新建实验项目
|
批量设置实验任务
|
||||||
</el-button>
|
</el-button>
|
||||||
<el-button :icon="Refresh" @click="load">刷新</el-button>
|
<el-button :icon="Refresh" @click="load">刷新</el-button>
|
||||||
</div>
|
</div>
|
||||||
@@ -627,19 +713,22 @@ onMounted(async () => {
|
|||||||
|
|
||||||
<el-dialog
|
<el-dialog
|
||||||
v-model="projectDialog"
|
v-model="projectDialog"
|
||||||
:title="editingProjectId ? '编辑实验项目' : '新建实验项目'"
|
:title="editingProjectId ? '编辑实验项目' : '批量设置实验任务'"
|
||||||
width="720px"
|
width="720px"
|
||||||
top="5vh"
|
top="5vh"
|
||||||
>
|
>
|
||||||
<el-form label-position="top" class="experiment-form">
|
<el-form label-position="top" class="experiment-form">
|
||||||
<div class="form-section">
|
<div class="form-section">
|
||||||
<header><span>PROJECT</span><b>规定实验项目</b></header>
|
<header><span>PROJECT</span><b>规定实验项目</b></header>
|
||||||
<el-form-item label="所属教学任务" required>
|
<el-form-item :label="editingProjectId ? '所属教学任务' : '适用教学任务(可多选)'" required>
|
||||||
<el-select
|
<el-select
|
||||||
v-model="projectForm.teachingTaskId"
|
v-model="projectForm.teachingTaskIds"
|
||||||
filterable
|
filterable
|
||||||
|
multiple
|
||||||
|
collapse-tags
|
||||||
|
collapse-tags-tooltip
|
||||||
:disabled="!!editingProjectId"
|
:disabled="!!editingProjectId"
|
||||||
placeholder="选择已发布教学任务"
|
placeholder="选择同一学期、同一课程的已发布教学任务"
|
||||||
@change="onTaskChange"
|
@change="onTaskChange"
|
||||||
>
|
>
|
||||||
<el-option
|
<el-option
|
||||||
@@ -647,8 +736,14 @@ onMounted(async () => {
|
|||||||
:key="task.id"
|
:key="task.id"
|
||||||
:label="`${task.courseCode} · ${task.courseName} · ${task.taskNumber}`"
|
:label="`${task.courseCode} · ${task.courseName} · ${task.taskNumber}`"
|
||||||
:value="task.id"
|
:value="task.id"
|
||||||
|
:disabled="!!selectedTask
|
||||||
|
&& (task.academicTermId !== selectedTask.academicTermId
|
||||||
|
|| task.courseId !== selectedTask.courseId)"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
|
<small v-if="!editingProjectId" class="form-help">
|
||||||
|
已选 {{ projectForm.teachingTaskIds.length }} 个;实验编码、名称、内容和开放日期将一次应用到这些教学任务。
|
||||||
|
</small>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<div class="form-grid two">
|
<div class="form-grid two">
|
||||||
<el-form-item label="项目编码" required>
|
<el-form-item label="项目编码" required>
|
||||||
@@ -708,7 +803,13 @@ onMounted(async () => {
|
|||||||
</el-form>
|
</el-form>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<el-button @click="projectDialog = false">取消</el-button>
|
<el-button @click="projectDialog = false">取消</el-button>
|
||||||
<el-button type="primary" @click="saveProject">保存项目</el-button>
|
<el-button type="primary" @click="saveProject">
|
||||||
|
{{ editingProjectId
|
||||||
|
? '保存项目'
|
||||||
|
: projectForm.teachingTaskIds.length
|
||||||
|
? `创建 ${projectForm.teachingTaskIds.length} 个项目`
|
||||||
|
: '创建项目' }}
|
||||||
|
</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
@@ -778,6 +879,86 @@ onMounted(async () => {
|
|||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
|
<el-dialog
|
||||||
|
v-model="batchSessionDialog"
|
||||||
|
title="批量安排实验场次"
|
||||||
|
width="min(1180px, 94vw)"
|
||||||
|
top="4vh"
|
||||||
|
>
|
||||||
|
<el-alert
|
||||||
|
title="一次提交整批排课;系统会逐条检查管理范围、开放日期、实验室、课表、教师和班级冲突,任何一条失败都不会写入本批次。"
|
||||||
|
type="info"
|
||||||
|
:closable="false"
|
||||||
|
show-icon
|
||||||
|
/>
|
||||||
|
<el-form label-position="top" class="batch-session-form">
|
||||||
|
<el-form-item label="选择实验项目" required>
|
||||||
|
<el-select
|
||||||
|
v-model="batchSessionProjectIds"
|
||||||
|
multiple
|
||||||
|
filterable
|
||||||
|
collapse-tags
|
||||||
|
collapse-tags-tooltip
|
||||||
|
placeholder="选择需要一起排课的实验项目"
|
||||||
|
@change="syncBatchSessionRows"
|
||||||
|
>
|
||||||
|
<el-option
|
||||||
|
v-for="project in batchProjectOptions"
|
||||||
|
:key="project.id"
|
||||||
|
:label="`${project.courseCode} · ${project.name} · ${project.taskNumber}`"
|
||||||
|
:value="project.id"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
|
<div v-if="batchSessionRows.length" class="batch-session-tools">
|
||||||
|
<span>共 {{ batchSessionRows.length }} 条排课</span>
|
||||||
|
<el-button size="small" @click="applyFirstBatchTime">套用首行日期与节次</el-button>
|
||||||
|
</div>
|
||||||
|
<div class="batch-session-table">
|
||||||
|
<article v-for="(row, index) in batchSessionRows" :key="row.projectId" class="batch-session-row">
|
||||||
|
<div class="batch-project-cell">
|
||||||
|
<span>{{ index + 1 }}</span>
|
||||||
|
<div>
|
||||||
|
<b>{{ batchProject(row.projectId)?.name }}</b>
|
||||||
|
<small>{{ batchProject(row.projectId)?.taskNumber }} · {{ batchProject(row.projectId)?.classNames.join('、') || '选课学生' }}</small>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<el-date-picker
|
||||||
|
v-model="row.sessionDate"
|
||||||
|
type="date"
|
||||||
|
value-format="YYYY-MM-DD"
|
||||||
|
placeholder="实验日期"
|
||||||
|
/>
|
||||||
|
<el-select v-model="row.startPeriod" placeholder="起始节次">
|
||||||
|
<el-option
|
||||||
|
v-for="period in periodsForProject(row.projectId)"
|
||||||
|
:key="period.periodNumber"
|
||||||
|
:label="period.name"
|
||||||
|
:value="period.periodNumber"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
<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"
|
||||||
|
:key="room.id"
|
||||||
|
:label="`${room.campusName} · ${room.buildingName} ${room.name} · ${room.capacity} 人`"
|
||||||
|
:value="room.id"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
<el-input-number v-model="row.capacity" :min="1" :max="10000" controls-position="right" />
|
||||||
|
</article>
|
||||||
|
</div>
|
||||||
|
<el-empty v-if="!batchSessionRows.length" :image-size="60" description="选择实验项目后,在同一张表中完成排课" />
|
||||||
|
</el-form>
|
||||||
|
<template #footer>
|
||||||
|
<el-button @click="batchSessionDialog = false">取消</el-button>
|
||||||
|
<el-button type="primary" :disabled="!batchSessionRows.length" @click="saveBatchSessions">
|
||||||
|
提交整批排课
|
||||||
|
</el-button>
|
||||||
|
</template>
|
||||||
|
</el-dialog>
|
||||||
|
|
||||||
<el-dialog
|
<el-dialog
|
||||||
v-model="participantsDialog"
|
v-model="participantsDialog"
|
||||||
:title="`${participantSession?.project?.arrangementMode === 'Centralized' ? '应到名单' : '预约名单'} · ${participantSession ? formatSessionTime(participantSession) : ''}`"
|
:title="`${participantSession?.project?.arrangementMode === 'Centralized' ? '应到名单' : '预约名单'} · ${participantSession ? formatSessionTime(participantSession) : ''}`"
|
||||||
@@ -912,6 +1093,7 @@ onMounted(async () => {
|
|||||||
.student-booking-summary span { display: grid; gap: 2px; color: #365f5b; font-size: 12px; }
|
.student-booking-summary span { display: grid; gap: 2px; color: #365f5b; font-size: 12px; }
|
||||||
.student-booking-summary b { font-size: 10px; text-transform: uppercase; letter-spacing: .06em; }
|
.student-booking-summary b { font-size: 10px; text-transform: uppercase; letter-spacing: .06em; }
|
||||||
.experiment-form { display: grid; gap: 13px; }
|
.experiment-form { display: grid; gap: 13px; }
|
||||||
|
.form-help { display: block; margin-top: 7px; color: var(--muted); line-height: 1.5; }
|
||||||
.form-section { padding: 14px 15px 1px; border: 1px solid var(--line); background: #fbfcfd; }
|
.form-section { padding: 14px 15px 1px; border: 1px solid var(--line); background: #fbfcfd; }
|
||||||
.form-section > header { display: flex; align-items: baseline; gap: 9px; margin-bottom: 13px; }
|
.form-section > header { display: flex; align-items: baseline; gap: 9px; margin-bottom: 13px; }
|
||||||
.form-section > header span { color: var(--lab-teal); font: 700 10px/1 Consolas, monospace; letter-spacing: .08em; }
|
.form-section > header span { color: var(--lab-teal); font: 700 10px/1 Consolas, monospace; letter-spacing: .08em; }
|
||||||
@@ -920,6 +1102,25 @@ onMounted(async () => {
|
|||||||
.mode-choice :deep(.el-radio-button__inner) { display: grid; gap: 5px; width: 100%; padding: 13px; }
|
.mode-choice :deep(.el-radio-button__inner) { display: grid; gap: 5px; width: 100%; padding: 13px; }
|
||||||
.mode-choice b { font-size: 13px; }
|
.mode-choice b { font-size: 13px; }
|
||||||
.mode-choice small { font-size: 10px; font-weight: 400; }
|
.mode-choice small { font-size: 10px; font-weight: 400; }
|
||||||
|
.batch-session-form { display: grid; gap: 12px; margin-top: 16px; }
|
||||||
|
.batch-session-tools { display: flex; align-items: center; justify-content: space-between; color: var(--muted); font-size: 12px; }
|
||||||
|
.batch-session-table { display: grid; gap: 8px; overflow-x: auto; padding-bottom: 4px; }
|
||||||
|
.batch-session-row {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: minmax(230px, 1.4fr) 150px 120px 110px minmax(230px, 1.3fr) 110px;
|
||||||
|
gap: 8px;
|
||||||
|
align-items: center;
|
||||||
|
min-width: 1000px;
|
||||||
|
padding: 10px;
|
||||||
|
border: 1px solid #dce5e9;
|
||||||
|
background: #f9fbfc;
|
||||||
|
}
|
||||||
|
.batch-project-cell { display: flex; align-items: center; gap: 10px; min-width: 0; }
|
||||||
|
.batch-project-cell > span { display: grid; width: 25px; height: 25px; place-items: center; border-radius: 50%; background: #e5f0f5; color: var(--lab-blue); font: 700 11px/1 Consolas, monospace; }
|
||||||
|
.batch-project-cell > div { display: grid; gap: 3px; min-width: 0; }
|
||||||
|
.batch-project-cell b, .batch-project-cell small { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
||||||
|
.batch-project-cell b { color: var(--lab-ink); font-size: 12px; }
|
||||||
|
.batch-project-cell small { color: var(--muted); font-size: 10px; }
|
||||||
@media (prefers-reduced-motion: reduce) {
|
@media (prefers-reduced-motion: reduce) {
|
||||||
.session-ticket { transition: none; }
|
.session-ticket { transition: none; }
|
||||||
}
|
}
|
||||||
@@ -936,5 +1137,6 @@ onMounted(async () => {
|
|||||||
.ticket-action { grid-column: 1 / -1; justify-content: flex-start; padding: 0 10px 10px; }
|
.ticket-action { grid-column: 1 / -1; justify-content: flex-start; padding: 0 10px 10px; }
|
||||||
.project-actions, .student-booking-summary { padding-inline: 14px; }
|
.project-actions, .student-booking-summary { padding-inline: 14px; }
|
||||||
.mode-choice { grid-template-columns: 1fr; }
|
.mode-choice { grid-template-columns: 1fr; }
|
||||||
|
.intro-actions { flex-wrap: wrap; justify-content: flex-end; }
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
Reference in New Issue
Block a user