yujialong 1 month ago
parent 996a611e03
commit b692519c5d
  1. 2
      src/setting.js
  2. 7
      src/views/match/manage/matchArch.vue
  3. 27
      src/views/match/manage/matchArchList.vue
  4. 16
      src/views/match/manage/matchInfo.vue

@ -51,7 +51,7 @@ const Setting = {
isDev, isDev,
isPro, isPro,
// 是否使用动态路由 // 是否使用动态路由
dynamicRoute: false, dynamicRoute: true,
/** /**
* @description 默认密码 * @description 默认密码
*/ */

@ -28,8 +28,11 @@
<el-button type="text" @click="toRank(scope.row, scope.$index)">排名</el-button> <el-button type="text" @click="toRank(scope.row, scope.$index)">排名</el-button>
<el-button type="text" @click="toArch(scope.row, scope.$index)">成绩统计</el-button> <el-button type="text" @click="toArch(scope.row, scope.$index)">成绩统计</el-button>
<!-- <el-button @click="toArch(scope.row, scope.$index)">编辑试卷</el-button> --> <!-- <el-button @click="toArch(scope.row, scope.$index)">编辑试卷</el-button> -->
<el-button type="text" @click="showReview(scope.row, '/myReview/records')">我的评阅任务</el-button> <template v-if="scope.row.method === 1">
<el-button type="text" @click="showReview(scope.row, '/allocationReview/records')">分配评阅任务</el-button> <el-button type="text" @click="showReview(scope.row, '/myReview/records')">我的评阅任务</el-button>
<el-button v-auth="'/review:分配评阅任务'" type="text"
@click="showReview(scope.row, '/allocationReview/records')">分配评阅任务</el-button>
</template>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

@ -77,8 +77,9 @@
</li> </li>
</ul> </ul>
<div> <div>
<template v-if="active"> <template v-if="active && method === 1">
<el-button type="primary" size="mini" @click="showReview('/allocationReview/records')">分配评阅任务</el-button> <el-button v-auth="'/review:分配评阅任务'" type="primary" size="mini"
@click="showReview('/allocationReview/records')">分配评阅任务</el-button>
<el-button type="primary" size="mini" @click="showReview('/myReview/records')">我的评阅任务</el-button> <el-button type="primary" size="mini" @click="showReview('/myReview/records')">我的评阅任务</el-button>
<el-button type="primary" size="mini" @click="exportFiles">导出答题文件</el-button> <el-button type="primary" size="mini" @click="exportFiles">导出答题文件</el-button>
</template> </template>
@ -140,16 +141,18 @@
</el-table-column> </el-table-column>
<el-table-column v-if="active" label="操作" align="center" width="300"> <el-table-column v-if="active" label="操作" align="center" width="300">
<template v-if="scope.row.reportId" slot-scope="scope"> <template v-if="scope.row.reportId" slot-scope="scope">
<el-popover placement="top" trigger="click" popper-class="files-tip"> <template v-if="method === 1">
<div> <el-popover placement="top" trigger="click" popper-class="files-tip">
<ul class="match-files"> <div>
<li v-for="(file, i) in scope.row.files" :key="i" @click="preview(file.attachmentUrl)">{{ <ul class="match-files">
file.attachmentName }}</li> <li v-for="(file, i) in scope.row.files" :key="i" @click="preview(file.attachmentUrl)">{{
</ul> file.attachmentName }}</li>
</div> </ul>
<el-button slot="reference" type="text" @click="showFiles(scope.row)">查看答题文件</el-button> </div>
</el-popover> <el-button slot="reference" type="text" @click="showFiles(scope.row)">查看答题文件</el-button>
<el-button style="margin-left: 10px;" type="text" @click="downloadFile(scope.row)">下载答题文件</el-button> </el-popover>
<el-button style="margin-left: 10px;" type="text" @click="downloadFile(scope.row)">下载答题文件</el-button>
</template>
<el-button v-if="method != 2" type="text" @click="toReport(scope.row)">查看成绩报告</el-button> <el-button v-if="method != 2" type="text" @click="toReport(scope.row)">查看成绩报告</el-button>
<el-button type="text" @click="handleDelete(scope.row)">删除</el-button> <el-button type="text" @click="handleDelete(scope.row)">删除</el-button>
</template> </template>

@ -43,8 +43,8 @@
<template> <template>
<tr> <tr>
<th>队长</th> <th>队长</th>
<td>{{ info.caption.userName }}{{ info.caption.realSchool && ',' + info.caption.realSchool }}{{ <td>{{ info.captain.userName }}{{ info.captain.realSchool && ',' + info.captain.realSchool }}{{
info.caption.workNumber && ',' + info.caption.workNumber }}</td> info.captain.workNumber && ',' + info.captain.workNumber }}</td>
</tr> </tr>
<tr> <tr>
<th>团队成员</th> <th>团队成员</th>
@ -144,7 +144,7 @@
}}</el-tag> }}</el-tag>
</div> </div>
<div class="flex-center"> <div class="flex-center">
<p>队长{{ info.caption.userName }}</p> <p>队长{{ info.captain.userName }}</p>
<el-button type="primary" @click="transfer">转让队长</el-button> <el-button type="primary" @click="transfer">转让队长</el-button>
</div> </div>
<el-table :data="info.teamDetail" stripe header-align="center"> <el-table :data="info.teamDetail" stripe header-align="center">
@ -239,7 +239,7 @@ export default {
info: { info: {
isCaption: 0, isCaption: 0,
person: {}, person: {},
caption: {}, captain: {},
team: { team: {
captain: 1, captain: 1,
invitationCode: '' invitationCode: ''
@ -314,10 +314,10 @@ export default {
info.team = {} info.team = {}
info.teamDetail = [] info.teamDetail = []
} else { } else {
info.isCaption = info.team.caption info.isCaption = info.team.captain
} }
const caption = info.teamDetail.find(e => !e.caption) const captain = info.teamDetail.find(e => !e.captain)
info.caption = caption ? caption : {} info.captain = captain ? captain : {}
info.person = info.personalDetail || info.teamDetail.find(e => e.accountId == info.team.accountId) info.person = info.personalDetail || info.teamDetail.find(e => e.accountId == info.team.accountId)
this.originInfo = JSON.parse(JSON.stringify(info)) this.originInfo = JSON.parse(JSON.stringify(info))
// accountId // accountId
@ -451,7 +451,7 @@ export default {
transferSubmit () { transferSubmit () {
if (!this.checkedPlayer) return Util.errorMsg('请选择成员') if (!this.checkedPlayer) return Util.errorMsg('请选择成员')
this.$post(this.api.captainOfTransfer, { this.$post(this.api.captainOfTransfer, {
captainId: this.info.caption.teamId, captainId: this.info.captain.teamId,
playerId: this.checkedPlayer playerId: this.checkedPlayer
}).then(res => { }).then(res => {
this.checkedPlayer = '' this.checkedPlayer = ''

Loading…
Cancel
Save