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

赛事修复

Browse Source
dev_202412
yujialong 10 months ago
parent 85486b3a33
commit 3e4e9f5329
4 changed files with 564 additions and 622 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      src/pages/match/details/index.vue
  2. 8
      src/pages/match/list/index.vue
  3. 16
      src/pages/record/show/index.vue
  4. 1132
      src/pages/station/preview/index.vue

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

@ -76,7 +76,7 @@
</template> </template>
<template v-if="form.completeCompetitionSetup.competitionType"> <template v-if="form.completeCompetitionSetup.competitionType">
<p>每个团队参赛人数限制：{{ rule.customNumber || '不限制' }}</p> <p>每个团队参赛人数限制：{{ rule.teamNumLimit ? rule.customNumber : '不限制' }}</p>
<p>团队成绩计算方式：{{ teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod) && <p>团队成绩计算方式：{{ teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod) &&
teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod).name }}</p> teamCalculationMethods.find(e => e.id == rule.teamCalculationMethod).name }}</p>
</template> </template>
@ -272,7 +272,8 @@
<th width="110">参赛人数限制</th> <th width="110">参赛人数限制</th>
<th> <th>
允许参赛人员 允许参赛人员
<el-tooltip v-if="stageTip" effect="dark" :content="stageTip" placement="bottom"> <el-tooltip v-if="stageTip" effect="dark" content="阶段参赛人员异常，请尽快按照阶段赛规则调整，否则可能影响比赛成绩！"
placement="bottom">
<i class="info el-icon-warning" style="margin-right: 10px;color: #ff1650;"></i> <i class="info el-icon-warning" style="margin-right: 10px;color: #ff1650;"></i>
</el-tooltip> </el-tooltip>
</th> </th>
@ -285,7 +286,7 @@
<td>{{ i + 1 }}</td> <td>{{ i + 1 }}</td>
<td>{{ item.stageName || form.name }}</td> <td>{{ item.stageName || form.name }}</td>
<template v-if="form.completeCompetitionSetup.competitionType"> <template v-if="form.completeCompetitionSetup.competitionType">
<td>{{ item.customNumber || '不限制' }}</td> <td>{{ item.teamNumLimit ? item.customNumber : '不限制' }}</td>
<td> <td>
<template v-if="item.participants"> <template v-if="item.participants">
<el-tag v-for="tag in item.participants" :key="tag.name" class="m-r-5 m-b-5" <el-tag v-for="tag in item.participants" :key="tag.name" class="m-r-5 m-b-5"
@ -296,7 +297,7 @@
<span v-else class="m-r-5">无</span> <span v-else class="m-r-5">无</span>
<i v-if="info.team.captain === 0 && status < 4" class="el-icon-edit icon" <i v-if="info.team.captain === 0 && status < 4" class="el-icon-edit icon"
@click="selectPar(item)"></i> @click="selectPar(item)"></i>
<el-tooltip v-if="stageTips.length && stageTips[i]" effect="dark" :content="stageTips[i]" <el-tooltip v-if="stageTip.length && stageTip[i]" effect="dark" :content="stageTip[i]"
placement="bottom"> placement="bottom">
<el-tag type="danger" class="m-l-5">异常</el-tag> <el-tag type="danger" class="m-l-5">异常</el-tag>
</el-tooltip> </el-tooltip>
@ -651,8 +652,7 @@ export default {
now: '', now: '',
allocated: 0, allocated: 0,
teamErrors: [], teamErrors: [],
stageTip: '', stageTip: null,
stageTips: [],
showButton: false, showButton: false,
assignRecord: {}, assignRecord: {},
allocating: false, allocating: false,
@ -911,9 +911,8 @@ export default {
teamId: this.info.teamId teamId: this.info.teamId
}) })
this.teamErrors = res.teamTip.split(';').filter(e => e) this.teamErrors = res.teamTip.split(';').filter(e => e)
if (res.stageTip) { if (Object.keys(res.stageTip)) {
this.stageTip = res.stageTip this.stageTip = res.stageTip
this.stageTips = res.stageTip.split(';').filter(e => e)
} }
}, },
// 编辑保存 // 编辑保存
@ -1211,8 +1210,8 @@ export default {
chooseSubmit () { chooseSubmit () {
const accountIds = this.checkedMembers const accountIds = this.checkedMembers
if (!accountIds.length) return Util.errorMsg('请选择参赛成员！') if (!accountIds.length) return Util.errorMsg('请选择参赛成员！')
const limit = this.curRow.teamNumLimit // 参赛人数限制 const { customNumber, teamNumLimit } = this.curRow // 参赛人数限制
if (limit && accountIds.length > limit) return Util.errorMsg(`请选择${this.curRow.customNumber}个以下参赛成员！`) // 选择的参赛人员个数不能大于参赛人数限制 if (teamNumLimit && accountIds.length > customNumber) return Util.errorMsg(`请选择${this.curRow.customNumber}个以下参赛成员！`) // 选择的参赛人员个数不能大于参赛人数限制
this.$post(this.api.stageSelectParticipants, { this.$post(this.api.stageSelectParticipants, {
accountIds, accountIds,
competitionId: this.id, competitionId: this.id,
@ -1324,10 +1323,10 @@ export default {
afterCreateTeam () { afterCreateTeam () {
// 赛事自动分配状态为开启，则直接提示；否则弹框询问是否要启用团队自动分配 // 赛事自动分配状态为开启，则直接提示；否则弹框询问是否要启用团队自动分配
if (this.allocated) { if (this.allocated) {
Util.successMsg('团队创建成功，系统将自动帮您分配阶段参赛成员，您也可以到参数信息进行指定') Util.successMsg('团队创建成功，系统将在报名结束后自动帮您分配阶段参赛成员，您也可以到参数信息进行指定')
} else { } else {
// 未分配 // 未分配
this.$confirm('是否要启用自动分配成员参加阶段赛项', '提示', { this.$confirm('报名成功！是否要启用自动分配成员参加阶段赛项？启用后，将在报名结束后给团队成员自动分配阶段参赛人员。', '提示', {
cancelButtonText: '否', cancelButtonText: '否',
confirmButtonText: '是', confirmButtonText: '是',
type: 'success', type: 'success',
@ -1348,7 +1347,12 @@ export default {
// 自动分配 // 自动分配
automaticAllocationMember () { automaticAllocationMember () {
const whether = this.assignRecord.assignOrNot && this.status < 3 const whether = this.assignRecord.assignOrNot && this.status < 3
this.$confirm(`确定${whether ? '取消' : ''}自动分配阶段成员`, '提示', { const tips = this.status < 3 ?
whether ?
'确定取消自动分配阶段成员？' :
'是否要启用自动分配成员参加阶段赛项？启用后，将在报名结束后给团队成员自动分配阶段参赛人员。'
: '确定立即自动分配阶段成员？'
this.$confirm(tips, '提示', {
cancelButtonText: '否', cancelButtonText: '否',
confirmButtonText: '是', confirmButtonText: '是',
type: 'success', type: 'success',

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

@ -52,7 +52,7 @@
<dt>筛选排序：</dt> <dt>筛选排序：</dt>
<dd v-for="(item, i) in sorts" :key="i" :class="{ active: form.sequence == item.id }" <dd v-for="(item, i) in sorts" :key="i" :class="{ active: form.sequence == item.id }"
@click="changeSort(item.id)">{{ @click="changeSort(item.id)">{{
item.name }}</dd> item.name }}</dd>
</dl> </dl>
</div> </div>
</div> </div>
@ -112,7 +112,7 @@
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item v-for="(stage, i) in item.playingStages" :key="i" :command="stage">进入{{ <el-dropdown-item v-for="(stage, i) in item.playingStages" :key="i" :command="stage">进入{{
stage.stageName stage.stageName
}}</el-dropdown-item> }}</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<p class="status" v-else-if="item.status != 4 || (item.status == 4 && item.curStage)" <p class="status" v-else-if="item.status != 4 || (item.status == 4 && item.curStage)"
@ -661,10 +661,10 @@ export default {
const res = await this.$post(`${this.api.viewEventAllocationInformation}?competitionId=${this.teamForm.competitionId}`) const res = await this.$post(`${this.api.viewEventAllocationInformation}?competitionId=${this.teamForm.competitionId}`)
// 赛事自动分配状态为开启，则直接提示；否则弹框询问是否要启用团队自动分配 // 赛事自动分配状态为开启，则直接提示；否则弹框询问是否要启用团队自动分配
if (res.data && res.data.assignOrNot) { if (res.data && res.data.assignOrNot) {
Util.successMsg('团队创建成功，系统将自动帮您分配阶段参赛成员，您也可以到参数信息进行指定') Util.successMsg('团队创建成功，系统将在报名结束后自动帮您分配阶段参赛成员，您也可以到参数信息进行指定')
} else { } else {
// 未分配 // 未分配
this.$confirm('是否要启用自动分配成员参加阶段赛项', '提示', { this.$confirm('报名成功！是否要启用自动分配成员参加阶段赛项？启用后，将在报名结束后给团队成员自动分配阶段参赛人员。', '提示', {
cancelButtonText: '否', cancelButtonText: '否',
confirmButtonText: '是', confirmButtonText: '是',
type: 'success', type: 'success',

16
src/pages/record/show/index.vue
Unescape View File

@ -263,16 +263,19 @@ export default {
let index = 1 let index = 1
e.lcRuleRecords.map((n, i) => { e.lcRuleRecords.map((n, i) => {
n.index = index n.index = index
// 下面几行是导出的时候后端需要的字段
e.assessmentPoint += `${index}.${n.name};${n.ruleOperation === '或' ? '\n或\n' : ''}`
e.referenceAnswer += `${index}.${n.ruleAnswer};${n.ruleOperation === '或' ? '\n或\n' : ''}`
if (!n.userAnswer) n.userAnswer = '未填写'
if (n.ruleOperation === '或') { if (n.ruleOperation === '或') {
index = 1 index = 1
} else { } else {
index++ index++
} }
e.assessmentPoint += `${i + 1}.${n.name}` })
e.referenceAnswer += `${i + 1}.${n.ruleAnswer}` e.lcStudentAnswer.map((n, i) => {
if (!n.userAnswer) n.userAnswer = '未填写' e.answer += `${i + 1}.${n.userAnswer};`
e.answer += `${i + 1}.${n.userAnswer}`
}) })
}) })
} else { // python系统显示图片（从userScores里取） } else { // python系统显示图片（从userScores里取）
@ -301,10 +304,9 @@ export default {
e.id = i + 1 e.id = i + 1
if (e.referenceAnswer && typeof e.referenceAnswer === 'string') e.referenceAnswer = e.referenceAnswer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;') if (e.referenceAnswer && typeof e.referenceAnswer === 'string') e.referenceAnswer = e.referenceAnswer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
if (e.answer && typeof e.answer === 'string') e.answer = e.answer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;') if (e.answer && typeof e.answer === 'string') e.answer = e.answer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
delete e.lcRuleRecords
delete e.lcStudentAnswer
}) })
// for (const i in form) {
// if (form[i] && typeof form[i] === 'string') form[i] = form[i].replace(/<[^>]+>/g, '')
// }
form.purpose = form.purpose.replace(/<[^>]+>/g, '') form.purpose = form.purpose.replace(/<[^>]+>/g, '')
this.$post(this.isLc ? this.api.exportBankExperimentReport : this.api.exportLabReport, { this.$post(this.isLc ? this.api.exportBankExperimentReport : this.api.exportLabReport, {
...form, ...form,

1132
src/pages/station/preview/index.vue
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save