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

fix

Browse Source
master
yujialong 8 months ago
parent dd4e060637
commit 55b3fb1996
10 changed files with 544 additions and 462 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/pages/match/add/step1.vue
  3. 2
      src/pages/match/list/index.vue
  4. 7
      src/pages/match/manage/index.vue
  5. 156
      src/pages/match/manage/matchArchList.vue
  6. 41
      src/pages/match/manage/matchInfo.vue
  7. 105
      src/pages/match/manage/matchRank.vue
  8. 37
      src/pages/match/manage/matchSignup.vue
  9. 2
      src/pages/product/show/index.vue
  10. 17
      src/pages/project/add/index.vue

1
src/api/index.js
Unescape View File

@ -268,6 +268,7 @@ export default {
allExperimentalResultsAreDerived: `${host}competition/competition/performance/allExperimentalResultsAreDerived`, allExperimentalResultsAreDerived: `${host}competition/competition/performance/allExperimentalResultsAreDerived`,
derivedRanking: `${host}competition/competition/rank/derivedRanking`, derivedRanking: `${host}competition/competition/rank/derivedRanking`,
individualDerivedRanking: `${host}competition/competition/rank/individualDerivedRanking`, individualDerivedRanking: `${host}competition/competition/rank/individualDerivedRanking`,
gradeDownloadExcel: `${host}competition/competition/performance/downloadExcel`,
gradeImport: `https://www.occupationlab.com/template/赛事成绩导入模板.xlsx`, gradeImport: `https://www.occupationlab.com/template/赛事成绩导入模板.xlsx`,
rankImportTeam: `https://www.occupationlab.com/template/赛事排名导入模板(团队赛).xlsx`, rankImportTeam: `https://www.occupationlab.com/template/赛事排名导入模板(团队赛).xlsx`,
rankImportPerson: `https://www.occupationlab.com/template/赛事排名导入模板(个人赛).xlsx`, rankImportPerson: `https://www.occupationlab.com/template/赛事排名导入模板(个人赛).xlsx`,

2
src/pages/match/add/step1.vue
Unescape View File

@ -146,11 +146,13 @@
<div> <div>
<el-radio v-model="form.competitionScope" <el-radio v-model="form.competitionScope"
:label="2">指定区域、院校</el-radio> :label="2">指定区域、院校</el-radio>
<template v-if="form.competitionScope === 2">
<el-button v-if="form.competitionScope === 2" <el-button v-if="form.competitionScope === 2"
type="primary" type="primary"
size="mini" size="mini"
@click="showRange">选择院校</el-button> @click="showRange">选择院校</el-button>
<span style="margin-left: 20px">{{ rangeName }}</span> <span style="margin-left: 20px">{{ rangeName }}</span>
</template>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item class="req" <el-form-item class="req"

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

@ -429,7 +429,7 @@ export default {
}).catch(err => { }) }).catch(err => { })
}, },
manage (row) { manage (row) {
this.$router.push(`/match/manage?id=${row.id}&releaseType=${row.releaseType}&name=${row.competitionName}`) this.$router.push(`/match/manage?id=${row.id}&name=${row.competitionName}`)
}, },
changeType () { changeType () {

7
src/pages/match/manage/index.vue
Unescape View File

@ -52,7 +52,6 @@ export default {
data () { data () {
return { return {
name: this.$route.query.name, name: this.$route.query.name,
releaseType: +this.$route.query.releaseType,
active: this.$route.query.tab || '', active: this.$route.query.tab || '',
tabs: { tabs: {
tab1: "大赛详情", tab1: "大赛详情",
@ -102,7 +101,7 @@ export default {
// } // }
// }, // },
methods: { methods: {
initTabs () { async initTabs () {
const { btns } = this const { btns } = this
const tab1 = btns.includes('/match/list:管理:大赛详情') const tab1 = btns.includes('/match/list:管理:大赛详情')
const tab2 = btns.includes('/match/list:管理:大赛成绩管理') const tab2 = btns.includes('/match/list:管理:大赛成绩管理')
@ -110,8 +109,10 @@ export default {
const tab4 = btns.includes('/match/list:管理:公告通知') const tab4 = btns.includes('/match/list:管理:公告通知')
const tab5 = btns.includes('/match/list:管理:报名人员') const tab5 = btns.includes('/match/list:管理:报名人员')
const res = await this.$post(`${this.api.getCompetition}?competitionId=${this.$route.query.id}`)
tab1 || this.$delete(this.tabs, 'tab1') tab1 || this.$delete(this.tabs, 'tab1')
if (!tab2 || !this.releaseType) this.$delete(this.tabs, 'tab2') if (!tab2 || !res.competition.releaseType) this.$delete(this.tabs, 'tab2')
tab3 || this.$delete(this.tabs, 'tab3') tab3 || this.$delete(this.tabs, 'tab3')
tab4 || this.$delete(this.tabs, 'tab4') tab4 || this.$delete(this.tabs, 'tab4')
tab5 || this.$delete(this.tabs, 'tab5') tab5 || this.$delete(this.tabs, 'tab5')

156
src/pages/match/manage/matchArchList.vue
Unescape View File

@ -9,6 +9,7 @@
</el-card> </el-card>
<div v-loading="loading">
<el-card v-if="method != 2" <el-card v-if="method != 2"
shadow="hover" shadow="hover"
class="m-b-20"> class="m-b-20">
@ -53,14 +54,16 @@
type="primary" type="primary"
@click="batchImport">上传成绩</el-button> @click="batchImport">上传成绩</el-button>
<el-button type="primary" <el-button type="primary"
:disabled="!!multipleSelection.find(e => method != 2 && !e.reportId)"
@click="delAllData">批量删除</el-button> @click="delAllData">批量删除</el-button>
<el-button type="primary" <el-button type="primary"
@click="exportData">导出</el-button> :loading="exporting"
@click="exportData">{{ exporting ? '正在导出' : '批量导出' }}</el-button>
</div> </div>
<div v-else> <div v-else>
<el-button type="primary" <el-button type="primary"
:loading="loading" :loading="exporting1"
@click="exportData1">{{ loading ? '正在导出' : '批量导出' }}</el-button> @click="exportData1">{{ exporting1 ? '正在导出' : '批量导出' }}</el-button>
</div> </div>
</div> </div>
<template v-if="!active"> <template v-if="!active">
@ -84,8 +87,12 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="schoolName" <el-table-column prop="schoolName"
label="学校" label="学生账号归属"
min-width="150" min-width="100"
align="center"></el-table-column>
<el-table-column prop="realSchool"
label="学生所属院校"
min-width="100"
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column v-if="competitionType" <el-table-column v-if="competitionType"
prop="teamName" prop="teamName"
@ -168,7 +175,10 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="schoolName" <el-table-column prop="schoolName"
label="学校" label="学生账号归属"
align="center"></el-table-column>
<el-table-column prop="realSchool"
label="学生所属院校"
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column v-if="competitionType" <el-table-column v-if="competitionType"
prop="teamName" prop="teamName"
@ -221,19 +231,23 @@
</div> </div>
</template> </template>
</el-card> </el-card>
</div>
<el-dialog title="批量导入" <el-dialog title="批量导入"
:visible.sync="importVisible" :visible.sync="importVisible"
width="24%" width="24%"
:close-on-click-modal="false"> :close-on-click-modal="false">
<div style="text-align: center"> <div style="text-align: center">
<template v-if="!uploadFaild">
<div style="margin-bottom: 10px;"> <div style="margin-bottom: 10px;">
<el-button type="primary" <el-button type="primary"
@click="download">模板下载<i class="el-icon-download el-icon--right"></i></el-button> @click="download">模板下载<i class="el-icon-download el-icon--right"></i></el-button>
</div> </div>
<el-upload ref="importStaff" <el-upload ref="upload"
name="file" name="file"
class="import-file"
accept=".xls,.xlsx" accept=".xls,.xlsx"
:before-upload="beforeUpload"
:on-remove="handleRemove" :on-remove="handleRemove"
:on-error="uploadError" :on-error="uploadError"
:on-success="uploadSuccess" :on-success="uploadSuccess"
@ -243,25 +257,28 @@
:action="this.api.batchImportGrades" :action="this.api.batchImportGrades"
:file-list="uploadList" :file-list="uploadList"
:headers="headers" :headers="headers"
:disabled="uploading"
:data="{ :data="{
competitionId: this.id, competitionId: this.id,
stageId: this.stageId, stageId: this.stageId,
systemId: 0 systemId: 0
}"> }">
<el-button type="primary" <el-button type="primary"
:loading="uploading"
class="ml20">上传文件<i class="el-icon-upload2 el-icon--right"></i></el-button> class="ml20">上传文件<i class="el-icon-upload2 el-icon--right"></i></el-button>
</el-upload> </el-upload>
<el-link v-if="uploadFaild" </template>
type="primary" <template v-else>
@click="showFaild">部分数据导入失败，查看失败原因</el-link> <p style="margin-bottom: 13px;font-size: 14px;color: #e90000;">{{ faildData.tip }}</p>
<p type="primary"
style="margin-bottom: 10px;font-size: 14px;color: #9076FF;text-decoration: underline;cursor: pointer;"
@click="showFaild">部分数据导入失败，查看失败原因</p>
</template>
</div> </div>
<span slot="footer" <span v-if="uploading"
slot="footer"
class="dialog-footer"> class="dialog-footer">
<el-button size="small" <el-button @click="cancelUpload">停止导入</el-button>
@click="importVisible = false">取 消</el-button>
<el-button size="small"
type="primary"
@click="uploadSure">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
@ -299,14 +316,17 @@ export default {
importVisible: false, importVisible: false,
uploadList: [], uploadList: [],
uploadFaild: false, uploadFaild: false,
exportCode: '', uploading: false,
faildData: null,
headers: { headers: {
token: util.local.get(Setting.tokenKey) token: util.local.get(Setting.tokenKey)
}, },
statData: {}, statData: {},
tabs: ['成绩列表', '文件列表'], tabs: ['成绩列表', '文件列表'],
active: 0, active: 0,
loading: false loading: false,
exporting: false,
exporting1: false,
}; };
}, },
watch: { watch: {
@ -321,16 +341,17 @@ export default {
this.getData() this.getData()
}, },
methods: { methods: {
getData () { async getData () {
this.loading = true
// 文件列表 // 文件列表
if (this.active) { if (this.active) {
this.$post(this.api.cCompetitionStageFileList, { const { data } = await this.$post(this.api.cCompetitionStageFileList, {
pageNum: this.page1, pageNum: this.page1,
pageSize: this.pageSize, pageSize: this.pageSize,
competitionId: this.id, competitionId: this.id,
stageId: this.stageId, stageId: this.stageId,
keyWord: this.keyword, keyWord: this.keyword,
}).then(({ data }) => { })
data.records.forEach(e => { data.records.forEach(e => {
e.loading = false e.loading = false
e.fileType = '其他' e.fileType = '其他'
@ -350,22 +371,22 @@ export default {
}) })
this.list1 = data.records this.list1 = data.records
this.total1 = data.total this.total1 = data.total
}).catch(res => { }) this.loading = false
} else { // 成绩列表 } else { // 成绩列表
this.$post(this.api.stageGradeManagementList, { const { data, page } = await this.$post(this.api.stageGradeManagementList, {
pageNum: this.page, pageNum: this.page,
pageSize: this.pageSize, pageSize: this.pageSize,
competitionId: this.id, competitionId: this.id,
keyWord: this.keyword, keyWord: this.keyword,
stageId: this.stageId, stageId: this.stageId,
isNakadai: 1 isNakadai: 1
}).then(({ data, page }) => { })
this.total = page.total this.total = page.total
this.list = page.records this.list = page.records
this.statData = data this.statData = data
this.avgScore = (+data.avgScore).toFixed(2) this.avgScore = (+data.avgScore).toFixed(2)
this.getChart() this.getChart()
}).catch(res => { }) this.loading = false
} }
}, },
initData () { initData () {
@ -377,17 +398,19 @@ export default {
this.$router.push(`/match/report?reportId=${row.reportId}`) this.$router.push(`/match/report?reportId=${row.reportId}`)
}, },
// 导出(有勾选：就导勾选中的；没有勾选：就导全部) // 导出(有勾选：就导勾选中的；没有勾选：就导全部)
exportData () { async exportData () {
if (this.list.length) {
this.exporting = true
// 有选择数据，则导出已选择的，否则导出全部 // 有选择数据，则导出已选择的，否则导出全部
if (this.multipleSelection.length) { if (this.multipleSelection.length) {
axios.post(this.api.exportExperimentalResultsInBatch, this.multipleSelection, { const res = await axios.post(this.api.exportExperimentalResultsInBatch, this.multipleSelection, {
headers: this.headers, headers: this.headers,
responseType: 'blob' responseType: 'blob'
}).then((res) => { })
util.downloadFileDirect(`赛事成绩.xls`, new Blob([res.data])) util.downloadFileDirect(`赛事成绩.xls`, new Blob([res.data]))
}).catch(res => { }) this.exporting = false
} else if (this.list.length) { } else {
axios.post(this.api.allExperimentalResultsAreDerived, { const res = await axios.post(this.api.allExperimentalResultsAreDerived, {
pageNum: 1, pageNum: 1,
pageSize: 10000, pageSize: 10000,
competitionId: this.id, competitionId: this.id,
@ -396,31 +419,21 @@ export default {
}, { }, {
headers: this.headers, headers: this.headers,
responseType: 'blob' responseType: 'blob'
}).then((res) => { })
util.downloadFileDirect(`赛事成绩.xls`, new Blob([res.data])) util.downloadFileDirect(`赛事成绩.xls`, new Blob([res.data]))
}).catch(res => { }) this.exporting = false
}
} }
// let { list } = this
// if (this.multipleSelection.length) {
// list = this.multipleSelection
// }
// axios.post(this.api.exportExperimentalResultsInBatch, list, {
// headers: this.headers,
// responseType: 'blob'
// }).then((res) => {
// util.downloadFileDirect(`赛事成绩.xls`, new Blob([res.data]))
// }).catch(res => { })
}, },
// 导出(有勾选：就导勾选中的；没有勾选：就导全部) // 导出(有勾选：就导勾选中的；没有勾选：就导全部)
exportData1 () { exportData1 () {
this.loading = true this.exporting1 = true
let list = this.list1 let list = this.list1
if (this.multipleSelection1.length) { if (this.multipleSelection1.length) {
list = this.multipleSelection1 list = this.multipleSelection1
} }
Zip('批量导出', list, () => { Zip('批量导出', list, () => {
this.loading = false this.exporting1 = false
}) })
}, },
handleDelete (row) { // 删除 handleDelete (row) { // 删除
@ -443,21 +456,22 @@ export default {
if (this.multipleSelection.length) { if (this.multipleSelection.length) {
this.$confirm("该项目下的所有成绩报告将会删除，是否继续？", "提示", { this.$confirm("该项目下的所有成绩报告将会删除，是否继续？", "提示", {
type: "warning" type: "warning"
}).then(() => { }).then(async () => {
let ids = this.multipleSelection.map(item => { let ids = this.multipleSelection.map(item => {
return this.method == 2 ? item.scoreId : item.reportId return this.method == 2 ? item.scoreId : item.reportId
}); });
this.$post(this.api.batchDeleteContestGrade, { ids = ids.filter(e => e)
if (ids.length) {
await this.$post(this.api.batchDeleteContestGrade, {
ids, ids,
competitionId: this.id, competitionId: this.id,
stageId: this.stageId stageId: this.stageId
}).then(res => { })
this.multipleSelection = []; this.multipleSelection = [];
this.$refs.table.clearSelection(); this.$refs.table.clearSelection();
util.successMsg("删除成功"); util.successMsg("删除成功");
this.getData(); this.getData();
}).catch(res => { }
});
}).catch(() => { }).catch(() => {
}); });
} else { } else {
@ -517,7 +531,12 @@ export default {
}, },
// 模板下载 // 模板下载
download () { download () {
location.href = this.api.gradeImport axios.get(`${this.api.gradeDownloadExcel}?competitionId=${this.id}&stageId=${this.stageId}`, {
headers: this.headers,
responseType: 'blob'
}).then((res) => {
util.downloadFileDirect('赛事成绩导入模板.xlsx', new Blob([res.data]))
}).catch(res => { })
}, },
// 上传文件 // 上传文件
handleExceed (files, fileList) { handleExceed (files, fileList) {
@ -527,23 +546,27 @@ export default {
}, },
// 下载失败文件 // 下载失败文件
showFaild () { showFaild () {
axios.get(`${this.api.performanceExportFailure}?exportCode=${this.exportCode}`, { axios.get(`${this.api.performanceExportFailure}?exportCode=${this.faildData.exportCode}&competitionType=${this.faildData.competitionType}`, {
headers: this.headers, headers: this.headers,
responseType: 'blob' responseType: 'blob'
}).then((res) => { }).then((res) => {
util.downloadFileDirect(`批量导入成绩管理失败数据导出.xls`, new Blob([res.data])) util.downloadFileDirect(`批量导入成绩管理失败数据导出.xls`, new Blob([res.data]))
}).catch(res => { }) }).catch(res => { })
}, },
uploadSuccess (res, file, fileList) { uploadSuccess (res) {
this.uploading = false
this.uploadFaild = false this.uploadFaild = false
if (res.status === 200) { if (res.status === 200) {
if (res.data.exportCode) { const { data } = res
this.exportCode = res.data.exportCode if (data.exportCode) {
this.faildData = data
this.uploadFaild = true this.uploadFaild = true
util.errorMsg(`本次上传有${res.data.failureNum}个错误信息录入`) } else {
util.successMsg(data.tip, 3000)
this.importVisible = false
} }
} else { } else {
res.message ? util.errorMsg(res.message) : util.errorMsg("上传失败，请检查数据") util.errorMsg(res.message || '上传失败，请检查数据')
} }
}, },
uploadError (err, file, fileList) { uploadError (err, file, fileList) {
@ -553,6 +576,9 @@ export default {
center: true center: true
}) })
}, },
beforeUpload (file) {
this.uploading = true
},
beforeRemove (file, fileList) { beforeRemove (file, fileList) {
return this.$confirm(`确定移除 ${file.name}？`) return this.$confirm(`确定移除 ${file.name}？`)
}, },
@ -560,9 +586,12 @@ export default {
this.uploadList = fileList this.uploadList = fileList
this.uploadFaild = false this.uploadFaild = false
}, },
uploadSure () { cancelUpload () {
this.uploading = false
this.$refs.upload.abort()
this.keyword = ''
this.initData()
this.importVisible = false this.importVisible = false
this.getData()
}, },
// tab回调 // tab回调
@ -658,4 +687,11 @@ export default {
height: 300px; height: 300px;
} }
} }
/deep/.import-file {
.el-progress__text,
.el-progress,
.el-upload-list__item-status-label {
display: none !important;
}
}
</style> </style>

41
src/pages/match/manage/matchInfo.vue
Unescape View File

@ -288,7 +288,7 @@
<script> <script>
import Setting from "@/setting"; import Setting from "@/setting";
import util from "@/libs/util"; import Util from "@/libs/util";
export default { export default {
data () { data () {
return { return {
@ -419,10 +419,10 @@ export default {
let status let status
const n = this.form const n = this.form
let now = new Date().getTime(); let now = new Date().getTime();
let signUpStartTime = new Date(util.dateCompatible(n.signUpStartTime)).getTime(); // 报名开始时间 let signUpStartTime = new Date(Util.dateCompatible(n.signUpStartTime)).getTime(); // 报名开始时间
let signUpEndTime = new Date(util.dateCompatible(n.signUpEndTime)).getTime(); // 报名结束时间 let signUpEndTime = new Date(Util.dateCompatible(n.signUpEndTime)).getTime(); // 报名结束时间
let playStartTime = new Date(util.dateCompatible(n.playStartTime)).getTime(); // 比赛开始时间 let playStartTime = new Date(Util.dateCompatible(n.playStartTime)).getTime(); // 比赛开始时间
let playEndTime = new Date(util.dateCompatible(n.playEndTime)).getTime(); // 比赛结束时间 let playEndTime = new Date(Util.dateCompatible(n.playEndTime)).getTime(); // 比赛结束时间
if (now < signUpStartTime) { // 报名没开始 if (now < signUpStartTime) { // 报名没开始
status = 0; status = 0;
} else if (now > signUpStartTime && now < signUpEndTime) { // 报名进行中 } else if (now > signUpStartTime && now < signUpEndTime) { // 报名进行中
@ -440,6 +440,7 @@ export default {
edit (showMsg) { edit (showMsg) {
if (this.editing || !showMsg) { if (this.editing || !showMsg) {
const { teamId, teamName, invitationCode } = this.info.team const { teamId, teamName, invitationCode } = this.info.team
if (invitationCode.length !== 6) return Util.errorMsg('请输入6位数团队邀请码')
this.$post(this.api.editCompetitionTeam, { this.$post(this.api.editCompetitionTeam, {
accountId: this.accountId, accountId: this.accountId,
identification: 1, identification: 1,
@ -451,7 +452,7 @@ export default {
}).then(res => { }).then(res => {
this.editing = false this.editing = false
this.getInfo() this.getInfo()
showMsg && util.successMsg('保存成功') showMsg && Util.successMsg('保存成功')
}).catch(res => { }) }).catch(res => { })
} else { } else {
this.editing = !this.editing this.editing = !this.editing
@ -464,7 +465,7 @@ export default {
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.$post(`${this.api.deleteAnAdvisor}?id=${row.id}`).then(res => { this.$post(`${this.api.deleteAnAdvisor}?id=${row.id}`).then(res => {
util.successMsg('删除成功') Util.successMsg('删除成功')
this.info.teamInstructors.splice(i, 1) this.info.teamInstructors.splice(i, 1)
}).catch(res => { }) }).catch(res => { })
}).catch(() => { }) }).catch(() => { })
@ -474,7 +475,7 @@ export default {
}, },
// 添加指导老师 // 添加指导老师
addAdvisor () { addAdvisor () {
if (this.info.teamInstructors.length > 4) return util.errorMsg('指导老师仅限添加5个！') if (this.info.teamInstructors.length > 4) return Util.errorMsg('指导老师仅限添加5个！')
const line = JSON.parse(JSON.stringify(this.originIns)) const line = JSON.parse(JSON.stringify(this.originIns))
line.edit = 1 line.edit = 1
this.info.teamInstructors.push(line) this.info.teamInstructors.push(line)
@ -485,9 +486,9 @@ export default {
}, },
// 提交指导老师 // 提交指导老师
submitAdvisor (row, i) { submitAdvisor (row, i) {
if (!row.name) return util.errorMsg('请输入姓名') if (!row.name) return Util.errorMsg('请输入姓名')
const { phone } = row const { phone } = row
if (phone && !/^1[3456789]\d{9}$/.test(phone)) return util.errorMsg('请输入正确手机号格式') if (phone && !/^1[3456789]\d{9}$/.test(phone)) return Util.errorMsg('请输入正确手机号格式')
this.$post(this.api.addAnAdvisor, { this.$post(this.api.addAnAdvisor, {
name: row.name, name: row.name,
competitionId: this.id, competitionId: this.id,
@ -497,7 +498,7 @@ export default {
position: row.position, position: row.position,
accountId: this.accountId accountId: this.accountId
}).then(({ id }) => { }).then(({ id }) => {
util.successMsg((row.id ? '修改' : '新增') + '成功') Util.successMsg((row.id ? '修改' : '新增') + '成功')
if (!row.id) { if (!row.id) {
this.info.teamInstructors[i].id = id this.info.teamInstructors[i].id = id
} }
@ -510,13 +511,13 @@ 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.caption.teamId,
playerId: this.checkedPlayer playerId: this.checkedPlayer
}).then(res => { }).then(res => {
this.checkedPlayer = '' this.checkedPlayer = ''
util.successMsg('转让成功') Util.successMsg('转让成功')
this.transferVisible = false this.transferVisible = false
this.getInfo() this.getInfo()
}).catch(res => { }) }).catch(res => { })
@ -528,7 +529,7 @@ export default {
let start = 0 let start = 0
// for (const e of this.form.competitionStage) { // for (const e of this.form.competitionStage) {
// if (now >= new Date(e.startTime) && now <= new Date(e.endTime)) { // if (now >= new Date(e.startTime) && now <= new Date(e.endTime)) {
// util.errorMsg('比赛已经开始，无法踢出成员！') // Util.errorMsg('比赛已经开始，无法踢出成员！')
// start = 1 // start = 1
// break // break
// } // }
@ -549,7 +550,7 @@ export default {
closeOnClickModal: false closeOnClickModal: false
}).then(() => { }).then(() => {
this.$post(`${this.api.removeTheLine}?teamId=${this.info.teamId}&competitionId=${this.id}&accountId=${row.accountId}`).then(res => { this.$post(`${this.api.removeTheLine}?teamId=${this.info.teamId}&competitionId=${this.id}&accountId=${row.accountId}`).then(res => {
util.successMsg('移除成功') Util.successMsg('移除成功')
this.getInfo() this.getInfo()
}).catch(res => { }) }).catch(res => { })
}).catch(() => { }) }).catch(() => { })
@ -566,7 +567,7 @@ export default {
stageId: stage.stageId, stageId: stage.stageId,
teamId: this.info.teamId teamId: this.info.teamId
}).then(res => { }).then(res => {
util.successMsg('移除成功') Util.successMsg('移除成功')
this.getInfo() this.getInfo()
}).catch(res => { }) }).catch(res => { })
}).catch(() => { }) }).catch(() => { })
@ -594,16 +595,16 @@ export default {
this.chooses = this.info.teamDetail this.chooses = this.info.teamDetail
} }
this.curRow = row this.curRow = row
this.checkedMembers = [] this.checkedMembers = row.participants.map(e => e.id)
this.chooseVisible = true this.chooseVisible = true
} }
}, },
// 选择参赛人员提交 // 选择参赛人员提交
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 limit = this.curRow.teamNumLimit // 参赛人数限制
if (limit && accountIds.length > limit) return util.errorMsg(`请选择${limit}个以下参赛成员！`) // 选择的参赛人员个数不能大于参赛人数限制 if (limit && accountIds.length > limit) return Util.errorMsg(`请选择${limit}个以下参赛成员！`) // 选择的参赛人员个数不能大于参赛人数限制
this.$post(this.api.stageSelectParticipants, { this.$post(this.api.stageSelectParticipants, {
accountIds, accountIds,
competitionId: this.id, competitionId: this.id,
@ -611,7 +612,7 @@ export default {
teamId: this.info.teamId teamId: this.info.teamId
}).then(res => { }).then(res => {
this.checkedMembers = [] this.checkedMembers = []
util.successMsg('修改成功') Util.successMsg('修改成功')
this.getInfo() this.getInfo()
this.chooseVisible = false this.chooseVisible = false
}).catch(res => { }) }).catch(res => { })

105
src/pages/match/manage/matchRank.vue
Unescape View File

@ -37,7 +37,7 @@
</div> </div>
<div style="display: inline-flex;align-items: center"> <div style="display: inline-flex;align-items: center">
<el-input style="width: 220px;margin-right: 15px" <el-input style="width: 220px;margin-right: 15px"
placeholder="请输入团队名称/队长/学校" :placeholder="'请输入' + (competitionType ? '团队名称/队长' : '学生姓名') + '/学校'"
prefix-icon="el-icon-search" prefix-icon="el-icon-search"
v-model="keyword" v-model="keyword"
clearable></el-input> clearable></el-input>
@ -51,8 +51,8 @@
</template> </template>
<el-button v-if="list.length" <el-button v-if="list.length"
type="primary" type="primary"
:loading="loading" :loading="exporting"
@click="exportData">{{ loading ? '正在导出' : '批量导出' }}</el-button> @click="exportData">{{ exporting ? '正在导出' : '批量导出' }}</el-button>
</div> </div>
</div> </div>
<el-table :data="list" <el-table :data="list"
@ -60,6 +60,7 @@
ref="table" ref="table"
stripe stripe
row-key="scoreId" row-key="scoreId"
v-loading="loading"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
header-align="center"> header-align="center">
<el-table-column type="selection" <el-table-column type="selection"
@ -90,7 +91,11 @@
min-width="100" min-width="100"
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column prop="schoolName" <el-table-column prop="schoolName"
label="学校" label="学生账号归属"
min-width="100"
align="center"></el-table-column>
<el-table-column prop="realSchool"
label="学生所属院校"
min-width="100" min-width="100"
align="center"></el-table-column> align="center"></el-table-column>
<el-table-column prop="timeSum" <el-table-column prop="timeSum"
@ -195,8 +200,10 @@
<el-dialog title="批量导入" <el-dialog title="批量导入"
:visible.sync="importVisible" :visible.sync="importVisible"
width="24%" width="24%"
:close-on-click-modal="false"> :close-on-click-modal="false"
@close="cancelUpload">
<div style="text-align: center"> <div style="text-align: center">
<template v-if="!uploadFaild">
<div style="margin-bottom: 10px;"> <div style="margin-bottom: 10px;">
<el-button type="primary" <el-button type="primary"
@click="download">模板下载<i class="el-icon-download el-icon--right"></i></el-button> @click="download">模板下载<i class="el-icon-download el-icon--right"></i></el-button>
@ -204,6 +211,8 @@
<el-upload ref="upload" <el-upload ref="upload"
name="file" name="file"
accept=".xls,.xlsx" accept=".xls,.xlsx"
class="import-file"
:before-upload="beforeUpload"
:on-remove="handleRemove" :on-remove="handleRemove"
:on-error="uploadError" :on-error="uploadError"
:on-success="uploadSuccess" :on-success="uploadSuccess"
@ -213,27 +222,29 @@
:action="this.api.batchImportRanking" :action="this.api.batchImportRanking"
:file-list="uploadList" :file-list="uploadList"
:headers="headers" :headers="headers"
:disabled="uploading"
:data="{ :data="{
competitionId: this.id, competitionId: this.id,
stageId: this.stageId, stageId: this.stageId,
isOverallRanking: active ? 0 : 1, isOverallRanking: active ? 0 : 1,
schoolId: this.$store.state.user.schoolId schoolId: this.$store.state.user.schoolId
}" }">
:auto-upload="false">
<el-button type="primary" <el-button type="primary"
:loading="uploading"
class="ml20">上传文件<i class="el-icon-upload2 el-icon--right"></i></el-button> class="ml20">上传文件<i class="el-icon-upload2 el-icon--right"></i></el-button>
</el-upload> </el-upload>
<el-link v-if="uploadFaild" </template>
type="primary" <template v-else>
@click="showFaild">部分数据导入失败，查看失败原因</el-link> <p style="margin: -10px 0 13px;font-size: 14px;color: #e90000;">{{ faildData.tip }}</p>
<p type="primary"
style="margin-bottom: 10px;font-size: 14px;color: #9076FF;text-decoration: underline;cursor: pointer;"
@click="showFaild">部分数据导入失败，查看失败原因</p>
</template>
</div> </div>
<span slot="footer" <span v-if="uploading"
slot="footer"
class="dialog-footer"> class="dialog-footer">
<el-button size="small" <el-button @click="cancelUpload">停止导入</el-button>
@click="importVisible = false">取 消</el-button>
<el-button size="small"
type="primary"
@click="uploadSure">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
@ -307,7 +318,8 @@ export default {
importVisible: false, importVisible: false,
uploadList: [], uploadList: [],
uploadFaild: false, uploadFaild: false,
exportCode: '', uploading: false,
faildData: null,
curRow: {}, curRow: {},
stageName: '', stageName: '',
totalScore: 0, totalScore: 0,
@ -334,6 +346,7 @@ export default {
uploaded: 0, uploaded: 0,
multipleSelection: [], multipleSelection: [],
loading: false, loading: false,
exporting: false,
isPointWeight: false isPointWeight: false
}; };
}, },
@ -375,6 +388,7 @@ export default {
this.list = message.records this.list = message.records
this.total = message.total this.total = message.total
this.getPublishTime() this.getPublishTime()
this.loading = false
}).catch(res => { }) }).catch(res => { })
} else { // 默认排名接口 } else { // 默认排名接口
if (!this.active) { if (!this.active) {
@ -393,6 +407,7 @@ export default {
this.list = page this.list = page
this.total = total this.total = total
this.getPublishTime() this.getPublishTime()
this.loading = false
}).catch(res => { }) }).catch(res => { })
} else { // 阶段排名 } else { // 阶段排名
this.$post(`${this.api.stageRaceRanking}?competitionId=${this.id}&stageId=${this.active}&pageNum=${this.page}&pageSize=${this.pageSize}&publicationType=${this.type}&keyword=${this.keyword}`).then(({ page, total, publishStatus }) => { this.$post(`${this.api.stageRaceRanking}?competitionId=${this.id}&stageId=${this.active}&pageNum=${this.page}&pageSize=${this.pageSize}&publicationType=${this.type}&keyword=${this.keyword}`).then(({ page, total, publishStatus }) => {
@ -400,17 +415,20 @@ export default {
this.list = page this.list = page
this.total = total this.total = total
this.getPublishTime() this.getPublishTime()
this.loading = false
}).catch(res => { }) }).catch(res => { })
} }
} }
}, },
// 获取阶段 // 获取阶段
getStage () { async getStage () {
this.$post(this.api.detailsOfCompetitionStage, { this.loading = true
try {
const { page } = await this.$post(this.api.detailsOfCompetitionStage, {
pageNum: 1, pageNum: 1,
pageSize: 100, pageSize: 100,
contestId: this.id, contestId: this.id,
}).then(({ page }) => { })
this.grades = page.records.slice(0, this.index + 1) this.grades = page.records.slice(0, this.index + 1)
this.active = this.grades[this.index].stageId this.active = this.grades[this.index].stageId
// 积分赛才显示总分 // 积分赛才显示总分
@ -419,7 +437,9 @@ export default {
stageName: '总分' stageName: '总分'
}) })
this.getData() this.getData()
}).catch(res => { }); } catch (e) {
this.loading = false
}
}, },
// 排序类型切换回调 // 排序类型切换回调
typeChange (val) { typeChange (val) {
@ -530,7 +550,7 @@ export default {
// 导出(有勾选：就导勾选中的；没有勾选：就导全部) // 导出(有勾选：就导勾选中的；没有勾选：就导全部)
async exportData () { async exportData () {
this.loading = true this.exporting = true
let { list } = this let { list } = this
if (this.multipleSelection.length) { if (this.multipleSelection.length) {
list = this.multipleSelection list = this.multipleSelection
@ -575,7 +595,7 @@ export default {
responseType: 'blob' responseType: 'blob'
}).then((res) => { }).then((res) => {
util.downloadFileDirect(`${this.grades.find(e => e.stageId == this.active).stageName}排名.xls`, new Blob([res.data])) util.downloadFileDirect(`${this.grades.find(e => e.stageId == this.active).stageName}排名.xls`, new Blob([res.data]))
this.loading = false this.exporting = false
}).catch(res => { }) }).catch(res => { })
}, },
// 发布排名 // 发布排名
@ -718,39 +738,45 @@ export default {
}, },
// 下载失败文件 // 下载失败文件
showFaild () { showFaild () {
axios.get(`${this.api.rankExportFailure}?exportCode=${this.exportCode}&competitionId=${this.id}`, { axios.get(`${this.api.rankExportFailure}?exportCode=${this.faildData.exportCode}&competitionId=${this.id}`, {
headers: this.headers, headers: this.headers,
responseType: 'blob' responseType: 'blob'
}).then((res) => { }).then((res) => {
util.downloadFileDirect(`批量导入排名管理失败数据导出.xls`, new Blob([res.data])) util.downloadFileDirect(`批量导入排名管理失败数据导出.xls`, new Blob([res.data]))
}).catch(res => { }) }).catch(res => { })
}, },
uploadSuccess (res, file, fileList) { uploadSuccess (res) {
this.uploading = false
this.uploadFaild = false this.uploadFaild = false
this.uploaded = 0 this.uploaded = 0
if (res.status === 200) { if (res.status === 200) {
const { exportCode } = res.data const { data } = res
if (exportCode) { if (data.exportCode) {
this.exportCode = exportCode this.faildData = data
this.uploadFaild = true this.uploadFaild = true
util.errorMsg(`本次上传有${res.data.failureNum}个错误信息录入`)
} else { } else {
this.uploaded = 1 this.uploaded = 1
this.importVisible = false this.importVisible = false
this.getRank() this.getRank()
util.successMsg('请检查数据后，点击发布排名以发布数据！') util.successMsg(data.tip, 3000)
// util.successMsg('请检查数据后，点击发布排名以发布数据！')
} }
} else { } else {
util.errorMsg(res.message || "上传失败，请检查数据") util.errorMsg(res.message || "上传失败，请检查数据")
} }
}, },
uploadError (err, file, fileList) { uploadError (err, file, fileList) {
this.uploading = false
this.$message({ this.$message({
message: "上传出错，请重试！", message: "上传出错，请重试！",
type: "error", type: "error",
center: true center: true
}) })
}, },
async beforeUpload (file) {
this.uploading = true
if (this.list.length) await this.$post(`${this.api.cancelRanking}?competitionId=${this.id}&isOverallRanking=${this.active ? 0 : 1}&${this.active ? 'stageIds=' + this.active : query.join('&')}&releaseId=${this.timeId}`)
},
beforeRemove (file, fileList) { beforeRemove (file, fileList) {
return this.$confirm(`确定移除 ${file.name}？`) return this.$confirm(`确定移除 ${file.name}？`)
}, },
@ -758,12 +784,12 @@ export default {
this.uploadList = fileList this.uploadList = fileList
this.uploadFaild = false this.uploadFaild = false
}, },
uploadSure () { cancelUpload () {
this.list.length ? this.uploading = false
this.$post(this.api.cancelImport, this.list.map(e => e.id)).then(res => { if (this.$refs.upload) this.$refs.upload.abort()
this.$refs.upload.submit() this.keyword = ''
}).catch(res => { }) : this.getRank()
this.$refs.upload.submit() this.importVisible = false
}, },
} }
}; };
@ -794,4 +820,11 @@ export default {
color: #9076ff; color: #9076ff;
} }
} }
/deep/.import-file {
.el-progress__text,
.el-progress,
.el-upload-list__item-status-label {
display: none !important;
}
}
</style> </style>

