|
|
|
|
@ -83,8 +83,8 @@ |
|
|
|
|
<p>比赛时间：{{ rule.startTime && rule.startTime + ' ~ ' + rule.endTime }}</p> |
|
|
|
|
<p>比赛方式：{{ methods.find(e => e.id == rule.method) && methods.find(e => e.id == rule.method).name }}</p> |
|
|
|
|
<p v-if="rule.method != 2">课程系统：{{ rule.systemName }}</p> |
|
|
|
|
<p v-if="rule.onlineButton && rule.method != 2">线下地点：{{ rule.onlineAddress }}</p> |
|
|
|
|
<p v-if="rule.offlineButton">比赛地点：{{ rule.offlineAddress }}</p> |
|
|
|
|
<p v-if="rule.onlineButton && rule.method != 2">线上地点：{{ rule.onlineAddress }}</p> |
|
|
|
|
<p v-if="rule.offlineButton">线下地点：{{ rule.offlineAddress }}</p> |
|
|
|
|
<template v-if="rule.method === 2"> |
|
|
|
|
<p>比赛地点：{{ rule.offlineAddress }}</p> |
|
|
|
|
<p>比赛内容：{{ rule.contentDescription }}</p> |
|
|
|
|
@ -624,7 +624,8 @@ |
|
|
|
|
width="600px" |
|
|
|
|
@close="stageClose"> |
|
|
|
|
<template v-if="curStage && curStage.competitionStageContentSetting"> |
|
|
|
|
<div v-if="curStage.competitionStageContentSetting.systemLink"> |
|
|
|
|
<div v-if="curStage.competitionStageContentSetting.systemLink" |
|
|
|
|
class="m-b-20"> |
|
|
|
|
<span class="fs-14">进入比赛：</span> |
|
|
|
|
<el-button type="danger" |
|
|
|
|
style="font-size: 13px" |
|
|
|
|
@ -768,6 +769,7 @@ export default { |
|
|
|
|
whetherSignUp: 1 |
|
|
|
|
}, |
|
|
|
|
curStage: null, |
|
|
|
|
choosing: false, |
|
|
|
|
originInfo: {}, |
|
|
|
|
info: { |
|
|
|
|
isCaption: 0, |
|
|
|
|
@ -897,7 +899,7 @@ export default { |
|
|
|
|
let signUpEndTime = new Date(this.core.dateCompatible(form.signUpEndTime)) // 报名结束时间 |
|
|
|
|
let playStartTime = new Date(this.core.dateCompatible(form.playStartTime)) // 比赛开始时间 |
|
|
|
|
let playEndTime = new Date(this.core.dateCompatible(form.playEndTime)) // 比赛结束时间 |
|
|
|
|
// this.timer = setInterval(() => { |
|
|
|
|
this.timer = setInterval(() => { |
|
|
|
|
const now = new Date() |
|
|
|
|
if (now < signUpStartTime) { // 报名没开始 |
|
|
|
|
status = 0 |
|
|
|
|
@ -966,7 +968,7 @@ export default { |
|
|
|
|
} |
|
|
|
|
this.endList[4] = endText |
|
|
|
|
} |
|
|
|
|
this.curStage = curStage |
|
|
|
|
if (!this.choosing) this.curStage = curStage |
|
|
|
|
} else { // 仅发布信息 |
|
|
|
|
total = playEndTime - now |
|
|
|
|
} |
|
|
|
|
@ -989,7 +991,7 @@ export default { |
|
|
|
|
} else if (this.status === 5) { // 竞赛结束，清除定时器 |
|
|
|
|
clearInterval(this.timer) |
|
|
|
|
} |
|
|
|
|
// }, 1000) |
|
|
|
|
}, 1000) |
|
|
|
|
}, |
|
|
|
|
// 该阶段是否符合线下能进入比赛的条件 |
|
|
|
|
offlineCanEntry (stage) { |
|
|
|
|
@ -1468,7 +1470,7 @@ export default { |
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
this.uploading = false |
|
|
|
|
const url = 'http://huoran.oss-cn-shenzhen.aliyuncs.com/' + name |
|
|
|
|
const url = 'https://huoran.oss-cn-shenzhen.aliyuncs.com/' + name |
|
|
|
|
this.fileList = [{ |
|
|
|
|
name: name, |
|
|
|
|
url |
|
|
|
|
@ -1517,12 +1519,14 @@ export default { |
|
|
|
|
}, |
|
|
|
|
// 阶段弹框关闭回调 |
|
|
|
|
stageClose () { |
|
|
|
|
this.choosing = false |
|
|
|
|
this.fileList = [] |
|
|
|
|
this.getData() |
|
|
|
|
}, |
|
|
|
|
|
|
|
|
|
// 选择要进入的阶段 |
|
|
|
|
chooseStage (e) { |
|
|
|
|
this.choosing = true |
|
|
|
|
this.curStage = e |
|
|
|
|
this.signup() |
|
|
|
|
}, |
|
|
|
|
@ -1650,6 +1654,7 @@ export default { |
|
|
|
|
util.cookies.set('curriculumName', encodeURIComponent(form.systemName)) |
|
|
|
|
util.cookies.set('systemId', form.systemId) |
|
|
|
|
util.cookies.set('isSubmit', '', -1) |
|
|
|
|
util.cookies.set('className', '', -1) |
|
|
|
|
util.cookies.set('competitionId', this.form.id) |
|
|
|
|
util.cookies.set('stageId', form.stageId) |
|
|
|
|
util.cookies.set('teamId', this.form.competitionRegistration.teamId) |
|
|
|
|
|
