fix contest conflict.

src/admin/api.ts

@@ -1,22 +1,10 @@
 import http from "utils/http"
 import { Problem } from "~/utils/types"
 
-export async function getProblemList(
-  offset = 0,
-  limit = 10,
-  searchParams: any = {}
-) {
-  let params: any = {
-    paging: true,
-    offset,
-    limit,
-  }
-  Object.keys(searchParams).forEach((element) => {
-    if (searchParams[element]) {
-      params[element] = searchParams[element]
-    }
+export async function getProblemList(offset = 0, limit = 10, keyword: string) {
+  const res = await http.get("admin/problem", {
+    params: { paging: true, offset, limit, keyword },
   })
-  const res = await http.get("admin/problem", { params })
   return {
     results: res.data.results.map((result: Problem) => ({
       id: result.id,
@@ -41,3 +29,9 @@ export function editProblem(problem: Problem) {
 export function getProblem(id: number) {
   return http.get("admin/problem", { params: { id } })
 }
+
+export function getUserList(offset = 0, limit = 10, keyword: string) {
+  return http.get("admin/user", {
+    params: { paging: true, offset, limit, keyword },
+  })
+}

src/admin/problem/components/Actions.vue

@@ -0,0 +1,48 @@
+<script lang="ts" setup>
+import { deleteProblem } from "~/admin/api"
+
+interface Props {
+  problemID: number
+}
+const props = defineProps<Props>()
+const emit = defineEmits(["deleted"])
+
+const router = useRouter()
+const message = useMessage()
+
+async function handleDeleteProblem(problemID: number) {
+  await deleteProblem(problemID)
+  message.success("删除成功")
+  emit("deleted")
+}
+
+function download() {
+  console.log(props.problemID)
+}
+
+function goEdit() {
+  router.push({
+    name: "problem edit",
+    params: { problemID: props.problemID },
+  })
+}
+</script>
+<template>
+  <n-space align="center">
+    <n-button size="small" secondary type="primary" @click="goEdit">
+      编辑
+    </n-button>
+    <n-popconfirm @positive-click="() => handleDeleteProblem(props.problemID)">
+      <template #trigger>
+        <n-button secondary size="small" type="error">删除</n-button>
+      </template>
+      确定删除这道题目吗？相关的提交也会被相应删除哦 😯
+    </n-popconfirm>
+    <n-tooltip>
+      <template #trigger>
+        <n-button size="small" secondary @click="download">下载</n-button>
+      </template>
+      下载测试用例
+    </n-tooltip>
+  </n-space>
+</template>

src/admin/problem/components/DeleteProblem.vue

@@ -1,24 +0,0 @@
-<script lang="ts" setup>
-import { deleteProblem } from "~/admin/api"
-
-interface Props {
-  problemID: number
-}
-const props = defineProps<Props>()
-const emit = defineEmits(["deleted"])
-const message = useMessage()
-
-async function handleDeleteProblem(problemID: number) {
-  await deleteProblem(problemID)
-  message.success("删除成功")
-  emit("deleted")
-}
-</script>
-<template>
-  <n-popconfirm @positive-click="() => handleDeleteProblem(props.problemID)">
-    <template #trigger>
-      <n-button tertiary size="small" type="error">删除</n-button>
-    </template>
-    确定删除这道题目吗？相关的提交也会被相应删除哦 😯
-  </n-popconfirm>
-</template>

src/admin/problem/components/DownloadTestcases.vue

@@ -1,15 +0,0 @@
-<script lang="ts" setup>
-const props = defineProps<{ problemID: number }>()
-
-function download() {
-  console.log(props.problemID)
-}
-</script>
-<template>
-  <n-tooltip>
-    <template #trigger>
-      <n-button size="small" tertiary @click="download">下载</n-button>
-    </template>
-    下载测试用例
-  </n-tooltip>
-</template>

src/admin/problem/list.vue

@@ -1,13 +1,10 @@
 <script setup lang="ts">
 import { getProblemList, getProblem, editProblem } from "../api"
 import Pagination from "~/shared/Pagination.vue"
-import { DataTableColumn, NButton, NSwitch } from "naive-ui"
+import { DataTableColumn, NSwitch } from "naive-ui"
 import { AdminProblemFiltered } from "~/utils/types"
 import { parseTime } from "~/utils/functions"
-import DownloadTestcases from "./components/DownloadTestcases.vue"
-import DeleteProblem from "./components/DeleteProblem.vue"
-
-const router = useRouter()
+import Actions from "./components/Actions.vue"
 
 const total = ref(0)
 const problems = ref<AdminProblemFiltered[]>([])
@@ -41,38 +38,14 @@ const columns: DataTableColumn<AdminProblemFiltered>[] = [
   },
   {
     key: "edit",
-    render: (row) =>
-      h(
-        NButton,
-        {
-          type: "primary",
-          size: "small",
-          tertiary: true,
-          onClick: () =>
-            router.push({
-              name: "problem edit",
-              params: { problemID: row.id },
-            }),
-        },
-        { default: () => "编辑" }
-      ),
-  },
-  {
-    key: "delete",
-    render: (row) =>
-      h(DeleteProblem, { problemID: row.id, onDeleted: listProblems }),
-  },
-  {
-    key: "download",
-    render: (row) => h(DownloadTestcases, { problemID: row.id }),
+    width: 200,
+    render: (row) => h(Actions, { problemID: row.id, onDeleted: listProblems }),
   },
 ]
 
 async function listProblems() {
   const offset = (query.page - 1) * query.limit
-  const res = await getProblemList(offset, query.limit, {
-    keyword: query.keyword,
-  })
+  const res = await getProblemList(offset, query.limit, query.keyword)
   total.value = res.total
   problems.value = res.results
 }

src/admin/user/components/Actions.vue

@@ -0,0 +1,15 @@
+<script lang="ts" setup>
+import { User } from "~/utils/types"
+
+interface Props {
+  user: User
+}
+const props = defineProps<Props>()
+</script>
+<template>
+  <n-space align="center">
+    <n-button size="small" secondary type="primary">编辑</n-button>
+    <n-button size="small" secondary type="error">封号</n-button>
+    <n-button size="small" secondary type="default">删除</n-button>
+  </n-space>
+</template>

src/admin/user/components/Name.vue

@@ -0,0 +1,25 @@
+<script setup lang="ts">
+import { User } from "~/utils/types"
+import { getUserRole } from "~/utils/functions"
+
+interface Props {
+  user: User
+}
+const props = defineProps<Props>()
+const isAdmin = computed(() => props.user.admin_type !== "Regular User")
+</script>
+<template>
+  <n-space align="center">
+    <n-tag v-if="props.user.is_disabled" type="error" size="small">
+      封号中
+    </n-tag>
+    <n-tag
+      v-if="isAdmin"
+      :type="getUserRole(props.user.admin_type).type"
+      size="small"
+    >
+      {{ getUserRole(props.user.admin_type).tagString }}
+    </n-tag>
+    {{ props.user.username }}
+  </n-space>
+</template>

src/admin/user/list.vue

@@ -1,7 +1,75 @@
-<script setup lang="ts"></script>
+<script setup lang="ts">
+import { DataTableColumn } from "naive-ui"
+import Pagination from "~/shared/Pagination.vue"
+import { parseTime } from "~/utils/functions"
+import { User } from "~/utils/types"
+import { getUserList } from "../api"
+import Actions from "./components/Actions.vue"
+import Name from "./components/Name.vue"
+
+const total = ref(0)
+const users = ref<User[]>([])
+const query = reactive({
+  limit: 10,
+  page: 1,
+  keyword: "",
+})
+
+const columns: DataTableColumn<User>[] = [
+  { title: "ID", key: "id", width: 60 },
+  {
+    title: "用户名",
+    key: "username",
+    width: 150,
+    render: (row) => h(Name, { user: row }),
+  },
+  {
+    title: "创建时间",
+    key: "create_time",
+    width: 200,
+    render: (row) => parseTime(row.create_time, "YYYY-MM-DD hh:mm:ss"),
+  },
+  {
+    title: "上次登录",
+    key: "last_login",
+    width: 200,
+    render: (row) =>
+      row.last_login
+        ? parseTime(row.last_login, "YYYY-MM-DD hh:mm:ss")
+        : "从未登录",
+  },
+  { title: "真名", key: "real_name", width: 100 },
+  { title: "邮箱", key: "email", width: 200 },
+  {
+    key: "edit",
+    width: 200,
+    render: (row) => h(Actions, { user: row }),
+  },
+]
+
+async function listUsers() {
+  const offset = (query.page - 1) * query.limit
+  const res = await getUserList(offset, query.limit, query.keyword)
+  total.value = res.data.total
+  users.value = res.data.results
+}
+
+onMounted(listUsers)
+watch(query, listUsers, { deep: true })
+</script>
 
 <template>
-  <div>user list</div>
+  <n-form inline label-placement="left">
+    <n-form-item>
+      <n-input placeholder="请输入关键字搜索" v-model:value="query.keyword" />
+    </n-form-item>
+  </n-form>
+  <n-data-table :data="users" :columns="columns" size="small" striped />
+  <Pagination
+    :total="total"
+    v-model:limit="query.limit"
+    v-model:page="query.page"
+  />
 </template>
 
 <style scoped></style>