feat: 完善学生生命周期管理与权限范围并发布 1.4.2
This commit is contained in:
1 parent
6347d1e5aa
commit
24e8dd902b
92 files changed
+6801
-2255
No files matched your search
@@ -0,0 +1,52 @@
|
||||
<script setup lang="ts">
|
||||
// 档案编辑器采用与参考一致的细线图标,不依赖系统字体图标。
|
||||
defineProps<{ name: string }>();
|
||||
const paths: Record<string, string> = {
|
||||
archive: 'M3 4h12v7H3z M6 11v8h15v-8H6 M10 14h4 M15 4h6v7',
|
||||
file: 'M6 3h8l4 4v14H6z M14 3v5h4 M9 12h6 M9 15h6 M9 18h4',
|
||||
chart: 'M6 3h8l4 4v14H6z M14 3v5h4 M9 17v-4 M12 17v-7 M15 17v-5',
|
||||
group: 'M8 7H5V4 M16 7h3V4 M8 17H5v3 M16 17h3v3 M9 8h6v8H9z M3 11v2 M21 11v2',
|
||||
save: 'M4 3h13l3 3v15H4z M8 3v6h8V3 M8 21v-8h9v8',
|
||||
transfer: 'M13 3h5l3 3v12h-7 M18 3v5h3 M4 16h8 M8 12l4 4-4 4 M4 5h5v5H4z',
|
||||
help: 'M9 7a3 3 0 1 1 5 2c-2 1-2 2-2 4 M12 17v.2',
|
||||
refresh: 'M20 7v5h-5 M20 12a8 8 0 1 0-2 5 M20 7l-3-3',
|
||||
left: 'M20 12H4 M10 6l-6 6 6 6',
|
||||
right: 'M4 12h16 M14 6l6 6-6 6',
|
||||
plus: 'M12 4v16 M4 12h16',
|
||||
clock: 'M12 3a9 9 0 1 0 0 18 9 9 0 0 0 0-18 M12 7v5l4 2',
|
||||
grid: 'M4 4h16v16H4z M4 9h16 M4 14h16 M9 4v16 M15 4v16',
|
||||
calendar: 'M4 5h16v16H4z M4 10h16 M8 3v4 M16 3v4 M8 14h1 M12 14h1 M16 14h1 M8 17h1 M12 17h1',
|
||||
list: 'M8 5h13 M8 12h13 M8 19h13 M3 4h1v2H3z M3 11h1v2H3z M3 18h1v2H3z',
|
||||
settings:
|
||||
'M12 8a4 4 0 1 0 0 8 4 4 0 0 0 0-8 M10 3h4l1 3 3 1 3 3v4l-3 1-1 3-3 3h-4l-1-3-3-1-3-3v-4l3-1 1-3z',
|
||||
close: 'M5 5l14 14 M19 5L5 19',
|
||||
shield: 'M12 3l8 3v6c0 5-8 9-8 9s-8-4-8-9V6z M8 12l3 3 5-6',
|
||||
back: 'M11 5l-7 7 7 7 M4 12h13a3 3 0 0 1 3 3v3',
|
||||
chevron: 'M6 9l6 6 6-6',
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<svg
|
||||
class="archive-icon"
|
||||
viewBox="0 0 24 24"
|
||||
fill="none"
|
||||
stroke="currentColor"
|
||||
stroke-width="1.5"
|
||||
stroke-linecap="round"
|
||||
stroke-linejoin="round"
|
||||
aria-hidden="true"
|
||||
>
|
||||
<path :d="paths[name] || paths.file" />
|
||||
</svg>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.archive-icon {
|
||||
display: inline-block;
|
||||
flex: 0 0 auto;
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
</style>
|
||||
@@ -1,77 +1,297 @@
|
||||
<script setup lang="ts">
|
||||
import { onMounted, ref } from 'vue';
|
||||
import { ElMessageBox } from 'element-plus';
|
||||
import { ElMessage, ElMessageBox } from 'element-plus';
|
||||
import { type PromotionPlan } from '@classhelper/shared';
|
||||
import { api } from '@/api/http';
|
||||
type Status = {
|
||||
config: { month: number; day: number; hour: number; classCount: number };
|
||||
type Run = {
|
||||
year: number;
|
||||
pending: boolean;
|
||||
runs: {
|
||||
year: number;
|
||||
status: string;
|
||||
message: string;
|
||||
classCount: number;
|
||||
studentCount: number;
|
||||
snapshotPath: string;
|
||||
status: string;
|
||||
message: string;
|
||||
classCount: number;
|
||||
studentCount: number;
|
||||
snapshotPath: string;
|
||||
snapshotSha256: string;
|
||||
operatorName: string;
|
||||
detailsJson: string;
|
||||
error: string;
|
||||
};
|
||||
type Preview = {
|
||||
year: number;
|
||||
planHash: string;
|
||||
classCount: number;
|
||||
studentCount: number;
|
||||
blockers: { code: string; message: string }[];
|
||||
warnings: string[];
|
||||
termWeekDeleteCount: number;
|
||||
termStartDate: string;
|
||||
tracks: {
|
||||
id: string;
|
||||
name: string;
|
||||
classes: {
|
||||
id: string;
|
||||
name: string;
|
||||
grade: string;
|
||||
nextGrade: string;
|
||||
active: number;
|
||||
inactive: number;
|
||||
transferred: number;
|
||||
}[];
|
||||
newClasses: { name: string; grade: string; code: string }[];
|
||||
}[];
|
||||
};
|
||||
type Status = {
|
||||
config: { month: number; day: number; hour: number; classCount: number };
|
||||
plan: PromotionPlan;
|
||||
year: number;
|
||||
pending: boolean;
|
||||
runs: Run[];
|
||||
};
|
||||
const status = ref<Status>();
|
||||
const preview = ref<Preview>();
|
||||
const year = ref(2026);
|
||||
const visible = ref(false),
|
||||
saving = ref(false),
|
||||
running = ref(false),
|
||||
loading = ref(false);
|
||||
async function load() {
|
||||
status.value = await api.get('/term/promotion');
|
||||
year.value = status.value!.year;
|
||||
}
|
||||
function normalizeStages() {
|
||||
for (const track of status.value?.plan.tracks ?? [])
|
||||
track.stages.forEach((stage, i) => {
|
||||
stage.terminal = i === track.stages.length - 1;
|
||||
});
|
||||
}
|
||||
function addTrack() {
|
||||
status.value?.plan.tracks.push({
|
||||
id: `track-${Date.now().toString(36)}`,
|
||||
name: '新轨道',
|
||||
entryClassCount: 0,
|
||||
stages: [{ grade: '', terminal: true }],
|
||||
});
|
||||
}
|
||||
function moveStage(track: PromotionPlan['tracks'][number], index: number, direction: number) {
|
||||
const next = index + direction;
|
||||
if (next < 0 || next >= track.stages.length) return;
|
||||
[track.stages[index], track.stages[next]] = [track.stages[next], track.stages[index]];
|
||||
normalizeStages();
|
||||
}
|
||||
async function save() {
|
||||
if (status.value) await api.put('/term/promotion', status.value.config);
|
||||
await load();
|
||||
}
|
||||
async function catchUp() {
|
||||
if (!status.value) return;
|
||||
const preview = await api.post<{ classCount: number; studentCount: number }>('/term/promotion/run', {
|
||||
year: status.value.year,
|
||||
dryRun: true,
|
||||
});
|
||||
await ElMessageBox.confirm(
|
||||
`将影响 ${preview.classCount} 个班、${preview.studentCount} 名学生。执行前自动保存全库快照;高三归档,其余升一级,新建高一骨架。`,
|
||||
'补跑学年升级',
|
||||
{ type: 'warning' },
|
||||
normalizeStages();
|
||||
saving.value = true;
|
||||
try {
|
||||
await api.put('/term/promotion', { ...status.value.config, plan: status.value.plan });
|
||||
preview.value = undefined;
|
||||
await load();
|
||||
ElMessage.success('升级计划已保存');
|
||||
} finally {
|
||||
saving.value = false;
|
||||
}
|
||||
}
|
||||
async function showPreview() {
|
||||
loading.value = true;
|
||||
try {
|
||||
preview.value = await api.post('/term/promotion/preview', { year: year.value });
|
||||
visible.value = true;
|
||||
} finally {
|
||||
loading.value = false;
|
||||
}
|
||||
}
|
||||
async function execute() {
|
||||
if (!preview.value || running.value) return;
|
||||
const { year: target, planHash } = preview.value;
|
||||
await ElMessageBox.prompt(
|
||||
`请输入 ${target} 确认执行。快照可供手工恢复;撤销归档不会回滚年级、新班或周次。`,
|
||||
'确认学年升级',
|
||||
{
|
||||
inputValidator: (value) => value === String(target) || '输入必须与预览学年一致',
|
||||
confirmButtonText: '执行升级',
|
||||
type: 'warning',
|
||||
},
|
||||
);
|
||||
await api.post('/term/promotion/run', { year: status.value.year, dryRun: false });
|
||||
await load();
|
||||
running.value = true;
|
||||
try {
|
||||
await api.post('/term/promotion/run', { year: target, planHash, confirm: true, catchUp: true });
|
||||
visible.value = false;
|
||||
await load();
|
||||
ElMessage.success('学年升级完成,快照与执行明细已保留');
|
||||
} finally {
|
||||
running.value = false;
|
||||
}
|
||||
}
|
||||
onMounted(load);
|
||||
</script>
|
||||
<template>
|
||||
<el-card v-if="status">
|
||||
<h3>每年自动学年升级</h3>
|
||||
<el-form inline>
|
||||
<el-form-item label="月">
|
||||
<el-input-number v-model="status.config.month" :min="1" :max="12" />
|
||||
</el-form-item>
|
||||
<el-form-item label="日">
|
||||
<el-input-number v-model="status.config.day" :min="1" :max="31" />
|
||||
</el-form-item>
|
||||
<el-form-item label="时">
|
||||
<el-input-number v-model="status.config.hour" :min="0" :max="23" />
|
||||
</el-form-item>
|
||||
<el-form-item label="新高一班级数">
|
||||
<el-input-number v-model="status.config.classCount" :min="1" :max="99" />
|
||||
</el-form-item>
|
||||
<el-button @click="save">保存升级时间</el-button>
|
||||
</el-form>
|
||||
<p>新学年开学日重置为 9 月 1 日,保留总周数上限;新班主任与任课关系由管理员指定。</p>
|
||||
<el-card v-if="status" shadow="never">
|
||||
<h3>学年升级计划</h3>
|
||||
<el-alert
|
||||
v-if="status.pending"
|
||||
title="有尚未执行的学年升级,请预览影响后补跑"
|
||||
type="warning"
|
||||
title="先保存计划,再预览影响。执行前保存全库快照;恢复整学年需要管理员手工恢复快照。"
|
||||
type="info"
|
||||
:closable="false"
|
||||
/>
|
||||
<el-button v-if="status.pending" @click="catchUp">预览并补跑 {{ status.year }} 学年</el-button>
|
||||
<el-form label-position="top" :disabled="saving || running">
|
||||
<div class="toolbar">
|
||||
<el-form-item label="执行月份">
|
||||
<el-input-number v-model="status.config.month" :min="1" :max="12" />
|
||||
</el-form-item>
|
||||
<el-form-item label="执行日期">
|
||||
<el-input-number v-model="status.config.day" :min="1" :max="31" />
|
||||
</el-form-item>
|
||||
<el-form-item label="执行小时">
|
||||
<el-input-number v-model="status.config.hour" :min="0" :max="23" />
|
||||
</el-form-item>
|
||||
<el-form-item label="新学期开学日(空则当年 9 月 1 日)">
|
||||
<el-date-picker
|
||||
v-model="status.plan.termStartDate"
|
||||
type="date"
|
||||
value-format="YYYY-MM-DD"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="周次区间处理">
|
||||
<el-switch
|
||||
v-model="status.plan.resetTermWeeks"
|
||||
active-text="重置全校及班级周次"
|
||||
inactive-text="保留原周次"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
<el-card v-for="(track, ti) in status.plan.tracks" :key="track.id" shadow="never" class="track-card">
|
||||
<div class="toolbar">
|
||||
<el-form-item label="轨道名称"><el-input v-model="track.name" /></el-form-item>
|
||||
<el-form-item label="起始年级新班数">
|
||||
<el-input-number v-model="track.entryClassCount" :min="0" :max="99" />
|
||||
</el-form-item>
|
||||
<el-button
|
||||
:disabled="status.plan.tracks.length === 1"
|
||||
type="danger"
|
||||
plain
|
||||
@click="status.plan.tracks.splice(ti, 1)"
|
||||
>
|
||||
删除轨道
|
||||
</el-button>
|
||||
</div>
|
||||
<div v-for="(stage, si) in track.stages" :key="si" class="toolbar stage-row">
|
||||
<el-form-item :label="`第 ${si + 1} 学段`">
|
||||
<el-input v-model="stage.grade" placeholder="填写年级名称" />
|
||||
</el-form-item>
|
||||
<el-tag v-if="si === track.stages.length - 1" type="warning">毕业学段</el-tag>
|
||||
<el-button :disabled="si === 0" @click="moveStage(track, si, -1)">上移</el-button>
|
||||
<el-button :disabled="si === track.stages.length - 1" @click="moveStage(track, si, 1)">
|
||||
下移
|
||||
</el-button>
|
||||
<el-button
|
||||
:disabled="track.stages.length === 1"
|
||||
@click="
|
||||
track.stages.splice(si, 1);
|
||||
normalizeStages();
|
||||
"
|
||||
>
|
||||
移除学段
|
||||
</el-button>
|
||||
</div>
|
||||
<el-button
|
||||
@click="
|
||||
track.stages.push({ grade: '', terminal: true });
|
||||
normalizeStages();
|
||||
"
|
||||
>
|
||||
添加学段
|
||||
</el-button>
|
||||
</el-card>
|
||||
<div class="toolbar">
|
||||
<el-button @click="addTrack">添加轨道</el-button>
|
||||
<el-button type="primary" :loading="saving" @click="save">保存计划</el-button>
|
||||
</div>
|
||||
</el-form>
|
||||
<div class="toolbar preview-toolbar">
|
||||
<el-form-item label="预览学年">
|
||||
<el-input-number v-model="year" :min="2000" :max="status.year" />
|
||||
</el-form-item>
|
||||
<el-button :loading="loading" @click="showPreview">预览已保存计划</el-button>
|
||||
<el-tag :type="status.pending ? 'warning' : 'success'">
|
||||
{{ status.pending ? `待执行 ${status.year} 学年` : '应执行学年已完成' }}
|
||||
</el-tag>
|
||||
</div>
|
||||
<h4>执行记录</h4>
|
||||
<el-table :data="status.runs">
|
||||
<el-table-column prop="year" label="学年" />
|
||||
<el-table-column prop="status" label="结果" />
|
||||
<el-table-column prop="classCount" label="班级数" />
|
||||
<el-table-column prop="studentCount" label="学生数" />
|
||||
<el-table-column prop="message" label="执行记录" />
|
||||
<el-table-column prop="snapshotPath" label="执行前快照" />
|
||||
<el-table-column prop="year" label="学年" width="90" />
|
||||
<el-table-column prop="status" label="状态" width="100" />
|
||||
<el-table-column prop="operatorName" label="操作人" min-width="130" />
|
||||
<el-table-column prop="classCount" label="班级" width="80" />
|
||||
<el-table-column prop="studentCount" label="在读学生" width="100" />
|
||||
<el-table-column label="记录与快照" min-width="350">
|
||||
<template #default="{ row }">
|
||||
<details>
|
||||
<summary>{{ row.error || row.message }}</summary>
|
||||
<p class="digest">
|
||||
快照:{{ row.snapshotPath }}
|
||||
<br />
|
||||
SHA256:{{ row.snapshotSha256 }}
|
||||
</p>
|
||||
<pre>{{ row.detailsJson }}</pre>
|
||||
</details>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-drawer v-model="visible" title="学年升级影响预览" size="90%" :close-on-click-modal="!running">
|
||||
<template v-if="preview">
|
||||
<p>
|
||||
{{ preview.year }} 学年 · {{ preview.classCount }} 个班 · {{ preview.studentCount }} 名在读学生 ·
|
||||
开学日 {{ preview.termStartDate }} · 删除周次 {{ preview.termWeekDeleteCount }} 条
|
||||
</p>
|
||||
<el-alert
|
||||
v-for="block in preview.blockers"
|
||||
:key="block.message"
|
||||
:title="block.message"
|
||||
type="error"
|
||||
:closable="false"
|
||||
/>
|
||||
<el-alert
|
||||
v-for="warning in preview.warnings"
|
||||
:key="warning"
|
||||
:title="warning"
|
||||
type="warning"
|
||||
:closable="false"
|
||||
/>
|
||||
<section v-for="track in preview.tracks" :key="track.id">
|
||||
<h4>{{ track.name }}</h4>
|
||||
<el-table :data="track.classes">
|
||||
<el-table-column prop="name" label="班级" min-width="150" />
|
||||
<el-table-column prop="grade" label="当前年级" />
|
||||
<el-table-column prop="nextGrade" label="处理结果" />
|
||||
<el-table-column prop="active" label="在读" />
|
||||
<el-table-column prop="inactive" label="停用" />
|
||||
<el-table-column prop="transferred" label="转出" />
|
||||
</el-table>
|
||||
<el-table :data="track.newClasses" empty-text="不新建班级">
|
||||
<el-table-column prop="name" label="新班" />
|
||||
<el-table-column prop="grade" label="年级" />
|
||||
<el-table-column prop="code" label="班级码" />
|
||||
</el-table>
|
||||
</section>
|
||||
<p class="digest">计划哈希:{{ preview.planHash }}</p>
|
||||
<el-button type="danger" :disabled="preview.blockers.length > 0" :loading="running" @click="execute">
|
||||
确认学年并执行
|
||||
</el-button>
|
||||
</template>
|
||||
</el-drawer>
|
||||
</el-card>
|
||||
</template>
|
||||
<style scoped>
|
||||
.track-card,
|
||||
.preview-toolbar {
|
||||
margin-top: 16px;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
.stage-row {
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
.digest,
|
||||
pre {
|
||||
overflow-wrap: anywhere;
|
||||
white-space: pre-wrap;
|
||||
}
|
||||
</style>
|
||||
@@ -2,30 +2,77 @@
|
||||
import { onMounted, ref } from 'vue';
|
||||
import { ElMessageBox } from 'element-plus';
|
||||
import { api } from '@/api/http';
|
||||
import { classApi } from '@/api';
|
||||
import { useAuthStore } from '@/stores/auth';
|
||||
import type { ClassDto } from '@classhelper/shared';
|
||||
const auth = useAuthStore();
|
||||
const students = ref<
|
||||
{ id: string; studentNo: string; name: string; transferNote: string; class: { name: string } | null }[]
|
||||
>([]);
|
||||
const classes = ref<ClassDto[]>([]),
|
||||
target = ref(''),
|
||||
restoring = ref(''),
|
||||
visible = ref(false),
|
||||
saving = ref(false);
|
||||
async function load() {
|
||||
students.value = await api.get('/archives/transferred');
|
||||
}
|
||||
async function restore(id: string) {
|
||||
await ElMessageBox.confirm('撤回后学生恢复到原班,转出历史仍保留。', '撤回转出');
|
||||
await api.post(`/archives/transferred/${id}/restore`);
|
||||
await load();
|
||||
async function openRestore(id: string) {
|
||||
restoring.value = id;
|
||||
target.value = '';
|
||||
classes.value = await classApi.list();
|
||||
visible.value = true;
|
||||
}
|
||||
async function restore() {
|
||||
await ElMessageBox.confirm(
|
||||
'恢复到所选在读班级;原转出历史保留。原班已归档时必须指定其他在读班。',
|
||||
'撤回转出',
|
||||
);
|
||||
saving.value = true;
|
||||
try {
|
||||
await api.post(
|
||||
`/archives/transferred/${restoring.value}/restore`,
|
||||
target.value ? { toClassId: target.value } : {},
|
||||
);
|
||||
visible.value = false;
|
||||
await load();
|
||||
} finally {
|
||||
saving.value = false;
|
||||
}
|
||||
}
|
||||
onMounted(load);
|
||||
</script>
|
||||
<template>
|
||||
<el-card>
|
||||
<el-card shadow="never">
|
||||
<h3>已转出</h3>
|
||||
<el-table :data="students">
|
||||
<el-table-column prop="studentNo" label="学号" />
|
||||
<el-table-column prop="name" label="姓名" />
|
||||
<el-table-column prop="class.name" label="原班级" />
|
||||
<el-table-column prop="transferNote" label="转出说明" />
|
||||
<el-table-column label="操作">
|
||||
<template #default="{ row }"><el-button link @click="restore(row.id)">撤回转出</el-button></template>
|
||||
<el-table-column v-if="auth.can('roster:manage')" label="操作">
|
||||
<template #default="{ row }">
|
||||
<el-button link @click="openRestore(row.id)">撤回转出</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-dialog v-model="visible" title="撤回转出" width="min(92%, 480px)">
|
||||
<el-form label-position="top">
|
||||
<el-form-item label="目标在读班级(留空使用原班)">
|
||||
<el-select v-model="target" clearable>
|
||||
<el-option
|
||||
v-for="cls in classes"
|
||||
:key="cls.id"
|
||||
:value="cls.id"
|
||||
:label="`${cls.name} / ${cls.grade}`"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-button @click="visible = false">取消</el-button>
|
||||
<el-button type="primary" :loading="saving" @click="restore">确认撤回</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</el-card>
|
||||
</template>
|
||||
Reference in new issue
Block a user