实验课现在直接进入普通排课流程,不再要求先到实验排课模块逐个安排。
普通“添加排课”新增“理论课 / 实验课”类型。 自动排课会分别补足理论学时和实验学时。 实验课只能安排到实验室、实训室、机房、语音室等场地。 发布课表时分别校验理论、实验学时;任一未排足都不能发布。 普通课表及 Excel 导出会标注“实验课”。 历史排课保持不变,迁移后默认识别为理论课;后续新建或修订版本时再补充实验课。
This commit is contained in:
@@ -79,12 +79,10 @@ const selectedCourse = computed(() =>
|
||||
)
|
||||
const regularScheduleHours = (course: any) =>
|
||||
Math.max(0, Number(course?.totalHours ?? 0) - Number(course?.practiceHours ?? 0))
|
||||
const targetCourseHours = (course: any, schedulingMode: string) =>
|
||||
schedulingMode === 'Flexible'
|
||||
? Number(course?.totalHours ?? 0)
|
||||
: regularScheduleHours(course)
|
||||
const targetCourseHours = (course: any) =>
|
||||
Number(course?.totalHours ?? 0)
|
||||
const selectedCourseTargetHours = computed(() =>
|
||||
targetCourseHours(selectedCourse.value, form.schedulingMode),
|
||||
targetCourseHours(selectedCourse.value),
|
||||
)
|
||||
const plannedHours = computed(() =>
|
||||
form.startWeek && form.endWeek && form.weeklyHours && form.endWeek >= form.startWeek
|
||||
@@ -124,7 +122,7 @@ const generationPlannedHours = computed(() =>
|
||||
)
|
||||
const generationHoursMatch = computed(() =>
|
||||
!selectedGenerationCourse.value ||
|
||||
generationPlannedHours.value === regularScheduleHours(selectedGenerationCourse.value),
|
||||
generationPlannedHours.value === Number(selectedGenerationCourse.value?.totalHours ?? 0),
|
||||
)
|
||||
const manageableCourses = computed(() => {
|
||||
if (isSuperAdmin.value) return courses.value
|
||||
@@ -364,7 +362,7 @@ async function save() {
|
||||
}
|
||||
if (!hoursMatch.value) {
|
||||
ElMessage.warning(
|
||||
`该课程普通课表应安排 ${selectedCourseTargetHours.value} 学时,当前安排合计 ${plannedHours.value} 学时;实践学时请在实验管理中安排。`,
|
||||
`该课程理论课和实验课共应安排 ${selectedCourseTargetHours.value} 学时,当前安排合计 ${plannedHours.value} 学时。`,
|
||||
)
|
||||
return
|
||||
}
|
||||
@@ -551,7 +549,7 @@ async function generatePublicTasks() {
|
||||
}
|
||||
if (!generationHoursMatch.value) {
|
||||
ElMessage.warning(
|
||||
`该课程普通课表应安排 ${regularScheduleHours(selectedGenerationCourse.value)} 学时,当前安排合计 ${generationPlannedHours.value} 学时;实践学时不进入普通课表。`,
|
||||
`该课程理论课和实验课共应安排 ${selectedGenerationCourse.value?.totalHours ?? 0} 学时,当前安排合计 ${generationPlannedHours.value} 学时。`,
|
||||
)
|
||||
return
|
||||
}
|
||||
@@ -773,7 +771,7 @@ onMounted(async () => {
|
||||
<el-radio-button value="Flexible">非排时课程</el-radio-button>
|
||||
</el-radio-group>
|
||||
<small class="field-hint">
|
||||
正常排课只安排非实践学时;全部由实验模块安排的课程请选择“非排时课程”。
|
||||
正常排课会同时安排理论课和实验课;只有无需固定星期、节次和场地的课程才选择“非排时课程”。
|
||||
</small>
|
||||
</el-form-item>
|
||||
<el-form-item label="授课教师">
|
||||
|
||||
Reference in New Issue
Block a user