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

fix

Browse Source
master
yujialong 2 weeks ago
parent 1c0de78d1b
commit 886656945c
7 changed files with 23 additions and 16 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. 2
      src/api/index.js
  2. 4
      src/pages/allocationReview/list/index.vue
  3. 6
      src/pages/allocationReview/records/index.vue
  4. 2
      src/pages/expert/list/index.vue
  5. 2
      src/pages/myReview/list/index.vue
  6. 8
      src/pages/myReview/records/index.vue
  7. 15
      src/pages/myReview/theoryReview/index.vue

2
src/api/index.js
Unescape View File

@ -31,7 +31,7 @@ export default {
occupationlabStaff: `/occupationlab/occupationlab/staff/staffList`, occupationlabStaff: `/occupationlab/occupationlab/staff/staffList`,
querySchoolByReadAndAppraise: `/nakadai/nakadai/school/querySchoolByReadAndAppraise`, querySchoolByReadAndAppraise: `/nakadai/nakadai/school/querySchoolByReadAndAppraise`,
querySchool: `/nakadai/nakadai/school/querySchool`, querySchool: `/nakadai/nakadai/school/querySchool`,
myClass: `/occupationlab/occupationlab/achievement/myClass`, allClassesInOurSchool: `/occupationlab/occupationlab/achievement/allClassesInOurSchool`,
getDetailedExamScores: `/exam/exam/paper/getDetailedExamScores`, getDetailedExamScores: `/exam/exam/paper/getDetailedExamScores`,
reviewSettingsList: `/competition/competition/readAndAppraise/reviewSettingsList`, reviewSettingsList: `/competition/competition/readAndAppraise/reviewSettingsList`,

4
src/pages/allocationReview/list/index.vue
Unescape View File

@ -50,7 +50,7 @@
min-width="120" show-overflow-tooltip></el-table-column> min-width="120" show-overflow-tooltip></el-table-column>
<el-table-column v-if="fromNakadai" :key="2" prop="stageName" label="阶段赛名称" align="center" <el-table-column v-if="fromNakadai" :key="2" prop="stageName" label="阶段赛名称" align="center"
min-width="100"></el-table-column> min-width="100"></el-table-column>
<el-table-column :key="3" prop="competitionContent" :label="fromNakadai ? '比赛内容' : '考核名称'" align="center" <el-table-column :key="3" prop="competitionContent" :label="fromNakadai ? '比赛内容' : '考核内容'" align="center"
min-width="100"></el-table-column> min-width="100"></el-table-column>
<el-table-column :key="5" prop="totalAnswer" label="总答卷数" align="center" width="90"></el-table-column> <el-table-column :key="5" prop="totalAnswer" label="总答卷数" align="center" width="90"></el-table-column>
<el-table-column :key="6" prop="unReviewedAnswer" label="待评答卷数" align="center" width="90"></el-table-column> <el-table-column :key="6" prop="unReviewedAnswer" label="待评答卷数" align="center" width="90"></el-table-column>
@ -63,7 +63,7 @@
<el-table-column :key="12" label="操作" align="center" width="220" fixed="right"> <el-table-column :key="12" label="操作" align="center" width="220" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="scope.row.seted"> <template v-if="scope.row.seted">
<el-button v-auth="'分配评阅任务:评阅进度'" type="text" @click="toProgress(scope.row)">评阅进度</el-button> <!-- <el-button v-auth="'分配评阅任务:评阅进度'" type="text" @click="toProgress(scope.row)">评阅进度</el-button> -->
<el-button v-auth="'分配评阅任务:修改评阅设置'" type="text" @click="toSetup(scope.row)">修改评阅设置</el-button> <el-button v-auth="'分配评阅任务:修改评阅设置'" type="text" @click="toSetup(scope.row)">修改评阅设置</el-button>
<el-button v-auth="'分配评阅任务:任务分配'" type="text" @click="toTask(scope.row)">任务分配</el-button> <el-button v-auth="'分配评阅任务:任务分配'" type="text" @click="toTask(scope.row)">任务分配</el-button>
</template> </template>

6
src/pages/allocationReview/records/index.vue
Unescape View File

@ -206,7 +206,7 @@ export default {
keyWord: keyword || '', keyWord: keyword || '',
} }
provinceId && this.getCity() provinceId && this.getCity()
this.$router.push(`records?competitionId=${query.competitionId}&stageId=${query.stageId}`).catch(() => { }) this.$router.push(`records?competitionId=${query.competitionId}&stageId=${query.stageId}&assessmentId=${this.assessmentId}`).catch(() => { })
} }
if (fromNakadai) { if (fromNakadai) {
@ -287,8 +287,8 @@ export default {
// 获取班级 // 获取班级
getClassData () { getClassData () {
this.$post(this.api.myClass).then(res => { this.$post(this.api.allClassesInOurSchool).then(res => {
this.classList = res.list this.classList = res.data
}).catch(res => { }) }).catch(res => { })
}, },

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

@ -297,7 +297,7 @@ export default {
}, },
// 复制链接 // 复制链接
copy (e) { copy (e) {
clipboard('http://121.37.12.51/reviewCenter', e, '链接已复制！') clipboard(`http://47.97.49.1/reviewCenter`, e, '链接已复制！')
}, },
// 编辑/查看 // 编辑/查看
async queryExpert (row, isDetail) { async queryExpert (row, isDetail) {

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

@ -39,7 +39,7 @@
min-width="120" show-overflow-tooltip></el-table-column> min-width="120" show-overflow-tooltip></el-table-column>
<el-table-column v-if="fromNakadai" :key="2" prop="stageName" label="阶段赛名称" align="center" <el-table-column v-if="fromNakadai" :key="2" prop="stageName" label="阶段赛名称" align="center"
min-width="100"></el-table-column> min-width="100"></el-table-column>
<el-table-column :key="3" prop="competitionContent" :label="fromNakadai ? '比赛内容' : '考核名称'" align="center" <el-table-column :key="3" prop="competitionContent" :label="fromNakadai ? '比赛内容' : '考核内容'" align="center"
min-width="100"></el-table-column> min-width="100"></el-table-column>
<el-table-column prop="totalAnswer" label="分配答卷数" align="center" width="90"></el-table-column> <el-table-column prop="totalAnswer" label="分配答卷数" align="center" width="90"></el-table-column>
<el-table-column prop="unReviewedAnswer" label="待评答卷数" align="center" width="90"></el-table-column> <el-table-column prop="unReviewedAnswer" label="待评答卷数" align="center" width="90"></el-table-column>

8
src/pages/myReview/records/index.vue
Unescape View File

@ -179,7 +179,7 @@ export default {
keyWord: keyword || '', keyWord: keyword || '',
} }
provinceId && this.getCity() provinceId && this.getCity()
this.$router.push(`records?competitionId=${query.competitionId}&stageId=${query.stageId}`).catch(() => { }) this.$router.push(`records?competitionId=${query.competitionId}&stageId=${query.stageId}&assessmentId=${this.assessmentId}`).catch(() => { })
} }
if (fromNakadai) { if (fromNakadai) {
@ -277,8 +277,8 @@ export default {
// 获取班级 // 获取班级
getClassData () { getClassData () {
this.$post(this.api.myClass).then(res => { this.$post(this.api.allClassesInOurSchool).then(res => {
this.classList = res.list this.classList = res.data
}).catch(res => { }) }).catch(res => { })
}, },
@ -308,7 +308,7 @@ export default {
}, },
// 评阅 // 评阅
toReview (row, readonly = 0) { toReview (row, readonly = 0) {
window.open(this.$router.resolve(`/theoryReview?id=${row.reportId}&u=${+this.showUserInfo}&m=${this.setup.hasManualScoreType}&c=${this.competitionId}&s=${this.stageId}&r=${readonly ? 1 : 0}`).href) window.open(this.$router.resolve(`/theoryReview?id=${row.reportId}&u=${+this.showUserInfo}&m=${this.setup.hasManualScoreType}&c=${this.competitionId}&a=${this.assessmentId}&s=${this.stageId}&r=${readonly ? 1 : 0}`).href)
}, },
} }
}; };

