排名
@@ -28,14 +28,26 @@ export default {
return {
id: +this.$route.query.id,
list: [],
+ form: {},
+ timer: null,
curStep: []
};
},
mounted() {
+ this.$once('hook:beforeDestroy', function() {
+ clearInterval(this.timer)
+ })
this.getData()
},
methods: {
getData() {
+ this.$post(`${this.api.getCompetition}?competitionId=${this.id}`).then(({ competition }) => {
+ this.form = competition
+ this.timer = setInterval(this.handleStatus, 1000)
+ this.getArch()
+ }).catch(err => {})
+ },
+ getArch() {
this.$post(this.api.detailsOfCompetitionStage, {
pageNum: 1,
pageSize: 100,
@@ -50,6 +62,25 @@ export default {
this.list = list
}).catch(res => {});
},
+ // 报名时间、比赛时间、状态处理
+ handleStatus() {
+ const now = new Date()
+ this.form.competitionStage.map(e => {
+ const startTime = new Date(e.startTime)
+ const endTime = new Date(e.endTime)
+ const item = this.list.find(n => n.stageId == e.stageId)
+ if (item) {
+ if (now < startTime) {
+ this.$set(item, 'status', '未开始')
+ } else if (now >= startTime && now <= endTime) {
+ this.$set(item, 'status', '比赛中')
+ } else if (now > endTime) {
+ this.$set(item, 'status', '已完成')
+ }
+ }
+ })
+ console.log("🚀 ~ file: matchArch.vue:87 ~ handleStatus ~ this.status", this.list)
+ },
// 排名
toRank(row, i) {
this.$router.push(`/matchRank?id=${this.id}&stageId=${row.stageId}&index=${i}&method=${row.method}&competitionType=${row.competitionType}&rule=${row.rule}`)
diff --git a/src/views/match/manage/matchArchList.vue b/src/views/match/manage/matchArchList.vue
index c0d72c4..c7c0e8c 100644
--- a/src/views/match/manage/matchArchList.vue
+++ b/src/views/match/manage/matchArchList.vue
@@ -266,7 +266,7 @@ export default {
},
// 模板下载
download() {
- location.href = this.api.staffTemplate
+ location.href = this.api.gradeImport
},
// 上传文件
handleExceed(files, fileList) {
@@ -276,7 +276,7 @@ export default {
},
// 下载失败文件
showFaild() {
- location.href = `${this.api.exportFailure}?exportCode=${this.exportCode}`
+ location.href = `${this.api.performanceExportFailure}?exportCode=${this.exportCode}`
},
uploadSuccess(res, file, fileList) {
this.uploadFaild = false
diff --git a/src/views/match/manage/matchInfo.vue b/src/views/match/manage/matchInfo.vue
index 6f0452a..9c4f688 100644
--- a/src/views/match/manage/matchInfo.vue
+++ b/src/views/match/manage/matchInfo.vue
@@ -7,6 +7,21 @@
+
+
+ | 团队名称： |
+
+
+ |
+ 团队邀请码： |
+
+
+ |
+
+
+
+ {{ editing ? '保存' : '编辑' }}
+
| 姓名： |
@@ -21,12 +36,6 @@
{{ info.person.schoolName }} |
-
- | 团队名称： |
-
- {{ info.team.teamName }}
- |
-
| 队长： |
@@ -38,34 +47,24 @@
{{ item.userName }}
-
- | 团队邀请码： |
-
- {{ info.team.invitationCode }}
- |
-
| 指导老师： |
-
-
- | 姓名 |
- 职务 |
- 手机号 |
-
-
-
- | {{ item.name }} |
- {{ item.position }} |
- {{ item.phone }} |
-
+
+
+
+
+
+
+
+
+
+
+
-
- | 暂无数据 |
-
-
+
|
@@ -102,7 +101,7 @@
+
+
+ 团队成员
+
+
队长：{{ info.caption.userName }}
+
转让队长
+
+
+
+ {{ item.userName }}
+
+
+
+
+
+ {{ item.userName }}
+
+ 注：当前阶段限制1人参赛，且此竞赛每个成员只能参加一个阶段赛项。
+
+
团队名称：{{ members[0].teamName }} 阶段名称：{{ curRow.stageName }}
@@ -155,6 +192,7 @@ export default {
return {
id: +this.$route.query.id,
accountId: +this.$route.query.accountId,
+ status: 5,
form: {
competitionStage: [],
completeCompetitionSetup: {},
@@ -175,15 +213,54 @@ export default {
memberVisible: false,
members: [],
curRow: {},
+ teamVisible: false,
+ teams: [],
+ teamNameRepeat: false,
+ teamForm: {
+ accountId: +this.$route.query.accountId,
+ identification: 1,
+ competitionId: this.$route.query.id,
+ registrationInvitationCode: '',
+ teamName: '',
+ invitationCode: '',
+ whetherSignUp: 1
+ },
+ curStage: null,
+ originInfo: {},
+ originIns: {
+ position: '',
+ name: '',
+ phone: '',
+ },
+ checkedPlayer: '',
+ transferVisible: false,
+ editing: false,
+ memberVisible: false,
+ members: [],
+ curRow: {},
+ chooseVisible: false,
+ checkedMember: '',
+ checkedMembers: [],
+ chooses: [],
+ timerList: [],
+ timer: null
};
},
mounted() {
+ this.$once('hook:beforeDestroy', function() {
+ clearInterval(this.timer)
+ this.timerList.forEach(n => {
+ clearInterval(n)
+ })
+ this.timerList = []
+ })
this.getData()
},
methods: {
getData() {
this.$post(`${this.api.getCompetition}?competitionId=${this.id}`).then(({ competition }) => {
this.form = competition
+ this.timer = setInterval(this.handleStatus, 1000)
this.getInfo()
}).catch(err => {})
},
@@ -191,6 +268,8 @@ export default {
getInfo() {
this.$post(`${this.api.entryInformation}?competitionId=${this.id}&accountId=${this.accountId}`).then(res => {
const info = res.entryInformation
+ // 如果是队长，并且没有指导老师，默认添加一个空的
+ if (!info.teamInstructors.length) info.teamInstructors.push(JSON.parse(JSON.stringify(this.originIns)))
if (info.personalDetail) {
info.team = {}
info.teamDetail = []
@@ -200,9 +279,207 @@ export default {
const caption = info.teamDetail.find(e => !e.caption)
info.caption = caption ? caption : {}
info.person = info.personalDetail || info.teamDetail.find(e => e.accountId == info.team.accountId)
+ this.originInfo = JSON.parse(JSON.stringify(info))
+ // 设置定时器，阶段比赛结束后公布成绩，到时间后调本接口
+ const now = Date.now()
+ this.form.competitionStage.map(e => {
+ // 如果公布成绩详情勾选的是
+ if (!e.resultsDetails) {
+ const endTime = new Date(e.endTime).getTime() + e.resultAnnouncementTime * 3600000 // 阶段结束时间+成绩公布时间（成绩公布时间单位是小时，所以要转化为毫秒）
+ if (now > endTime) { // 如果到了公布时间
+ info.stages.find(n => n.stageId == e.stageId).showDetail = 1
+ } else { // 没有到公布时间，则加定时器，到点后调用
+ this.timerList.push(setTimeout(this.getInfo, endTime - now))
+ }
+ }
+ })
this.info = info
}).catch(err => {});
},
+ // 报名时间、比赛时间、状态处理
+ handleStatus() {
+ let status
+ const n = this.form
+ let now = new Date().getTime();
+ let signUpStartTime = new Date(this.dateCompatible(n.signUpStartTime)).getTime(); // 报名开始时间
+ let signUpEndTime = new Date(this.dateCompatible(n.signUpEndTime)).getTime(); // 报名结束时间
+ let playStartTime = new Date(this.dateCompatible(n.playStartTime)).getTime(); // 比赛开始时间
+ let playEndTime = new Date(this.dateCompatible(n.playEndTime)).getTime(); // 比赛结束时间
+ if (now < signUpStartTime) { // 报名没开始
+ status = 0;
+ } else if (now > signUpStartTime && now < signUpEndTime) { // 报名进行中
+ status = n.competitionRegistration ? 1 : 2 // 1已报名，2立即报名
+ } else if (now > signUpEndTime && now < playStartTime) { // 报名结束了,但比赛没开始
+ status = 3;
+ } else if (now > playStartTime && now < playEndTime) { // 比赛进行中
+ status = 4
+ } else if (now > playEndTime) { // 比赛结束
+ status = 5;
+ }
+ this.status = status
+ },
+ // 编辑保存
+ edit(showMsg) {
+ if (this.editing || !showMsg) {
+ const { teamId, teamName, invitationCode } = this.info.team
+ this.$post(this.api.editCompetitionTeam, {
+ accountId: this.accountId,
+ identification: 1,
+ competitionId: this.id,
+ teamId,
+ teamName,
+ invitationCode,
+ whetherSignUp: 1
+ }).then(res => {
+ this.getInfo()
+ showMsg && util.successMsg('保存成功')
+ }).catch(res => {})
+ } else {
+ this.editing = !this.editing
+ }
+ },
+ // 删除指导老师
+ delAdvisor(row, i) {
+ if (row.id) {
+ this.$confirm('确定要删除吗？', '提示', {
+ type: 'warning'
+ }).then(() => {
+ this.$post(`${this.api.deleteAnAdvisor}?id=${row.id}`).then(res => {
+ util.successMsg('删除成功')
+ this.getInfo()
+ }).catch(res => {})
+ }).catch(() => {})
+ } else {
+ this.info.teamInstructors.splice(i, 1)
+ }
+ },
+ // 添加指导老师
+ addAdvisor() {
+ if (this.info.teamInstructors.length > 4) return util.errorMsg('指导老师仅限添加5个！')
+ this.info.teamInstructors.push(JSON.parse(JSON.stringify(this.originIns)))
+ },
+ // 编辑导老师
+ editAdvisor(row) {
+ this.$set(row, 'edit', 1)
+ },
+ // 提交指导老师
+ submitAdvisor(row) {
+ if (!row.name) return util.errorMsg('请输入姓名')
+ const { phone } = row
+ if (phone && !/^1[3456789]\d{9}$/.test(phone)) return util.errorMsg('请输入正确手机号格式')
+ this.$post(this.api.addAnAdvisor, {
+ name: row.name,
+ competitionId: this.id,
+ id: row.id,
+ teamId: this.info.teamId,
+ phone: row.phone,
+ position: row.position,
+ }).then(res => {
+ util.successMsg((row.id ? '修改' : '新增') + '成功')
+ this.getInfo()
+ }).catch(res => {})
+ },
+ // 显示转让队长
+ transfer() {
+ // 取每个阶段的开始结束时间，有任何阶段开始了都不能转让队长和踢出队员
+ const now = new Date()
+ let start = 0
+ for (const e of this.form.competitionStage) {
+ if (now >= new Date(e.startTime) && now <= new Date(e.endTime)) {
+ util.errorMsg('比赛已经开始，无法转让队长！')
+ start = 1
+ break
+ }
+ }
+ if (!start) this.transferVisible = true
+ },
+ // 转让队长提交
+ transferSubmit() {
+ if (!this.checkedPlayer) return util.errorMsg('请选择成员')
+ this.$post(this.api.captainOfTransfer, {
+ captainId: this.info.caption.teamId,
+ playerId: this.checkedPlayer
+ }).then(res => {
+ this.checkedPlayer = ''
+ util.successMsg('转让成功')
+ this.transferVisible = false
+ this.getInfo()
+ }).catch(res => {})
+ },
+ // 踢出团队
+ removeLine(row) {
+ // 取每个阶段的开始结束时间，有任何阶段开始了都不能转让队长和踢出队员
+ const now = new Date()
+ let start = 0
+ for (const e of this.form.competitionStage) {
+ if (now >= new Date(e.startTime) && now <= new Date(e.endTime)) {
+ util.errorMsg('比赛已经开始，无法踢出成员！')
+ start = 1
+ break
+ }
+ }
+ if (!start) {
+ this.$confirm('确定要踢出该成员吗？', '提示', {
+ type: 'warning'
+ }).then(() => {
+ this.$post(`${this.api.removeTheLine}?teamId=${this.info.teamId}&competitionId=${this.id}&accountId=${row.accountId}`).then(res => {
+ util.successMsg('移除成功')
+ this.getInfo()
+ if (row.accountId == this.accountId) this.$router.back()
+ }).catch(res => {})
+ }).catch(() => {})
+ }
+ },
+ // 选择参赛人员
+ selectPar(row) {
+ const item = this.form.competitionStage.find(e => e.stageId == row.stageId)
+ if (item) {
+ // 该阶段已经开始比赛则不能修改
+ const now = new Date()
+ if (now >= new Date(item.startTime) && now <= new Date(item.endTime)) {
+ return util.errorMsg('该阶段比赛已经开始，无法修改允许参赛人员！')
+ } else {
+ const { teamLimit, stages, teamDetail } = this.info
+ // teamLimit=true，则每个成员只能参加一个阶段的比赛，要获取stages里返回的所有participantAccountIds（参赛人员的accountId），然后不显示这些参赛人员
+ if (teamLimit) {
+ const chooses = []
+ let ids = []
+ // 获取已经允许参赛的人员accountId
+ stages.map(e => {
+ const id = e.participantAccountIds
+ id && ids.push(...id.split(',').map(n => +n))
+ })
+ ids = [...new Set(ids)]
+ teamDetail.map(e => {
+ ids.includes(e.accountId) || chooses.push(e) // 没有参赛的人员则显示出来
+ })
+ this.chooses = chooses
+ } else {
+ this.chooses = this.info.teamDetail
+ }
+ this.curRow = row
+ this.chooseVisible = true
+ }
+ }
+ },
+ // 选择参赛人员提交
+ chooseSubmit() {
+ const accountIds = this.checkedMembers
+ if (!accountIds.length) return util.errorMsg('请选择参赛成员！')
+ const limit = this.curRow.teamNumLimit // 参赛人数限制
+ if (accountIds.length > limit) return util.errorMsg(`请选择${limit}个以下参赛成员！`) // 选择的参赛人员个数不能大于参赛人数限制
+ this.$post(this.api.stageSelectParticipants, {
+ accountIds,
+ competitionId: this.id,
+ stageId: this.curRow.stageId,
+ teamId: this.info.teamId
+ }).then(res => {
+ this.checkedMembers = []
+ util.successMsg('修改成功')
+ this.getInfo()
+ this.chooseVisible = false
+ }).catch(res => {})
+ },
// 查看成绩详情
show(row) {
// 团队展示弹框，个人跳转实验报告
@@ -236,6 +513,10 @@ export default {
\ No newline at end of file
diff --git a/src/views/match/manage/matchRank.vue b/src/views/match/manage/matchRank.vue
index f7e2684..0d238b1 100644
--- a/src/views/match/manage/matchRank.vue
+++ b/src/views/match/manage/matchRank.vue
@@ -15,13 +15,13 @@
- 默认系统排序
- 手动上传
+ 默认系统排序
+ 手动上传
上传文件
- 发布排名
- 取消发布
+ 发布排名
+ 取消发布
@@ -164,7 +164,10 @@ export default {
exportCode: '',
curRow: {},
stageName: '',
- totalScore: 0
+ totalScore: 0,
+ published: false,
+ uploadData: [],
+ sourceType: ''
};
},
mounted() {
@@ -173,23 +176,51 @@ export default {
methods: {
// 获排名
getData() {
- if (!this.active) {
- // 总分排名
- const ids = this.grades.map(e => e.stageId)
- this.$post(this.api.overallStandingsInThePointsRace, {
+ // 查询是否已经发布排名
+ this.$post(`${this.api.whetherToPublish}?competitionId=${this.id}&stageId=${this.active || ''}&isOverallRanking=${this.active ? 0 : 1}`).then(({ whetherToPublish }) => {
+ // 如果已发布，查询发布上一次排名的来源——>默认顺序或者手动发布(返回数据:是否手动发布(1为是,0不是))
+ whetherToPublish && this.$post(`${this.api.queryPublicationSource}?competitionId=${this.id}&stageId=${this.active || ''}&isOverallRanking=${this.active ? 0 : 1}`).then(({ source }) => {
+ this.sourceType = source
+ this.type = source == 1 ? 1 : 0
+ }).catch(res => {})
+ this.published = whetherToPublish
+ this.getRank(whetherToPublish)
+ }).catch(res => {})
+ },
+ // 查询排名
+ getRank(whetherToPublish) {
+ // 已发布，则调已发布的排名接口
+ if (whetherToPublish) {
+ console.log(44, this.active)
+ this.$post(this.api.manuallyRankTheUploadList, {
pageNum: this.page,
pageSize: this.pageSize,
competitionId: this.id,
- stageIds: ids.splice(0, ids.length - 1)
- }).then(({ page }) => {
- this.list = page
- this.total = total
- }).catch(res => {})
- } else { // 阶段排名
- this.$post(`${this.api.stageRaceRanking}?competitionId=${this.id}&stageId=${this.active}&pageNum=${this.page}&pageSize=${this.pageSize}`).then(({ page, total }) => {
- this.list = page
- this.total = total
+ isOverallRanking: this.active ? 0 : 1,
+ stageId: this.active || ''
+ }).then(({ message }) => {
+ this.list = message.records
+ this.total = message.total
}).catch(res => {})
+ } else { // 未发布的排名接口
+ if (!this.active) {
+ // 总分排名
+ const ids = this.grades.map(e => e.stageId)
+ this.$post(this.api.overallStandingsInThePointsRace, {
+ pageNum: this.page,
+ pageSize: this.pageSize,
+ competitionId: this.id,
+ stageIds: ids.splice(0, ids.length - 1)
+ }).then(({ page }) => {
+ this.list = page
+ this.total = total
+ }).catch(res => {})
+ } else { // 阶段排名
+ this.$post(`${this.api.stageRaceRanking}?competitionId=${this.id}&stageId=${this.active}&pageNum=${this.page}&pageSize=${this.pageSize}`).then(({ page, total }) => {
+ this.list = page
+ this.total = total
+ }).catch(res => {})
+ }
}
},
// 获取阶段
@@ -209,6 +240,10 @@ export default {
this.getData()
}).catch(res => {});
},
+ // 排序类型切换回调
+ typeChange(val) {
+ this.getRank(val)
+ },
initData() {
this.page = 1
this.getData()
@@ -294,42 +329,12 @@ export default {
this.getData();
},
// 发布排名
- publish() {
- const promises = []
- const { list, id } = this
- const result = []
- const isOverall = this.active ? 0 : 1
- const data = {
- pageNum: 1,
- pageSize: 1000,
- competitionId: this.id,
- }
- // 阶段传当前阶段的id，总分传所有阶段的id
- // if (this.active) {
- // data.stageId = this.active
- // } else {
- // const ids = this.grades.map(e => e.stageId)
- // data.stageIds = ids.splice(0, ids.length - 1).join()
- // }
- // list.map(e => {
- // data.teamId = e.teamId
- // const temp = JSON.parse(JSON.stringify(data))
- // temp.teamId = e.teamId
- // promises.push(new Promise((resolve,reject) => {
- // // 获取团队成员成绩
- // this.$post(this.api[this.active ? 'stageTeamScoreDetails' : 'multipleStageTeamScoreDetails'], temp).then(({ page }) => {
- // const { records } = page
- // records.map(n => {
- // n.teamId = e.teamId
- // n.competitionId = id
- // n.isOverallRanking = isOverall
- // })
- // result.push(...records)
- // resolve()
- // }).catch(res => {})
- // }))
- // })
- // Promise.all(promises).then(_ => {
+ publishSubmit() {
+ let data = this.uploadData // 手动上传后发布排名，数据直接取批量上传后返回的data
+ if (!this.type) { // 默认排序
+ // 处理默认排序的数据
+ const { list, id } = this
+ const isOverall = this.active ? 0 : 1
if (list.length) {
const isPerson = this.competitionType == 0
list.map(e => {
@@ -338,11 +343,32 @@ export default {
if (isOverall) delete e.stageId
if (isPerson) e.teamId = null // 个人赛则teamId传null
})
- this.$post(this.api.publishRanking, this.list).then(res => {
- util.successMsg('发布成功！')
- }).catch(res => {})
+ data = list
}
- // })
+ }
+ // 发布前校验
+ this.$post(`${this.api.releaseVerification}?competitionId=${this.id}&stageId=${this.active || ''}&isOverallRanking=${this.active ? 0 : 1}&whetherToManuallyPublish=${this.type}`).then(res => {
+ this.$post(this.api.publishRanking, data).then(res => {
+ this.uploadData = []
+ this.getData()
+ util.successMsg('发布成功！')
+ }).catch(res => {})
+ }).catch(res => {})
+ },
+ // 发布排名确认
+ publish() {
+ // 如果已发布，并且上次发布的类型跟这次发布的类型不一致，则要提示确认
+ if (this.published && this.sourceType != !this.type) {
+ this.$confirm(this.sourceType && !this.type ?
+ '手动排名已发布，是否要取消手动排名的内容，改为为系统排名的内容？' :
+ '默认系统排名已发布，是否要取消系统排名的内容，改为为手动发布的内容？', '提示', {
+ type: 'success'
+ }).then(() => {
+ this.publishSubmit()
+ }).catch(() => {})
+ } else {
+ this.publishSubmit()
+ }
},
// 取消发布排名
cancelPublish(publish) {
@@ -352,6 +378,8 @@ export default {
stageIds.map(e => {
query.push('stageIds=' + e)
})
+ // 如果是发布排名，则先删除已发布的排名，再调发布排名的接口
+ // 如果是取消发布，则直接调取消发布的接口
if (publish) {
this.$post(this.api.deleteLastPublication, {
competitionId: this.id,
@@ -362,6 +390,7 @@ export default {
}).catch(res => {})
} else {
this.$post(`${this.api.cancelRanking}?competitionId=${this.id}&isOverallRanking=${this.active ? 0 : 1}&${this.active ? 'stageIds=' + this.active : query.join('&')}`).then(res => {
+ this.getData()
util.successMsg('取消发布成功！')
}).catch(res => {})
}
@@ -388,17 +417,19 @@ export default {
headers: this.headers,
responseType: 'blob'
}).then((res) => {
- util.downloadFileDirect(`批量导入成绩管理失败数据导出.xls`, new Blob([res.data]))
+ util.downloadFileDirect(`批量导入排名管理失败数据导出.xls`, new Blob([res.data]))
}).catch(res => {})
},
uploadSuccess(res, file, fileList) {
this.uploadFaild = false
if (res.status === 200) {
- if (res.data.exportCode) {
- this.exportCode = res.data.exportCode
+ const { exportCode } = res.data
+ if (exportCode) {
+ this.exportCode = exportCode
this.uploadFaild = true
util.errorMsg(`本次上传有${res.data.failureNum}个错误信息录入`)
}
+ this.uploadData = res.data.data
} else {
res.message ? util.errorMsg(res.message) : util.errorMsg("上传失败，请检查数据")
}
@@ -419,10 +450,8 @@ export default {
},
uploadSure() {
this.importVisible = false
- this.studentType = 1
- this.keyWord = ''
- this.$refs.orgTree.setCurrentKey(null)
- this.getOrg()
+ this.list = this.uploadData
+ this.uploadData.length && util.successMsg('请检查数据后，点击发布排名以发布数据！')
}
}
};
diff --git a/src/views/match/manage/matchSignup.vue b/src/views/match/manage/matchSignup.vue
index 5ca0750..92a85ff 100644
--- a/src/views/match/manage/matchSignup.vue
+++ b/src/views/match/manage/matchSignup.vue
@@ -9,7 +9,7 @@
-
+
@@ -58,27 +58,36 @@
-
+
-
+
-
+
-
-
+
+
-
-
+
+
+
+
+ 学生
-
+
- 创建团队
+ 创建团队
+
+
+
+
+
+
@@ -106,14 +115,14 @@