+ 
+
+ 您所选择的院校暂未在本平台开通组织账号，请通知院校老师联系下方二维码客服咨询。
+
+ 您所选择的院校暂未在本平台开通组织账号，请通知院校老师联系下方二维码客服咨询。
+
+ - 距离{{ endList[status] }}还有{{ end }} + 距离{{ endList[status] }}还有 + {{ end }} 天 + {{ end }}
- {{ statusList[status] }} + {{ statusList[status] }}
赛程、规则与内容{{ rule.stageName }}
+比赛时间：{{ rule.startTime + ' ~ ' + rule.endTime }}
+比赛方式：{{ methods.find(e => e.id == rule.method) && methods.find(e => e.id == rule.method).name }}
+课程系统：{{ rule.systemName }}
+ +团队参赛人数限制：{{ rule.teamNumLimit }}
+团队成绩计算方式：{{ teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod) && teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod).name }}
+ +（阶段）比赛结束后{{ rule.resultAnnouncementTime }}小时，公布（阶段）比赛成绩。
+ 竞赛进展 竞赛排名 参赛信息| 姓名： | +{{ info.person.userName }} | +||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 学号： | +{{ info.person.workNumber }} | +||||||||||||||||||
| 学校： | +{{ info.person.schoolName }} | +||||||||||||||||||
| 团队名称： | +
+ |
+ ||||||||||||||||||
| 队长： | +{{ info.caption.userName }}{{ info.caption.schoolName && '，' + info.caption.schoolName }}{{ info.caption.workNumber && '，' + info.caption.workNumber }} | +||||||||||||||||||
| 团队成员： | +
+ |
+ ||||||||||||||||||
| 指导老师： | +
+
+
+
+
+
+ |
+ + {{ info.teamInstructors.map(e => e.name).join('，')}} + | +|||||||||||||||||
| 团队邀请码： | +
+ |
+ ||||||||||||||||||
| 竞赛阶段： | +
+
|
+ ||||||||||||||||||
队长：{{ info.caption.userName }}
+注：当前阶段限制1人参赛，且此竞赛每个成员只能参加一个阶段赛项。
+ +| 序号 | +姓名 | +学校 | +用时 | +分数 | +得分详情 | +
|---|---|---|---|---|---|
| {{ i + 1 }} | +{{ item.userName }} | +{{ item.schoolName }} | +{{ item.timeSum }}min | +{{ item.score }} | +
+ |
+
距离{{ endList[item.status] }}还有 - {{ item.end }} + {{ item.end }} 天 + {{ item.end }}
@@ -189,7 +187,7 @@ export default { return { timer: null, token: util.local.get(Setting.tokenKey), - statusList: ["等待报名", "已报名", "立即报名", "报名截止", "进入初赛", "已结束"], + statusList: ["等待报名", "取消报名", "立即报名", "报名截止", "进入初赛", "已结束"], endList: ["报名开始", "报名截止", "报名截止", "竞赛开始", "竞赛结束", ""], typeList: [ { @@ -274,7 +272,8 @@ export default { competitionId: '', teamId: '', invitationCode: '', - registrationInvitationCode: '' + registrationInvitationCode: '', + whetherSignUp: 1 }, teamVisible: false, @@ -285,10 +284,83 @@ export default { registrationInvitationCode: '', teamName: '', invitationCode: '', + whetherSignUp: 1 }, curItem: {} }; }, + directives: { + countdown: { + bind: function(el, binding, vnode) { + let that = vnode.context; + let item = that.listData[binding.value]; + let time = '' + + let second = 1000; + let minute = second * 60; + let hour = minute * 60; + let now = new Date().getTime(); + let signUpStartTime = new Date(that.core.dateCompatible(item.signUpStartTime)).getTime(); // 报名开始时间 + let signUpEndTime = new Date(that.core.dateCompatible(item.signUpEndTime)).getTime(); // 报名结束时间 + let playStartTime = new Date(that.core.dateCompatible(item.playStartTime)).getTime(); // 比赛开始时间 + let playEndTime = new Date(that.core.dateCompatible(item.playEndTime)).getTime(); // 比赛结束时间 + switch (item.status) { + // status每个值的解释请看getData方法 + case 0: + if (now > signUpStartTime) { + item.status = item.whetherToSignUp ? 2 : 1 // 1已报名，2立即报名 + } else { + time = signUpStartTime - now; + } + break; + case 1: + if (now > signUpEndTime) { + item.status = 3; + } else { + time = signUpEndTime - now; + } + break; + case 2: + if (now > signUpEndTime) { + item.status = 3; + } else { + time = signUpEndTime - now; + } + break; + case 3: + if (now > playStartTime) { + item.status = 4; + } else { + time = playStartTime - now; + } + break; + case 4: + if (now > playEndTime) { + item.status = 5; + } else { + time = playEndTime - now; + } + break; + } + time = `${Math.floor(time / hour)}:${Math.floor(time % hour / minute)}:${Math.floor(time % hour % minute / second)}`; + let timer = setInterval(() => { + let timeList = time.split(":"); + let total = Number.parseInt(timeList[0] * 60 * 60) + Number.parseInt(timeList[1] * 60) + Number.parseInt(timeList[2]); + if (total > 0) { + --total; + let hours = Math.floor(total / (60 * 60)); + let minutes = Math.floor(total % (60 * 60) / 60); + let seconds = Math.floor(total % (60 * 60) % 60); + time = `${that.core.formateTime(hours)}:${that.core.formateTime(minutes)}:${that.core.formateTime(seconds)}`; + } else { + clearInterval(timer); + } + el.innerHTML = time; + }, 1000); + that.timerList.push(timer); + } + } + }, computed: { ...mapState('match', [ 'eventType' @@ -308,7 +380,10 @@ export default { this.getProvince() this.getData() this.$once('hook:beforeDestroy', function() { - clearInterval(this.timer) + this.timerList.forEach(n => { + clearInterval(n) + }) + this.timerList = [] }) }, methods: { @@ -357,9 +432,9 @@ export default { } else if (now > playStartTime && now < playEndTime) { // 比赛进行中 // 赛事阶段 let curStage = null - if (n.competitionStageList) { + if (n.competitionStageList && n.whetherToSignUp === 0) { for (const e of n.competitionStageList) { - if (now > new Date(e.startTime) && now < new Date(e.endTime) && !e.count) { + if (now > new Date(e.startTime) && now < new Date(e.endTime) && !e.count && e.method !== 2) { n.stageName = '进入' + e.stageName curStage = e break @@ -402,10 +477,6 @@ export default { getData() { this.loadIns = Loading.service() this.getList() - // if (!Setting.isDev) { - // clearInterval(this.timer) - // this.timer = setInterval(this.getList, 1000) - // } }, initData() { this.page = 1 @@ -479,7 +550,8 @@ export default { competitionId: this.curItem.id, teamName: '', invitationCode: '', - registrationInvitationCode: '' + registrationInvitationCode: '', + whetherSignUp: 1 } this.teamVisible = true }, @@ -508,12 +580,25 @@ export default { }, // 报名 signup(item) { - const { status, id } = item + const { status, id, rule } = item // 如果没登录，提示去登录 if (util.local.get(Setting.tokenKey)) { this.curItem = item if (status == 4) { // 进入比赛 - this.toSub() + if (item.isDisable === 1) return util.errorMsg('当前用户已被禁赛，如有疑问，请联系平台管理员。') // 被禁用的用户不能进入大赛 + // 是否允许参加赛事（淘汰赛制） + if (rule === 1) { + this.$post(this.api.allowedParticipateCompetition, { + competitionId: id, + number: item.curStage.number, + stageId: item.curStage.stageId, + teamId: item.teamId, + }).then(res => { + this.toSub() + }).catch(res => {}) + } else { + this.toSub() + } } else if (status == 2) { // 报名 // 团队赛报名 if (item.setup.competitionType) { @@ -563,7 +648,7 @@ export default { util.cookies.set('projectId', form.projectId) util.cookies.set('token', token) util.cookies.set('courseId', form.cid) - // util.cookies.set('curriculumName', escape(this.curriculumName)) + util.cookies.set('curriculumName', escape(form.systemName)) util.cookies.set('systemId', form.systemId) util.cookies.set('competitionId', this.curItem.id) util.cookies.set('stageId', form.stageId) @@ -579,20 +664,19 @@ export default { // 进入子系统 toSub() { const form = this.curItem - const { systemId, projectId, cid } = form.curStage + const { systemId, projectId, cid, stageId } = form.curStage const competitionId = form.id - const { stageId } = form - const teamId = form.competitionRegistration.teamId + const teamId = form.teamId let token = util.local.get(Setting.tokenKey); if (systemId == 11) { // 银行系统 - location.href = `${Setting.systemPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${this.courseId}&systemId=${systemId}&projectId=${projectId}&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&assessmentId=&classId=&stopTime=&test=true` + location.href = `${Setting.systemPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${cid}&systemId=${systemId}&projectId=${projectId}&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&assessmentId=&classId=&stopTime=&test=true` } else if (systemId == 12) { // 众筹系统 window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${cid}&projectId=${projectId}&token=${token}&userId=${this.userId}&classId=1&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}`); } else { // python系统 - this.toPython(this.curProject) + this.toPython() } } } @@ -637,6 +721,9 @@ export default { .main{ background: url(../../../assets/img/match-bg1.png) (0px 95px)/auto auto no-repeat, url(../../../assets/img/match-bg2.png) (98% bottom)/auto auto no-repeat; + .center-wrap { + width: 1078px; + } } .filter { width: 100%; @@ -808,8 +895,8 @@ export default { display: inline-flex; .cover { img { - width: 220px; - height: 140px; + width: 298px; + height: 190px; border-radius: 6px; } } diff --git a/src/pages/touristMatch/list/index.vue b/src/pages/touristMatch/list/index.vue index aaf6f78..0cb84fb 100644 --- a/src/pages/touristMatch/list/index.vue +++ b/src/pages/touristMatch/list/index.vue @@ -69,13 +69,6 @@ {{ item.sponsor }} -距离{{ endList[item.status] }}还有 - {{ item.end }} + {{ item.end }} 天 + {{ item.end }}
@@ -178,7 +172,7 @@ export default { timer: null, token: util.local.get(Setting.tokenKey), way: 2, - statusList: ["等待报名", "已报名", "立即报名", "报名截止", "进入初赛", "已结束"], + statusList: ["等待报名", "取消报名", "立即报名", "报名截止", "进入初赛", "已结束"], endList: ["报名开始", "报名截止", "报名截止", "竞赛开始", "竞赛结束", ""], typeList: [ { @@ -255,10 +249,83 @@ export default { registrationInvitationCode: '', teamName: '', invitationCode: '', + whetherSignUp: 1 }, curItem: {} }; }, + directives: { + countdown: { + bind: function(el, binding, vnode) { + let that = vnode.context; + let item = that.listData[binding.value]; + let time = '' + + let second = 1000; + let minute = second * 60; + let hour = minute * 60; + let now = new Date().getTime(); + let signUpStartTime = new Date(that.core.dateCompatible(item.signUpStartTime)).getTime(); // 报名开始时间 + let signUpEndTime = new Date(that.core.dateCompatible(item.signUpEndTime)).getTime(); // 报名结束时间 + let playStartTime = new Date(that.core.dateCompatible(item.playStartTime)).getTime(); // 比赛开始时间 + let playEndTime = new Date(that.core.dateCompatible(item.playEndTime)).getTime(); // 比赛结束时间 + switch (item.status) { + // status每个值的解释请看getData方法 + case 0: + if (now > signUpStartTime) { + item.status = item.whetherToSignUp ? 2 : 1 // 1已报名，2立即报名 + } else { + time = signUpStartTime - now; + } + break; + case 1: + if (now > signUpEndTime) { + item.status = 3; + } else { + time = signUpEndTime - now; + } + break; + case 2: + if (now > signUpEndTime) { + item.status = 3; + } else { + time = signUpEndTime - now; + } + break; + case 3: + if (now > playStartTime) { + item.status = 4; + } else { + time = playStartTime - now; + } + break; + case 4: + if (now > playEndTime) { + item.status = 5; + } else { + time = playEndTime - now; + } + break; + } + time = `${Math.floor(time / hour)}:${Math.floor(time % hour / minute)}:${Math.floor(time % hour % minute / second)}`; + let timer = setInterval(() => { + let timeList = time.split(":"); + let total = Number.parseInt(timeList[0] * 60 * 60) + Number.parseInt(timeList[1] * 60) + Number.parseInt(timeList[2]); + if (total > 0) { + --total; + let hours = Math.floor(total / (60 * 60)); + let minutes = Math.floor(total % (60 * 60) / 60); + let seconds = Math.floor(total % (60 * 60) % 60); + time = `${that.core.formateTime(hours)}:${that.core.formateTime(minutes)}:${that.core.formateTime(seconds)}`; + } else { + clearInterval(timer); + } + el.innerHTML = time; + }, 1000); + that.timerList.push(timer); + } + } + }, computed: { ...mapState('match', [ 'toMatch' @@ -273,11 +340,14 @@ export default { } }, mounted() { - this.getProvince() - this.getData() - this.$once('hook:beforeDestroy', function() { - clearInterval(this.timer) + this.getProvince() + this.getData() + this.$once('hook:beforeDestroy', function() { + this.timerList.forEach(n => { + clearInterval(n) }) + this.timerList = [] + }) }, methods: { ...mapMutations('match', [ @@ -324,9 +394,9 @@ export default { } else if (now > playStartTime && now < playEndTime) { // 比赛进行中 // 赛事阶段 let curStage = null - if (n.competitionStageList) { + if (n.competitionStageList && n.whetherToSignUp === 0) { for (const e of n.competitionStageList) { - if (now > new Date(e.startTime) && now < new Date(e.endTime) && !e.count) { + if (now > new Date(e.startTime) && now < new Date(e.endTime) && !e.count && e.method !== 2) { n.stageName = '进入' + e.stageName curStage = e break @@ -445,7 +515,8 @@ export default { competitionId: this.curItem.id, teamName: '', invitationCode: '', - registrationInvitationCode: '' + registrationInvitationCode: '', + whetherSignUp: 1 } this.teamVisible = true }, @@ -474,12 +545,25 @@ export default { }, // 报名 signup(item) { - const { status, id } = item + const { status, id, rule } = item // 如果没登录，提示去登录 if (util.local.get(Setting.tokenKey)) { this.curItem = item if (status == 4) { // 进入比赛 - this.toSub() + if (item.isDisable === 1) return util.errorMsg('当前用户已被禁赛，如有疑问，请联系平台管理员。') // 被禁用的用户不能进入大赛 + // 是否允许参加赛事（淘汰赛制） + if (rule === 1) { + this.$post(this.api.allowedParticipateCompetition, { + competitionId: id, + number: item.curStage.number, + stageId: item.curStage.stageId, + teamId: item.teamId, + }).then(res => { + this.toSub() + }).catch(res => {}) + } else { + this.toSub() + } } else if (status == 2) { // 报名 // 团队赛报名 if (item.setup.competitionType) { @@ -529,7 +613,7 @@ export default { util.cookies.set('projectId', form.projectId) util.cookies.set('token', token) util.cookies.set('courseId', form.cid) - // util.cookies.set('curriculumName', escape(this.curriculumName)) + util.cookies.set('curriculumName', escape(form.systemName)) util.cookies.set('systemId', form.systemId) util.cookies.set('competitionId', this.curItem.id) util.cookies.set('stageId', form.stageId) @@ -545,14 +629,13 @@ export default { // 进入子系统 toSub() { const form = this.curItem - const { systemId, projectId, cid } = form.curStage + const { systemId, projectId, cid, stageId } = form.curStage const competitionId = form.id - const { stageId } = form - const teamId = form.competitionRegistration.teamId + const teamId = form.teamId let token = util.local.get(Setting.tokenKey); if (systemId == 11) { // 银行系统 - location.href = `${Setting.systemPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${this.courseId}&systemId=${systemId}&projectId=${projectId}&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&assessmentId=&classId=&stopTime=&test=true` + location.href = `${Setting.systemPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${cid}&systemId=${systemId}&projectId=${projectId}&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&assessmentId=&classId=&stopTime=&test=true` } else if (systemId == 12) { // 众筹系统 window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${cid}&projectId=${projectId}&token=${token}&userId=${this.userId}&classId=1&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}`);