diff --git a/apps/admin/src/locales/langs/en-us.ts b/apps/admin/src/locales/langs/en-us.ts index 80b9cf1..91e088a 100644 --- a/apps/admin/src/locales/langs/en-us.ts +++ b/apps/admin/src/locales/langs/en-us.ts @@ -255,6 +255,9 @@ const local: App.I18n.Schema = { 'user_rules': 'User Rules', 'user_groups': 'User Groups', 'user_home': 'User Home', + 'results_results-list': 'Results List', + 'results_results-detail': 'Results Detail', + 'test': 'Test', }, page: { login: { diff --git a/apps/admin/src/locales/langs/zh-cn.ts b/apps/admin/src/locales/langs/zh-cn.ts index 4df7841..587564c 100644 --- a/apps/admin/src/locales/langs/zh-cn.ts +++ b/apps/admin/src/locales/langs/zh-cn.ts @@ -251,6 +251,9 @@ const local: App.I18n.Schema = { 'user_rules': '用户规则', 'user_groups': '用户组', 'user_home': '用户首页', + 'results_results-list': '实时结果列表', + 'results_results-detail': '实时结果详情', + 'test': 'Test', }, page: { login: { diff --git a/apps/admin/src/router/elegant/imports.ts b/apps/admin/src/router/elegant/imports.ts index 4af0e85..d59d57f 100644 --- a/apps/admin/src/router/elegant/imports.ts +++ b/apps/admin/src/router/elegant/imports.ts @@ -28,7 +28,9 @@ export const views: Record Promise import("@/views/question-store/index.vue"), "rank_rank-detail": () => import("@/views/rank/rank-detail/index.vue"), "rank_rank-list": () => import("@/views/rank/rank-list/index.vue"), - results: () => import("@/views/results/index.vue"), + "results_results-detail-copy": () => import("@/views/results/results-detail-copy/index.vue"), + "results_results-detail": () => import("@/views/results/results-detail/index.vue"), + "results_results-list": () => import("@/views/results/results-list/index.vue"), "template_template-detail": () => import("@/views/template/template-detail/index.vue"), "template_template-list": () => import("@/views/template/template-list/index.vue"), test: () => import("@/views/test/index.vue"), diff --git a/apps/admin/src/router/elegant/routes.ts b/apps/admin/src/router/elegant/routes.ts index 9f3d763..ec175cf 100644 --- a/apps/admin/src/router/elegant/routes.ts +++ b/apps/admin/src/router/elegant/routes.ts @@ -179,13 +179,43 @@ export const generatedRoutes: GeneratedRoute[] = [ { name: 'results', path: '/results', - component: 'layout.base$view.results', + component: 'layout.base', meta: { title: 'results', i18nKey: 'route.results', icon: 'mdi:clipboard-check-multiple', order: 2 - } + }, + children: [ + { + name: 'results_results-detail', + path: '/results/results-detail', + component: 'view.results_results-detail', + meta: { + title: 'results_results-detail', + i18nKey: 'route.results_results-detail', + hideInMenu: true + } + }, + { + name: 'results_results-detail-copy', + path: '/results/results-detail-copy', + component: 'view.results_results-detail-copy', + meta: { + title: 'results_results-detail-copy', + i18nKey: 'route.results_results-detail-copy' + } + }, + { + name: 'results_results-list', + path: '/results/results-list', + component: 'view.results_results-list', + meta: { + title: 'results_results-list', + i18nKey: 'route.results_results-list' + } + } + ] }, { name: 'template', diff --git a/apps/admin/src/router/elegant/transform.ts b/apps/admin/src/router/elegant/transform.ts index a4e466e..4905f8b 100644 --- a/apps/admin/src/router/elegant/transform.ts +++ b/apps/admin/src/router/elegant/transform.ts @@ -179,6 +179,9 @@ const routeMap: RouteMap = { "rank_rank-detail": "/rank/rank-detail", "rank_rank-list": "/rank/rank-list", "results": "/results", + "results_results-detail": "/results/results-detail", + "results_results-detail-copy": "/results/results-detail-copy", + "results_results-list": "/results/results-list", "template": "/template", "template_template-detail": "/template/template-detail", "template_template-list": "/template/template-list", diff --git a/apps/admin/src/service/api/game.ts b/apps/admin/src/service/api/game.ts index a1eee49..0a72407 100644 --- a/apps/admin/src/service/api/game.ts +++ b/apps/admin/src/service/api/game.ts @@ -49,9 +49,9 @@ export function fetchSubmitQuestionResult(data: Api.Competition.QuestionAddParam } /** 获取游戏现场统计结果 */ -export function fetchGetGameStatistics(data: Api.Competition.QuestionAddParams) { +export function fetchGetGameStatistics(data: { TeamGroupID: number, QuestionID: number, QuestionDetaiID: number }) { return request({ - url: `/Base/ActivityMain/GetTeamQuestionUseByTeamGroupIDAndQuestionID/?RoomID=${data.RoomID}&MainID=${data.MainID}&TeamGroupID=${data.TeamGroupID}&QuestionID=${data.QuestionID}&QuestionDetaiID=${data.QuestionDetaiID}`, + url: `/Base/ActivityMain/GetTeamQuestionUseByTeamGroupIDAndQuestionID/?TeamGroupID=${data.TeamGroupID}&QuestionID=${data.QuestionID}&QuestionDetaiID=${data.QuestionDetaiID}`, method: 'post', data, }) @@ -84,3 +84,14 @@ export function fetchGetQuestionTableByActivityID(ActivityID: string) { method: 'get', }) } + +/** 根据 roomid查询当前正在比赛的题目 */ +export function fetchGetCurrentQuestionByRoomID(RoomID: number) { + return request>({ + url: `/Base/ActivityMain/SelectTask?RoomID=${RoomID}`, + method: 'post', + data: { + RoomID, + }, + }) +} diff --git a/apps/admin/src/typings/api/Competition.d.ts b/apps/admin/src/typings/api/Competition.d.ts index a165c14..8ddba17 100644 --- a/apps/admin/src/typings/api/Competition.d.ts +++ b/apps/admin/src/typings/api/Competition.d.ts @@ -67,6 +67,16 @@ declare namespace Api { Finished = 3, } + interface CompetitionItem { + Id: number + Name: string + StartTime: string + EndTime: string + TeamGroupNumber: number + PublishStatus: number + RoomID: number + } + /** room */ interface Room { /** room id */ diff --git a/apps/admin/src/typings/elegant-router.d.ts b/apps/admin/src/typings/elegant-router.d.ts index 56f5a14..e8047fb 100644 --- a/apps/admin/src/typings/elegant-router.d.ts +++ b/apps/admin/src/typings/elegant-router.d.ts @@ -33,6 +33,9 @@ declare module "@elegant-router/types" { "rank_rank-detail": "/rank/rank-detail"; "rank_rank-list": "/rank/rank-list"; "results": "/results"; + "results_results-detail": "/results/results-detail"; + "results_results-detail-copy": "/results/results-detail-copy"; + "results_results-list": "/results/results-list"; "template": "/template"; "template_template-detail": "/template/template-detail"; "template_template-list": "/template/template-list"; @@ -120,7 +123,9 @@ declare module "@elegant-router/types" { | "question-store" | "rank_rank-detail" | "rank_rank-list" - | "results" + | "results_results-detail-copy" + | "results_results-detail" + | "results_results-list" | "template_template-detail" | "template_template-list" | "test" diff --git a/apps/admin/src/views/competition/competition-add/index.vue b/apps/admin/src/views/competition/competition-add/index.vue index 9388827..7056837 100644 --- a/apps/admin/src/views/competition/competition-add/index.vue +++ b/apps/admin/src/views/competition/competition-add/index.vue @@ -150,14 +150,14 @@ async function submitForm() { activityID: 0, questionID: question.QuestionID, questionIndex: index, - actitvityQuestionName: question.ActitvityQuestionName, + actitvityQuestionName: question.ActitvityQuestionName || '', questionTime: question.QuestionTime, questionRule: question.QuestionRule, uiType: question.UIType, point: question.Point, templateID: question.TemplateID, roundType: round.roundType, - questionSubTitle: question.ActitvityQuestionName, + questionSubTitle: question.ActitvityQuestionName || '', }) }) }) diff --git a/apps/admin/src/views/competition/competition-list/index.vue b/apps/admin/src/views/competition/competition-list/index.vue index 80903c1..8f5ced3 100644 --- a/apps/admin/src/views/competition/competition-list/index.vue +++ b/apps/admin/src/views/competition/competition-list/index.vue @@ -1,25 +1,19 @@ @@ -109,7 +107,7 @@ onMounted(() => fetchActivityList()) - + diff --git a/apps/admin/src/views/competition/competition-list/modules/competition-card.vue b/apps/admin/src/views/competition/competition-list/modules/competition-card.vue index 72a40ba..defb615 100644 --- a/apps/admin/src/views/competition/competition-list/modules/competition-card.vue +++ b/apps/admin/src/views/competition/competition-list/modules/competition-card.vue @@ -1,24 +1,21 @@ + + + + diff --git a/apps/admin/src/views/results/results-detail/modules/GroupTabs.vue b/apps/admin/src/views/results/results-detail/modules/GroupTabs.vue new file mode 100644 index 0000000..22bc25a --- /dev/null +++ b/apps/admin/src/views/results/results-detail/modules/GroupTabs.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/apps/admin/src/views/results/results-detail/modules/TeamResultCard.vue b/apps/admin/src/views/results/results-detail/modules/TeamResultCard.vue new file mode 100644 index 0000000..a2f85b6 --- /dev/null +++ b/apps/admin/src/views/results/results-detail/modules/TeamResultCard.vue @@ -0,0 +1,114 @@ + + + + + diff --git a/apps/admin/src/views/results/results-list/index.vue b/apps/admin/src/views/results/results-list/index.vue new file mode 100644 index 0000000..c1cdab4 --- /dev/null +++ b/apps/admin/src/views/results/results-list/index.vue @@ -0,0 +1,64 @@ + + + + + diff --git a/apps/admin/src/views/user/analysis/index.vue b/apps/admin/src/views/user/analysis/index.vue index 2d09471..4fc9478 100644 --- a/apps/admin/src/views/user/analysis/index.vue +++ b/apps/admin/src/views/user/analysis/index.vue @@ -1,9 +1,10 @@ @@ -172,7 +157,7 @@ onBeforeUnmount(() => {
- 备注:由AI模型评判 + 备注:评委正在评分中,请等待。。。
@@ -180,43 +165,37 @@ onBeforeUnmount(() => { v-for="team in teams" :key="team.id" class="flex flex-col border-2 border-gray-200 rounded-xl bg-white/90 p-4 shadow-sm" > -
- {{ team.name }} +
+ {{ team.TeamName }} + 正确 {{ + team.correctCount }} + 积分 {{ team.Points + }}
-
-
- -
- (点击放大查看详情) +
+
-
+