feat(island,homework,schedule): 灵动岛点开修复+胶囊类型汇总 · 作业看板与未交名单 · 单双周课表与 ClassIsland 课程表导入

一、灵动岛(用户反馈的三处"点不开"全部修复)
- 非紧急叫人:上课时段仍以胶囊保持可见、可点开(不再只进队列导致屏幕上什么都没有);
  新增 isOpenable():紧急消息 + 任何"叫人"都允许点开,但普通叫人不会自动展开打断课堂。
- 紧急叫人收起后再点:命中改为"主进程按光标位置兜底校正"(上一轮的 island:set-hit-rect 轮询),
  本轮补齐叫人类专项回归(展开 → 收起 → 再次点开)。
- 设置页预览:新增 preview 通道 —— 示例岛直接展开、失焦不收起、30 秒自行消失、关掉不残留。
- 收起态胶囊汇总消息类型:多条时显示「新消息:叫人/作业/通知(共 3 条)」+「点击查看」+ 类型小标签。
- 顺带修掉两个真问题:胶囊态收到新消息会把上一条静默顶掉(现在一律回队);
  syncWindow 的上课时段守卫只认"紧急"导致普通叫人被藏掉。
- 性能:岛体矩形上报限流(~10 次/秒 + 尾随补发),修掉每帧 IPC 导致的开合采样骤降。

二、作业(学生端 + Web 教师端)
- 新增**看板模式**:按科目分卡片、点卡片放大全屏、工具栏可切「看板/列表」、
  开关「显示时间」、拖「看板字号」(11–28px),偏好持久化到客户端配置 homeworkBoard。
- 去掉「全班标记完成」,改为**未交名单**:勾选没交的同学,其余自动标记已交;
  新增 GET/PATCH /api/homeworks/:id/submissions(教师与班级设备可用,普通学生 403)。

三、课表单双周 + ClassIsland 课程表导入
- Schedule 新增 weekParity(ALL/ODD/EVEN)+ 迁移;周视图与上课判定按「第 1 周=单周」过滤,
  历史数据默认 ALL 行为不变;Web 手动新增/编辑课表可选单双周,学生端课表打「单周/双周」标签。
- 修复既有 P0 bug:ClassIsland 真实档案里 TimeLayouts 是 "Guid → { Name, Layouts }" 字典,
  旧解析器只认数组/.items,导致**真实导出完全导不进来**;现已按真实形态解析(并兼容旧写法),
  同时补上 TimeType=3(行动)映射。
- 新增 ClassIsland 课程表(ClassPlan)导入:解析 TimeRule.WeekCountDiv/WeekCountDivTotal → 单双周,
  Classes[i] 对齐第 i 个 TimeType=0 的时间点,Subjects 映射科目(缺失自动补建课程),
  星期 0=周日 换算为 1=周一 … 7=周日;replace/merge 两种模式,预览只解析不写库。
- 新增维护脚本 packages/server/scripts/apply-parity-column.cjs(手工覆盖 dist 部署时补列用)。

验证:verify:e2e 148/148(新增单双周 12 项 + 课程表导入 5 项)、verify:desktop 71/71(复跑 65/65)、
verify:web 20/20、typecheck / lint / format 全绿;服务端与 Web 已重新打包并部署到本机安装目录。
This commit is contained in:
LoveChengke committed 2026-09-12 23:48:59 +08:00
1 parent 86430c5f4a
commit b8ef5d8dbb
34 files changed
+2351 -86

No files matched your search