15
src/pages/myReview/theoryReview/index.vue
Unescape View File

@ -195,9 +195,11 @@
<h6>基本信息</h6> <h6>基本信息</h6>
<div class="lines"> <div class="lines">
<template v-if="showUserInfo"> <template v-if="showUserInfo">
<p>考生所在院校：{{ info.realSchool }}</p> <template v-if="fromNakadai">
<p>团队名称：{{ info.teamName }}</p> <p>考生所在院校：{{ info.realSchool }}</p>
<!-- <p>考生班级：{{ info.className }}</p> --> <p>团队名称：{{ info.teamName }}</p>
</template>
<p v-else>考生班级：{{ info.className }}</p>
<p>考生姓名：{{ info.userName }}</p> <p>考生姓名：{{ info.userName }}</p>
<p>考生学号：{{ info.workNumber }}</p> <p>考生学号：{{ info.workNumber }}</p>
</template> </template>
@ -222,16 +224,20 @@ import QuesConst from '@/const/ques'
import Util from '@/libs/util' import Util from '@/libs/util'
import _ from 'lodash' import _ from 'lodash'
import Decimal from 'decimal.js' import Decimal from 'decimal.js'
const fromNakadai = localStorage.getItem('reviewFromNakadai')
export default { export default {
components: { components: {
PdfDia PdfDia
}, },
data () { data () {
return { return {
fromNakadai,
numToLetter: Util.numToLetter, numToLetter: Util.numToLetter,
arabicToChinese: Util.arabicToChinese, arabicToChinese: Util.arabicToChinese,
reportId: this.$route.query.id, reportId: this.$route.query.id,
competitionId: this.$route.query.c, competitionId: this.$route.query.c,
assessmentId: this.$route.query.a,
stageId: this.$route.query.s, stageId: this.$route.query.s,
showUserInfo: +this.$route.query.u, // 是否展示学生信息 showUserInfo: +this.$route.query.u, // 是否展示学生信息
hasManualScoreType: +this.$route.query.m, // 是否有主观题 hasManualScoreType: +this.$route.query.m, // 是否有主观题
@ -568,6 +574,7 @@ export default {
const res = await this.$post(this.api.getTheLabReportIdUpAndDown, { const res = await this.$post(this.api.getTheLabReportIdUpAndDown, {
competitionId: this.competitionId, competitionId: this.competitionId,
stageId: this.stageId, stageId: this.stageId,
assessmentId: this.assessmentId,
currentReportId: this.reportId currentReportId: this.reportId
}) })
this.showNext = !init && !isNext && res.previousReportId ? true : (init ? !!res.nextReportId : !!res.nextNextReportId) this.showNext = !init && !isNext && res.previousReportId ? true : (init ? !!res.nextReportId : !!res.nextNextReportId)
@ -577,7 +584,7 @@ export default {
const id = res[isNext ? 'nextReportId' : 'previousReportId'] const id = res[isNext ? 'nextReportId' : 'previousReportId']
if (id) { if (id) {
this.reportId = id this.reportId = id
this.$router.push(`/theoryReview?id=${id}&u=${this.showUserInfo}&m=${this.hasManualScoreType}&c=${this.competitionId}&s=${this.stageId}&r=${this.readonly ? 1 : 0}`) this.$router.push(`/theoryReview?id=${id}&u=${this.showUserInfo}&m=${this.hasManualScoreType}&c=${this.competitionId}&s=${this.stageId}&a=${this.assessmentId}&r=${this.readonly ? 1 : 0}`)
this.getData() this.getData()
} }
} }

Write Preview
Loading…
Cancel
Save