feat(提交列表): 「数据统计」改回在当前页弹框里看,不再开新标签页;按钮和「今日统计」一个样子

弹框带着列表现在的班级、学生、题号打开,「在提交列表里看」直接改背后的列表。
今日统计里点班级名也开同一个弹框。统计主体抽成 StatisticsView,/statistics 页面
留给课堂看板「回头看」、题目页这些别处的入口。

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
xuyueandClaude Opus 5.5 committed 2026-09-30 01:20:01 +08:00
1 parent 13051926cf
commit e3eb41288c
4 files changed
+581 -434

No files matched your search

@@ -16,6 +16,8 @@ import { classLabel } from "../utils"
const emit = defineEmits<{
close: []
openProblem: [problem: string]
/** 点班级名:在提交列表的数据统计弹框里看这个班今天 */
openClass: [className: string]
/** 拉到数之后把总数报回去:按钮上的数只在进页面时拉过一次,停久了会对不上 */
loaded: [total: number]
}>()
@@ -131,14 +133,6 @@ const scatteredText = computed(() =>
.join("、"),
)
function openClass(className: string) {
const href = router.resolve({
name: "statistics",
query: { className, period: "today" },
}).href
window.open(href, "_blank")
}
const judgedResults = computed(() => stats.value?.results ?? [])
const languageText = computed(() => {
@@ -221,7 +215,7 @@ const meText = computed(() => {
<div class="timeline">
<div v-for="item in stats.classes" :key="item.className" class="lane">
<div class="lane-label">
<a href="#" class="lane-name" @click.prevent="openClass(item.className)">
<a href="#" class="lane-name" @click.prevent="emit('openClass', item.className)">
{{ classLabel(item.className) }}
</a>
<n-text depth="3" class="tiny">
+73 -16
View File
@@ -11,6 +11,7 @@ import {
getTodaySubmissionCount,
retryFlowchartSubmission,
} from "oj/api"
import { DEFAULT_PERIOD, type Period } from "oj/statistics/period"
import { useContestStore } from "oj/store/contest"
import Pagination from "shared/components/Pagination.vue"
import { useBreakpoints } from "shared/composables/breakpoints"
@@ -44,6 +45,10 @@ import { classLabel, submissionClockText, submissionDayText } from "./utils"
const SubmissionPane = defineAsyncComponent(() => import("./components/SubmissionPane.vue"))
const FlowchartPane = defineAsyncComponent(() => import("./components/FlowchartPane.vue"))
const TodayStatistics = defineAsyncComponent(() => import("./components/TodayStatistics.vue"))
// 统计带着 chart.js,只有老师点开才拉
const StatisticsView = defineAsyncComponent(
() => import("oj/statistics/components/StatisticsView.vue"),
)
interface SubmissionQuery {
username: string
@@ -313,10 +318,11 @@ function move(step: 1 | -1) {
}
const [todayPanel, toggleTodayPanel] = useToggle(false)
const statsPanel = ref(false)
// 只用 ↑ ↓(用户定的,← → 不要)
onKeyStroke(["ArrowUp", "ArrowDown"], (e: KeyboardEvent) => {
if (!isDesktop.value || todayPanel.value) return
if (!isDesktop.value || todayPanel.value || statsPanel.value) return
// 别的控件已经处理了这次按键(下拉框自己会开菜单、换选项)
if (e.defaultPrevented) return
const target = e.target as HTMLElement | null
@@ -558,21 +564,44 @@ function filterUser(username: string) {
}
/**
* 「数据统计」:新标签打开统计页,带上现在的班级 / 学生 / 题号 / 代码或流程图
* (原来是这一页上的弹框)。「今天」带过去就是统计页的「今天」
* 「数据统计」弹框的查询条件。每次打开从这张列表现在的班级 / 学生 / 题号 / 代码或流程图
* 带进去(「今天」带过去就是统计的「今天」);时间段沿用上次在弹框里选的
*/
function openStatistics() {
const href = router.resolve({
name: "statistics",
query: {
...(flowMode.value ? { tab: "flow" } : {}),
...(query.className ? { className: query.className } : {}),
...(query.username ? { username: query.username } : {}),
...(query.problem ? { problem: query.problem } : {}),
...(query.today === "1" ? { period: "today" } : {}),
},
}).href
window.open(href, "_blank")
const statsQuery = reactive({
tab: "code",
className: "",
username: "",
problem: "",
period: DEFAULT_PERIOD as string,
from: "",
to: "",
})
function openStatistics(preset?: { className: string; period: Period }) {
todayPanel.value = false
Object.assign(statsQuery, {
tab: flowMode.value ? "flow" : "code",
className: preset ? preset.className : query.className,
username: preset ? "" : query.username,
problem: preset ? "" : query.problem,
...(preset ? { period: preset.period } : query.today === "1" ? { period: "today" } : {}),
})
statsPanel.value = true
}
/** 统计里的「在提交列表里看」:直接改背后这张列表的筛选,关掉弹框 */
function listFromStatistics(next: Record<string, string>) {
statsPanel.value = false
exactFor.value = ""
Object.assign(query, {
username: next.username ?? "",
className: next.className ?? "",
result: "",
myself: "0",
problem: next.problem ?? "",
language: next.language === "Flowchart" ? "Flowchart" : flowMode.value ? "" : query.language,
today: next.today === "1" ? "1" : "0",
})
}
/** 右栏「只看这个班」:从看一个人换成看他整个班 */
@@ -796,7 +825,13 @@ function dayBreak(index: number) {
<template v-if="!(teacher && narrowBar)">今日统计</template>
<span v-if="todayCount" class="count">{{ todayCount }}</span>
</n-button>
<n-button v-if="teacher && route.name === 'submissions'" size="small" @click="openStatistics">
<n-button
v-if="teacher && route.name === 'submissions'"
size="small"
quaternary
title="数据统计:按班级、题号、时间段回头看"
@click="openStatistics()"
>
<template #icon><Icon icon="ph:chart-pie-slice" /></template>
数据统计
</n-button>
@@ -1074,8 +1109,30 @@ function dayBreak(index: number) {
@close="todayPanel = false"
@loaded="(total: number) => (todayCount = total)"
@open-problem="(id: string) => openProblem({ problemDisplayId: id } as Row)"
@open-class="(name: string) => openStatistics({ className: name, period: 'today' })"
/>
</n-modal>
<!--
包一层普通 div:n-modal 没有 preset 时把 class 和 ref 挂到直接子节点上,子节点是异步组件的话
里面下拉框的弹层插不进去(HierarchyRequestError,时间段、班级下拉点了没反应)
-->
<n-modal v-model:show="statsPanel">
<div>
<StatisticsView
v-model:tab="statsQuery.tab"
v-model:class-name="statsQuery.className"
v-model:username="statsQuery.username"
v-model:problem="statsQuery.problem"
v-model:period="statsQuery.period"
v-model:from="statsQuery.from"
v-model:to="statsQuery.to"
modal
@close="statsPanel = false"
@list="listFromStatistics"
/>
</div>
</n-modal>
</template>
<style scoped>