+146 -1
View File
@@ -8,6 +8,7 @@ import {
type ClassDto,
type CourseDto,
type HomeworkDto,
type HomeworkSubmissionsDto,
} from '@classhelper/shared';
import { classApi, courseApi, homeworkApi } from '@/api';
import { useRealtimeStore } from '@/stores/realtime';
@@ -34,6 +35,65 @@ const completedMap = computed(() => {
return { total, done, rate: total === 0 ? 0 : Math.round((done / total) * 100) };
});
/* ------------------------------------------------------------ 未交名单(勾选谁没交) */
const submissionsVisible = ref(false);
const submissionsLoading = ref(false);
const submissionsSaving = ref(false);
const submissionStudents = ref<HomeworkSubmissionsDto['students']>([]);
/** 勾选 = 未交(保存后其余学生一律标记为已交) */
const notSubmittedIds = ref<string[]>([]);
const notSubmittedNames = computed(() =>
submissionStudents.value.filter((item) => notSubmittedIds.value.includes(item.userId)),
);
/** 打开详情时顺带读一次未交名单(教师/管理员都有权限) */
async function loadSubmissions(homeworkId: string): Promise<void> {
submissionsLoading.value = true;
try {
const result = await homeworkApi.submissions(homeworkId);
submissionStudents.value = result.students;
notSubmittedIds.value = result.notSubmitted.map((item) => item.userId);
} catch {
submissionStudents.value = [];
notSubmittedIds.value = [];
} finally {
submissionsLoading.value = false;
}
}
async function openSubmissions(): Promise<void> {
if (!current.value) return;
if (submissionStudents.value.length === 0) await loadSubmissions(current.value.id);
submissionsVisible.value = true;
}
async function saveSubmissions(): Promise<void> {
if (!current.value) return;
submissionsSaving.value = true;
try {
const result = await homeworkApi.saveSubmissions(current.value.id, notSubmittedIds.value);
submissionStudents.value = result.students;
notSubmittedIds.value = result.notSubmitted.map((item) => item.userId);
if (current.value) current.value.completedCount = result.completedCount;
ElMessage.success(`未交名单已保存(未交 ${result.notSubmitted.length} / ${result.total} 人)`);
submissionsVisible.value = false;
} catch (error) {
ElMessage.error(error instanceof Error ? error.message : '保存未交名单失败');
} finally {
submissionsSaving.value = false;
}
}
function markAllSubmitted(): void {
notSubmittedIds.value = [];
}
function markAllNotSubmitted(): void {
notSubmittedIds.value = submissionStudents.value.map((item) => item.userId);
}
async function loadClasses(): Promise<void> {
classes.value = await classApi.list();
if (!filter.classId && classes.value.length > 0) filter.classId = classes.value[0]?.id ?? '';
@@ -136,6 +196,7 @@ async function openDetail(row: HomeworkDto): Promise<void> {
current.value = await homeworkApi.detail(row.id);
const students = await classApi.students(row.classId);
classStudents.value = students.map((item) => ({ id: item.id, name: item.name }));
void loadSubmissions(row.id);
detailVisible.value = true;
}
@@ -257,6 +318,27 @@ onUnmounted(() => {
已完成 {{ completedMap.done }} / {{ completedMap.total }} 人({{ completedMap.rate }}%)
<el-progress :percentage="completedMap.rate" :stroke-width="10" class="mt-12" />
</el-descriptions-item>
<el-descriptions-item label="未交名单" :span="2">
<div v-loading="submissionsLoading" class="submission-summary">
<template v-if="submissionStudents.length === 0">该班还没有学生账号</template>
<template v-else-if="notSubmittedNames.length === 0">
<el-tag type="success" size="small" effect="light">全部已交</el-tag>
</template>
<template v-else>
<el-tag
v-for="student in notSubmittedNames"
:key="student.userId"
type="warning"
size="small"
effect="light"
class="submission-tag"
>
{{ student.name }}
</el-tag>
</template>
<el-button size="small" type="primary" plain @click="openSubmissions">勾选未交</el-button>
</div>
</el-descriptions-item>
</el-descriptions>
<div class="mt-16">
@@ -277,6 +359,35 @@ onUnmounted(() => {
/>
</template>
</el-drawer>
<!-- 未交名单:勾选谁没交,其余学生自动标记为已交 -->
<el-dialog v-model="submissionsVisible" title="未交名单" width="520px">
<p class="text-muted" style="margin-top: 0">
勾选
<strong>没交作业</strong>
的同学,保存后其余同学会自动标记为已完成。
</p>
<div class="submission-toolbar">
<el-button size="small" @click="markAllSubmitted">全部已交</el-button>
<el-button size="small" @click="markAllNotSubmitted">全部未交</el-button>
<span class="text-muted">未交 {{ notSubmittedIds.length }} / {{ submissionStudents.length }} 人</span>
</div>
<div v-loading="submissionsLoading" class="submission-list">
<el-empty
v-if="submissionStudents.length === 0 && !submissionsLoading"
description="该班还没有学生账号"
/>
<el-checkbox-group v-model="notSubmittedIds">
<el-checkbox v-for="student in submissionStudents" :key="student.userId" :value="student.userId">
{{ student.name }}({{ student.username }})
</el-checkbox>
</el-checkbox-group>
</div>
<template #footer>
<el-button @click="submissionsVisible = false">取消</el-button>
<el-button type="primary" :loading="submissionsSaving" @click="saveSubmissions">保存</el-button>
</template>
</el-dialog>
</div>
</template>
@@ -289,8 +400,42 @@ onUnmounted(() => {
white-space: pre-wrap;
line-height: 1.7;
background: #fafafa;
border-radius: 8px;
border-radius: 12px;
padding: 12px;
margin: 0;
}
/* ---------------------------------------------------------------- 未交名单 */
.submission-summary {
display: flex;
align-items: center;
flex-wrap: wrap;
gap: 6px;
}
.submission-tag {
margin: 0;
}
.submission-toolbar {
display: flex;
align-items: center;
gap: 10px;
margin-bottom: 10px;
}
.submission-list {
max-height: 46vh;
overflow-y: auto;
border: 1px solid #eef0f5;
border-radius: 12px;
padding: 12px;
}
.submission-list :deep(.el-checkbox-group) {
display: flex;
flex-direction: column;
gap: 4px;
}
</style>
+65 -1
View File
@@ -5,15 +5,20 @@ import {
SOCKET_EVENTS,
WEEKDAYS,
WEEKDAY_LABELS,
WEEK_PARITY_LABELS,
WEEK_PARITY_VALUES,
buildWeekOptions,
formatWeekRange,
weekParityOf,
type ClassDto,
type CourseDto,
type CreateScheduleRequest,
type ScheduleDto,
type ScheduleWeekView,
type WeekParity,
} from '@classhelper/shared';
import { classApi, courseApi, dashboardApi, scheduleApi } from '@/api';
import ClassPlanImportDialog from '@/components/ClassPlanImportDialog.vue';
import TimeLayoutImportDialog from '@/components/TimeLayoutImportDialog.vue';
import { useAuthStore } from '@/stores/auth';
import { useRealtimeStore } from '@/stores/realtime';
@@ -41,6 +46,12 @@ const rawSchedules = ref<ScheduleDto[]>([]);
const query = reactive({ classId: '', week: 1 });
const weekOptions = ref<number[]>(buildWeekOptions(20));
/** 当前周次的单双周(第 1 周记为单周),用于工具栏提示与课表校验 */
const currentWeekParity = computed(() => weekParityOf(query.week));
const currentWeekParityLabel = computed(
() => `第 ${query.week} 周 · ${WEEK_PARITY_LABELS[currentWeekParity.value]}`,
);
/** 把同一时间段的课表行聚合成"节次"行,形成 7 列课表 */
const periods = computed(() => {
const buckets = new Map<string, ScheduleDto[]>();
@@ -112,6 +123,8 @@ const form = reactive({
location: '',
weekStart: 1,
weekEnd: 20,
/** 单双周:ALL 每周(默认)/ ODD 单周 / EVEN 双周 */
weekParity: 'ALL' as WeekParity,
});
const rules: FormRules = {
@@ -133,6 +146,7 @@ function openCreate(): void {
form.location = '';
form.weekStart = 1;
form.weekEnd = weekOptions.value.at(-1) ?? 20;
form.weekParity = 'ALL';
formVisible.value = true;
}
@@ -145,6 +159,7 @@ function openEdit(item: ScheduleDto): void {
form.location = item.location ?? '';
form.weekStart = item.weekStart;
form.weekEnd = item.weekEnd;
form.weekParity = item.weekParity ?? 'ALL';
formVisible.value = true;
}
@@ -165,6 +180,7 @@ async function submitForm(): Promise<void> {
location: form.location || null,
weekStart: Number(form.weekStart),
weekEnd: Number(form.weekEnd),
weekParity: form.weekParity,
};
if (editingId.value) {
@@ -207,6 +223,24 @@ function openTimeLayoutImport(): void {
timeLayoutVisible.value = true;
}
/* ------------------------------------------------------------ ClassIsland 课程表导入(支持单双周) */
const classPlanVisible = ref(false);
function openClassPlanImport(): void {
if (!query.classId) {
ElMessage.warning('请先选择班级');
return;
}
classPlanVisible.value = true;
}
/** 导入成功后刷新周视图与列表(grid + list 都在 loadSchedules 里) */
async function onClassPlanImported(): Promise<void> {
await loadCourses();
await loadSchedules();
}
onMounted(async () => {
await loadBase();
await loadSchedules();
@@ -237,6 +271,7 @@ onUnmounted(() => {
<el-select v-model="query.week" placeholder="周次" style="width: 130px" @change="loadSchedules">
<el-option v-for="week in weekOptions" :key="week" :label="`第 ${week} 周`" :value="week" />
</el-select>
<el-tag type="info" effect="plain">{{ currentWeekParityLabel }}</el-tag>
<el-button :icon="'Refresh'" @click="loadSchedules">刷新</el-button>
<el-button v-if="canManageSchedule" type="primary" :icon="'Plus'" @click="openCreate">
新增课表
@@ -244,6 +279,15 @@ onUnmounted(() => {
<el-button v-if="canManageSchedule" type="warning" :icon="'Upload'" @click="openTimeLayoutImport">
导入时间配置
</el-button>
<el-button
v-if="canManageSchedule"
type="warning"
plain
:icon="'Upload'"
@click="openClassPlanImport"
>
导入 ClassIsland 课程表
</el-button>
</div>
</div>
@@ -268,7 +312,12 @@ onUnmounted(() => {
<el-table-column v-for="day in WEEKDAYS" :key="day" :label="WEEKDAY_LABELS[day]" min-width="130">
<template #default="{ row }">
<div v-for="item in cellItems(row, day)" :key="item.id" class="timetable-cell">
<div class="timetable-course">{{ item.course?.name ?? '-' }}</div>
<div class="timetable-course">
{{ item.course?.name ?? '-' }}
<el-tag v-if="item.weekParity !== 'ALL'" size="small" effect="plain">
{{ WEEK_PARITY_LABELS[item.weekParity] }}
</el-tag>
</div>
<div class="timetable-meta">{{ item.location ?? '未填地点' }}</div>
<div class="timetable-meta">{{ formatWeekRange(item.weekStart, item.weekEnd) }}</div>
<div>
@@ -323,6 +372,13 @@ onUnmounted(() => {
<span style="margin: 0 8px">至</span>
<el-input-number v-model="form.weekEnd" :min="1" :max="30" />
</el-form-item>
<el-form-item label="单双周" prop="weekParity">
<el-radio-group v-model="form.weekParity">
<el-radio v-for="parity in WEEK_PARITY_VALUES" :key="parity" :value="parity">
{{ WEEK_PARITY_LABELS[parity] }}
</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="formVisible = false">取消</el-button>
@@ -336,5 +392,13 @@ onUnmounted(() => {
:class-id="query.classId"
:class-name="classes.find((item) => item.id === query.classId)?.name"
/>
<!-- ClassIsland 课程表导入(支持单双周;导入成功后刷新周视图与列表) -->
<ClassPlanImportDialog
v-model="classPlanVisible"
:class-id="query.classId"
:class-name="classes.find((item) => item.id === query.classId)?.name"
@imported="onClassPlanImported"
/>
</div>
</template>