huoran
/
FE_occupationlab_client
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

fix

Browse Source
alioss
yujialong 2 years ago
parent 7e2ae10bf7
commit c6066fc6e4
5 changed files with 274 additions and 202 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      src/pages/account/login/index.vue
  2. 48
      src/pages/match/details/index.vue
  3. 32
      src/pages/match/list/index.vue
  4. 2
      src/pages/station/preview/index.vue
  5. 43
      src/pages/touristMatch/list/index.vue

9
src/pages/account/login/index.vue
Unescape View File

@ -330,6 +330,9 @@ export default {
...mapActions("user", [
"setInfo"
]),
...mapMutations('match', [
'SET_SOURCE'
]),
// 赋值学校列表及id
setSchool(list) {
this.schoolList = list
@ -417,10 +420,12 @@ export default {
util.cookies.remove('serverLogin')
this.reloadIndex()
util.successMsg('登录成功')
const { toMatch } = this
this.SET_SOURCE('')
this.$router.replace(this.courseId ?
`/preCourse/details?id=${this.courseId}` :
this.toMatch ?
`/touristMatch` :
toMatch ?
`/touristMatch/details?id=` + toMatch :
'/station')
},
// 提交登录

48
src/pages/match/details/index.vue
Unescape View File

@ -14,7 +14,15 @@
距离{{ endList[status] }}还有
<em>{{ end }}</em>
</p>
<a v-if="status != 4 || (status == 4 && curStage)" class="status" :class="{wait: status == 0,signing: status == 2,signed: status == 1,playing: status == 4,finish: status == 3 || status == 5}" :title="statusList[status]" @click.stop="signup">{{ statusList[status] }}</a>
<el-dropdown v-if="playingStages.length > 1" class="m-l-10" @command="chooseStage">
<el-button type="primary" style="background-color: #f96d6d;border: 0;">
选择竞赛<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-for="(item, i) in playingStages" :key="i" :command="item">进入{{ item.stageName }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<a v-else-if="status != 4 || (status == 4 && curStage)" class="status" :class="{wait: status == 0,signing: status == 2,signed: status == 1,playing: status == 4,finish: status == 3 || status == 5}" :title="statusList[status]" @click.stop="signup">{{ statusList[status] }}</a>
</div>
</div>
<div class="info">
@ -246,7 +254,7 @@
<el-tag
v-for="tag in item.participants"
:key="tag.name"
class="m-r-5"
class="m-r-5 m-b-5"
:closable="info.team.captain === 0"
@close="removePar(tag, item)">
{{tag.name}}
@ -415,7 +423,7 @@ export default {
id: +this.$route.query.id,
end: '',
status: '',
statusList: ["等待报名", "取消报名", "立即报名", "报名截止", "进入初赛", "已结束"],
statusList: ["等待报名", "取消报名", "立即报名", "报名截止", "进入竞赛", "已结束"],
endList: ["报名开始", "报名截止", "报名截止", "竞赛开始", "竞赛结束", ""],
rules: Const.rules,
methods: Const.methods,
@ -508,7 +516,8 @@ export default {
checkedMember: '',
checkedMembers: [],
chooses: [],
lastType: 1
lastType: 1,
playingStages: []
};
},
computed: {
@ -572,7 +581,7 @@ export default {
})
this.getInfo()
}
this.token() && this.getRank()
this.token && this.getRank()
} else {
this.typeList = this.typeList.slice(0, 3)
}
@ -596,16 +605,27 @@ export default {
status = 0
total = signUpStartTime - now
} else if (now > signUpStartTime && now < signUpEndTime) { // 报名进行中
status = form.competitionRegistration ? 1 : 2 // 1已报名，2立即报名
// 1已报名，2立即报名(没登录的情况下，直接显示立即报名，登录了则取报名信息，有则已报名，无则立即报名)
status = this.token ?
(form.competitionRegistration ?
1 :
2) :
2
total = signUpEndTime - now
} else if (now > signUpEndTime && now < playStartTime) { // 报名结束了,但比赛没开始
status = 3
total = playStartTime - now
} else if (now > playStartTime && now < playEndTime) { // 比赛进行中
// 如果是完整比赛
if (form.releaseType) {
// 进行中的赛事，则遍历每个阶段的开始结束时间，看阶段比赛是否开始
let curStage = null
const stages = form.competitionStage
if (stages) {
this.playingStages = []
stages.forEach(e => {
if (now >= new Date(e.startTime) && now <= new Date(e.endTime) && e.method !== 2) this.playingStages.push(e)
})
let endText = ''
for (const i in stages) {
const e = stages[i]
@ -619,8 +639,10 @@ export default {
if (form.competitionRegistration) { // 报名了才能进入比赛
this.statusList[4] = e.count ? '已提交' : '进入' + e.stageName
curStage = e
} else if (!this.token) {
this.statusList[4] = '进入' + e.stageName
curStage = e
}
endText = '阶段结束'
total = endTime - now
break
@ -638,6 +660,9 @@ export default {
this.endList[4] = endText
}
this.curStage = curStage
} else { // 仅发布信息
total = playEndTime - now
}
status = 4
} else if (now > playEndTime) { // 比赛结束
status = 5
@ -646,7 +671,7 @@ export default {
total = total / 1000
--total
if (total > 86400) { // 超过一天则显示天数
clearInterval(this.timer)
// clearInterval(this.timer)
this.end = Math.floor(total / 86400) + '天'
} else if (total > 0) { // 一天之内，显示时分秒
let hours = Math.floor(total / (60 * 60))
@ -1074,6 +1099,11 @@ export default {
}
},
// 选择要进入的阶段
chooseStage(e) {
this.curStage = e
this.signup()
},
// 判断是否能进赛事
getAllow() {
// 是否允许参加赛事（淘汰赛制）
@ -1097,7 +1127,7 @@ export default {
if (util.local.get(Setting.tokenKey)) {
const { competitionType } = form.completeCompetitionSetup
if (status == 4) { // 进入比赛
if (this.curStage.count) return // 参加过比赛不让参加
if (this.curStage && this.curStage.count) return // 参加过比赛不让参加
if (form.competitionRegistration.isDisable === 1) return util.errorMsg('当前用户已被禁赛，如有疑问，请联系平台管理员。') // 被禁用的用户不能进入大赛
// 团队赛，则判断是否为参赛人员
if (competitionType) {

32
src/pages/match/list/index.vue
Unescape View File

@ -100,8 +100,16 @@
</div>
</div>
<div class="right">
<el-dropdown v-if="item.playingStages && item.playingStages.length > 1" class="m-l-10" @command="e => chooseStage(e, item)">
<el-button type="primary" style="background-color: #f96d6d;border: 0;">
选择竞赛<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-for="(stage, i) in item.playingStages" :key="i" :command="stage">进入{{ stage.stageName }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<p class="status"
v-if="item.status != 4 || (item.status == 4 && item.curStage)"
v-else-if="item.status != 4 || (item.status == 4 && item.curStage)"
:class="{wait: item.status == 0,signing: item.status == 2,signed: item.status == 1,playing: item.status == 4 && item.curStage,finish: item.status == 3 || item.status == 5}" :title="item.status == 4 ? item.stageName : statusList[item.status]"
@click.stop="signup(item)">{{ item.status == 4 ? item.stageName : statusList[item.status] }}</p>
<p class="end-text" v-if="item.end">
@ -316,6 +324,7 @@ export default {
'SET_TYPE'
]),
getList() {
this.clearTimer()
const { form } = this
const { eventType, competitionScope } = form
const data = {
@ -357,6 +366,7 @@ export default {
// 定时处理时间及状态
handleStatus() {
this.listData.map(item => {
if (item.signUpStartTime && item.signUpEndTime && item.playStartTime && item.playEndTime) {
let total = ''
let time = ''
let status = ''
@ -377,10 +387,16 @@ export default {
status = 3
total = playStartTime - now
} else if (now > playStartTime && now < playEndTime) { // 比赛进行中
// 如果是完整比赛
if (item.releaseType) {
// 进行中的赛事，则遍历每个阶段的开始结束时间，看阶段比赛是否开始
let curStage = null
const stages = item.competitionStageList
if (stages) {
item.playingStages = []
stages.forEach(e => {
if (now >= new Date(e.startTime) && now <= new Date(e.endTime) && e.method !== 2) item.playingStages.push(e)
})
for (const i in stages) {
const e = stages[i]
const startTime = new Date(e.startTime)
@ -410,6 +426,10 @@ export default {
}
}
item.curStage = curStage
} else { // 仅发布信息
this.$set(item, 'endText', '竞赛结束')
total = playEndTime - now
}
status = 4
} else if (now > playEndTime) { // 比赛结束
status = 5
@ -418,7 +438,7 @@ export default {
total = total / 1000
--total
if (total > 86400) { // 超过一天则显示天数
clearInterval(timer)
// clearInterval(timer)
this.$set(item, 'end', Math.floor(total / 86400) + '天')
} else if (total > 0) { // 一天之内，显示时分秒
let hours = Math.floor(total / (60 * 60))
@ -431,8 +451,8 @@ export default {
}
}, 1000)
this.timerList.push(timer)
}
})
console.log("🚀 ~ file: index.vue:434 ~ handleStatus ~ timerList", this.listData)
},
// 清除定时器
clearTimer() {
@ -492,7 +512,6 @@ export default {
this.$router.push(`/match/details?id=${item.id}`);
},
handleCurrentChange(val) {
this.clearTimer()
this.page = val;
this.getData();
},
@ -546,6 +565,11 @@ export default {
util.successMsg('报名成功！')
}).catch(res => {})
},
// 选择要进入的阶段
chooseStage(e, item) {
item.curStage = e
this.signup(item)
},
// 判断是否能进赛事
getAllow(item) {
// 是否允许参加赛事（淘汰赛制）

2
src/pages/station/preview/index.vue
Unescape View File

@ -90,7 +90,7 @@
<ul class="projects">
<li v-for="(item, i) in projects" :key="i" :class="{active: curProject == item.projectId}" @click="selectProject(item)">
<img src="@/assets/img/project.png" alt="">
<span>{{ item.projectName }}</span>
<span>{{ i + 1 }}. {{ item.projectName }}</span>
</li>
</ul>

43
src/pages/touristMatch/list/index.vue
Unescape View File

@ -83,8 +83,16 @@
</div>
</div>
<div class="right">
<el-dropdown v-if="item.playingStages && item.playingStages.length > 1" class="m-l-10" @command="e => chooseStage(e, item)">
<el-button type="primary" style="background-color: #f96d6d;border: 0;">
选择竞赛<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-for="(stage, i) in item.playingStages" :key="i" :command="stage">进入{{ stage.stageName }}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<p class="status"
v-if="item.status != 4 || (item.status == 4 && item.curStage)"
v-else-if="item.status != 4 || (item.status == 4 && item.curStage)"
:class="{wait: item.status == 0,signing: item.status == 2,signed: item.status == 1,playing: item.status == 4 && item.curStage,finish: item.status == 3 || item.status == 5}" :title="item.status == 4 ? item.stageName : statusList[item.status]"
@click.stop="signup(item)">{{ item.status == 4 ? item.stageName : statusList[item.status] }}</p>
<p class="end-text" v-if="item.end">
@ -279,6 +287,7 @@ export default {
'SET_SOURCE'
]),
getList() {
this.clearTimer()
const { form } = this
const scope = form.competitionScope
const data = {
@ -312,16 +321,6 @@ export default {
this.listData = records
this.totals = data.total
this.handleStatus()
// 如果是登录前点报名去登录的，则跳转到该赛事，toMatch存的是点击的赛事id，通过scrollIntoView去跳到赛事的位置
const id = this.toMatch
if (id) {
this.$nextTick(() => {
this.SET_SOURCE('')
const item = records.find(e => e.id === id)
item && this.toDetail(item)
})
}
this.loadIns.close()
}).catch(res => {
this.loadIns.close()
@ -330,6 +329,7 @@ export default {
// 定时处理时间及状态
handleStatus() {
this.listData.map(item => {
if (item.signUpStartTime && item.signUpEndTime && item.playStartTime && item.playEndTime) {
let total = ''
let time = ''
let status = ''
@ -350,10 +350,16 @@ export default {
status = 3
total = playStartTime - now
} else if (now > playStartTime && now < playEndTime) { // 比赛进行中
// 如果是完整比赛
if (item.releaseType) {
// 进行中的赛事，则遍历每个阶段的开始结束时间，看阶段比赛是否开始
let curStage = null
const stages = item.competitionStageList
if (stages) {
item.playingStages = []
stages.forEach(e => {
if (now >= new Date(e.startTime) && now <= new Date(e.endTime) && e.method !== 2) item.playingStages.push(e)
})
for (const i in stages) {
const e = stages[i]
const startTime = new Date(e.startTime)
@ -383,6 +389,10 @@ export default {
}
}
item.curStage = curStage
} else { // 仅发布信息
this.$set(item, 'endText', '竞赛结束')
total = playEndTime - now
}
status = 4
} else if (now > playEndTime) { // 比赛结束
status = 5
@ -391,7 +401,7 @@ export default {
total = total / 1000
--total
if (total > 86400) { // 超过一天则显示天数
clearInterval(timer)
// clearInterval(timer)
this.$set(item, 'end', Math.floor(total / 86400) + '天')
} else if (total > 0) { // 一天之内，显示时分秒
let hours = Math.floor(total / (60 * 60))
@ -402,10 +412,9 @@ export default {
} else if (item.status === 5) { // 竞赛结束，清除定时器
clearInterval(timer)
}
console.log(33, this.listData)
}, 1000)
this.timerList.push(timer)
}
})
},
// 清除定时器
@ -456,7 +465,6 @@ export default {
this.$router.push(`/touristMatch/details?id=${item.id}`);
},
handleCurrentChange(val) {
this.clearTimer()
this.page = val;
this.getData();
},
@ -509,6 +517,11 @@ export default {
util.successMsg('报名成功！')
}).catch(res => {})
},
// 选择要进入的阶段
chooseStage(e, item) {
item.curStage = e
this.signup(item)
},
// 判断是否能进赛事
getAllow(item) {
// 是否允许参加赛事（淘汰赛制）

Write Preview
Loading…
Cancel
Save