diff --git a/apps/web/src/oj/statistics/components/StatisticsView.vue b/apps/web/src/oj/statistics/components/StatisticsView.vue
new file mode 100644
index 0000000..74f26dd
--- /dev/null
+++ b/apps/web/src/oj/statistics/components/StatisticsView.vue
@@ -0,0 +1,487 @@
+<script setup lang="ts">
+import { Icon } from "@iconify/vue"
+import { useThemeVars } from "naive-ui"
+import type {
+  FlowchartStatistics,
+  SubmissionStatistics,
+  SubmissionStatisticsGrid,
+} from "@oj2/contract"
+import {
+  getFlowchartStatistics,
+  getSubmissionStatistics,
+  getSubmissionStatisticsGrid,
+} from "oj/api"
+import { useConfigStore } from "shared/store/config"
+import { fromPickerValue, toPickerValue } from "utils/functions"
+import { useTone } from "oj/submission/composables/tone"
+import { classLabel } from "oj/submission/utils"
+import { DEFAULT_PERIOD, PERIOD_OPTIONS, periodRange, type Period } from "../period"
+import ByClass from "./ByClass.vue"
+import CodeStats from "./CodeStats.vue"
+import RingChart from "./RingChart.vue"
+import StatItem from "./StatItem.vue"
+
+/**
+ * 数据统计的主体（设计稿「统计重设计 · 定稿 B」）。两处用它：提交列表里的弹框（老师
+ * 平时从这里看），和 /statistics 页面（课堂看板「回头看」、题目页、今日统计之类从别处
+ * 进来的，条件放在地址栏里能刷新、能转发）。
+ *
+ * 分工：**课堂看板管这节课，这里管回头看**（用户定的）。所以不自动刷新、没有
+ * 投影用的大字名单和请假隐藏 —— 那些在看板上。课堂统计一般看一两节课，时间段默认「两节课」。
+ *
+ * 查询条件都是 v-model：页面接地址栏，弹框接提交列表那边的一份本地状态。
+ */
+const FlowStats = defineAsyncComponent(() => import("./FlowStats.vue"))
+
+const props = defineProps<{
+  /** 在弹框里：右上角多一个关闭；「在提交列表里看」由外面接住，改的是背后那张列表 */
+  modal?: boolean
+}>()
+
+const emit = defineEmits<{
+  close: []
+  /** 「在提交列表里看」：带着现在的条件回提交列表（query 是提交列表的地址栏参数） */
+  list: [query: Record<string, string>]
+}>()
+
+const router = useRouter()
+const configStore = useConfigStore()
+const theme = useThemeVars()
+const tone = useTone()
+
+const tab = defineModel<string>("tab", { default: "code" })
+const className = defineModel<string>("className", { default: "" })
+const username = defineModel<string>("username", { default: "" })
+const problem = defineModel<string>("problem", { default: "" })
+const period = defineModel<string>("period", { default: DEFAULT_PERIOD })
+const from = defineModel<string>("from", { default: "" })
+const to = defineModel<string>("to", { default: "" })
+
+const periodValue = computed<Period>(() =>
+  PERIOD_OPTIONS.some((option) => option.value === period.value)
+    ? (period.value as Period)
+    : DEFAULT_PERIOD,
+)
+
+/** 地址栏里的 from / to 是手改过、不是数字的话当没选（不然 toISOString 抛错整页空白） */
+const custom = computed<[number, number] | null>(() => {
+  const a = Number(from.value)
+  const b = Number(to.value)
+  return from.value && to.value && Number.isFinite(a) && Number.isFinite(b) ? [a, b] : null
+})
+
+/** n-date-picker 按浏览器时区渲染，存取都要平移到东八区（见 utils/functions 的注释） */
+const pickerValue = computed<[number, number] | null>(() =>
+  custom.value ? [toPickerValue(custom.value[0]), toPickerValue(custom.value[1])] : null,
+)
+function pickDates(value: [number, number] | null) {
+  if (!value) {
+    from.value = ""
+    to.value = ""
+    return
+  }
+  from.value = String(fromPickerValue(value[0]))
+  to.value = String(fromPickerValue(value[1]))
+}
+
+/** 学生框：包含匹配。班级另外单独传（按 class_name 精确匹配，见后端 scopedUsers） */
+const studentParam = computed(() => username.value.trim())
+
+const classOptions = computed(() => {
+  const list = configStore.config?.classList ?? []
+  const all = className.value && !list.includes(className.value) ? [className.value, ...list] : list
+  return all.map((item) => ({ label: classLabel(item), value: item }))
+})
+
+// ---------- 取数 ----------
+
+const loading = ref(false)
+const failed = ref("")
+const stats = ref<SubmissionStatistics | null>(null)
+const grid = ref<SubmissionStatisticsGrid | null>(null)
+const flow = ref<FlowchartStatistics | null>(null)
+
+/**
+ * 这一份数据是按什么条件查出来的。页面上的标签（按班级汇总还是看人、「做完」还是
+ * 「做对过题」、时间范围那句话）跟着它走，不跟着输入框 —— 老师边打字边看时，数据还是
+ * 上一次的，标签先变了就对不上
+ */
+const shown = ref({ byClass: true, explicit: false, rangeText: "", withinToday: false })
+let seq = 0
+
+const ERROR_TEXT: Record<string, string> = {
+  "problem-not-found": "有题号找不到，检查一下是不是打错了",
+  "invalid-request": "一次最多查 20 道题",
+}
+
+async function load() {
+  const current = ++seq
+  const range = periodRange(periodValue.value, custom.value)
+  const duration = { start: range.start, end: range.end }
+  const snapshot = {
+    byClass: !studentParam.value && !className.value,
+    explicit: !!problem.value.trim(),
+    rangeText: range.text,
+    withinToday: range.withinToday,
+  }
+  loading.value = true
+  failed.value = ""
+  try {
+    if (tab.value === "flow") {
+      const res = await getFlowchartStatistics(
+        duration,
+        problem.value,
+        studentParam.value,
+        className.value,
+      )
+      if (current !== seq) return
+      flow.value = res
+    } else {
+      const [s, g] = await Promise.all([
+        getSubmissionStatistics(duration, problem.value, studentParam.value, className.value),
+        getSubmissionStatisticsGrid(duration, problem.value, studentParam.value, className.value),
+      ])
+      if (current !== seq) return
+      stats.value = s
+      grid.value = g
+    }
+    shown.value = snapshot
+  } catch (error) {
+    if (current !== seq) return
+    // 失败了就别留着上一次的结果配这一次的条件 —— 清掉，说清楚为什么
+    stats.value = null
+    grid.value = null
+    flow.value = null
+    const code = (error as { error?: string })?.error ?? ""
+    failed.value = ERROR_TEXT[code] ?? "没拉下来，改一下条件再试"
+  } finally {
+    if (current === seq) loading.value = false
+  }
+}
+
+onMounted(load)
+watch([tab, className, periodValue, custom], load)
+watchDebounced([username, problem], load, { debounce: 600, maxWait: 1500 })
+
+// ---------- 数字行（代码） ----------
+
+const doneCount = computed(() => stats.value?.data.filter((row) => row.done).length ?? 0)
+/**
+ * 没填题号时后端的「做完」是「至少做对一道」—— 一个月里零零散散几十道题，谈不上
+ * 「全做完」。这时各处都叫「做对过题」（CodeStats、ByClass 同一个口径）
+ */
+const hasProblems = computed(() => shown.value.explicit)
+const personCount = computed(() => stats.value?.personCount ?? 0)
+const judged = computed(() =>
+  stats.value ? stats.value.submissionCount - stats.value.judgingCount : 0,
+)
+
+// ---------- 两个入口 ----------
+
+/**
+ * 1366 以下（机房 1280 的屏）右上两个入口只留图标。弹框比屏幕窄一圈、还多一个关闭，
+ * 1366 的屏上整排放不下，所以弹框里宽一档才出字
+ */
+const narrow = useMediaQuery(props.modal ? "(max-width: 1439px)" : "(max-width: 1365px)")
+
+function openList() {
+  emit("list", {
+    ...(tab.value === "flow" ? { language: "Flowchart" } : {}),
+    ...(className.value ? { className: className.value } : {}),
+    ...(studentParam.value ? { username: studentParam.value } : {}),
+    ...(problem.value ? { problem: problem.value } : {}),
+    ...(shown.value.withinToday ? { today: "1" } : {}),
+  })
+}
+
+function pickClass(value: string) {
+  className.value = value
+  username.value = ""
+}
+</script>
+
+<template>
+  <div class="stats" :class="{ modal }">
+    <div class="filters">
+      <span class="title">数据统计</span>
+      <n-radio-group v-model:value="tab" size="small">
+        <n-radio-button value="code">代码</n-radio-button>
+        <n-radio-button value="flow">流程图</n-radio-button>
+      </n-radio-group>
+      <span class="vsep"></span>
+      <n-select
+        :value="className || null"
+        class="w-class"
+        size="small"
+        :options="classOptions"
+        placeholder="全部班级"
+        clearable
+        filterable
+        @update:value="(v: string | null) => (className = v ?? '')"
+      />
+      <n-input v-model:value="username" class="w-user" size="small" clearable placeholder="学生">
+        <template #prefix><Icon icon="ph:magnifying-glass" /></template>
+      </n-input>
+      <n-input
+        v-model:value="problem"
+        class="w-problem"
+        size="small"
+        clearable
+        placeholder="题号，几道用空格隔开"
+      >
+        <template #prefix><Icon icon="ph:hash" /></template>
+      </n-input>
+      <n-select
+        :value="periodValue"
+        class="w-period"
+        size="small"
+        :options="PERIOD_OPTIONS.map((o) => ({ label: o.label, value: o.value }))"
+        :consistent-menu-width="false"
+        @update:value="(v: string) => (period = v)"
+      />
+      <n-date-picker
+        v-if="periodValue === 'custom'"
+        :value="pickerValue"
+        type="daterange"
+        size="small"
+        class="w-dates"
+        clearable
+        @update:value="pickDates"
+      />
+      <span v-else class="range">{{ shown.rangeText }}</span>
+      <n-spin v-if="loading" :size="14" />
+      <n-text v-if="failed" type="error" class="range">{{ failed }}</n-text>
+      <span v-if="periodValue === 'custom' && !custom" class="range"
+        >选一下开始和结束的日子，没选先按今天算</span
+      >
+      <span class="spacer"></span>
+      <n-button
+        size="small"
+        quaternary
+        title="这节课去课堂看板"
+        aria-label="这节课去课堂看板"
+        @click="router.push('/classroom')"
+      >
+        <template #icon><Icon icon="ph:monitor" /></template>
+        <template v-if="!narrow">这节课去课堂看板</template>
+      </n-button>
+      <n-button size="small" title="在提交列表里看" aria-label="在提交列表里看" @click="openList">
+        <template #icon><Icon icon="ph:arrow-square-out" /></template>
+        <template v-if="!narrow">在提交列表里看</template>
+      </n-button>
+      <button v-if="modal" type="button" class="close" aria-label="关闭" @click="emit('close')">
+        <Icon icon="ph:x" :width="18" />
+      </button>
+    </div>
+
+    <template v-if="tab === 'flow'">
+      <FlowStats v-if="flow" :data="flow" />
+    </template>
+
+    <template v-else-if="stats && grid">
+      <div class="summary">
+        <StatItem label="提交" :value="stats.submissionCount" unit="条" />
+        <StatItem
+          label="正确率"
+          :value="stats.submissionCount ? `${Math.round(stats.correctRate)}%` : '—'"
+          :unit="stats.judgingCount ? `判题中 ${stats.judgingCount}` : ''"
+        />
+        <template v-if="personCount">
+          <StatItem
+            :label="hasProblems ? '做完' : '做对过题'"
+            :value="`${doneCount} / ${personCount}`"
+            unit="人"
+            tone="success"
+          />
+          <StatItem
+            v-if="hasProblems"
+            label="完成度"
+            :value="`${personCount ? Math.round((doneCount / personCount) * 100) : 0}%`"
+          />
+          <StatItem label="一道没交" :value="stats.dataUnaccepted.length" unit="人" tone="error" />
+        </template>
+        <StatItem
+          :label="hasProblems ? '交了没全对' : '一道没做对'"
+          :value="stats.dataAttempted.length"
+          unit="人"
+          tone="warning"
+        />
+        <span class="spacer"></span>
+        <span class="ring-wrap">
+          <RingChart
+            :value="stats.acceptedCount"
+            :total="judged"
+            :color="tone('success').solid"
+            :labels="['正确', '没对']"
+          />
+          <span class="ring-label">提交<br />正确率</span>
+        </span>
+        <span v-if="personCount && hasProblems" class="ring-wrap">
+          <RingChart
+            :value="doneCount"
+            :total="personCount"
+            :color="tone('info').solid"
+            :labels="['做完', '没做完']"
+          />
+          <span class="ring-label">班级<br />完成度</span>
+        </span>
+      </div>
+      <ByClass v-if="shown.byClass" :grid="grid" :explicit="shown.explicit" @pick="pickClass" />
+      <CodeStats v-else :stats="stats" :grid="grid" :explicit="shown.explicit" />
+    </template>
+  </div>
+</template>
+
+<style scoped>
+/* 高度由外面给（页面铺满顶栏以下、弹框按屏幕高），里面几栏各自滚动 */
+.stats {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  background: v-bind("theme.cardColor");
+}
+
+/* 弹框：四周留 24，和今日统计同一种圆角卡片 */
+.stats.modal {
+  width: calc(100vw - 48px);
+  max-width: 1480px;
+  height: calc(100vh - 48px);
+  border-radius: 12px;
+  box-shadow: v-bind("theme.boxShadow3");
+  overflow: hidden;
+}
+
+.filters {
+  height: 52px;
+  flex: none;
+  box-sizing: border-box;
+  padding: 0 20px;
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  white-space: nowrap;
+  border-bottom: 1px solid v-bind("theme.dividerColor");
+}
+
+.title {
+  font-size: 17px;
+  font-weight: 700;
+  margin-right: 6px;
+}
+
+.vsep {
+  width: 1px;
+  height: 20px;
+  margin: 0 4px;
+  background: v-bind("theme.dividerColor");
+}
+
+.w-class {
+  width: 132px;
+}
+.w-user {
+  width: 110px;
+}
+.w-problem {
+  width: 220px;
+}
+.w-period {
+  width: 150px;
+}
+.w-dates {
+  width: 240px;
+}
+
+@media (max-width: 1365px) {
+  .w-problem {
+    width: 190px;
+  }
+}
+
+.range {
+  font-size: 12px;
+  color: v-bind("theme.textColor3");
+}
+
+.spacer {
+  flex: 1 1 0;
+}
+
+.close {
+  width: 32px;
+  height: 32px;
+  margin-right: -8px;
+  border: 0;
+  border-radius: 4px;
+  background: transparent;
+  color: v-bind("theme.textColor2");
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+}
+
+.close:hover {
+  background: v-bind("theme.actionColor");
+}
+
+.summary {
+  height: 72px;
+  flex: none;
+  box-sizing: border-box;
+  padding: 0 20px;
+  display: flex;
+  align-items: center;
+  gap: 36px;
+  border-bottom: 1px solid v-bind("theme.dividerColor");
+  background: v-bind("theme.actionColor");
+}
+
+.ring-wrap {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.ring-label {
+  font-size: 12px;
+  line-height: 1.5;
+  color: v-bind("theme.textColor3");
+}
+
+/* 手机：老师很少在手机上看统计，只保证不坏 —— 筛选和数字行折行，整页自然滚动 */
+@media (max-width: 767px) {
+  .stats:not(.modal) {
+    height: auto;
+  }
+
+  .filters,
+  .summary {
+    height: auto;
+    flex-wrap: wrap;
+    padding: 10px 14px;
+    row-gap: 10px;
+    white-space: normal;
+  }
+
+  .summary {
+    gap: 12px 24px;
+  }
+
+  .vsep,
+  .spacer {
+    display: none;
+  }
+
+  .w-class,
+  .w-user,
+  .w-period {
+    width: calc(50% - 4px);
+  }
+
+  .w-problem,
+  .w-dates {
+    width: 100%;
+  }
+}
+</style>
diff --git a/apps/web/src/oj/statistics/index.vue b/apps/web/src/oj/statistics/index.vue
index 48210f0..26caf81 100644
--- a/apps/web/src/oj/statistics/index.vue
+++ b/apps/web/src/oj/statistics/index.vue
@@ -1,41 +1,15 @@
 <script setup lang="ts">
-import { Icon } from "@iconify/vue"
-import { useThemeVars } from "naive-ui"
 import { useRouteQuery } from "@vueuse/router"
-import type {
-  FlowchartStatistics,
-  SubmissionStatistics,
-  SubmissionStatisticsGrid,
-} from "@oj2/contract"
-import {
-  getFlowchartStatistics,
-  getSubmissionStatistics,
-  getSubmissionStatisticsGrid,
-} from "oj/api"
-import { useConfigStore } from "shared/store/config"
-import { fromPickerValue, toPickerValue } from "utils/functions"
-import { useTone } from "oj/submission/composables/tone"
-import { classLabel } from "oj/submission/utils"
-import ByClass from "./components/ByClass.vue"
-import CodeStats from "./components/CodeStats.vue"
-import RingChart from "./components/RingChart.vue"
-import StatItem from "./components/StatItem.vue"
-import { DEFAULT_PERIOD, PERIOD_OPTIONS, periodRange, type Period } from "./period"
+import StatisticsView from "./components/StatisticsView.vue"
+import { DEFAULT_PERIOD } from "./period"
 
 /**
- * 数据统计（设计稿「统计重设计 · 定稿 B」）。从提交列表、题目页的弹框改成独立页面。
+ * 数据统计的页面形态：课堂看板「回头看」、题目页统计页签、今日统计从别处进来时用。
+ * 提交列表里是弹框（用户定的），两边是同一个 StatisticsView。
  *
- * 分工：**课堂看板管这节课，这里管回头看**（用户定的）。所以这页不自动刷新、没有
- * 投影用的大字名单和请假隐藏 —— 那些在看板上。课堂统计一般看一两节课，时间段默认「两节课」。
- *
- * 查询条件都在地址栏里：从提交列表、题目页带过来，刷新、转发给别的老师都还是这一份。
+ * 查询条件都在地址栏里：带过来、刷新、转发给别的老师都还是这一份。
  */
-const FlowStats = defineAsyncComponent(() => import("./components/FlowStats.vue"))
-
 const router = useRouter()
-const configStore = useConfigStore()
-const theme = useThemeVars()
-const tone = useTone()
 
 const tab = useRouteQuery<string>("tab", "code", { mode: "replace" })
 const className = useRouteQuery<string>("className", "", { mode: "replace" })
@@ -45,276 +19,23 @@ const period = useRouteQuery<string>("period", DEFAULT_PERIOD, { mode: "replace"
 const from = useRouteQuery<string>("from", "", { mode: "replace" })
 const to = useRouteQuery<string>("to", "", { mode: "replace" })
 
-const periodValue = computed<Period>(() =>
-  PERIOD_OPTIONS.some((option) => option.value === period.value)
-    ? (period.value as Period)
-    : DEFAULT_PERIOD,
-)
-
-/** 地址栏里的 from / to 是手改过、不是数字的话当没选（不然 toISOString 抛错整页空白） */
-const custom = computed<[number, number] | null>(() => {
-  const a = Number(from.value)
-  const b = Number(to.value)
-  return from.value && to.value && Number.isFinite(a) && Number.isFinite(b) ? [a, b] : null
-})
-
-/** n-date-picker 按浏览器时区渲染，存取都要平移到东八区（见 utils/functions 的注释） */
-const pickerValue = computed<[number, number] | null>(() =>
-  custom.value ? [toPickerValue(custom.value[0]), toPickerValue(custom.value[1])] : null,
-)
-function pickDates(value: [number, number] | null) {
-  if (!value) {
-    from.value = ""
-    to.value = ""
-    return
-  }
-  from.value = String(fromPickerValue(value[0]))
-  to.value = String(fromPickerValue(value[1]))
-}
-
-/** 学生框：包含匹配。班级另外单独传（按 class_name 精确匹配，见后端 scopedUsers） */
-const studentParam = computed(() => username.value.trim())
-
-const classOptions = computed(() => {
-  const list = configStore.config?.classList ?? []
-  const all = className.value && !list.includes(className.value) ? [className.value, ...list] : list
-  return all.map((item) => ({ label: classLabel(item), value: item }))
-})
-
-// ---------- 取数 ----------
-
-const loading = ref(false)
-const failed = ref("")
-const stats = ref<SubmissionStatistics | null>(null)
-const grid = ref<SubmissionStatisticsGrid | null>(null)
-const flow = ref<FlowchartStatistics | null>(null)
-
-/**
- * 这一份数据是按什么条件查出来的。页面上的标签（按班级汇总还是看人、「做完」还是
- * 「做对过题」、时间范围那句话）跟着它走，不跟着输入框 —— 老师边打字边看时，数据还是
- * 上一次的，标签先变了就对不上
- */
-const shown = ref({ byClass: true, explicit: false, rangeText: "", withinToday: false })
-let seq = 0
-
-const ERROR_TEXT: Record<string, string> = {
-  "problem-not-found": "有题号找不到，检查一下是不是打错了",
-  "invalid-request": "一次最多查 20 道题",
-}
-
-async function load() {
-  const current = ++seq
-  const range = periodRange(periodValue.value, custom.value)
-  const duration = { start: range.start, end: range.end }
-  const snapshot = {
-    byClass: !studentParam.value && !className.value,
-    explicit: !!problem.value.trim(),
-    rangeText: range.text,
-    withinToday: range.withinToday,
-  }
-  loading.value = true
-  failed.value = ""
-  try {
-    if (tab.value === "flow") {
-      const res = await getFlowchartStatistics(
-        duration,
-        problem.value,
-        studentParam.value,
-        className.value,
-      )
-      if (current !== seq) return
-      flow.value = res
-    } else {
-      const [s, g] = await Promise.all([
-        getSubmissionStatistics(duration, problem.value, studentParam.value, className.value),
-        getSubmissionStatisticsGrid(duration, problem.value, studentParam.value, className.value),
-      ])
-      if (current !== seq) return
-      stats.value = s
-      grid.value = g
-    }
-    shown.value = snapshot
-  } catch (error) {
-    if (current !== seq) return
-    // 失败了就别留着上一次的结果配这一次的条件 —— 清掉，说清楚为什么
-    stats.value = null
-    grid.value = null
-    flow.value = null
-    const code = (error as { error?: string })?.error ?? ""
-    failed.value = ERROR_TEXT[code] ?? "没拉下来，改一下条件再试"
-  } finally {
-    if (current === seq) loading.value = false
-  }
-}
-
-onMounted(load)
-watch([tab, className, periodValue, custom], load)
-watchDebounced([username, problem], load, { debounce: 600, maxWait: 1500 })
-
-// ---------- 数字行（代码） ----------
-
-const doneCount = computed(() => stats.value?.data.filter((row) => row.done).length ?? 0)
-/**
- * 没填题号时后端的「做完」是「至少做对一道」—— 一个月里零零散散几十道题，谈不上
- * 「全做完」。这时各处都叫「做对过题」（CodeStats、ByClass 同一个口径）
- */
-const hasProblems = computed(() => shown.value.explicit)
-const personCount = computed(() => stats.value?.personCount ?? 0)
-const judged = computed(() =>
-  stats.value ? stats.value.submissionCount - stats.value.judgingCount : 0,
-)
-
-// ---------- 两个入口 ----------
-
-/** 1366 以下（机房 1280 的屏）右上两个入口只留图标 */
-const narrow = useMediaQuery("(max-width: 1365px)")
-
-function openList() {
-  const href = router.resolve({
-    name: "submissions",
-    query: {
-      ...(tab.value === "flow" ? { language: "Flowchart" } : {}),
-      ...(className.value ? { className: className.value } : {}),
-      ...(studentParam.value ? { username: studentParam.value } : {}),
-      ...(problem.value ? { problem: problem.value } : {}),
-      ...(shown.value.withinToday ? { today: "1" } : {}),
-    },
-  }).href
-  window.open(href, "_blank")
-}
-
-function pickClass(value: string) {
-  className.value = value
-  username.value = ""
+function openList(query: Record<string, string>) {
+  window.open(router.resolve({ name: "submissions", query }).href, "_blank")
 }
 </script>
 
 <template>
   <div class="page">
-    <div class="filters">
-      <span class="title">数据统计</span>
-      <n-radio-group v-model:value="tab" size="small">
-        <n-radio-button value="code">代码</n-radio-button>
-        <n-radio-button value="flow">流程图</n-radio-button>
-      </n-radio-group>
-      <span class="vsep"></span>
-      <n-select
-        :value="className || null"
-        class="w-class"
-        size="small"
-        :options="classOptions"
-        placeholder="全部班级"
-        clearable
-        filterable
-        @update:value="(v: string | null) => (className = v ?? '')"
-      />
-      <n-input v-model:value="username" class="w-user" size="small" clearable placeholder="学生">
-        <template #prefix><Icon icon="ph:magnifying-glass" /></template>
-      </n-input>
-      <n-input
-        v-model:value="problem"
-        class="w-problem"
-        size="small"
-        clearable
-        placeholder="题号，几道用空格隔开"
-      >
-        <template #prefix><Icon icon="ph:hash" /></template>
-      </n-input>
-      <n-select
-        :value="periodValue"
-        class="w-period"
-        size="small"
-        :options="PERIOD_OPTIONS.map((o) => ({ label: o.label, value: o.value }))"
-        :consistent-menu-width="false"
-        @update:value="(v: string) => (period = v)"
-      />
-      <n-date-picker
-        v-if="periodValue === 'custom'"
-        :value="pickerValue"
-        type="daterange"
-        size="small"
-        class="w-dates"
-        clearable
-        @update:value="pickDates"
-      />
-      <span v-else class="range">{{ shown.rangeText }}</span>
-      <n-spin v-if="loading" :size="14" />
-      <n-text v-if="failed" type="error" class="range">{{ failed }}</n-text>
-      <span v-if="periodValue === 'custom' && !custom" class="range"
-        >选一下开始和结束的日子，没选先按今天算</span
-      >
-      <span class="spacer"></span>
-      <n-button
-        size="small"
-        quaternary
-        title="这节课去课堂看板"
-        aria-label="这节课去课堂看板"
-        @click="router.push('/classroom')"
-      >
-        <template #icon><Icon icon="ph:monitor" /></template>
-        <template v-if="!narrow">这节课去课堂看板</template>
-      </n-button>
-      <n-button size="small" title="在提交列表里看" aria-label="在提交列表里看" @click="openList">
-        <template #icon><Icon icon="ph:arrow-square-out" /></template>
-        <template v-if="!narrow">在提交列表里看</template>
-      </n-button>
-    </div>
-
-    <template v-if="tab === 'flow'">
-      <FlowStats v-if="flow" :data="flow" />
-    </template>
-
-    <template v-else-if="stats && grid">
-      <div class="summary">
-        <StatItem label="提交" :value="stats.submissionCount" unit="条" />
-        <StatItem
-          label="正确率"
-          :value="stats.submissionCount ? `${Math.round(stats.correctRate)}%` : '—'"
-          :unit="stats.judgingCount ? `判题中 ${stats.judgingCount}` : ''"
-        />
-        <template v-if="personCount">
-          <StatItem
-            :label="hasProblems ? '做完' : '做对过题'"
-            :value="`${doneCount} / ${personCount}`"
-            unit="人"
-            tone="success"
-          />
-          <StatItem
-            v-if="hasProblems"
-            label="完成度"
-            :value="`${personCount ? Math.round((doneCount / personCount) * 100) : 0}%`"
-          />
-          <StatItem label="一道没交" :value="stats.dataUnaccepted.length" unit="人" tone="error" />
-        </template>
-        <StatItem
-          :label="hasProblems ? '交了没全对' : '一道没做对'"
-          :value="stats.dataAttempted.length"
-          unit="人"
-          tone="warning"
-        />
-        <span class="spacer"></span>
-        <span class="ring-wrap">
-          <RingChart
-            :value="stats.acceptedCount"
-            :total="judged"
-            :color="tone('success').solid"
-            :labels="['正确', '没对']"
-          />
-          <span class="ring-label">提交<br />正确率</span>
-        </span>
-        <span v-if="personCount && hasProblems" class="ring-wrap">
-          <RingChart
-            :value="doneCount"
-            :total="personCount"
-            :color="tone('info').solid"
-            :labels="['做完', '没做完']"
-          />
-          <span class="ring-label">班级<br />完成度</span>
-        </span>
-      </div>
-      <ByClass v-if="shown.byClass" :grid="grid" :explicit="shown.explicit" @pick="pickClass" />
-      <CodeStats v-else :stats="stats" :grid="grid" :explicit="shown.explicit" />
-    </template>
+    <StatisticsView
+      v-model:tab="tab"
+      v-model:class-name="className"
+      v-model:username="username"
+      v-model:problem="problem"
+      v-model:period="period"
+      v-model:from="from"
+      v-model:to="to"
+      @list="openList"
+    />
   </div>
 </template>
 
@@ -323,125 +44,13 @@ function pickClass(value: string) {
 .page {
   margin: -16px;
   height: calc(100vh - 56px);
-  display: flex;
-  flex-direction: column;
-  background: v-bind("theme.cardColor");
 }
 
-.filters {
-  height: 52px;
-  flex: none;
-  box-sizing: border-box;
-  padding: 0 20px;
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  white-space: nowrap;
-  border-bottom: 1px solid v-bind("theme.dividerColor");
-}
-
-.title {
-  font-size: 17px;
-  font-weight: 700;
-  margin-right: 6px;
-}
-
-.vsep {
-  width: 1px;
-  height: 20px;
-  margin: 0 4px;
-  background: v-bind("theme.dividerColor");
-}
-
-.w-class {
-  width: 132px;
-}
-.w-user {
-  width: 110px;
-}
-.w-problem {
-  width: 220px;
-}
-.w-period {
-  width: 150px;
-}
-.w-dates {
-  width: 240px;
-}
-
-@media (max-width: 1365px) {
-  .w-problem {
-    width: 190px;
-  }
-}
-
-.range {
-  font-size: 12px;
-  color: v-bind("theme.textColor3");
-}
-
-.spacer {
-  flex: 1 1 0;
-}
-
-.summary {
-  height: 72px;
-  flex: none;
-  box-sizing: border-box;
-  padding: 0 20px;
-  display: flex;
-  align-items: center;
-  gap: 36px;
-  border-bottom: 1px solid v-bind("theme.dividerColor");
-  background: v-bind("theme.actionColor");
-}
-
-.ring-wrap {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.ring-label {
-  font-size: 12px;
-  line-height: 1.5;
-  color: v-bind("theme.textColor3");
-}
-
-/* 手机：老师很少在手机上看统计，只保证不坏 —— 筛选和数字行折行，整页自然滚动 */
+/* 手机：老师很少在手机上看统计，只保证不坏 —— 整页自然滚动 */
 @media (max-width: 767px) {
   .page {
     height: auto;
     min-height: calc(100vh - 56px);
   }
-
-  .filters,
-  .summary {
-    height: auto;
-    flex-wrap: wrap;
-    padding: 10px 14px;
-    row-gap: 10px;
-    white-space: normal;
-  }
-
-  .summary {
-    gap: 12px 24px;
-  }
-
-  .vsep,
-  .spacer {
-    display: none;
-  }
-
-  .w-class,
-  .w-user,
-  .w-period {
-    width: calc(50% - 4px);
-  }
-
-  .w-problem,
-  .w-dates {
-    width: 100%;
-  }
 }
 </style>
diff --git a/apps/web/src/oj/submission/components/TodayStatistics.vue b/apps/web/src/oj/submission/components/TodayStatistics.vue
index 785b8fc..d938b65 100644
--- a/apps/web/src/oj/submission/components/TodayStatistics.vue
+++ b/apps/web/src/oj/submission/components/TodayStatistics.vue
@@ -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">
diff --git a/apps/web/src/oj/submission/list.vue b/apps/web/src/oj/submission/list.vue
index 56b5aa6..e8891c8 100644
--- a/apps/web/src/oj/submission/list.vue
+++ b/apps/web/src/oj/submission/list.vue
@@ -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>