diff --git a/src/oj/composables/code.ts b/src/oj/composables/code.ts
new file mode 100644
index 0000000..1df1da9
--- /dev/null
+++ b/src/oj/composables/code.ts
@@ -0,0 +1,6 @@
+import { Code } from "~/utils/types"
+
+export const code = reactive<Code>({
+  value: "",
+  language: "C",
+})
diff --git a/src/oj/problem/components/Editor.vue b/src/oj/problem/components/Editor.vue
index 1035e9c..146605b 100644
--- a/src/oj/problem/components/Editor.vue
+++ b/src/oj/problem/components/Editor.vue
@@ -3,7 +3,7 @@ import { TabsPaneContext } from "element-plus"
 import { SOURCES } from "utils/constants"
 import { Problem } from "utils/types"
 import Monaco from "~/shared/Monaco/index.vue"
-import { useCodeStore } from "oj/store/code"
+import { code } from "oj/composables/code"
 
 const SubmitPanel = defineAsyncComponent(() => import("./SubmitPanel.vue"))
 const TestcasePanel = defineAsyncComponent(() => import("./TestcasePanel.vue"))
@@ -14,8 +14,6 @@ interface Props {
 
 const props = defineProps<Props>()
 
-const { code } = useCodeStore()
-
 code.language = props.problem.languages[0] || "C"
 code.value = props.problem.template[code.language] || SOURCES[code.language]
 
diff --git a/src/oj/problem/components/ProblemContent.vue b/src/oj/problem/components/ProblemContent.vue
index c31aef5..016c7a5 100644
--- a/src/oj/problem/components/ProblemContent.vue
+++ b/src/oj/problem/components/ProblemContent.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { Flag, CloseBold, Select, CopyDocument } from "@element-plus/icons-vue"
 import copy from "copy-text-to-clipboard"
-import { useCodeStore } from "oj/store/code"
+import { code } from "oj/composables/code"
 import { SOURCES } from "utils/constants"
 import { Problem, ProblemStatus } from "utils/types"
 import { createTestSubmission } from "utils/judge"
@@ -33,7 +33,6 @@ const samples = ref<Sample[]>(
     loading: false,
   }))
 )
