diff --git a/src/api/competition.js b/src/api/competition.js index c6015bf8a..9f6b53b27 100644 --- a/src/api/competition.js +++ b/src/api/competition.js @@ -54,3 +54,12 @@ export function getIsSignUp(raceId) { }); } +/** 分页查询竞赛报名人员 */ +export function getRaceUserList(params) { + return request({ + url: `/api/race/${params.raceId}/raceUser`, + method: 'get', + params + }); +} + diff --git a/src/i18n/langs/zh/router.js b/src/i18n/langs/zh/router.js index 24ef91938..fc651d643 100644 --- a/src/i18n/langs/zh/router.js +++ b/src/i18n/langs/zh/router.js @@ -81,5 +81,6 @@ export default { refereeJManage: '仿真管理', homeJsxt: '首页', examDetail: '考试详情', - raceManage: '竞赛管理' + raceManage: '竞赛管理', + recaList: '报名列表' }; diff --git a/src/router/index_Common.js b/src/router/index_Common.js index af2fb7fd8..7446d4868 100644 --- a/src/router/index_Common.js +++ b/src/router/index_Common.js @@ -132,6 +132,7 @@ const JsxtApply = () => import('@/views/jsxt/apply/index'); // const theoryManage = () => import('@/views/jsxt/competition/theory/index'); const RefereeList = () => import('@/views/jsxt/refereeList/index'); const homeJsxt = () => import('@/views/jsxt/home/index'); +const RecaList = () => import('@/views/jsxt/reca/list'); import { GenerateRouteProjectList } from '@/scripts/ProjectConfig'; import { getSessionStorage } from '@/utils/auth'; @@ -304,6 +305,16 @@ export const publicAsyncRoute = [ component: Jlmap3d, hidden: true }, + { // 运行图编辑 + path: '/plan/usertool', + component: PlanMonitorEditUserTool, + hidden: true + }, + { // 运行图编辑 + path: '/plan/tool', + component: PlanMonitorEditTool, + hidden: true + }, { path: '/displayIscs/system', component: IscsSystem, @@ -505,20 +516,6 @@ export const asyncRouter = [ } ] }, - { // 运行图编辑 - path: '/plan/usertool', - component: PlanMonitorEditUserTool, - meta: { - }, - hidden: true - }, - { // 运行图编辑 - path: '/plan/tool', - component: PlanMonitorEditTool, - meta: { - }, - hidden: true - }, { // 发布内容管理 path: '/publish', component: Layout, @@ -1058,6 +1055,26 @@ export const JSXT = [ } } ] + }, + { + path: '/referee', + component: Layout, + meta: { + i18n: 'router.recaList', + roles: [user, admin] + }, + hidden: getSessionStorage('project') ? !getSessionStorage('project').endsWith('refereeJsxt') && !window.document.location.pathname.includes('refereeJsxt') : !window.document.location.pathname.includes('refereeJsxt'), + children: [ + { + path: 'recaList', + component: RecaList, + meta: { + i18n: 'router.recaList', + icon: 'design', + hidden: true + } + } + ] } ]; const createRouter = () => new Router({ diff --git a/src/views/jsxt/apply/index.vue b/src/views/jsxt/apply/index.vue index 692941fb9..06b5f0de3 100644 --- a/src/views/jsxt/apply/index.vue +++ b/src/views/jsxt/apply/index.vue @@ -300,7 +300,6 @@ export default { }, handleApply() { this.$refs.dataform.validateForm(() => { - console.log(this.formModel, '内容'); const param = { department: this.formModel.department, idNumber: this.formModel.numberId, diff --git a/src/views/jsxt/reca/list.vue b/src/views/jsxt/reca/list.vue new file mode 100644 index 000000000..8370ceaf6 --- /dev/null +++ b/src/views/jsxt/reca/list.vue @@ -0,0 +1,143 @@ + + + + + diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 7cc676be5..2e2bc3e88 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -335,12 +335,10 @@ export default { this.loading = false; this.tipsMsg = ''; removeSessionStorage('againEnter'); - console.log(this.$route.query, this.$route.query.raceId); if (this.$route.query.raceId) { getIsSignUp(this.$route.query.raceId).then(res => { this.$router.push({ path: this.path }); - }).catch(error => { - console.log(error, '错误'); + }).catch(() => { this.$messageBox('您未报名该竞赛,所以无法进入竞赛系统'); }); } else if (!this.$route.path.includes('jsxt/login')) {