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

fix

Browse Source
dev_202303
yujialong 2 years ago
parent 0da27c54c3
commit 1245651314
17 changed files with 123 additions and 79 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      public/index.html
  2. 2
      src/setting.js
  3. 41
      src/utils/api.js
  4. 2
      src/views/course/contentSettings.vue
  5. 2
      src/views/customer/AddCustomer.vue
  6. 3
      src/views/join/index.vue
  7. 2
      src/views/match/add/index.vue
  8. 13
      src/views/match/add/set.vue
  9. 21
      src/views/match/add/step2.vue
  10. 2
      src/views/match/add/step3.vue
  11. 4
      src/views/match/manage/matchArch.vue
  12. 1
      src/views/match/manage/matchArchList.vue
  13. 28
      src/views/match/manage/matchInfo.vue
  14. 30
      src/views/match/manage/matchRank.vue
  15. 5
      src/views/match/manage/matchReport.vue
  16. 39
      src/views/match/manage/matchSignup.vue
  17. 4
      src/views/serve/projectAdd.vue

3
public/index.html
Unescape View File

@ -3,9 +3,10 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="keywords" content="深圳或然科技中台">
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no">
<link rel="stylesheet" href="//at.alicdn.com/t/font_830376_qzecyukz0s.css">
<title>中台</title>
<title>深圳或然科技中台</title>
</head>
<body>
<noscript>

2
src/setting.js
Unescape View File

