From a8fcd8e9b9eefed6e233fa6c14d010c99285bbae Mon Sep 17 00:00:00 2001
From: yuetsh <517252939@qq.com>
Date: Mon, 3 Jun 2024 23:39:15 +0800
Subject: [PATCH] update

---
 .../submission/components/StatisticsPanel.vue | 30 ++++++++++++++-----
 src/oj/submission/list.vue                    | 11 +------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/src/oj/submission/components/StatisticsPanel.vue b/src/oj/submission/components/StatisticsPanel.vue
index a429e4e..9685af8 100644
--- a/src/oj/submission/components/StatisticsPanel.vue
+++ b/src/oj/submission/components/StatisticsPanel.vue
@@ -22,11 +22,18 @@
           :options="options"
         />
       </n-form-item>
+      <n-form-item>
+        <n-select
+          style="width: 120px"
+          v-model:value="query.groupby"
+          :options="groupbys"
+        />
+      </n-form-item>
       <n-form-item>
         <n-button type="primary" @click="handleStatistics">统计</n-button>
       </n-form-item>
     </n-form>
-    <n-space v-if="visble" size="large">
+    <n-space v-if="count.total > 0" size="large">
       <n-h1>
         <n-gradient-text type="primary">
           答案正确数：{{ count.accepted }}
@@ -39,14 +46,19 @@
       </n-h1>
       <n-h1>
         <n-gradient-text type="warning">
-          正确率：{{ count.rate * 100 }}%
+          正确率：{{ count.rate }}
         </n-gradient-text>
       </n-h1>
     </n-space>
+    <n-space v-else>
+      <n-h1>
+        <n-gradient-text type="primary">暂无提交</n-gradient-text>
+      </n-h1>
+    </n-space>
   </n-space>
 </template>
 <script setup lang="ts">
-import { formatISO, sub } from "date-fns"
+import { formatISO, sub, type Duration } from "date-fns"
 import { getSubmissionStatistics } from "oj/api"
 
 interface Props {
@@ -62,12 +74,19 @@ const options: SelectOption[] = [
   { label: "一天内", value: "days:1" },
   { label: "一周内", value: "weeks:1" },
   { label: "一个月内", value: "months:1" },
+  { label: "一年内", value: "years:1" },
+]
+
+const groupbys: SelectOption[] = [
+  { label: "用户分组", value: "problem" },
+  { label: "题目分组", value: "username" },
 ]
 
 const query = reactive({
   username: props.username,
   problem: props.problem,
-  duration: options[4].value,
+  duration: options[options.length - 1].value,
+  groupby: groupbys[0].value,
 })
 
 const count = reactive({
@@ -75,7 +94,6 @@ const count = reactive({
   accepted: 0,
   rate: 0,
 })
-const [visble, toggleVisble] = useToggle()
 
 const subOptions = computed<Duration>(() => {
   let dur = options.find((it) => it.value === query.duration) ?? options[0]
@@ -86,7 +104,6 @@ const subOptions = computed<Duration>(() => {
 })
 
 async function handleStatistics() {
-  toggleVisble(false)
   const current = Date.now()
   const end = formatISO(current)
   const start = formatISO(sub(current, subOptions.value))
@@ -95,7 +112,6 @@ async function handleStatistics() {
     query.problem,
     query.username,
   )
-  toggleVisble(true)
   count.total = res.data.submission_count
   count.accepted = res.data.accepted_count
   count.rate = res.data.correct_rate
diff --git a/src/oj/submission/list.vue b/src/oj/submission/list.vue
index 6f2545d..54cb1c0 100644
--- a/src/oj/submission/list.vue
+++ b/src/oj/submission/list.vue
@@ -42,15 +42,6 @@ const query = reactive<Query>({
 })
 const [show, toggleStatisticPanel] = useToggle(false)
 
-const panelTitle = computed(() => {
-  let p = ""
-  if (query.username) p = `用户 ${query.username} 的`
-  if (query.problem) p = `题号 ${query.problem} 的`
-  if (query.username && query.problem)
-    p = `用户 ${query.username} 关于题号 ${query.problem} 的`
-  return `${p}提交记录统计`
-})
-
 const options: SelectOption[] = [
   { label: "全部", value: "" },
   { label: "答案正确", value: "0" },
@@ -311,7 +302,7 @@ const columns = computed(() => {
     preset="card"
     :style="{ maxWidth: isDesktop && '70vw', maxHeight: '80vh' }"
     :content-style="{ overflow: 'auto' }"
-    :title="panelTitle"
+    title="提交记录的统计"
   >
     <StatisticsPanel :problem="query.problem" :username="query.username" />
   </n-modal>