37
src/pages/match/manage/matchSignup.vue
Unescape View File

@ -37,6 +37,7 @@
v-auth="'/match/list:管理:报名人员:新增'">新增</el-button> v-auth="'/match/list:管理:报名人员:新增'">新增</el-button>
<el-button type="primary" <el-button type="primary"
round round
:loading="exporting"
@click="exportAll" @click="exportAll"
v-auth="'/match/list:管理:报名人员:批量导出'">批量导出</el-button> v-auth="'/match/list:管理:报名人员:批量导出'">批量导出</el-button>
<el-button type="primary" <el-button type="primary"
@ -435,6 +436,7 @@ export default {
}, },
diffSchool: false, diffSchool: false,
uploading: false, uploading: false,
exporting: false,
}; };
}, },
watch: { watch: {
@ -559,7 +561,6 @@ export default {
} else { } else {
util[tip.includes('5000') ? 'errorMsg' : 'successMsg'](tip, 3000) util[tip.includes('5000') ? 'errorMsg' : 'successMsg'](tip, 3000)
this.importVisible = false this.importVisible = false
this.keyWord = ''
} }
} else { } else {
util.errorMsg(res.message || '上传失败，请检查数据', 3000) util.errorMsg(res.message || '上传失败，请检查数据', 3000)
@ -588,7 +589,7 @@ export default {
this.$refs.upload.abort() this.$refs.upload.abort()
this.init() this.init()
this.importVisible = false this.importVisible = false
this.keyWord = '' this.keyword = ''
}, },
// 新增 // 新增
add () { add () {
@ -650,14 +651,6 @@ export default {
}, },
// 新增编辑人员 // 新增编辑人员
submitForm () { submitForm () {
if (this.notExit) {
this.submiting = false
return util.errorMsg('学生不存在，无法添加！')
}
if (this.exitMember) {
this.submiting = false
return util.errorMsg('学生已存在')
}
const { form } = this const { form } = this
if (!this.isAdd) { // 编辑 if (!this.isAdd) { // 编辑
this.$post(this.api.updateUser, { this.$post(this.api.updateUser, {
@ -731,10 +724,17 @@ export default {
if (team && team.invitationCode) form.invitationCode = team.invitationCode if (team && team.invitationCode) form.invitationCode = team.invitationCode
// 平台id-端id-schoolId-workNumber组成账号 // 平台id-端id-schoolId-workNumber组成账号
form.account = `${Setting.platformId}-3-${form.schoolId}-${form.workNumber}` form.account = `${Setting.platformId}-3-${form.schoolId}-${form.workNumber}`
const { phone } = form const { phone, email } = form
if (phone && !/^1[3456789]\d{9}$/.test(phone)) { if (phone && !/^1[3456789]\d{9}$/.test(phone)) {
return util.errorMsg("请输入正确的手机号/邮箱") return util.errorMsg("请输入正确的手机号")
} else if (email && !/^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/.test(email)) {
return util.errorMsg("请输入正确的邮箱")
} else if (this.notExit) {
return util.errorMsg('学生不存在，无法添加！')
} else if (this.exitMember) {
return util.errorMsg('学生已存在')
} else { } else {
this.submiting = true
this.submitForm() this.submitForm()
} }
} }
@ -810,6 +810,8 @@ export default {
this.$router.push(`info?id=${this.id}&accountId=${row.accountId}`) this.$router.push(`info?id=${this.id}&accountId=${row.accountId}`)
}, },
exportAll () { exportAll () {
if (this.listData.length) {
this.exporting = true
const data = this.multipleSelection const data = this.multipleSelection
if (data.length) { if (data.length) {
data.map((e, i) => e.id = i + 1) data.map((e, i) => e.id = i + 1)
@ -821,7 +823,10 @@ export default {
}).then((res) => { }).then((res) => {
const name = res.headers['content-disposition'] const name = res.headers['content-disposition']
util.downloadFileDirect(name ? decodeURI(name) : '报名人员.xlsx', new Blob([res.data])) util.downloadFileDirect(name ? decodeURI(name) : '报名人员.xlsx', new Blob([res.data]))
}).catch(res => { }) this.exporting = false
}).catch(res => {
this.exporting = false
})
} else { } else {
axios.get(`${this.api.excelExport}?competitionId=${this.id}`, { axios.get(`${this.api.excelExport}?competitionId=${this.id}`, {
headers: { headers: {
@ -831,7 +836,11 @@ export default {
}).then((res) => { }).then((res) => {
const name = res.headers['content-disposition'] const name = res.headers['content-disposition']
util.downloadFileDirect(name ? decodeURI(name) : '报名人员.xlsx', new Blob([res.data])) util.downloadFileDirect(name ? decodeURI(name) : '报名人员.xlsx', new Blob([res.data]))
}).catch(res => { }) this.exporting = false
}).catch(res => {
this.exporting = false
})
}
} }
}, },
// 批量删除 // 批量删除

2
src/pages/product/show/index.vue
Unescape View File

@ -330,7 +330,7 @@ export default {
}, },
// 跳转试用体验 // 跳转试用体验
toTrail () { toTrail () {
window.open('https://f.wps.cn/g/0sJLI4NA/') window.open('https://www.wjx.top/vm/wFCPCFp.aspx')
}, },
// 跳转实验台 // 跳转实验台
toStation () { toStation () {

17
src/pages/project/add/index.vue
Unescape View File

@ -187,9 +187,12 @@
align="center" align="center"
width="120"> width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<!--type="number" @blur="updateProjectJudgment"--> <el-input :key="scope.$index"
<el-input v-model.trim="scope.row.score" type="number"
@input="scoreChange(scope.row, scope.$index,$event)"></el-input> step="0.1"
v-model.trim="scope.row.score"></el-input>
<!--
@input="scoreChange(scope.row, scope.$index)" -->
</template> </template>
</u-table-column> </u-table-column>
<u-table-column label="操作" <u-table-column label="操作"
@ -363,12 +366,11 @@ export default {
...mapState("project", [ ...mapState("project", [
"projectFields", "lastSystemId" "projectFields", "lastSystemId"
]), ]),
handDistributionScore: { handDistributionScore () {
get () {
//计算判分点分值，超出100提示， //计算判分点分值，超出100提示，
let score = 0; let score = 0;
this.projectJudgmentData.forEach(e => { this.projectJudgmentData.forEach(e => {
score = Decimal(e.score).add(Decimal(score)) if (e.score && !isNaN(e.score)) score = Decimal(e.score).add(Decimal(score))
}); });
if (isNaN(score)) { if (isNaN(score)) {
return 0; return 0;
@ -378,8 +380,6 @@ export default {
} }
return score; return score;
}, },
set (val) { }
},
// 是否流程点分类 // 是否流程点分类
isLc () { isLc () {
const systemId = +this.projectManage.systemId const systemId = +this.projectManage.systemId
@ -647,7 +647,6 @@ export default {
}); });
// this.updateProjectJudgment(); // this.updateProjectJudgment();
} }
this.handDistributionScore = res.sum || 0
}); });
} }
}, },

Write Preview
Loading…
Cancel
Save