From 9eeaf605d74415e9488d24e9ad75e094676d5581 Mon Sep 17 00:00:00 2001 From: tianea Date: Fri, 25 Mar 2022 14:22:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=81=E4=BB=93=E8=82=A1=E7=A5=A8=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/api/competition.js | 22 ++ front/src/components/index.vue | 214 +++++--------- front/src/utils/auth.js | 15 +- front/src/views/competition/first.vue | 156 ++++------ front/src/views/competition/ranking.vue | 5 + front/src/views/dialog/confirmdialog.vue | 57 ++++ front/src/views/system/cutdown.vue | 31 +- front/src/views/system/exam.vue | 266 +++++++++++++----- front/src/views/system/index.vue | 7 +- front/src/views/system/portrait.vue | 12 +- .../api/biz/CompetitionExamBiz.java | 160 ++++++++++- 11 files changed, 602 insertions(+), 343 deletions(-) create mode 100644 front/src/views/dialog/confirmdialog.vue diff --git a/front/src/api/competition.js b/front/src/api/competition.js index 472c698..d9faf21 100644 --- a/front/src/api/competition.js +++ b/front/src/api/competition.js @@ -24,4 +24,26 @@ export function submit(compId,stageId,qList){ qList: qList } }) +} +export function position(q){ + return request({ + url: baseUrl+ "position", + method: 'get', + params: q + }) +} + +export function get(q){ + return request({ + url: baseUrl+ "get", + method: 'get', + params: q + }) +} +export function startExam(q){ + return request({ + url: authUrl+ "exam/start", + method: 'get', + params: q + }) } \ No newline at end of file diff --git a/front/src/components/index.vue b/front/src/components/index.vue index 5f8e72a..d64ca8c 100644 --- a/front/src/components/index.vue +++ b/front/src/components/index.vue @@ -27,8 +27,8 @@ - - + + @@ -37,11 +37,11 @@
- 2021年全国高职金融模拟交易大赛 + {{ item.name}}
- 主办方:全国金融职业教育教学指导委员会 + 主办方:{{ item.sponsor}}
@@ -59,72 +59,18 @@
-
比赛时间:2022-05-20 16:002022-05-20 17:00
-
报名时间:2022-05-20 16:002022-05-20 17:00
+
比赛时间:{{ new Date(item.startTime).Format('yyyy-MM-dd') }}{{ new Date(item.endTime).Format('yyyy-MM-dd')}}
+
报名时间:{{ new Date(item.signupStartTime).Format('yyyy-MM-dd')}}{{ new Date(item.signupStartTime).Format('yyyy-MM-dd')}}
- + - + - 团队赛报名中 - - - -
- -
-
-
- - - - - - - - -
-
-
- - 2021年全国高职金融模拟交易大赛 -
-
- - 主办方:全国金融职业教育教学指导委员会 -
-
-
- -
-
-
-
-
- - -
-
-
- -
-
-
比赛时间:2022-05-20 16:002022-05-20 17:00
-
报名时间:2022-05-20 16:002022-05-20 17:00
-
-
-
- - - - - - - 个人赛报名中 + {{ item.type == 2?'个人赛':'团队赛' }}{{getStatus(item)}} @@ -212,13 +158,13 @@
- - -
+ + +
-
- - 团体赛 +
+ + {{ item.type == 1?'团体赛':'个人赛'}}
已结束 @@ -231,11 +177,11 @@
@@ -243,82 +189,8 @@
-
比赛时间:05/20 16:00 至 05/20 17:00
-
报名时间:05/20 16:00 至 05/20 17:00
-
-
-
-
- - -
-
-
- - 团体赛 -
-
- 已结束 -
-
-
- -
- -
-
- -
-
-
- - 个人赛 -
-
- 已结束 -
-
-
- -
- @@ -331,12 +203,30 @@ diff --git a/front/src/views/dialog/confirmdialog.vue b/front/src/views/dialog/confirmdialog.vue new file mode 100644 index 0000000..81d0f21 --- /dev/null +++ b/front/src/views/dialog/confirmdialog.vue @@ -0,0 +1,57 @@ + + + \ No newline at end of file diff --git a/front/src/views/system/cutdown.vue b/front/src/views/system/cutdown.vue index e2c8d61..4f64d49 100644 --- a/front/src/views/system/cutdown.vue +++ b/front/src/views/system/cutdown.vue @@ -14,18 +14,9 @@ export default { created(){ this.startTime = new Date(this.start) this.endTime = new Date(this.end) - - }, mounted(){ - let end = setInterval(() => { - - }, 3000); - for(var i = 0;i<=end;i++){ - clearInterval(i); - } - console.log("cutDown component mounted") - this.cutDownManger = setInterval(this.cutDown,1000) + }, props:{ start:{ @@ -37,6 +28,17 @@ export default { default: null } }, + watch:{ + start(val){ + this.startTime = new Date(this.start) + console.log("cutDown startTime:"+this.startTime) + }, + end(val){ + this.endTime = new Date(this.end) + console.log("cutDown endTime:"+this.endTime) + this.initCutDown() + } + }, data(){ return { startTime: null, @@ -50,6 +52,15 @@ export default { } }, methods:{ + initCutDown(){ + let end = setInterval(() => { + + }, 3000); + for(var i = 0;i<=end;i++){ + clearInterval(i); + } + this.cutDownManger = setInterval(this.cutDown,1000) + }, cutDown(){ let now = new Date() // console.log(this.cutDownManger) diff --git a/front/src/views/system/exam.vue b/front/src/views/system/exam.vue index 17357d6..0faa041 100644 --- a/front/src/views/system/exam.vue +++ b/front/src/views/system/exam.vue @@ -7,12 +7,12 @@
- +
- 2020年全国高职财经大数据分析大赛--金融实操赛项 + {{ competition.name}}--金融实操赛项
交卷 @@ -22,9 +22,9 @@
-
产品研究部试用吴京和
+
{{userInfo.school +' '+ userInfo.name}}
- 考试日期: {{new Date().Format("yyyy-MM-dd")}} + 考试日期: {{examInfo.startTime}}
@@ -68,7 +68,7 @@
@@ -114,17 +114,17 @@
-
案例名称:
-
- {{cq.id}}.{{cq.item.stem}} +
案例名称:
+
+ {{cq.item.stem}}
-
案例介绍:
-
- +
案例介绍:
+
+
{{subcq.id}}.{{subcq.stem}} @@ -148,17 +148,39 @@
+