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 b61162f633
commit 85486b3a33
6 changed files with 495 additions and 508 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. 1
      src/api/index.js
  2. 2
      src/layouts/header/index.vue
  3. 14
      src/pages/match/details/index.vue
  4. 340
      src/pages/match/list/index.vue
  5. 44
      src/pages/record/show/index.vue
  6. 6
      src/setting.js

1
src/api/index.js
Unescape View File

@ -156,7 +156,6 @@ export default {
cCompetitionStageFileDel: `competition/cCompetitionStageFile/batchDeletion`, cCompetitionStageFileDel: `competition/cCompetitionStageFile/batchDeletion`,
viewEventAllocationInformation: `competition/competitionAutomaticAllocationRecord/viewEventAllocationInformation`, viewEventAllocationInformation: `competition/competitionAutomaticAllocationRecord/viewEventAllocationInformation`,
checkTeamStatus: `competition/teamAbnormalInformation/checkTeamStatus`, checkTeamStatus: `competition/teamAbnormalInformation/checkTeamStatus`,
competitionTeamAutomaticAllocationRecordSave: `competition/competitionTeamAutomaticAllocationRecord/save`,
teamAssignmentButtonDisplay: `competition/competitionTeamAutomaticAllocationRecord/teamAssignmentButtonDisplay`, teamAssignmentButtonDisplay: `competition/competitionTeamAutomaticAllocationRecord/teamAssignmentButtonDisplay`,
assignedPlayer: `competition/competition/automaticAllocation/assignedPlayer`, assignedPlayer: `competition/competition/automaticAllocation/assignedPlayer`,
competitionTeamAutomaticAllocationRecordSave: `competition/competitionTeamAutomaticAllocationRecord/saveOrUpdate`, competitionTeamAutomaticAllocationRecordSave: `competition/competitionTeamAutomaticAllocationRecord/saveOrUpdate`,

2
src/layouts/header/index.vue
Unescape View File

@ -98,7 +98,7 @@ export default {
]) ])
}, },
mounted () { mounted () {
if (this.token) { if (util.local.get(Setting.tokenKey)) {
this.getSystemDetail(); this.getSystemDetail();
this.getUserInfo(); this.getUserInfo();
this.getNotice() this.getNotice()

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

@ -260,7 +260,8 @@
<th>竞赛阶段：</th> <th>竞赛阶段：</th>
<td> <td>
<div v-if="showButton" class="m-b-10 text-right"> <div v-if="showButton" class="m-b-10 text-right">
<el-button type="primary" :disabled="status > 3" @click="automaticAllocationMember">{{ <el-button type="primary" :disabled="status > 3" :loading="allocating"
@click="automaticAllocationMember">{{
assignRecord.assignOrNot && status < 3 ? '取消' : '' }}自动分配阶段成员</el-button> assignRecord.assignOrNot && status < 3 ? '取消' : '' }}自动分配阶段成员</el-button>
</div> </div>
<table class="table tc"> <table class="table tc">
@ -654,6 +655,7 @@ export default {
stageTips: [], stageTips: [],
showButton: false, showButton: false,
assignRecord: {}, assignRecord: {},
allocating: false,
}; };
}, },
computed: { computed: {
@ -1145,6 +1147,7 @@ export default {
const res = await this.$post(`${this.api.teamAssignmentButtonDisplay}?competitionId=${this.id}&teamId=${this.info.teamId}`) const res = await this.$post(`${this.api.teamAssignmentButtonDisplay}?competitionId=${this.id}&teamId=${this.info.teamId}`)
this.showButton = res.showButton // 自动分配按钮是否展示 this.showButton = res.showButton // 自动分配按钮是否展示
this.assignRecord = res.teamRecord || {} // 展示成自动分配 or 取消分配 this.assignRecord = res.teamRecord || {} // 展示成自动分配 or 取消分配
this.allocating = false
}, },
// 移除参赛人员 // 移除参赛人员
async removePar (e, stage) { async removePar (e, stage) {
@ -1319,7 +1322,7 @@ export default {
}, },
// 队长创建团队后弹框 // 队长创建团队后弹框
afterCreateTeam () { afterCreateTeam () {
// 已分配 // 赛事自动分配状态为开启，则直接提示；否则弹框询问是否要启用团队自动分配
if (this.allocated) { if (this.allocated) {
Util.successMsg('团队创建成功，系统将自动帮您分配阶段参赛成员，您也可以到参数信息进行指定') Util.successMsg('团队创建成功，系统将自动帮您分配阶段参赛成员，您也可以到参数信息进行指定')
} else { } else {
@ -1331,9 +1334,7 @@ export default {
closeOnClickModal: false, closeOnClickModal: false,
}).then(() => { }).then(() => {
this.automaticAllocation(1) this.automaticAllocation(1)
}).catch(() => { }).catch(() => { })
this.automaticAllocation(0)
})
} }
}, },
// 团队创建成功后分配 // 团队创建成功后分配
@ -1353,6 +1354,7 @@ export default {
type: 'success', type: 'success',
closeOnClickModal: false, closeOnClickModal: false,
}).then(async () => { }).then(async () => {
this.allocating = true
// 报名结束之前则调修改接口，否则调自动分配接口 // 报名结束之前则调修改接口，否则调自动分配接口
if (this.status < 3) { if (this.status < 3) {
await this.$post(this.api.competitionTeamAutomaticAllocationRecordSave, { await this.$post(this.api.competitionTeamAutomaticAllocationRecordSave, {
@ -1571,7 +1573,7 @@ export default {
type: 'success', type: 'success',
closeOnClickModal: false closeOnClickModal: false
}).then(() => { }).then(() => {
this.$post(`${this.api.cancelRegistration}?competitionId = ${this.id} `).then(res => { this.$post(`${this.api.cancelRegistration}?competitionId=${this.id}`).then(res => {
this.status = 2 this.status = 2
this.$message.success('取消报名成功') this.$message.success('取消报名成功')
this.getData() this.getData()

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

@ -3,21 +3,15 @@
<div class="search"> <div class="search">
<h6>赛事竞技，精彩纷呈</h6> <h6>赛事竞技，精彩纷呈</h6>
<div class="input"> <div class="input">
<img src="@/assets/img/search.png" <img src="@/assets/img/search.png" alt="">
alt=""> <input type="text" placeholder="请输入关键词" v-model="keyword">
<input type="text"
placeholder="请输入关键词"
v-model="keyword">
</div> </div>
</div> </div>
<div class="main"> <div class="main">
<div class="center-wrap list-inner"> <div class="center-wrap list-inner">
<ul v-if="token" <ul v-if="token" class="nav">
class="nav"> <li :class="{ active: form.eventType === item.id }" v-for="(item, index) in typeList" :key="index"
<li :class="{ active: form.eventType === item.id }"
v-for="(item, index) in typeList"
:key="index"
@click="changeType(item.id)">{{ item.name }} @click="changeType(item.id)">{{ item.name }}
</li> </li>
</ul> </ul>
@ -28,43 +22,27 @@
<dl v-if="form.eventType !== 1"> <dl v-if="form.eventType !== 1">
<dt>比赛范围：</dt> <dt>比赛范围：</dt>
<template v-if="form.eventType === 2"> <template v-if="form.eventType === 2">
<dd v-for="(item, i) in squareScopes" <dd v-for="(item, i) in squareScopes" :key="i" :class="{ active: form.competitionScope == item.id }"
:key="i"
:class="{active: form.competitionScope == item.id}"
@click="changeScope(item.id)">{{ item.name }}</dd> @click="changeScope(item.id)">{{ item.name }}</dd>
</template> </template>
<template v-if="form.eventType === 3"> <template v-if="form.eventType === 3">
<dd v-for="(item, i) in scopes" <dd v-for="(item, i) in scopes" :key="i" :class="{ active: form.competitionScope == item.id }"
:key="i"
:class="{active: form.competitionScope == item.id}"
@click="changeScope(item.id)">{{ item.name }}</dd> @click="changeScope(item.id)">{{ item.name }}</dd>
</template> </template>
<template v-if="form.eventType !== 1 && form.competitionScope === 2"> <template v-if="form.eventType !== 1 && form.competitionScope === 2">
<div class="select-wrap"> <div class="select-wrap">
<span class="label">省份</span> <span class="label">省份</span>
<el-select size="small" <el-select size="small" v-model="form.provinceId" clearable @change="getCity">
v-model="form.provinceId" <el-option label="不限" value=""></el-option>
clearable <el-option v-for="(item, index) in provinces" :key="index" :label="item.provinceName"
@change="getCity">
<el-option label="不限"
value=""></el-option>
<el-option v-for="(item,index) in provinces"
:key="index"
:label="item.provinceName"
:value="item.provinceId"></el-option> :value="item.provinceId"></el-option>
</el-select> </el-select>
</div> </div>
<div class="select-wrap"> <div class="select-wrap">
<span class="label">城市</span> <span class="label">城市</span>
<el-select size="small" <el-select size="small" v-model="form.cityId" clearable @change="initData">
v-model="form.cityId" <el-option label="不限" value=""></el-option>
clearable <el-option v-for="(item, index) in cities" :key="index" :label="item.cityName"
@change="initData">
<el-option label="不限"
value=""></el-option>
<el-option v-for="(item,index) in cities"
:key="index"
:label="item.cityName"
:value="item.cityId"></el-option> :value="item.cityId"></el-option>
</el-select> </el-select>
</div> </div>
@ -72,10 +50,9 @@
</dl> </dl>
<dl> <dl>
<dt>筛选排序：</dt> <dt>筛选排序：</dt>
<dd v-for="(item, i) in sorts" <dd v-for="(item, i) in sorts" :key="i" :class="{ active: form.sequence == item.id }"
:key="i" @click="changeSort(item.id)">{{
:class="{active: form.sequence == item.id}" item.name }}</dd>
@click="changeSort(item.id)">{{ item.name }}</dd>
</dl> </dl>
</div> </div>
</div> </div>
@ -83,37 +60,39 @@
<div class="list"> <div class="list">
<template v-if="listData.length"> <template v-if="listData.length">
<ul> <ul>
<li v-for="(item,index) in listData" <li v-for="(item, index) in listData" :key="index" @click="toDetail(item)">
:key="index"
@click="toDetail(item)">
<div class="left"> <div class="left">
<el-button v-if="item.status === 1 || item.status === 2 || item.curStage" <el-button v-if="item.status === 1 || item.status === 2 || item.curStage"
:class="['stage-label', {playing: item.curStage}]" :class="['stage-label', { playing: item.curStage }]" type="primary">{{ item.status === 1 ||
type="primary">{{ item.status === 1 || item.status === 2 ? '报名中' : item.curStage ? '竞赛中' : '' }}</el-button> item.status === 2 ? '报名中' : item.curStage ? '竞赛中' : '' }}</el-button>
<div class="cover"> <div class="cover">
<img :src="item.coverUrl || 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220623/png/1539857403162943488.png'" <img
:src="item.coverUrl || 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220623/png/1539857403162943488.png'"
alt=""> alt="">
</div> </div>
<div class="info"> <div class="info">
<div class="title">{{ item.competitionName }}</div> <div class="title">{{ item.competitionName }}</div>
<div class="metas"> <div class="metas">
<template v-if="item.sponsor"> <template v-if="item.sponsor">
<div :class="{'flex-top': item.sponsor.split(',').length > 1}"> <div :class="{ 'flex-top': item.sponsor.split(',').length > 1 }">
<span class="label">主办方：&emsp;</span> <span class="label">主办方：&emsp;</span>
<span class="val">{{ item.sponsor }}</span> <span class="val">{{ item.sponsor }}</span>
</div> </div>
</template> </template>
<div> <div>
<span class="label">报名时间：</span><span class="val">{{ item.signUpStartTime}} ~ {{ item.signUpEndTime }}</span> <span class="label">报名时间：</span><span class="val">{{ item.signUpStartTime }} ~ {{
item.signUpEndTime }}</span>
</div> </div>
<div> <div>
<span class="label">比赛时间：</span><span class="val">{{ item.playStartTime}} ~ {{ item.playEndTime }}</span> <span class="label">比赛时间：</span><span class="val">{{ item.playStartTime }} ~ {{
item.playEndTime }}</span>
</div> </div>
<div :title="item.locations || item.range"> <div :title="item.locations || item.range">
<span class="label">比赛范围：</span><span class="val">{{ item.locations || item.range }}</span> <span class="label">比赛范围：</span><span class="val">{{ item.locations || item.range }}</span>
</div> </div>
<div> <div>
<span class="label">比赛类型：</span><span class="val">{{ item.competitionType ? '团体赛' : '个人赛' }}</span> <span class="label">比赛类型：</span><span class="val">{{ item.competitionType ? '团体赛' : '个人赛'
}}</span>
</div> </div>
<div v-if="item.curStage"> <div v-if="item.curStage">
<span class="label">当前阶段：</span><span class="val">{{ item.curStage.stageName }}</span> <span class="label">当前阶段：</span><span class="val">{{ item.curStage.stageName }}</span>
@ -123,27 +102,25 @@
</div> </div>
<div class="right"> <div class="right">
<p v-if="item.status" <p v-if="item.status"
:class="['sign-status', {signing: item.status == 2, signed: item.status == 1, playing: item.status == 4 && item.curStage}]">{{ item.whetherToSignUp === 0 ? '已报名' : '未报名' }}</p> :class="['sign-status', { signing: item.status == 2, signed: item.status == 1, playing: item.status == 4 && item.curStage }]">
<el-dropdown v-if="item.playingStages && item.playingStages.length > 1" {{ item.whetherToSignUp === 0 ? '已报名' : '未报名' }}</p>
@click.stop="stageClick" <el-dropdown v-if="item.playingStages && item.playingStages.length > 1" @click.stop="stageClick"
@command="e => chooseStage(e, item)"> @command="e => chooseStage(e, item)">
<el-button type="primary" <el-button type="primary" style="background-color: #f96d6d;border: 0;">
style="background-color: #f96d6d;border: 0;">
选择竞赛<i class="el-icon-arrow-down el-icon--right"></i> 选择竞赛<i class="el-icon-arrow-down el-icon--right"></i>
</el-button> </el-button>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item v-for="(stage, i) in item.playingStages" <el-dropdown-item v-for="(stage, i) in item.playingStages" :key="i" :command="stage">进入{{
:key="i" stage.stageName
:command="stage">进入{{ stage.stageName }}</el-dropdown-item> }}</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<p class="status" <p class="status" v-else-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 }"
: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)">{{
:title="item.status == 4 ? item.stageName : statusList[item.status]" item.status == 4
@click.stop="signup(item)">{{ item.status == 4 ? item.stageName : statusList[item.status] }}</p> ? item.stageName : statusList[item.status] }}</p>
<p class="end-text" <p class="end-text" v-if="item.end">
v-if="item.end">
距离{{ item.status == 4 ? item.endText : endList[item.status] }}还有 距离{{ item.status == 4 ? item.endText : endList[item.status] }}还有
<em>{{ item.end }}</em> <em>{{ item.end }}</em>
</p> </p>
@ -151,19 +128,15 @@
</li> </li>
</ul> </ul>
<div class="pagination"> <div class="pagination">
<el-pagination background <el-pagination background layout="total, prev, pager, next" :total="totals"
layout="total, prev, pager, next" @current-change="handleCurrentChange" :current-page="page">
:total="totals"
@current-change="handleCurrentChange"
:current-page="page">
</el-pagination> </el-pagination>
</div> </div>
</template> </template>
<template v-else> <template v-else>
<div class="empty"> <div class="empty">
<div> <div>
<img src="@/assets/img/none.png" <img src="@/assets/img/none.png" alt="">
alt="">
<p>暂无赛事</p> <p>暂无赛事</p>
</div> </div>
</div> </div>
@ -173,174 +146,108 @@
</div> </div>
</div> </div>
<el-dialog title="报名" <el-dialog title="报名" :visible.sync="peopleSignupVisible" :close-on-click-modal="false" width="300px">
:visible.sync="peopleSignupVisible"
:close-on-click-modal="false"
width="300px">
<el-form class="dia-form"> <el-form class="dia-form">
<el-form-item> <el-form-item>
<el-input placeholder="请输入4位数大赛邀请码" <el-input placeholder="请输入4位数大赛邀请码" maxlength="4"
maxlength="4"
v-model="peopleSignupForm.registrationInvitationCode"></el-input> v-model="peopleSignupForm.registrationInvitationCode"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" <span slot="footer" class="dialog-footer">
class="dialog-footer"> <el-button size="small" type="primary" @click="peopleSignupSubmit">报名</el-button>
<el-button size="small" <el-button size="small" @click="peopleSignupVisible = false">取消</el-button>
type="primary"
@click="peopleSignupSubmit">报名</el-button>
<el-button size="small"
@click="peopleSignupVisible = false">取消</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog title="报名" <el-dialog title="报名" :visible.sync="enterVisible" :close-on-click-modal="false" width="300px">
:visible.sync="enterVisible"
:close-on-click-modal="false"
width="300px">
<el-form class="dia-form"> <el-form class="dia-form">
<p style="margin-bottom: 5px">请选择要加入的团队</p> <p style="margin-bottom: 5px">请选择要加入的团队</p>
<el-form-item> <el-form-item>
<el-select class="w-100" <el-select class="w-100" v-model="enterForm.teamId" filterable>
v-model="enterForm.teamId" <el-option v-for="(item, i) in teams" :key="i" :label="item.teamName" :value="item.teamId"></el-option>
filterable>
<el-option v-for="(item, i) in teams"
:key="i"
:label="item.teamName"
:value="item.teamId"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-input placeholder="请输入6位数团队邀请码" <el-input placeholder="请输入6位数团队邀请码" maxlength="6" v-model="enterForm.invitationCode"></el-input>
maxlength="6"
v-model="enterForm.invitationCode"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="curItem.isNeedCode"> <el-form-item v-if="curItem.isNeedCode">
<el-input placeholder="请输入4位数大赛邀请码" <el-input placeholder="请输入4位数大赛邀请码" maxlength="4" v-model="enterForm.registrationInvitationCode"></el-input>
maxlength="4"
v-model="enterForm.registrationInvitationCode"></el-input>
</el-form-item> </el-form-item>
<p class="tips"> <p class="tips">
查找不到团队？点击 <el-link :underline="false" 查找不到团队？点击 <el-link :underline="false" type="primary" @click="toTeam">创建团队</el-link>
type="primary"
@click="toTeam">创建团队</el-link>
</p> </p>
</el-form> </el-form>
<span slot="footer" <span slot="footer" class="dialog-footer">
class="dialog-footer"> <el-button size="small" type="primary" @click="enterSubmit">报名</el-button>
<el-button size="small" <el-button size="small" @click="enterVisible = false">取消</el-button>
type="primary"
@click="enterSubmit">报名</el-button>
<el-button size="small"
@click="enterVisible = false">取消</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog title="创建团队" <el-dialog title="创建团队" :visible.sync="teamVisible" :close-on-click-modal="false" width="300px">
:visible.sync="teamVisible"
:close-on-click-modal="false"
width="300px">
<el-form class="dia-form"> <el-form class="dia-form">
<el-form-item> <el-form-item>
<el-input placeholder="请输入团队名称" <el-input placeholder="请输入团队名称" maxlength="10" v-model="teamForm.teamName"></el-input>
maxlength="10"
v-model="teamForm.teamName"></el-input>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-input placeholder="请输入6位数团队邀请码" <el-input placeholder="请输入6位数团队邀请码" maxlength="6" v-model="teamForm.invitationCode"></el-input>
maxlength="6"
v-model="teamForm.invitationCode"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="curItem.isNeedCode"> <el-form-item v-if="curItem.isNeedCode">
<el-input placeholder="请输入4位数大赛邀请码" <el-input placeholder="请输入4位数大赛邀请码" maxlength="4" v-model="teamForm.registrationInvitationCode"></el-input>
maxlength="4"
v-model="teamForm.registrationInvitationCode"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" <span slot="footer" class="dialog-footer">
class="dialog-footer"> <el-button size="small" type="primary" @click="teamSubmit">创建并报名</el-button>
<el-button size="small" <el-button size="small" @click="teamVisible = false">取消</el-button>
type="primary"
@click="teamSubmit">创建并报名</el-button>
<el-button size="small"
@click="teamVisible = false">取消</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog :title="curStageItem.stageName" <el-dialog :title="curStageItem.stageName" :visible.sync="stageVisible" :close-on-click-modal="false" width="600px"
:visible.sync="stageVisible"
:close-on-click-modal="false"
width="600px"
@close="stageClose"> @close="stageClose">
<template v-if="curStageItem"> <template v-if="curStageItem">
<div v-if="curStageItem.systemLink" <div v-if="curStageItem.systemLink" class="m-b-20">
class="m-b-20">
<span class="fs-14">进入比赛：</span> <span class="fs-14">进入比赛：</span>
<el-button type="danger" <el-button type="danger" style="font-size: 13px" @click="toOffline">进入{{ curStageItem.stageName }}</el-button>
style="font-size: 13px"
@click="toOffline">进入{{ curStageItem.stageName }}</el-button>
</div> </div>
<div v-if="curStageItem.fileUrl" <div v-if="curStageItem.fileUrl" class="flex m-b-20 fs-14">
class="flex m-b-20 fs-14">
<span style="padding-top: 7px">文件下载：</span> <span style="padding-top: 7px">文件下载：</span>
<div> <div>
<div v-for="file in curStageItem.fileList" <div v-for="file in curStageItem.fileList" :key="file">
:key="file">
<span style="margin-right: 10px;color: #606266;">{{ file.name }}</span> <span style="margin-right: 10px;color: #606266;">{{ file.name }}</span>
<el-button type="text" <el-button type="text" style="font-size: 14px"
style="font-size: 14px" @click="download({ fileName: file.name, filePath: file.url })">点击下载</el-button>
@click="download({fileName: file.name, filePath: file.url})">点击下载</el-button>
</div> </div>
</div> </div>
</div> </div>
<div class="flex m-b-20"> <div class="flex m-b-20">
<span class="fs-14">文件上传：</span> <span class="fs-14">文件上传：</span>
<el-upload class="file-upload flex-1" <el-upload class="file-upload flex-1" :disabled="uploading" :before-upload="beforeUpload"
:disabled="uploading" :on-remove="handleRemove" :on-error="uploadError" :before-remove="beforeRemove" :on-preview="handlePreview"
:before-upload="beforeUpload" :limit="1" action="" :on-exceed="handleExceed" :file-list="fileList" :http-request="handleRequest"
:on-remove="handleRemove"
:on-error="uploadError"
:before-remove="beforeRemove"
:on-preview="handlePreview"
:limit="1"
action=""
:on-exceed="handleExceed"
:file-list="fileList"
:http-request="handleRequest"
name="file"> name="file">
<el-button size="small" <el-button size="small" type="primary" :loading="uploading"
type="primary" :disabled="!!(fileList && fileList.length) || uploading">{{ uploading ? '正在上传' : fileList &&
:loading="uploading" fileList.length ? '已上传' : '上传文件' }}</el-button>
:disabled="!!(fileList && fileList.length) || uploading">{{ uploading ? '正在上传' : fileList && fileList.length ? '已上传' : '上传文件' }}</el-button> <div slot="tip" class="el-upload__tip relative">
<div slot="tip" <el-progress v-if="uploading" class="m-b-5" :stroke-width="3" :percentage="uploadProgress"></el-progress>
class="el-upload__tip relative">
<el-progress v-if="uploading"
class="m-b-5"
:stroke-width="3"
:percentage="uploadProgress"></el-progress>
<p>请上传大小1G以内的文件，支持常见文件格式。</p> <p>请上传大小1G以内的文件，支持常见文件格式。</p>
<p>只允许上传一个文件，如有多个文件则需打包再上传。</p> <p>只允许上传一个文件，如有多个文件则需打包再上传。</p>
<div v-if="fileList.length" <div v-if="fileList.length" class="download" @click="downloadFile">下载</div>
class="download"
@click="downloadFile">下载</div>
</div> </div>
</el-upload> </el-upload>
</div> </div>
<div class="fs-14">说明：{{ curStageItem.stageExplain }}</div> <div class="fs-14">说明：{{ curStageItem.stageExplain }}</div>
</template> </template>
<span slot="footer" <span slot="footer" class="dialog-footer">
class="dialog-footer"> <el-button size="small" @click="stageVisible = false">关闭</el-button>
<el-button size="small"
@click="stageVisible = false">关闭</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { mapState, mapMutations } from "vuex"; import { mapState, mapMutations } from 'vuex'
import Setting from "@/setting" import Setting from '@/setting'
import Util from "@/libs/util" import Util from '@/libs/util'
import Bus from '@/libs/bus' import Bus from '@/libs/bus'
import OSS from 'ali-oss' import OSS from 'ali-oss'
import OssConfig from '@/components/upload/config.js' import OssConfig from '@/components/upload/config.js'
@ -733,7 +640,7 @@ export default {
this.teams = teamList this.teams = teamList
}).catch(res => { }) }).catch(res => { })
}, },
// 团队提交 // 创建团队提交
teamSubmit () { teamSubmit () {
const form = this.teamForm const form = this.teamForm
if (!form.teamName) return Util.errorMsg('请输入团队名称') if (!form.teamName) return Util.errorMsg('请输入团队名称')
@ -745,8 +652,36 @@ export default {
this.enterVisible = false this.enterVisible = false
this.getData() this.getData()
Util.successMsg('报名成功！') Util.successMsg('报名成功！')
this.afterCreateTeam(res.teamId)
}).catch(res => { }) }).catch(res => { })
}, },
// 队长创建团队后弹框
async afterCreateTeam (id) {
// 已分配
const res = await this.$post(`${this.api.viewEventAllocationInformation}?competitionId=${this.teamForm.competitionId}`)
// 赛事自动分配状态为开启，则直接提示；否则弹框询问是否要启用团队自动分配
if (res.data && res.data.assignOrNot) {
Util.successMsg('团队创建成功，系统将自动帮您分配阶段参赛成员，您也可以到参数信息进行指定')
} else {
// 未分配
this.$confirm('是否要启用自动分配成员参加阶段赛项', '提示', {
cancelButtonText: '否',
confirmButtonText: '是',
type: 'success',
closeOnClickModal: false,
}).then(() => {
this.automaticAllocation(id)
}).catch(() => { })
}
},
// 团队创建成功后分配
async automaticAllocation (teamId) {
await this.$post(this.api.competitionTeamAutomaticAllocationRecordSave, {
assignOrNot: 1,
competitionId: this.teamForm.competitionId,
teamId
})
},
// 该阶段是否符合线下能进入比赛的条件 // 该阶段是否符合线下能进入比赛的条件
offlineCanEntry (stage) { offlineCanEntry (stage) {
return stage.method === 2 && !!(stage.systemLink || stage.whetherToUploadFiles) return stage.method === 2 && !!(stage.systemLink || stage.whetherToUploadFiles)
@ -1060,21 +995,25 @@ export default {
text-align: center; text-align: center;
background: url(../../../assets/img/match-bg4.png) (27px 10px) / auto no-repeat, background: url(../../../assets/img/match-bg4.png) (27px 10px) / auto no-repeat,
url(../../../assets/img/match-bg5.png) (98% 20px) / auto no-repeat, url(../../../assets/img/match-bg3.png) 0 0/100% 100% no-repeat; url(../../../assets/img/match-bg5.png) (98% 20px) / auto no-repeat, url(../../../assets/img/match-bg3.png) 0 0/100% 100% no-repeat;
h6 { h6 {
margin-bottom: 25px; margin-bottom: 25px;
font-size: 26px; font-size: 26px;
color: #fff; color: #fff;
} }
.input { .input {
position: relative; position: relative;
width: 700px; width: 700px;
margin: 0 auto; margin: 0 auto;
} }
img { img {
position: absolute; position: absolute;
top: 19px; top: 19px;
left: 14px; left: 14px;
} }
input { input {
width: 100%; width: 100%;
height: 62px; height: 62px;
@ -1087,28 +1026,34 @@ export default {
border-radius: 4px; border-radius: 4px;
} }
} }
.main { .main {
background: url(../../../assets/img/match-bg1.png) (0px 95px) / auto auto no-repeat, 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; url(../../../assets/img/match-bg2.png) (98% bottom) / auto auto no-repeat;
.center-wrap { .center-wrap {
width: 1078px; width: 1078px;
} }
} }
.filter { .filter {
width: 100%; width: 100%;
padding: 0 20px; padding: 0 20px;
margin-bottom: 20px; margin-bottom: 20px;
background-color: #fff; background-color: #fff;
dl { dl {
display: flex; display: flex;
align-items: center; align-items: center;
margin: 20px 0; margin: 20px 0;
dt { dt {
color: #333; color: #333;
font-size: 16px; font-size: 16px;
font-weight: 600; font-weight: 600;
white-space: nowrap; white-space: nowrap;
} }
dd { dd {
padding: 5px 15px; padding: 5px 15px;
color: #6a6a6a; color: #6a6a6a;
@ -1116,6 +1061,7 @@ export default {
white-space: nowrap; white-space: nowrap;
cursor: pointer; cursor: pointer;
border-radius: 4px; border-radius: 4px;
&.active { &.active {
color: $main-color; color: $main-color;
background-color: #e6f0ff; background-color: #e6f0ff;
@ -1123,28 +1069,34 @@ export default {
} }
} }
} }
.select-wrap { .select-wrap {
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
margin: 0 10px; margin: 0 10px;
.label { .label {
margin-right: 10px; margin-right: 10px;
white-space: nowrap; white-space: nowrap;
} }
.el-select { .el-select {
width: 130px; width: 130px;
} }
} }
.list-inner { .list-inner {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: flex-start; align-items: flex-start;
} }
.nav { .nav {
width: 156px; width: 156px;
text-align: right; text-align: right;
overflow: hidden; overflow: hidden;
background-color: #fff; background-color: #fff;
li { li {
padding: 0 24px; padding: 0 24px;
font-size: 16px; font-size: 16px;
@ -1153,6 +1105,7 @@ export default {
border-bottom: 2px solid #f3f6fa; border-bottom: 2px solid #f3f6fa;
border-right: 2px solid transparent; border-right: 2px solid transparent;
cursor: pointer; cursor: pointer;
&:before { &:before {
content: ''; content: '';
display: inline-block; display: inline-block;
@ -1163,18 +1116,22 @@ export default {
border-radius: 50%; border-radius: 50%;
background-color: #666; background-color: #666;
} }
&.active { &.active {
color: $main-color; color: $main-color;
border-right-color: $main-color; border-right-color: $main-color;
&:before { &:before {
background-color: $main-color; background-color: $main-color;
} }
} }
} }
} }
.list-wrap { .list-wrap {
width: calc(100% - 180px); width: calc(100% - 180px);
margin-left: 24px; margin-left: 24px;
.list { .list {
li { li {
display: flex; display: flex;
@ -1185,26 +1142,32 @@ export default {
cursor: pointer; cursor: pointer;
border-radius: 6px; border-radius: 6px;
background-color: #fff; background-color: #fff;
.right { .right {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: center; justify-content: center;
align-items: flex-end; align-items: flex-end;
flex: 1; flex: 1;
.sign-status { .sign-status {
margin-bottom: 10px; margin-bottom: 10px;
font-size: 14px; font-size: 14px;
color: $main-color; color: $main-color;
&.signing { &.signing {
color: $main-color; color: $main-color;
} }
&.signed { &.signed {
color: #52c41a; color: #52c41a;
} }
&.playing { &.playing {
color: #f96d6d; color: #f96d6d;
} }
} }
.status { .status {
max-width: 120px; max-width: 120px;
padding: 0 23px; padding: 0 23px;
@ -1215,18 +1178,23 @@ export default {
background-color: #52c41a; background-color: #52c41a;
border-radius: 4px; border-radius: 4px;
@include ellipsis(); @include ellipsis();
&.wait { &.wait {
background-color: #faad14; background-color: #faad14;
} }
&.signing { &.signing {
background-color: $main-color; background-color: $main-color;
} }
&.signed { &.signed {
background-color: #52c41a; background-color: #52c41a;
} }
&.playing { &.playing {
background-color: #f96d6d; background-color: #f96d6d;
} }
&.finish { &.finish {
background-color: #ccc; background-color: #ccc;
} }
@ -1272,19 +1240,23 @@ export default {
} }
} }
} }
.left { .left {
position: relative; position: relative;
display: inline-flex; display: inline-flex;
.stage-label { .stage-label {
position: absolute; position: absolute;
top: -16px; top: -16px;
left: -16px; left: -16px;
border: 0; border: 0;
background-color: rgb(101, 227, 181); background-color: rgb(101, 227, 181);
&.playing { &.playing {
background-color: rgb(251, 174, 41); background-color: rgb(251, 174, 41);
} }
} }
.cover { .cover {
img { img {
width: 275px; width: 275px;
@ -1295,6 +1267,7 @@ export default {
.info { .info {
margin-left: 16px; margin-left: 16px;
.title { .title {
margin-bottom: 10px; margin-bottom: 10px;
font-size: 20px; font-size: 20px;
@ -1302,9 +1275,11 @@ export default {
color: #0b1d30; color: #0b1d30;
line-height: 1; line-height: 1;
} }
.metas { .metas {
font-size: 14px; font-size: 14px;
color: #666; color: #666;
div { div {
display: flex; display: flex;
align-items: center; align-items: center;
@ -1340,23 +1315,28 @@ export default {
} }
} }
} }
/deep/.dia-form { /deep/.dia-form {
.w-100 { .w-100 {
width: 100%; width: 100%;
} }
.tips { .tips {
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
} }
/deep/.file-upload { /deep/.file-upload {
.el-upload__tip { .el-upload__tip {
color: #727272; color: #727272;
} }
.el-progress { .el-progress {
white-space: nowrap; white-space: nowrap;
} }
.download { .download {
position: absolute; position: absolute;
bottom: -25px; bottom: -25px;
@ -1365,8 +1345,10 @@ export default {
color: #007eff; color: #007eff;
cursor: pointer; cursor: pointer;
} }
.el-upload-list__item { .el-upload-list__item {
width: 70%; width: 70%;
&:first-child { &:first-child {
margin-top: 5px; margin-top: 5px;
} }

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

@ -86,22 +86,22 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="judgmentName" label="判分点" width="200" align="center"></el-table-column> <el-table-column prop="judgmentName" label="判分点" width="200" align="center"></el-table-column>
<el-table-column v-if="IsLc" prop="judgmentName" label="考核点" align="center" :key="2" width="150"> <el-table-column v-if="isLc" prop="judgmentName" label="考核点" align="center" :key="2" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-for="(item, index) in scope.row.lcRuleRecords" :key="index"> <div v-for="(item, i) in scope.row.lcRuleRecords" :key="i" class="rule-line">
<span> <span>{{ item.index }}. </span>{{ item.name }}
<span>{{ index + 1 }}. </span>{{ item.name }} <p v-if="item.ruleOperation === '或'" class="m-t-5 m-b-5">
</span> {{ item.ruleOperation === '或' ? '或' : '' }}</p>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="ruleAnswer" label="参考答案" :key="3" style='word-wrap: break-word'> <el-table-column prop="ruleAnswer" label="参考答案" :key="3" style='word-wrap: break-word'>
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.lcRuleRecords"> <div v-if="scope.row.lcRuleRecords">
<div v-for="(item, index) in scope.row.lcRuleRecords" :key="index"> <div v-for="(item, i) in scope.row.lcRuleRecords" :key="i" class="rule-line">
<span> <span>{{ item.index }}. </span>{{ item.ruleAnswer }}
<span>{{ index + 1 }}. </span>{{ item.ruleAnswer }} <p v-if="item.ruleOperation === '或'" class="p-l-10 m-t-5 m-b-5">
</span> {{ item.ruleOperation === '或' ? '或' : '' }}</p>
</div> </div>
</div> </div>
<div v-else v-html="scope.row.referenceAnswer"></div> <div v-else v-html="scope.row.referenceAnswer"></div>
@ -109,15 +109,15 @@
</el-table-column> </el-table-column>
<el-table-column prop="userAnswer" :key="4" label="学生答案"> <el-table-column prop="userAnswer" :key="4" label="学生答案">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.lcRuleRecords"> <div v-if="scope.row.lcStudentAnswer">
<div v-for="(item, index) in scope.row.lcRuleRecords" :key="index"> <div v-for="(item, i) in scope.row.lcStudentAnswer" :key="i" class="rule-line">
{{ index + 1 }}. {{ item.userAnswer || '未填写' }} {{ i + 1 }}. {{ item.userAnswer || '未填写' }}
</div> </div>
</div> </div>
<div v-else v-html="scope.row.answer" style="white-space: pre-wrap"></div> <div v-else v-html="scope.row.answer" style="white-space: pre-wrap"></div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-if="!IsLc" prop="runResult" label="学生运行结果" :key="5" align="center"> <el-table-column v-if="!isLc" prop="runResult" label="学生运行结果" :key="5" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="m-b-20" v-html="scope.row.runResult" style="white-space: pre-wrap"></div> <div class="m-b-20" v-html="scope.row.runResult" style="white-space: pre-wrap"></div>
<template v-if="scope.row.runThePictureList"> <template v-if="scope.row.runThePictureList">
@ -168,7 +168,7 @@ export default {
editing: false, editing: false,
loadIns: null, loadIns: null,
loading: false, loading: false,
IsLc: false, isLc: false,
userScores: [], userScores: [],
quills: [], quills: [],
quillIndex1: 0, quillIndex1: 0,
@ -254,13 +254,21 @@ export default {
}, },
// 处理实验数据 // 处理实验数据
handleList (list) { handleList (list) {
this.IsLc = list.find(e => e.lcRuleRecords) // 流程系统才有lcRuleRecords this.isLc = list.find(e => e.lcRuleRecords) // 流程系统才有lcRuleRecords
if (this.IsLc) { if (this.isLc) {
list.map(e => { list.map(e => {
e.assessmentPoint = '' e.assessmentPoint = ''
e.referenceAnswer = '' e.referenceAnswer = ''
e.answer = '' e.answer = ''
let index = 1
e.lcRuleRecords.map((n, i) => { e.lcRuleRecords.map((n, i) => {
n.index = index
if (n.ruleOperation === '或') {
index = 1
} else {
index++
}
e.assessmentPoint += `${i + 1}.${n.name}` e.assessmentPoint += `${i + 1}.${n.name}`
e.referenceAnswer += `${i + 1}.${n.ruleAnswer}` e.referenceAnswer += `${i + 1}.${n.ruleAnswer}`
if (!n.userAnswer) n.userAnswer = '未填写' if (!n.userAnswer) n.userAnswer = '未填写'
@ -298,7 +306,7 @@ export default {
// if (form[i] && typeof form[i] === 'string') form[i] = form[i].replace(/<[^>]+>/g, '') // 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,
experimentalData: list experimentalData: list
}).then(res => { }).then(res => {
@ -351,7 +359,7 @@ export default {
}, },
editReport () { // 编辑实验报告 editReport () { // 编辑实验报告
if (this.editing) { if (this.editing) {
this.$post(`${this.api.updateReport}`, this.infoData).then(res => { this.$post(this.api.updateReport, this.infoData).then(res => {
this.editing = false; this.editing = false;
util.successMsg("修改成功"); util.successMsg("修改成功");
}).catch(err => { }); }).catch(err => { });

6
src/setting.js
Unescape View File

@ -16,17 +16,13 @@ let sandPath = `${location.origin}/sandbox` // 沙盘地址
let host = `${location.origin}/` let host = `${location.origin}/`
// let host = `https://izhixinyun.com/` // let host = `https://izhixinyun.com/`
let uploadURL = `${location.origin}/` let uploadURL = `${location.origin}/`
// let uploadURL = `https://izhixinyun.com/`
let title = isZxy ? let title = isZxy ?
'智信云' : '智信云' :
(isHh || isCH) ? (isHh || isCH) ?
'学生端' : '学生端' :
'职站' '职站'
if (isPro) { if (isDev) {
// 职站生产
uploadURL = `https://www.huorantech.cn/`
} else if (isDev) {
// 本地 // 本地
systemPath = `http://${location.hostname}:8093` systemPath = `http://${location.hostname}:8093`
sandPath = `http://${location.hostname}:9520` sandPath = `http://${location.hostname}:9520`

Write Preview
Loading…
Cancel
Save