排课版本新建、编辑、复制、发布、归档和删除。
周课表视图,支持12节课、单双周和起止周。 自动校验教师、行政班、教室、时间段冲突。 校验教室容量、教学任务状态和学期范围。 SQLite 开发环境自动升级,MySQL 提供正式 EF Core 迁移。 Vue 已编译为静态文件并随 ASP.NET Core 发布,无需 npm run dev。 桌面端和390px移动端页面均已验收。
This commit is contained in:
@@ -96,18 +96,23 @@ onMounted(async () => {
|
||||
<b>{{ data.counts.teachingTasks ?? 0 }} 个教学班 · 教师与行政班</b>
|
||||
<i class="done">已建立</i>
|
||||
</div>
|
||||
<div>
|
||||
<span>排课课表</span>
|
||||
<b>{{ data.counts.schedulePlans ?? 0 }} 个版本 · 冲突校验与发布</b>
|
||||
<i class="done">已建立</i>
|
||||
</div>
|
||||
</div>
|
||||
</article>
|
||||
|
||||
<article class="work-card phase-card">
|
||||
<span class="section-kicker">NEXT MILESTONE</span>
|
||||
<h3>下一段业务链</h3>
|
||||
<p>学期教学任务已可发布,下一步进入时间、教室冲突校验与课表发布。</p>
|
||||
<p>排课与课表发布链路已就绪,下一步进入学生选课轮次、容量与候补管理。</p>
|
||||
<div class="phase-line">
|
||||
<span class="active">基础底座</span>
|
||||
<span class="active">人员档案</span>
|
||||
<span class="active">培养方案</span>
|
||||
<span class="active">教学任务</span>
|
||||
<span class="active">排课课表</span>
|
||||
</div>
|
||||
</article>
|
||||
</section>
|
||||
|
||||
@@ -0,0 +1,365 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, onMounted, reactive, ref } from 'vue'
|
||||
import { CopyDocument, Plus, Promotion, Refresh, Search } from '@element-plus/icons-vue'
|
||||
import http, { apiErrorMessage } from '../api/http'
|
||||
|
||||
const plans = ref<any[]>([])
|
||||
const selected = ref<any | null>(null)
|
||||
const terms = ref<any[]>([])
|
||||
const tasks = ref<any[]>([])
|
||||
const classrooms = ref<any[]>([])
|
||||
const loading = ref(false)
|
||||
const detailLoading = ref(false)
|
||||
const planDialog = ref(false)
|
||||
const cloneDialog = ref(false)
|
||||
const entryDialog = ref(false)
|
||||
const editingPlanId = ref('')
|
||||
const editingEntryId = ref('')
|
||||
const keyword = ref('')
|
||||
const termId = ref<string | undefined>()
|
||||
const planForm = reactive<Record<string, any>>({})
|
||||
const cloneForm = reactive<Record<string, any>>({})
|
||||
const entryForm = reactive<Record<string, any>>({})
|
||||
|
||||
const weekdays = [
|
||||
{ value: 1, label: '星期一' },
|
||||
{ value: 2, label: '星期二' },
|
||||
{ value: 3, label: '星期三' },
|
||||
{ value: 4, label: '星期四' },
|
||||
{ value: 5, label: '星期五' },
|
||||
{ value: 6, label: '星期六' },
|
||||
{ value: 7, label: '星期日' },
|
||||
]
|
||||
const periods = Array.from({ length: 12 }, (_, index) => index + 1)
|
||||
const statusLabels: Record<string, string> = {
|
||||
Draft: '草稿',
|
||||
Published: '已发布',
|
||||
Archived: '已归档',
|
||||
}
|
||||
const patternLabels: Record<string, string> = {
|
||||
All: '每周',
|
||||
Odd: '单周',
|
||||
Even: '双周',
|
||||
}
|
||||
const isDraft = computed(() => selected.value?.status === 'Draft')
|
||||
const filteredEntries = computed(() => {
|
||||
const text = keyword.value.trim().toLowerCase()
|
||||
if (!text) return selected.value?.entries ?? []
|
||||
return (selected.value?.entries ?? []).filter((entry: any) =>
|
||||
[
|
||||
entry.taskNumber,
|
||||
entry.taskName,
|
||||
entry.courseCode,
|
||||
entry.courseName,
|
||||
entry.classroomName,
|
||||
...entry.teacherNames,
|
||||
...entry.classNames,
|
||||
].some((value) => String(value).toLowerCase().includes(text)),
|
||||
)
|
||||
})
|
||||
|
||||
function entriesAt(day: number, period: number) {
|
||||
return filteredEntries.value.filter(
|
||||
(entry: any) => entry.dayOfWeek === day && entry.startPeriod === period,
|
||||
)
|
||||
}
|
||||
|
||||
async function loadPlans(keepSelection = true) {
|
||||
loading.value = true
|
||||
try {
|
||||
plans.value = (await http.get('/schedules/plans', {
|
||||
params: { academicTermId: termId.value },
|
||||
})).data
|
||||
const id = keepSelection && selected.value
|
||||
? selected.value.id
|
||||
: plans.value[0]?.id
|
||||
if (id && plans.value.some((item) => item.id === id)) await loadDetail(id)
|
||||
else selected.value = null
|
||||
} catch (error) {
|
||||
ElMessage.error(apiErrorMessage(error))
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
async function loadDetail(id: string) {
|
||||
detailLoading.value = true
|
||||
try {
|
||||
selected.value = (await http.get(`/schedules/plans/${id}`)).data
|
||||
} catch (error) {
|
||||
ElMessage.error(apiErrorMessage(error))
|
||||
} finally {
|
||||
detailLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
function openPlan(plan?: any) {
|
||||
editingPlanId.value = plan?.id ?? ''
|
||||
Object.assign(planForm, {
|
||||
academicTermId: plan?.academicTermId ?? termId.value,
|
||||
name: plan?.name ?? '',
|
||||
version: plan?.version ?? `V${plans.value.length + 1}`,
|
||||
notes: plan?.notes ?? '',
|
||||
})
|
||||
planDialog.value = true
|
||||
}
|
||||
|
||||
async function savePlan() {
|
||||
if (!planForm.academicTermId || !planForm.name?.trim() || !planForm.version?.trim()) {
|
||||
ElMessage.warning('请填写学期、版本名称和版本号。')
|
||||
return
|
||||
}
|
||||
try {
|
||||
if (editingPlanId.value) {
|
||||
await http.put(`/schedules/plans/${editingPlanId.value}`, planForm)
|
||||
} else {
|
||||
await http.post('/schedules/plans', planForm)
|
||||
}
|
||||
planDialog.value = false
|
||||
await loadPlans(false)
|
||||
} catch (error) {
|
||||
ElMessage.error(apiErrorMessage(error))
|
||||
}
|
||||
}
|
||||
|
||||
function openClone() {
|
||||
Object.assign(cloneForm, {
|
||||
name: `${selected.value.name}(调整版)`,
|
||||
version: `V${plans.value.length + 1}`,
|
||||
})
|
||||
cloneDialog.value = true
|
||||
}
|
||||
|
||||
async function clonePlan() {
|
||||
try {
|
||||
await http.post(`/schedules/plans/${selected.value.id}/clone`, cloneForm)
|
||||
cloneDialog.value = false
|
||||
ElMessage.success('已复制为可调整的草稿版本')
|
||||
await loadPlans(false)
|
||||
} catch (error) {
|
||||
ElMessage.error(apiErrorMessage(error))
|
||||
}
|
||||
}
|
||||
|
||||
async function publishPlan() {
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
'系统将再次检查全部教师、行政班和教室冲突;发布后本版本锁定,并归档旧课表。',
|
||||
'发布课表',
|
||||
{ type: 'warning', confirmButtonText: '检查并发布', cancelButtonText: '取消' },
|
||||
)
|
||||
await http.post(`/schedules/plans/${selected.value.id}/publish`)
|
||||
ElMessage.success('课表已发布')
|
||||
await loadPlans()
|
||||
} catch (error: any) {
|
||||
if (error !== 'cancel' && error !== 'close') ElMessage.error(apiErrorMessage(error))
|
||||
}
|
||||
}
|
||||
|
||||
async function deletePlan() {
|
||||
try {
|
||||
await ElMessageBox.confirm('删除该草稿及全部排课条目?', '删除排课草稿', {
|
||||
type: 'warning',
|
||||
})
|
||||
await http.delete(`/schedules/plans/${selected.value.id}`)
|
||||
await loadPlans(false)
|
||||
} catch (error: any) {
|
||||
if (error !== 'cancel' && error !== 'close') ElMessage.error(apiErrorMessage(error))
|
||||
}
|
||||
}
|
||||
|
||||
function openEntry(entry?: any, day?: number, period?: number) {
|
||||
editingEntryId.value = entry?.id ?? ''
|
||||
Object.assign(entryForm, {
|
||||
teachingTaskId: entry?.teachingTaskId,
|
||||
classroomId: entry?.classroomId,
|
||||
dayOfWeek: entry?.dayOfWeek ?? day ?? 1,
|
||||
startPeriod: entry?.startPeriod ?? period ?? 1,
|
||||
periodCount: entry?.periodCount ?? 2,
|
||||
startWeek: entry?.startWeek ?? 1,
|
||||
endWeek: entry?.endWeek ?? 16,
|
||||
weekPattern: entry?.weekPattern ?? 'All',
|
||||
notes: entry?.notes ?? '',
|
||||
})
|
||||
entryDialog.value = true
|
||||
}
|
||||
|
||||
async function saveEntry() {
|
||||
if (!entryForm.teachingTaskId || !entryForm.classroomId) {
|
||||
ElMessage.warning('请选择教学任务和教室。')
|
||||
return
|
||||
}
|
||||
try {
|
||||
const base = `/schedules/plans/${selected.value.id}/entries`
|
||||
if (editingEntryId.value) await http.put(`${base}/${editingEntryId.value}`, entryForm)
|
||||
else await http.post(base, entryForm)
|
||||
entryDialog.value = false
|
||||
ElMessage.success(editingEntryId.value ? '排课已调整' : '排课已添加')
|
||||
await loadDetail(selected.value.id)
|
||||
} catch (error) {
|
||||
ElMessage.error(apiErrorMessage(error))
|
||||
}
|
||||
}
|
||||
|
||||
async function deleteEntry(entry: any) {
|
||||
try {
|
||||
await ElMessageBox.confirm(`移除“${entry.taskName}”的这条安排?`, '移除排课', {
|
||||
type: 'warning',
|
||||
})
|
||||
await http.delete(`/schedules/plans/${selected.value.id}/entries/${entry.id}`)
|
||||
await loadDetail(selected.value.id)
|
||||
} catch (error: any) {
|
||||
if (error !== 'cancel' && error !== 'close') ElMessage.error(apiErrorMessage(error))
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
const [termRes, taskRes, classroomRes] = await Promise.all([
|
||||
http.get('/base-data/terms'),
|
||||
http.get('/teaching-tasks', { params: { page: 1, pageSize: 100, status: 'Published' } }),
|
||||
http.get('/base-data/classrooms'),
|
||||
])
|
||||
terms.value = termRes.data
|
||||
tasks.value = taskRes.data.items
|
||||
classrooms.value = classroomRes.data.filter((item: any) => item.isEnabled)
|
||||
termId.value = terms.value.find((item) => item.isCurrent)?.id
|
||||
await loadPlans(false)
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="page-stack">
|
||||
<section class="page-intro">
|
||||
<div>
|
||||
<span class="section-kicker">TIMETABLE BOARD</span>
|
||||
<h2>排课与课表</h2>
|
||||
<p>在发布前消除教师、行政班与教室冲突,并保留每次发布的版本。</p>
|
||||
</div>
|
||||
<el-button type="primary" :icon="Plus" @click="openPlan()">新建排课版本</el-button>
|
||||
</section>
|
||||
|
||||
<section class="schedule-toolbar">
|
||||
<el-select v-model="termId" placeholder="选择学期" @change="loadPlans(false)">
|
||||
<el-option v-for="item in terms" :key="item.id" :label="item.name" :value="item.id" />
|
||||
</el-select>
|
||||
<div class="schedule-version-strip">
|
||||
<button
|
||||
v-for="plan in plans"
|
||||
:key="plan.id"
|
||||
type="button"
|
||||
:class="{ active: selected?.id === plan.id }"
|
||||
@click="loadDetail(plan.id)"
|
||||
>
|
||||
<b>{{ plan.version }}</b>
|
||||
<span>{{ statusLabels[plan.status] }}</span>
|
||||
<small>{{ plan.entryCount }} 条安排</small>
|
||||
</button>
|
||||
<span v-if="plans.length === 0">该学期还没有排课版本</span>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section v-if="selected" v-loading="detailLoading" class="schedule-sheet">
|
||||
<header class="schedule-sheet-head">
|
||||
<div>
|
||||
<span>{{ selected.termName }} · {{ selected.version }}</span>
|
||||
<h3>{{ selected.name }}</h3>
|
||||
<p>共 {{ selected.entries.length }} 条安排 · {{ statusLabels[selected.status] }}</p>
|
||||
</div>
|
||||
<div class="plan-actions">
|
||||
<el-button v-if="isDraft" @click="openPlan(selected)">编辑版本</el-button>
|
||||
<el-button :icon="CopyDocument" @click="openClone">复制调整</el-button>
|
||||
<el-button v-if="isDraft" type="primary" :icon="Plus" @click="openEntry()">添加排课</el-button>
|
||||
<el-button v-if="isDraft" type="success" :icon="Promotion" @click="publishPlan">发布课表</el-button>
|
||||
<el-button v-if="isDraft" type="danger" plain @click="deletePlan">删除草稿</el-button>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
<div class="schedule-search">
|
||||
<el-input v-model="keyword" :prefix-icon="Search" clearable placeholder="筛选课程、教师、行政班或教室" />
|
||||
<el-button :icon="Refresh" @click="keyword = ''">清除筛选</el-button>
|
||||
<span>单双周和周次范围显示在课程卡片内</span>
|
||||
</div>
|
||||
|
||||
<div class="timetable-scroll">
|
||||
<div class="timetable-grid">
|
||||
<div class="timetable-corner">节次</div>
|
||||
<div v-for="day in weekdays" :key="day.value" class="timetable-day">{{ day.label }}</div>
|
||||
<template v-for="period in periods" :key="period">
|
||||
<div class="timetable-period">
|
||||
<b>{{ period }}</b>
|
||||
<span>第 {{ period }} 节</span>
|
||||
</div>
|
||||
<div
|
||||
v-for="day in weekdays"
|
||||
:key="`${day.value}-${period}`"
|
||||
class="timetable-cell"
|
||||
:class="{ editable: isDraft }"
|
||||
@dblclick="isDraft && openEntry(undefined, day.value, period)"
|
||||
>
|
||||
<article
|
||||
v-for="entry in entriesAt(day.value, period)"
|
||||
:key="entry.id"
|
||||
class="schedule-card"
|
||||
:class="{ readonly: !isDraft }"
|
||||
@click="isDraft && openEntry(entry)"
|
||||
>
|
||||
<span>{{ entry.courseCode }} · {{ patternLabels[entry.weekPattern] }}</span>
|
||||
<b>{{ entry.courseName }}</b>
|
||||
<small>{{ entry.teacherNames.join('、') }} · {{ entry.classroomName }}</small>
|
||||
<i>{{ entry.startWeek }}—{{ entry.endWeek }} 周 / 连上 {{ entry.periodCount }} 节</i>
|
||||
<button v-if="isDraft" type="button" @click.stop="deleteEntry(entry)">×</button>
|
||||
</article>
|
||||
<span v-if="isDraft && entriesAt(day.value, period).length === 0" class="cell-add">双击添加</span>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
<el-empty v-else description="请选择或新建一个排课版本" />
|
||||
|
||||
<el-dialog v-model="planDialog" :title="editingPlanId ? '编辑排课版本' : '新建排课版本'" width="560px">
|
||||
<el-form label-position="top">
|
||||
<el-form-item label="学期" required><el-select v-model="planForm.academicTermId"><el-option v-for="item in terms" :key="item.id" :label="item.name" :value="item.id" /></el-select></el-form-item>
|
||||
<el-form-item label="版本名称" required><el-input v-model="planForm.name" placeholder="如:第一轮正式课表" /></el-form-item>
|
||||
<el-form-item label="版本号" required><el-input v-model="planForm.version" placeholder="如 V1" /></el-form-item>
|
||||
<el-form-item label="备注"><el-input v-model="planForm.notes" type="textarea" :rows="2" /></el-form-item>
|
||||
</el-form>
|
||||
<template #footer><el-button @click="planDialog = false">取消</el-button><el-button type="primary" @click="savePlan">保存</el-button></template>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog v-model="cloneDialog" title="复制排课版本" width="520px">
|
||||
<el-form label-position="top">
|
||||
<el-form-item label="新版本名称" required><el-input v-model="cloneForm.name" /></el-form-item>
|
||||
<el-form-item label="新版本号" required><el-input v-model="cloneForm.version" /></el-form-item>
|
||||
</el-form>
|
||||
<template #footer><el-button @click="cloneDialog = false">取消</el-button><el-button type="primary" @click="clonePlan">复制</el-button></template>
|
||||
</el-dialog>
|
||||
|
||||
<el-dialog v-model="entryDialog" :title="editingEntryId ? '调整排课' : '添加排课'" width="680px">
|
||||
<el-form label-position="top">
|
||||
<el-form-item label="教学任务" required>
|
||||
<el-select v-model="entryForm.teachingTaskId" filterable>
|
||||
<el-option v-for="item in tasks" :key="item.id" :label="`${item.taskNumber} · ${item.name}`" :value="item.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="教室" required>
|
||||
<el-select v-model="entryForm.classroomId" filterable>
|
||||
<el-option v-for="item in classrooms" :key="item.id" :label="`${item.campusName} / ${item.buildingName} / ${item.name}(${item.capacity}人)`" :value="item.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<div class="form-grid three">
|
||||
<el-form-item label="星期"><el-select v-model="entryForm.dayOfWeek"><el-option v-for="day in weekdays" :key="day.value" :label="day.label" :value="day.value" /></el-select></el-form-item>
|
||||
<el-form-item label="开始节次"><el-input-number v-model="entryForm.startPeriod" :min="1" :max="12" /></el-form-item>
|
||||
<el-form-item label="连续节数"><el-input-number v-model="entryForm.periodCount" :min="1" :max="6" /></el-form-item>
|
||||
</div>
|
||||
<div class="form-grid three">
|
||||
<el-form-item label="开始周"><el-input-number v-model="entryForm.startWeek" :min="1" :max="30" /></el-form-item>
|
||||
<el-form-item label="结束周"><el-input-number v-model="entryForm.endWeek" :min="1" :max="30" /></el-form-item>
|
||||
<el-form-item label="单双周"><el-select v-model="entryForm.weekPattern"><el-option v-for="(label, value) in patternLabels" :key="value" :label="label" :value="value" /></el-select></el-form-item>
|
||||
</div>
|
||||
<el-form-item label="备注"><el-input v-model="entryForm.notes" type="textarea" :rows="2" /></el-form-item>
|
||||
</el-form>
|
||||
<template #footer><el-button @click="entryDialog = false">取消</el-button><el-button type="primary" @click="saveEntry">检查冲突并保存</el-button></template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
Reference in New Issue
Block a user