xuyue/ojnext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix.

Browse Source
This commit is contained in:
yuetsh
2023-04-04 11:46:28 +08:00
parent ae621b7dd2
commit 2066cb441b
18 changed files with 210 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/oj/contest/components/ContestInfo.vue
View File

@@ -1,7 +1,7 @@
<script setup lang="ts">
import { parseTime } from "utils/functions"
import { useContestStore } from "oj/store/contest"
import ContestTypeVue from "~/shared/ContestType.vue"
import ContestType from "~/shared/ContestType.vue"
const contestStore = useContestStore()
</script>
@@ -27,7 +27,7 @@ const contestStore = useContestStore()
{{ parseTime(contestStore.contest.end_time, "YYYY年M月D日 hh:mm:ss") }}
</n-descriptions-item>
<n-descriptions-item label="比赛类型">
<ContestTypeVue :contest="contestStore.contest" />
<ContestType :contest="contestStore.contest" />
</n-descriptions-item>
<n-descriptions-item label="发起人">
{{ contestStore.contest.created_by.username }}

15
src/oj/contest/detail.vue
View File

@@ -29,14 +29,17 @@ const passwordFormVisible = computed(
</script>
<template>
<div v-if="contestStore.contest">
<n-space class="title" align="center" justify="space-between">
<n-space vertical v-if="contestStore.contest">
<n-space align="center" justify="space-between">
<n-space align="center">
<h2 class="contestTitle">{{ contestStore.contest.title }}</h2>
<n-icon size="large" v-if="contestStore.isPrivate" class="lockIcon">
<i-ep-lock />
</n-icon>
<n-tag :type="CONTEST_STATUS[contestStore.contestStatus]['type']">
<n-tag
size="small"
:type="CONTEST_STATUS[contestStore.contestStatus]['type']"
>
{{ contestStore.countdown }}
</n-tag>
</n-space>
@@ -67,14 +70,10 @@ const passwordFormVisible = computed(
</n-form-item>
</n-form>
<router-view></router-view>
</div>
</n-space>
</template>
<style scoped>
.title {
margin-bottom: 16px;
}
.contestTitle {
font-weight: 500;
margin: 0;

48
src/oj/contest/list.vue
View File

@@ -119,31 +119,29 @@ function rowProps(row: Contest) {
}
</script>
<template>
<n-form label-placement="left" :inline="isDesktop">
<n-form-item label="状态">
<n-select
class="select"
:options="options"
v-model:value="query.status"
/>
</n-form-item>
<n-form-item label="搜索比赛标题">
<n-input placeholder="输入后回车或点击搜索" clearable @change="search" />
</n-form-item>
<n-form-item>
<n-space>
<n-button @click="search(query.keyword)">搜索</n-button>
<n-button @click="clear">重置</n-button>
</n-space>
</n-form-item>
</n-form>
<n-data-table
size="small"
striped
:columns="columns"
:data="data"
:row-props="rowProps"
/>
<n-space>
<n-form :show-feedback="false" label-placement="left" inline>
<n-form-item label="比赛状态">
<n-select
class="select"
:options="options"
v-model:value="query.status"
/>
</n-form-item>
<n-form-item label="搜索">
<n-input clearable @change="search" />
</n-form-item>
</n-form>
<n-form label-placement="left" inline>
<n-form-item>
<n-space>
<n-button @click="search(query.keyword)">搜索</n-button>
<n-button @click="clear">重置</n-button>
</n-space>
</n-form-item>
</n-form>
</n-space>
<n-data-table striped :columns="columns" :data="data" :row-props="rowProps" />
<Pagination
v-model:limit="query.limit"
v-model:page="query.page"

1
src/oj/contest/pages/problems.vue
View File

@@ -34,7 +34,6 @@ function rowProps(row: ProblemFiltered) {
<template>
<n-data-table
striped
size="small"
:data="contestStore.problems"
:columns="problemsColumns"
:row-props="rowProps"

1
src/oj/contest/pages/rank.vue
View File

@@ -165,7 +165,6 @@ onMounted(() => {
striped
:single-line="false"
:scroll-x="1200"
size="small"
:columns="columns"
:data="data"
/>

30
src/oj/problem/components/ProblemContent.vue
View File

@@ -1,5 +1,4 @@
<script setup lang="ts">
import { Promotion, CloseBold, Select } from "@element-plus/icons-vue"
import Copy from "~/shared/Copy.vue"
import { code } from "oj/composables/code"
import { SOURCES } from "utils/constants"
@@ -78,18 +77,22 @@ async function test(sample: Sample, index: number) {
})
}
const icon = (status: ProblemStatus) =>
({
not_test: Promotion,
failed: CloseBold,
passed: Select,
}[status])
const type = (status: ProblemStatus) =>
({
function label(status: ProblemStatus, loading: boolean) {
if (loading) return "测试中"
return {
not_test: "测试",
failed: "不通过",
passed: "通过",
}[status]
}
function type(status: ProblemStatus) {
return {
not_test: "",
failed: "error",
passed: "success",
}[status] as "warning" | "error" | "success")
}[status] as "warning" | "error" | "success"
}
</script>
<template>
@@ -120,15 +123,12 @@ const type = (status: ProblemStatus) =>
<n-tooltip trigger="hover">
<template #trigger>
<n-button
size="small"
:type="type(sample.status)"
:disabled="disabled"
:loading="sample.loading"
circle
@click="test(sample, index)"
>
<template #icon>
<component :is="icon(sample.status)"></component>
</template>
{{ label(sample.status, sample.loading) }}
</n-button>
</template>
点击测试

2
src/oj/problem/components/ProblemInfo.vue
View File

@@ -65,7 +65,7 @@ const options = {
</n-descriptions-item>
<n-descriptions-item :span="3" label="标签">
<n-space>
<n-tag type="info" v-for="tag in problem.tags" :key="tag">
<n-tag size="small" type="info" v-for="tag in problem.tags" :key="tag">
{{ tag }}
</n-tag>
</n-space>

1
src/oj/problem/components/Submit.vue
View File

@@ -227,7 +227,6 @@ watch(
<n-card v-if="msg" embedded class="msg">{{ msg }}</n-card>
<n-data-table
v-if="infoTable.length"
size="small"
striped
:data="infoTable"
:columns="columns"

14
src/oj/problem/list.vue
View File

@@ -2,7 +2,6 @@
import { useUserStore } from "~/shared/store/user"
import { filterEmptyValue, getTagColor } from "utils/functions"
import { ProblemFiltered } from "utils/types"
import { isMobile } from "~/shared/composables/breakpoints"
import { getProblemList, getRandomProblemID } from "oj/api"
import Pagination from "~/shared/Pagination.vue"
import { DataTableColumn, NSpace, NTag } from "naive-ui"
@@ -169,8 +168,8 @@ function rowProps(row: ProblemFiltered) {
</script>
<template>
<n-space :vertical="isMobile">
<n-form inline label-placement="left">
<n-space>
<n-form :show-feedback="false" inline label-placement="left">
<n-form-item label="难度">
<n-select
class="select"
@@ -178,12 +177,8 @@ function rowProps(row: ProblemFiltered) {
:options="difficultyOptions"
/>
</n-form-item>
<n-form-item>
<n-input
placeholder="输入编号或标题后回车"
clearable
@change="search"
/>
<n-form-item label="搜索">
<n-input clearable @change="search" />
</n-form-item>
</n-form>
<n-form inline label-placement="left">
@@ -212,7 +207,6 @@ function rowProps(row: ProblemFiltered) {
<n-data-table
class="table"
striped
size="small"
:data="problems"
:columns="columns"
:row-props="rowProps"

8
src/oj/rank/components/Chart.vue
View File

@@ -69,6 +69,7 @@ const data = computed(() => ({
}))
const options = {
maintainAspectRatio: false,
plugins: {
title: {
text: "全校前十名的用户（不包括超管）",
@@ -79,10 +80,13 @@ const options = {
}
</script>
<template>
<Bar class="chart" :data="data" :options="options" />
<div class="chart">
<Bar :data="data" :options="options" />
</div>
</template>
<style scoped>
.chart {
margin-bottom: 24px;
height: 400px;
margin-bottom: 20px;
}
</style>

2
src/oj/rank/list.vue
View File

@@ -73,7 +73,7 @@ onMounted(listRanks)
<template>
<Chart v-if="!!chart.length" :rankData="chart" />
<n-data-table striped size="small" :data="data" :columns="columns" />
<n-data-table striped :data="data" :columns="columns" />
<Pagination
:total="total"
v-model:page="query.page"

11
src/oj/submission/detail.vue
View File

@@ -67,7 +67,12 @@ onMounted(init)
</n-alert>
<n-card embedded>
<n-space justify="end">
<n-button type="primary" @click="handleCopy(submission!.code)">
<n-button
quaternary
class="copyBtn"
type="primary"
@click="handleCopy(submission!.code)"
>
{{ copied ? "已复制" : "复制代码" }}
</n-button>
</n-space>
@@ -90,4 +95,8 @@ onMounted(init)
.code {
font-size: 20px;
}
.copyBtn {
margin-bottom: 16px;
}
</style>

50
src/oj/submission/list.vue
View File

@@ -128,6 +128,7 @@ const columns = computed(() => {
{
title: "编号",
key: "id",
minWidth: 160,
render: (row) => {
if (row.show_link) {
return h(
@@ -215,6 +216,7 @@ const columns = computed(() => {
h(
NButton,
{
quaternary: true,
size: "small",
type: "primary",
onClick: () => rejudge(row.id),
@@ -227,28 +229,32 @@ const columns = computed(() => {
})
</script>
<template>
<n-form :inline="isDesktop" label-placement="left">
<n-form-item label="提交状态">
<n-select
class="select"
v-model:value="query.result"
:options="options"
/>
</n-form-item>
<n-form-item label="只看自己">
<n-switch v-model:value="query.myself" />
</n-form-item>
<n-form-item label="搜索用户">
<n-input @change="search" clearable placeholder="输入后回车或点击搜索" />
</n-form-item>
<n-form-item>
<n-space>
<n-button @click="search(query.username)">搜索</n-button>
<n-button @click="clear">重置</n-button>
</n-space>
</n-form-item>
</n-form>
<n-data-table striped size="small" :columns="columns" :data="submissions" />
<n-space>
<n-form :show-feedback="false" inline label-placement="left">
<n-form-item label="提交状态">
<n-select
class="select"
v-model:value="query.result"
:options="options"
/>
</n-form-item>
<n-form-item label="只看自己">
<n-switch v-model:value="query.myself" />
</n-form-item>
</n-form>
<n-form inline label-placement="left">
<n-form-item label="搜索用户">
<n-input clearable @change="search" />
</n-form-item>
<n-form-item>
<n-space>
<n-button @click="search(query.username)">搜索</n-button>
<n-button @click="clear">重置</n-button>
</n-space>
</n-form-item>
</n-form>
</n-space>
<n-data-table striped :columns="columns" :data="submissions" />
<Pagination
:total="total"
v-model:limit="query.limit"