-const { code } = useCodeStore()
 
 const disabled = computed(
   () =>
diff --git a/src/oj/problem/components/SubmitPanel.vue b/src/oj/problem/components/SubmitPanel.vue
index 48d4e9f..51ddc11 100644
--- a/src/oj/problem/components/SubmitPanel.vue
+++ b/src/oj/problem/components/SubmitPanel.vue
@@ -5,12 +5,11 @@ import { SOURCES, JUDGE_STATUS, SubmissionStatus } from "utils/constants"
 import { submissionMemoryFormat, submissionTimeFormat } from "utils/functions"
 import { Problem, Submission, SubmitCodePayload } from "utils/types"
 import { getSubmission, submitCode } from "oj/api"
-import { useCodeStore } from "oj/store/code"
+import { code } from "oj/composables/code"
 
 import SubmissionResultTag from "../../components/SubmissionResultTag.vue"
 
 const problem = inject<Ref<Problem>>("problem")
-const { code } = useCodeStore()
 
 const route = useRoute()
 const contestID = <string>route.params.contestID ?? ""
diff --git a/src/oj/problem/components/TestcasePanel.vue b/src/oj/problem/components/TestcasePanel.vue
index d665a1f..aee0419 100644
--- a/src/oj/problem/components/TestcasePanel.vue
+++ b/src/oj/problem/components/TestcasePanel.vue
@@ -1,10 +1,9 @@
 <script setup lang="ts">
 import { createTestSubmission } from "utils/judge"
-import { useCodeStore } from "oj/store/code"
+import { code } from "oj/composables/code"
 
 const input = ref("")
 const result = ref("")
-const { code } = useCodeStore()
 
 async function submit() {
   const res = await createTestSubmission(code, input.value)
diff --git a/src/oj/problem/list.vue b/src/oj/problem/list.vue
index a940a09..8d1092b 100644
--- a/src/oj/problem/list.vue
+++ b/src/oj/problem/list.vue
@@ -5,6 +5,26 @@ import { isDesktop } from "~/shared/composables/breakpoints"
 import { getProblemList, getProblemTagList, getRandomProblemID } from "oj/api"
 
 import Pagination from "~/shared/Pagination/index.vue"
+import { DataTableColumn, NIcon, NSpace, NTag, useThemeVars } from "naive-ui"
+import { Select, SemiSelect } from "@element-plus/icons-vue"
+
+interface Query {
+  keyword: string
+  difficulty: string
+  tag: string
+  page: number
+  limit: number
+}
+
+interface ProblemFiltered {
+  _id: string
+  title: string
+  difficulty: "简单" | "中等" | "困难"
+  tags: string[]
+  submission: number
+  rate: string
+  status: "not_test" | "passed" | "failed"
+}
 
 const difficultyOptions = [
   { label: "全部", value: "" },
@@ -15,24 +35,30 @@ const difficultyOptions = [
 
 const router = useRouter()
 const route = useRoute()
+const theme = useThemeVars()
 const userStore = useUserStore()
-const problems = ref([])
+const problems = ref<ProblemFiltered[]>([])
 const total = ref(0)
 
-const { data: tags } = getProblemTagList()
+const { data } = getProblemTagList()
 
-const query = reactive({
-  keyword: route.query.keyword ?? "",
-  difficulty: route.query.difficulty ?? "",
-  tag: route.query.tag ?? "",
+const tagOptions = computed(() => [
+  { label: "全部", value: "" },
+  ...(data.value?.map((t) => ({ label: t.name, value: t.name })) || []),
+])
+
+const query = reactive<Query>({
+  keyword: <string>route.query.keyword ?? "",
+  difficulty: <string>route.query.difficulty ?? "",
+  tag: <string>route.query.tag ?? "",
   page: parseInt(<string>route.query.page) || 1,
   limit: parseInt(<string>route.query.limit) || 10,
 })
 
 async function listProblems() {
-  query.keyword = route.query.keyword ?? ""
-  query.difficulty = route.query.difficulty ?? ""
-  query.tag = route.query.tag ?? ""
+  query.keyword = <string>route.query.keyword ?? ""
+  query.difficulty = <string>route.query.difficulty ?? ""
+  query.tag = <string>route.query.tag ?? ""
   query.page = parseInt(<string>route.query.page) || 1
   query.limit = parseInt(<string>route.query.limit) || 10
 
@@ -54,17 +80,14 @@ function routerPush() {
   })
 }
 
-function search() {
-  query.page = 1
-  routerPush()
+function search(value: string) {
+  query.keyword = value
 }
 
 function clear() {
   query.keyword = ""
   query.tag = ""
   query.difficulty = ""
-  query.page = 1
-  routerPush()
 }
 
 async function getRandom() {
@@ -72,14 +95,10 @@ async function getRandom() {
   router.push("/problem/" + res.data)
 }
 
-function goProblem(row: any) {
-  router.push("/problem/" + row._id)
-}
-
 watch(() => query.page, routerPush)
 
 watch(
-  () => [query.tag, query.difficulty, query.limit],
+  () => [query.tag, query.difficulty, query.limit, query.keyword],
   () => {
     query.page = 1
     routerPush()
@@ -97,90 +116,86 @@ watch(
 watch(() => userStore.isFinished && userStore.isAuthed, listProblems)
 
 onMounted(listProblems)
+
+const columns: DataTableColumn<ProblemFiltered>[] = [
+  {
+    title: "状态",
+    key: "status",
+    width: 80,
+    render: (row) => {
+      if (row.status === "passed") {
+        return h(NIcon, { color: theme.value.successColor }, () => h(Select))
+      } else if (row.status === "failed") {
+        return h(NIcon, { color: theme.value.errorColor }, () => h(SemiSelect))
+      } else {
+        return null
+      }
+    },
+  },
+  { title: "编号", key: "_id", width: 100 },
+  { title: "标题", key: "title", minWidth: 200 },
+  {
+    title: "难度",
+    key: "difficulty",
+    width: 100,
+    render: (row) =>
+      h(NTag, { type: getTagColor(row.difficulty) }, () => row.difficulty),
+  },
+  {
+    title: "标签",
+    key: "tags",
+    width: 260,
+    render: (row) =>
+      h(NSpace, () => row.tags.map((t) => h(NTag, { key: t }, () => t))),
+  },
+  { title: "提交数", key: "submission", width: 100 },
+  { title: "通过率", key: "rate", width: 100 },
+]
+
+function rowProps(row: ProblemFiltered) {
+  return {
+    style: "cursor: pointer",
+    onClick() {
+      router.push("/problem/" + row._id)
+    },
+  }
+}
 </script>
 
 <template>
-  <el-form inline>
-    <el-form-item label="难度">
-      <el-select v-model="query.difficulty">
-        <el-option
-          v-for="item in difficultyOptions"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        >
-        </el-option>
-      </el-select>
-    </el-form-item>
-    <el-form-item label="标签">
-      <el-select v-model="query.tag" clearable>
-        <el-option
-          v-for="item in tags"
-          :key="item.id"
-          :label="item.name"
-          :value="item.name"
-        >
-        </el-option>
-      </el-select>
-    </el-form-item>
-    <el-form-item label="搜索">
-      <el-input
-        v-model="query.keyword"
-        placeholder="输入编号或标题后回车"
-        clearable
-        @change="search"
+  <n-form :inline="isDesktop" label-placement="left">
+    <n-form-item label="难度">
+      <n-select
+        class="select"
+        v-model:value="query.difficulty"
+        :options="difficultyOptions"
       />
-    </el-form-item>
-    <el-form-item>
-      <el-button type="" @click="clear">重置</el-button>
-      <el-button type="" @click="getRandom">随机一题</el-button>
-    </el-form-item>
-  </el-form>
-  <el-table class="pointer" :data="problems" stripe @row-click="goProblem">
-    <el-table-column v-if="isDesktop" label="状态" :width="80">
-      <template #default="scope">
-        <el-icon
-          v-if="scope.row.status === 'passed'"
-          color="var(--el-color-success)"
-          ><i-ep-select
-        /></el-icon>
-        <el-icon
-          v-if="scope.row.status === 'failed'"
-          color="var(--el-color-error)"
-          ><i-ep-semi-select
-        /></el-icon>
-      </template>
-    </el-table-column>
-    <el-table-column prop="_id" label="编号" :width="isDesktop ? 100 : 60" />
-    <el-table-column prop="title" label="标题" />
-    <el-table-column label="难度" width="100">
-      <template #default="scope">
-        <el-tag disable-transitions :type="getTagColor(scope.row.difficulty)">
-          {{ scope.row.difficulty }}
-        </el-tag>
-      </template>
-    </el-table-column>
-    <el-table-column v-if="isDesktop" label="标签" :width="200">
-      <template #default="scope">
-        <el-space>
-          <el-tag
-            disable-transitions
-            v-for="tag in scope.row.tags"
-            :key="tag"
-            type="info"
-            >{{ tag }}</el-tag
-          >
-        </el-space>
-      </template>
-    </el-table-column>
-    <el-table-column
-      v-if="isDesktop"
-      prop="submission"
-      label="提交数"
-      width="100"
-    />
-    <el-table-column v-if="isDesktop" prop="rate" label="通过率" width="100" />
-  </el-table>
+    </n-form-item>
+    <n-form-item label="标签">
+      <n-select
+        class="select"
+        v-model:value="query.tag"
+        :options="tagOptions"
+        clearable
+      />
+    </n-form-item>
+    <n-form-item label="搜索">
+      <n-input placeholder="输入编号或标题后回车" clearable @change="search" />
+    </n-form-item>
+    <n-form-item>
+      <n-space>
+        <n-button @click="clear">重置</n-button>
+        <n-button @click="getRandom">随机一题</n-button>
+      </n-space>
+    </n-form-item>
+  </n-form>
+  <n-data-table
+    striped
+    size="small"
+    :data="problems"
+    :columns="columns"
+    :row-props="rowProps"
+  />
   <Pagination
     :total="total"
     v-model:limit="query.limit"
@@ -189,7 +204,7 @@ onMounted(listProblems)
 </template>
 
 <style scoped>
-.pointer {
-  cursor: pointer;
+.select {
+  width: 120px;
 }
 </style>
diff --git a/src/oj/store/code.ts b/src/oj/store/code.ts
deleted file mode 100644
index c937782..0000000
--- a/src/oj/store/code.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Code } from "utils/types"
-
-export const useCodeStore = defineStore("code", () => {
-  const code = reactive<Code>({
-    value: "",
-    language: "C",
-  })
-
-  return { code }
-})
diff --git a/src/utils/functions.ts b/src/utils/functions.ts
index da0a3c9..201dc07 100644
--- a/src/utils/functions.ts
+++ b/src/utils/functions.ts
@@ -22,14 +22,16 @@ export function buildProblemCodeKey(problemID: string, contestID = "") {
   return `${STORAGE_KEY.PROBLEM_CODE}_NaN_${problemID}`
 }
 
-export function getTagColor(tag: "Low" | "Mid" | "High") {
-  return {
+export function getTagColor(
+  tag: "Low" | "Mid" | "High" | "简单" | "中等" | "困难"
+) {
+  return <"success" | "info" | "error">{
     Low: "success",
-    Mid: "",
-    High: "danger",
+    Mid: "info",
+    High: "error",
     简单: "success",
-    中等: "",
-    困难: "danger",
+    中等: "info",
+    困难: "error",
   }[tag]
 }