diff --git a/src/pages/allocationReview/list/index.vue b/src/pages/allocationReview/list/index.vue
index c439ae9..138f84e 100644
--- a/src/pages/allocationReview/list/index.vue
+++ b/src/pages/allocationReview/list/index.vue
@@ -51,8 +51,8 @@
-
-
+
+
diff --git a/src/pages/myReview/list/index.vue b/src/pages/myReview/list/index.vue
index a3b19ab..3a29f67 100644
--- a/src/pages/myReview/list/index.vue
+++ b/src/pages/myReview/list/index.vue
@@ -5,7 +5,7 @@
-
-
+
{{ item.name
}}
@@ -117,19 +117,9 @@ export default {
name: '已完成'
},
],
- status: [
- {
- id: 1,
- name: '启用'
- },
- {
- id: 0,
- name: '禁用'
- },
- ],
+ month: '',
date: [],
filter: {
- month: '',
startTime: '',
endTime: '',
evaluationResult: '',
@@ -145,14 +135,6 @@ export default {
};
},
watch: {
- 'filter.month': function (val) {
- if (val) {
- let unit = 24 * 60 * 60 * 1000
- this.date = [dayjs(new Date(Date.now() - unit * 30 * val)).format('YYYY-MM-DD'), dayjs(new Date(Date.now() + unit)).format('YYYY-MM-DD')]
- } else {
- this.date = []
- }
- },
date: function (val) {
if (val) {
this.filter.startTime = val[0]
@@ -205,6 +187,7 @@ export default {
this.loading = true
const { page } = await this.$post(this.api.myReviewTask, {
...this.filter,
+ isTimed: this.month === 0 ? 1 : 0,
pageNum: this.page,
pageSize: this.pageSize,
})
@@ -269,6 +252,16 @@ export default {
this.handleStage()
}, 1000)
},
+ // 评阅月份选择回调
+ monthChange (val) {
+ if (val) {
+ const unit = 24 * 60 * 60 * 1000
+ this.date = [dayjs(new Date(Date.now() - unit * 30 * val)).format('YYYY-MM-DD'), dayjs(new Date(Date.now() + unit)).format('YYYY-MM-DD')]
+ } else {
+ this.date = []
+ // this.initData()
+ }
+ },
// 评阅
toReview (row) {
diff --git a/src/pages/myReview/records/index.vue b/src/pages/myReview/records/index.vue
index 41a84b0..3f7758c 100644
--- a/src/pages/myReview/records/index.vue
+++ b/src/pages/myReview/records/index.vue
@@ -32,7 +32,7 @@
-
-
+
-
@@ -70,7 +70,7 @@
show-overflow-tooltip>
- {{ scope.row.evaluationStatus
+ {{ scope.row.status
}}
@@ -109,12 +109,10 @@ export default {
schools: [],
status: [
{
- id: 1,
- name: '启用'
+ name: '待评阅'
},
{
- id: 0,
- name: '禁用'
+ name: '已评阅'
},
],
date: [],
@@ -231,8 +229,8 @@ export default {
},
// 清除省份
clearprovince () {
- this.filter.cityId = '',
- this.filter.schoolId = ''
+ this.filter.cityId = ''
+ this.filter.realSchoolId = ''
},
// 省份选择回调
provinceChange () {
diff --git a/src/pages/myReview/theoryReview/index.vue b/src/pages/myReview/theoryReview/index.vue
index 67c0b1c..f65ad6c 100644
--- a/src/pages/myReview/theoryReview/index.vue
+++ b/src/pages/myReview/theoryReview/index.vue
@@ -175,7 +175,7 @@
考生所在院校：{{ info.realSchool }}
团队名称：{{ info.teamName }}
- 考生班级：{{ info.className }}
+
考生姓名：{{ info.userName }}
考生学号：{{ info.workNumber }}
@@ -445,11 +445,7 @@ export default {
Util.successMsg('删除成功')
},
- // 上一个
- async prev () {
-
- },
- // 下一个
+ // 下一个、上一个
async switchRecord (isNext) {
const res = await this.$post(this.api.getTheLabReportIdUpAndDown, {
competitionId: this.competitionId,
@@ -457,7 +453,8 @@ export default {
currentReportId: this.reportId
})
const id = res[isNext ? 'nextReportId' : 'previousReportId']
- this[isNext ? 'showNext' : 'showPrev'] = !!id
+ this.showNext = !!res.nextReportId
+ this.showPrev = !!res.previousReportId
if (id) {
this.reportId = id
this.$router.push(`/theoryReview?id=${id}&u=${this.showUserInfo}&c=${this.competitionId}&s=${this.stageId}`)
@@ -473,13 +470,13 @@ export default {
const params = []
paper.forEach(e => {
e.userAnswerList.forEach(n => {
- n.reviewScore !== '' && params.push({
+ n.originUserScore !== n.reviewScore && params.push({
assignmentDetailId: n.assignmentDetailId,
reviewScore: n.reviewScore,
})
})
})
- await this.$post(this.api.reviewPaper, params)
+ if (params.length) await this.$post(this.api.reviewPaper, params)
Util.successMsg('保存成功')
} finally {
this.submiting = false