diff --git a/apps/web/src/admin/problemset/components/ProgressManagement.vue b/apps/web/src/admin/problemset/components/ProgressManagement.vue index 30d5a06..37ef946 100644 --- a/apps/web/src/admin/problemset/components/ProgressManagement.vue +++ b/apps/web/src/admin/problemset/components/ProgressManagement.vue @@ -2,10 +2,10 @@ import { h } from "vue" import { NDataTable, NButton, NFlex } from "naive-ui" import { parseTime } from "utils/functions" -import type { ProblemSetProgress } from "utils/types" +import type { AdminProblemSetProgress } from "utils/types" interface Props { - progress: ProblemSetProgress[] + progress: AdminProblemSetProgress[] } interface Emits { @@ -17,41 +17,41 @@ const emit = defineEmits() // 定义表格列 const progressColumns = [ - { title: "用户", key: "user.username", width: 120 }, + { title: "用户", key: "username", width: 120 }, { title: "加入时间", - key: "join_time", + key: "joinTime", width: 180, - render: (row: ProblemSetProgress) => + render: (row: AdminProblemSetProgress) => parseTime(row.joinTime, "YYYY-MM-DD HH:mm:ss"), }, - { title: "已完成", key: "completed_problems_count", width: 100 }, - { title: "总题目", key: "total_problems_count", width: 100 }, + { title: "已完成", key: "completedProblemsCount", width: 100 }, + { title: "总题目", key: "totalProblemsCount", width: 100 }, { title: "进度", - key: "progress_percentage", + key: "progressPercentage", width: 100, - render: (row: ProblemSetProgress) => + render: (row: AdminProblemSetProgress) => `${row.progressPercentage.toFixed(0)}%`, }, { title: "是否完成", - key: "is_completed", + key: "isCompleted", width: 100, - render: (row: ProblemSetProgress) => (row.isCompleted ? "是" : "否"), + render: (row: AdminProblemSetProgress) => (row.isCompleted ? "是" : "否"), }, { title: "操作", key: "actions", width: 120, - render: (row: ProblemSetProgress) => + render: (row: AdminProblemSetProgress) => h( NButton, { size: "small", type: "error", secondary: true, - onClick: () => emit("remove-user", row.user.id), + onClick: () => emit("remove-user", row.userId), }, { default: () => "移除" }, ), diff --git a/apps/web/src/admin/setting/home.vue b/apps/web/src/admin/setting/home.vue index 4e950ff..4ba8a7a 100644 --- a/apps/web/src/admin/setting/home.vue +++ b/apps/web/src/admin/setting/home.vue @@ -53,8 +53,8 @@ const columns: DataTableColumn[] = [ ), }, { title: "个性签名", key: "mood" }, - { title: "已解决", key: "accepted_number", width: 100 }, - { title: "提交数", key: "submission_number", width: 100 }, + { title: "已解决", key: "acceptedNumber", width: 100 }, + { title: "提交数", key: "submissionNumber", width: 100 }, { title: "正确率", key: "rate", diff --git a/apps/web/src/oj/ai/components/SolvedTable.vue b/apps/web/src/oj/ai/components/SolvedTable.vue index 56c7bea..8842be6 100644 --- a/apps/web/src/oj/ai/components/SolvedTable.vue +++ b/apps/web/src/oj/ai/components/SolvedTable.vue @@ -134,7 +134,7 @@ const flowchartsColumns: DataTableColumn[] = [ () => `${row.problemId} ${row.problemTitle}`, ), }, - { title: "提交次数", key: "submission_count", width: 100, align: "center" }, + { title: "提交次数", key: "submissionCount", width: 100, align: "center" }, { title: "最高分", key: "best", @@ -149,6 +149,6 @@ const flowchartsColumns: DataTableColumn[] = [ align: "center", render: (row) => parseTime(row.latestSubmissionTime), }, - { title: "平均分", key: "avg_score", width: 100, align: "center" }, + { title: "平均分", key: "avgScore", width: 100, align: "center" }, ] diff --git a/apps/web/src/oj/problemset/components/UserProgressView.vue b/apps/web/src/oj/problemset/components/UserProgressView.vue index 39962fb..77ed79e 100644 --- a/apps/web/src/oj/problemset/components/UserProgressView.vue +++ b/apps/web/src/oj/problemset/components/UserProgressView.vue @@ -111,7 +111,7 @@ const progressColumns = [ title: "排名", key: "rank", width: 80, - render: (row: ProblemSetProgress, index: number) => { + render: (_row: ProblemSetProgress, index: number) => { // 计算全局排名:当前页偏移 + 当前行索引 + 1 const globalRank = (query.page - 1) * query.limit + index + 1 return globalRank @@ -132,7 +132,7 @@ const progressColumns = [ }, { title: "已完成数量", - key: "completed_problems_count", + key: "completedProblemsCount", width: 100, }, { diff --git a/apps/web/src/oj/rank/list.vue b/apps/web/src/oj/rank/list.vue index 08f9c28..8baab6f 100644 --- a/apps/web/src/oj/rank/list.vue +++ b/apps/web/src/oj/rank/list.vue @@ -295,28 +295,28 @@ const classColumns: DataTableColumn[] = [ }, { title: "人数", - key: "user_count", + key: "userCount", width: 80, titleAlign: "center", align: "center", }, { title: "总AC数", - key: "total_ac", + key: "totalAc", width: 90, titleAlign: "center", align: "center", }, { title: "提交数", - key: "total_submission", + key: "totalSubmission", width: 90, titleAlign: "center", align: "center", }, { title: "平均AC数", - key: "avg_ac", + key: "avgAc", width: 100, titleAlign: "center", align: "center", @@ -399,13 +399,13 @@ const myClassColumns: DataTableColumn[] = [ }, { title: "已解决", - key: "accepted_number", + key: "acceptedNumber", width: 120, align: "center", }, { title: "提交数", - key: "submission_number", + key: "submissionNumber", width: 120, align: "center", },