@ -11,7 +11,7 @@ if (isDev) {
jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统
host = 'http://121.37.12.51/'
// host = 'https://huorantech.cn/'
host = 'http://192.168.31.51:9000/'// 榕
// host = 'http://192.168.31.151:9000/'// 榕
// host = 'http://192.168.31.116:9000/'// 赓
} else if (isPro) {
jumpPath = 'https://www.huorantech.cn/judgmentPoint/'

41
src/utils/api.js
Unescape View File

@ -11,6 +11,7 @@ export default {
bindPhoneOrEmail: `users/users/userAccount/bindPhoneOrEmail`,// 绑定手机
sendPhoneOrEmailCode: `users/users/userAccount/sendPhoneOrEmailCode`,// 手机验证码
getUserRolesPermissionMenu: `users/users/user-role/getUserRolesPermissionMenu`,
deleteProfile : `users/users/userInfo/deleteProfile`,
staffTemplate: `http://www.huorantech.cn/template/%E6%89%B9%E9%87%8F%E5%AF%BC%E5%85%A5%E5%91%98%E5%B7%A5%E6%A8%A1%E6%9D%BF.xlsx`, // 后台账号模板
@ -353,6 +354,7 @@ export default {
updateUser: `users/users/userInfo/updateUser`,
enquireAboutSchoolStudents: `users/users/userAccount/enquireAboutSchoolStudents`,
cancelParticipant: `competition/competition/teamParticipant/cancelParticipant`,
schoolsInCompetitionArea: `competition/competition/range/schoolsInCompetitionArea`,
// 赛事公告
addAnnouncement: `competition/competition/announcement/addAnnouncement`,
amendmentAnnouncement: `competition/competition/announcement/amendmentAnnouncement`,
@ -367,26 +369,27 @@ export default {
exportExperimentalResultsInBatch: `${host}competition/competition/performance/exportExperimentalResultsInBatch`,
performanceExportFailure: `${host}competition/competition/performance/exportFailure`,
rankExportFailure: `${host}competition/competition/rank/exportFailure`,
stageGradeManagementList: `competition/competition/performance/stageGradeManagementList`,
stageRaceRanking: `competition/competition/rank/stageRaceRanking`,
overallStandingsInThePointsRace: `competition/competition/rank/overallStandingsInThePointsRace`,
batchImportRanking: `${host}competition/competition/rank/batchImportRanking`,
publishRanking: `competition/competition/rank/publishRanking`,
stageTeamScoreDetails: `competition/competition/rank/stageTeamScoreDetails`,
multipleStageTeamScoreDetails: `competition/competition/rank/multipleStageTeamScoreDetails`,
detailsOfTotalTeamScores: `competition/competition/rank/detailsOfTotalTeamScores`,
cancelRanking: `competition/competition/rank/cancelRanking`,
reportDetail: `occupationlab/occupationlab/achievement/reportDetail`,
deleteLastPublication: `competition/competition/rank/deleteLastPublication`,
whetherToPublish: `competition/competition/rank/whetherToPublish`,
manuallyRankTheUploadList: `competition/competition/rank/manuallyRankTheUploadList`,
queryPublicationSource: `competition/competition/rank/queryPublicationSource`,
releaseVerification: `competition/competition/rank/releaseVerification`,
totalRankingScoreDetails: `competition/competition/rank/totalRankingScoreDetails`,
batchRelease: `competition/competition/rank/batchRelease`,
manuallyUploadedRankings: `competition/competition/rank/manuallyUploadedRankings`,
toggleTheSortingMode: `competition/competition/rank/toggleTheSortingMode`,
selectTheLastSortStatus: `competition/competition/rank/selectTheLastSortStatus`,
stageGradeManagementList: `${host1}competition/competition/performance/stageGradeManagementList`,
stageRaceRanking: `${host1}competition/competition/rank/stageRaceRanking`,
overallStandingsInThePointsRace: `${host1}competition/competition/rank/overallStandingsInThePointsRace`,
publishRanking: `${host1}competition/competition/rank/publishRanking`,
stageTeamScoreDetails: `${host1}competition/competition/rank/stageTeamScoreDetails`,
multipleStageTeamScoreDetails: `${host1}competition/competition/rank/multipleStageTeamScoreDetails`,
detailsOfTotalTeamScores: `${host1}competition/competition/rank/detailsOfTotalTeamScores`,
cancelRanking: `${host1}competition/competition/rank/cancelRanking`,
reportDetail: `${host1}occupationlab/occupationlab/achievement/reportDetail`,
deleteLastPublication: `${host1}competition/competition/rank/deleteLastPublication`,
whetherToPublish: `${host1}competition/competition/rank/whetherToPublish`,
manuallyRankTheUploadList: `${host1}competition/competition/rank/manuallyRankTheUploadList`,
queryPublicationSource: `${host1}competition/competition/rank/queryPublicationSource`,
releaseVerification: `${host1}competition/competition/rank/releaseVerification`,
totalRankingScoreDetails: `${host1}competition/competition/rank/totalRankingScoreDetails`,
batchRelease: `${host1}competition/competition/rank/batchRelease`,
manuallyUploadedRankings: `${host1}competition/competition/rank/manuallyUploadedRankings`,
toggleTheSortingMode: `${host1}competition/competition/rank/toggleTheSortingMode`,
selectTheLastSortStatus: `${host1}competition/competition/rank/selectTheLastSortStatus`,
cancelImport: `${host1}competition/competition/rank/cancelImport`,
gradeImport: `http://121.37.12.51/template/赛事成绩导入模板.xlsx`,
rankImportTeam: `http://121.37.12.51/template/赛事排名导入模板(团队赛).xlsx`,
rankImportPerson: `http://121.37.12.51/template/赛事排名导入模板(个人赛).xlsx`,

2
src/views/course/contentSettings.vue
Unescape View File

@ -654,6 +654,8 @@ export default {
this.downloadFile(row.name, player._urls[0].Url)
})
}).catch(res => {})
} else {
this.downloadFile(row.name + '.' + row.fileType, row.fileUrl)
}
},
preview(row) {

2
src/views/customer/AddCustomer.vue
Unescape View File

@ -23,7 +23,7 @@
</el-select>
</el-form-item>
<el-form-item prop="schoolId" label="客户名称">
<el-select v-model="form.schoolId" filterable clearable placeholder="请选择学校" @change="SchoolChange" @clear="clearSchool">
<el-select v-model="form.schoolId" filterable clearable placeholder="请选择学校" :disabled="customerId" @change="SchoolChange" @clear="clearSchool">
<el-option v-for="(item,index) in schoolList" :key="index" :label="item.schoolName" :value="item.schoolId"></el-option>
</el-select>
</el-form-item>

3
src/views/join/index.vue
Unescape View File

@ -7,7 +7,7 @@
<img src="@/assets/img/house.png" alt="">
</div>
<p class="text" style="font-size: 16px">城市合伙人计划</p>
<p class="text">加入并自动为你创建一个团队群组</p>
<p class="text">{{ teamName ? ('加入' + teamName) : '加入并自动为你创建一个团队群组' }}</p>
</div>
<div class="inner">
<el-form class="form" ref="form" :model="form" :rules="rules">
@ -41,6 +41,7 @@ export default {
return {
isMobile: util.isMobile(),
userName: this.$route.query.userName,
teamName: this.$route.query.teamName,
admin: this.$route.query.admin, // 是否是转让超管
form: {
id: this.$route.query.accountId,

2
src/views/match/add/index.vue
Unescape View File

@ -75,7 +75,7 @@ export default {
id: this.$route.query.id || '',
cache: this.$store.state.competitionCache,
publishStatus: 0,
competitionId: '',
competitionId: this.$route.query.id || '',
step: 1,
submiting: false,
updateTime: 0,

13
src/views/match/add/set.vue
Unescape View File

@ -71,10 +71,9 @@
{{ permissionsKeys[scope.row.permissions] }}
</template>
</el-table-column>
<!-- <el-table-column prop="createUser" label="创建人" align="center"></el-table-column> -->
<el-table-column prop="founder" label="创建人" align="center">
<template slot-scope="scope">
{{ scope.row.createUser }}
{{ scope.row.founder ? '老师创建' : '系统内置' }}
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
@ -160,9 +159,8 @@ export default {
},
// 课程选择回调
courseChange(val) {
const { sysId, sysName } = this.curriculumList.find(e => e.cid == this.form.cid)
this.form.sysName = sysName
this.sysId = sysId
const { systemId } = this.curriculumList.find(e => e.cid == this.form.cid)
this.sysId = systemId
if (val) this.loadIns = Loading.service()
this.getProject()
},
@ -235,11 +233,10 @@ export default {
if (new Date(form.time[0]) < new Date(playStartTime) || new Date(form.time[1]) > new Date(playEndTime)) return util.warningMsg('设置的阶段比赛时间必须要在第一步设置的竞赛时间范围内，请重新设置。')
if (!form.cid) return util.warningMsg('请选择课程')
if (!form.projectId) return util.warningMsg('请选择项目')
const cur = this.curriculumList.find(e => e.cid == form.cid)
if (cur) form.systemName = cur.sysName
const { systemId, projectName } = this.projects.find(e => e.projectId == form.projectId)
const { systemId, systemName, projectName } = this.projects.find(e => e.projectId == form.projectId)
if (systemId) form.systemId = systemId
if (projectName) form.projectName = projectName
if (systemName) form.systemName = systemName
form.startTime = form.time[0]
form.endTime = form.time[1]
this.$emit('hideSet', this.form)

21
src/views/match/add/step2.vue
Unescape View File

@ -28,7 +28,7 @@
)
</div>
</el-form-item>
<el-form-item prop="resultCalculationMethod" label="总成绩计算方式">
<el-form-item v-if="!form.rule" prop="resultCalculationMethod" label="总成绩计算方式">
<el-radio v-model="form.resultCalculationMethod" :label="0">各阶段成绩加权求和</el-radio>
<el-radio v-model="form.resultCalculationMethod" :label="1">各阶段成绩直接求和</el-radio>
<el-radio v-model="form.resultCalculationMethod" :label="2">各阶段成绩取平均值</el-radio>
@ -285,13 +285,19 @@ export default {
},
// 阶段数量选择回调
stageChange(val) {
const list = []
for (let i = 1; i <= val; i++) {
const form = JSON.parse(JSON.stringify(this.ruleForm))
form.number = i
list.push(form)
const stages = this.form.competitionStageList
const { ruleId } = this.form
if (stages.length < val) {
const list = []
for (let i = 1; i <= val - stages.length; i++) {
const form = JSON.parse(JSON.stringify(this.ruleForm))
form.number = stages.length + i
if (ruleId) form.ruleId = ruleId
this.form.competitionStageList.push(form)
}
} else {
this.form.competitionStageList = stages.slice(0, val)
}
this.form.competitionStageList = list
},
// 提交
save(status, next = 0) {
@ -305,6 +311,7 @@ export default {
let stages = form.competitionStageList
if (form.rule === 2) { // 单项赛只需要输入成绩公布时间
const e = stages[0]
e.stageName = step1.name
if (!e.resultsDetails) {
if (e.resultAnnouncementTime === '') {
return util.errorMsg('请填写成绩公布时间')

2
src/views/match/add/step3.vue
Unescape View File

@ -278,7 +278,7 @@ export default {
}).then(res => {
this.$parent.hideLoad()
// 新增赛事，并且点的是发布按钮，则发布该赛事
!form[0].contentId && status && this.publish(status)
status && this.publish(status)
util.successMsg((status ? '发布' : '保存') + '成功')
this.$emit('next', next)
}).catch(err => {

4
src/views/match/manage/matchArch.vue
Unescape View File

@ -30,7 +30,7 @@ export default {
list: [],
form: {},
timer: null,
curStep: []
curStep: [],
};
},
mounted() {
@ -52,7 +52,7 @@ export default {
pageNum: 1,
pageSize: 100,
contestId: this.id,
}).then(({ page }) => {
}).then(({ page, applicantSize }) => {
const list = page.records
list.map(e => {
e.methodName = Const.methods.find(n => n.id === e.method).name

1
src/views/match/manage/matchArchList.vue
Unescape View File

@ -184,6 +184,7 @@ export default {
url += `&ids=${ids.toString()}`
}
axios.post(this.api.exportExperimentalResultsInBatch, this.list, {
headers: this.headers,
responseType: 'blob'
}).then((res) => {
util.downloadFileDirect(`赛事成绩.xls`,new Blob([res.data]))

28
src/views/match/manage/matchInfo.vue
Unescape View File

@ -25,18 +25,20 @@
</div>
</div>
<table class="table">
<tr>
<th width="150">姓名：</th>
<td>{{ info.person.userName }}</td>
</tr>
<tr>
<th>学号：</th>
<td>{{ info.person.workNumber }}</td>
</tr>
<tr>
<th>学校：</th>
<td>{{ info.person.schoolName }}</td>
</tr>
<template v-if="form.completeCompetitionSetup.competitionType === 0">
<tr>
<th width="150">姓名：</th>
<td>{{ info.person.userName }}</td>
</tr>
<tr>
<th>学号：</th>
<td>{{ info.person.workNumber }}</td>
</tr>
<tr>
<th>学校：</th>
<td>{{ info.person.schoolName }}</td>
</tr>
</template>
<template v-if="form.completeCompetitionSetup.competitionType">
<template>
<tr>
@ -543,7 +545,7 @@ export default {
if (this.form.completeCompetitionSetup.competitionType) { // 团队比赛并且是队长，则展示团队成员成绩详情
this.curRow = row
this.memberVisible = true
const teamId = this.form.competitionRegistration.teamId
const teamId = this.info.teamId
if (teamId) {
this.$post(this.api.stageGradeManagementList, {
pageNum: 1,

30
src/views/match/manage/matchRank.vue
Unescape View File

@ -39,13 +39,13 @@
<el-table-column prop="schoolName" label="学校" min-width="100" align="center"></el-table-column>
<el-table-column prop="timeSum" label="用时" width="90" align="center">
<template slot-scope="scope">
{{ scope.row.timeSum }}min
{{ scope.row.timeSum + (scope.row.timeSum === '—' ? '' : 'min') }}
</template>
</el-table-column>
<el-table-column prop="score" label="分数" width="90" align="center"></el-table-column>
<el-table-column label="得分详情" align="center" width="160">
<template slot-scope="scope">
<el-button type="text" @click="show(scope.row, scope.$index)">查看</el-button>
<el-button v-if="(!competitionType && scope.row.reportId) || competitionType" type="text" @click="show(scope.row, scope.$index)">查看</el-button>
</template>
</el-table-column>
</el-table>
@ -114,7 +114,7 @@
<el-button type="primary" @click="download">模板下载<i class="el-icon-download el-icon--right"></i></el-button>
</div>
<el-upload
ref="importStaff"
ref="upload"
name="file"
accept=".xls,.xlsx"
:on-remove="handleRemove"
@ -129,8 +129,10 @@
:data="{
competitionId: this.id,
stageId: this.stageId,
isOverallRanking: active ? 0 : 1
isOverallRanking: active ? 0 : 1,
schoolId: ''
}"
:auto-upload="false"
>
<el-button type="primary" class="ml20">上传文件<i class="el-icon-upload2 el-icon--right"></i></el-button>
</el-upload>
@ -265,6 +267,7 @@ export default {
pageSize: this.pageSize,
competitionId: this.id,
publicationType: this.type,
locationStageId: this.stageId,
stageIds: ids.splice(0, ids.length - 1)
}).then(({ page, publishStatus }) => {
this.published = publishStatus
@ -407,6 +410,8 @@ export default {
},
// 发布排名
publishSubmit() {
const { startTime, endTime } = this.grades[this.index]
if (Date.now() <= new Date(endTime)) return util.errorMsg('当前阶段还在进行中,请在本阶段结束后再发布!')
if (this.type) { // 手动发布
this.$post(this.api.batchRelease, this.list.map(e => e.id)).then(res => {
this.getData()
@ -423,6 +428,7 @@ export default {
list.map(e => {
e.competitionId = id
e.isOverallRanking = isOverall
e.stageId = this.stageId
// if (isOverall) delete e.stageId
if (isPerson) e.teamId = null // 个人赛则teamId传null
})
@ -532,10 +538,13 @@ export default {
this.exportCode = exportCode
this.uploadFaild = true
util.errorMsg(`本次上传有${res.data.failureNum}个错误信息录入`)
} else {
this.importVisible = false
this.getRank()
util.successMsg('请检查数据后，点击发布排名以发布数据！')
}
this.uploadData = res.data.data
} else {
res.message ? util.errorMsg(res.message) : util.errorMsg("上传失败，请检查数据")
util.errorMsg(res.message || "上传失败，请检查数据")
}
},
uploadError(err, file, fileList) {
@ -553,10 +562,11 @@ export default {
this.uploadFaild = false
},
uploadSure() {
this.importVisible = false
// this.list = this.uploadData
this.getRank()
this.uploadData.length && util.successMsg('请检查数据后，点击发布排名以发布数据！')
this.list.length ?
this.$post(this.api.cancelImport, this.list.map(e => e.id)).then(res => {
this.$refs.upload.submit()
}).catch(res => {}) :
this.$refs.upload.submit()
}
}
};

5
src/views/match/manage/matchReport.vue
Unescape View File

@ -207,6 +207,11 @@ export default {
e.answer += `${i + 1}.${n.userAnswer}`
})
})
} else { // python系统显示图片（从userScores里取）
list.forEach(e => {
const item = this.userScores.find(n => n.judgmentId == e.judgmentId)
if (item && item.runThePictureList) e.runThePictureList = item.runThePictureList
})
}
this.expData = list
},

39
src/views/match/manage/matchSignup.vue
Unescape View File

@ -5,7 +5,7 @@
<ul class="filter">
<li>
<label>搜索：</label>
<el-input placeholder="请输入姓名/手机号/团队名称/学号" prefix-icon="el-icon-search" v-model="keyword" clearable size="mini" style="width: 250px"></el-input>
<el-input placeholder="请输入姓名/手机号/学号" prefix-icon="el-icon-search" v-model="keyword" clearable size="mini" style="width: 250px"></el-input>
</li>
<li v-if="info.releaseType">
<label>参赛人员状态：</label>
@ -62,7 +62,7 @@
<el-dialog :title="(!isAdd ? '编辑' : '新增') + '参赛人员'" :visible.sync="addVisible" width="400px" class="dialog" :close-on-click-modal="false" @close="closeAdd">
<el-form ref="form" :model="form" :rules="rules" label-width="80px" style='margin-right: 10px;'>
<el-form-item prop="schoolId" label="院校">
<el-form-item v-if="!schoolDisable" prop="schoolId" label="院校">
<el-select v-model="form.schoolId" filterable style="width: 100%">
<el-option v-for="(item, i) in clients" :key="i" :label="item.schoolName" :value="item.schoolId"></el-option>
</el-select>
@ -76,7 +76,7 @@
<el-form-item label="账号角色">
学生
</el-form-item>
<el-form-item prop="teamId" label="所属团队">
<el-form-item v-if="info.completeCompetitionSetup.competitionType" prop="teamId" label="所属团队">
<div style="display: flex;align-items: center">
<el-select v-model="form.teamId" :disabled="formEnable && isAdd" filterable style="width: 240px;margin-right: 10px">
<el-option v-for="(item, i) in teams" :key="i" :label="item.teamName" :value="item.teamId"></el-option>
@ -193,7 +193,8 @@ export default {
identification: 1
},
originForm: {},
exitMember: 0
exitMember: 0,
schoolDisable: false
};
},
watch: {
@ -207,7 +208,6 @@ export default {
mounted() {
this.initData()
this.getInfo()
this.getClient()
this.getTeam()
},
methods: {
@ -231,6 +231,13 @@ export default {
getInfo() {
this.$post(`${this.api.getCompetition}?competitionId=${this.id}`).then(({ competition }) => {
this.info = competition
// 非本校内则查询接口获取学校列表
if (competition.competitionScope) {
this.getClient()
} else {
this.schoolDisable = true
this.form.schoolId = competition.schoolId
}
}).catch(err => {})
},
initData() {
@ -288,12 +295,12 @@ export default {
},
// 新增编辑人员
submitForm() {
if (this.exitMember) {
this.submiting = false
return util.errorMsg('学生已存在')
}
const { form } = this
if (!this.isAdd) { // 编辑
if (this.exitMember) {
this.submiting = false
return util.errorMsg('学生已存在')
}
this.$post(this.api.updateUser, {
hrUserAccount: {
...form,
@ -332,7 +339,7 @@ export default {
})
} else {
// 新增人员后再调加入团队的接口
this.$post(this.api.joinCompetitionTeam, {
this.$post(this.api[this.info.completeCompetitionSetup.competitionType ? 'joinCompetitionTeam' : 'addCompetitionRegistration'], {
accountId: form.id,
competitionId: this.id,
teamId: this.form.teamId,
@ -399,9 +406,15 @@ export default {
},
// 获取客户
getClient() {
this.$get(this.api.querySchoolData).then(({ list }) => {
this.clients = list
}).catch(res => {})
if (this.info.competitionScope === 2) { // 指定范围
this.$get(`${this.api.schoolsInCompetitionArea}?competitionId=${this.id}`).then(({ schools }) => {
this.clients = schools
}).catch(res => {})
} else { // 本校内查询所有学校
this.$get(this.api.querySchoolData).then(({ list }) => {
this.clients = list
}).catch(res => {})
}
},
// 获取团队列表
getTeam() {

4
src/views/serve/projectAdd.vue
Unescape View File

@ -342,6 +342,7 @@ export default {
if (!this.isToPoint) {
this.$get(`${this.api.getProjectDetail}?projectId=${this.projectId}`).then(res => {
let { projectManage, projectJudgmentVos } = res;
if (!projectManage.remark) projectManage.remark = projectManage.projectName // 如果没有备注，则直接显示项目名称
this.projectManage = projectManage;
this.projectJudgmentData = projectJudgmentVos;
this.oriPer = projectManage.permissions
@ -349,6 +350,7 @@ export default {
e.sort = i + 1;
});
this.$nextTick(() => {
this.updateTime = 0
this.$refs.main.scrollTop = 0;
});
}).catch(err => {
@ -757,7 +759,7 @@ export default {
// 返回
back() {
// 更改了信息才需要提示
if(this.updateTime > 1){
if(this.updateTime){
this.$confirm('编辑的内容未保存，是否保存？', "提示", {
type: "warning"
}).then(() => {

Write Preview
Loading…
Cancel
Save