fix

src/pages/allocationReview/list/index.vue

@@ -51,8 +51,8 @@
       <el-table-column prop="reviewedAnswer" label="已评答卷数" align="center" width="90"></el-table-column>
       <el-table-column prop="time" label="评阅时间" align="center" width="160" />
       <el-table-column prop="stage" label="评阅阶段" align="center" width="90"></el-table-column>
-      <el-table-column prop="reviewStatusName" label="评阅情况" align="center" width="90"></el-table-column>
+      <el-table-column prop="reviewStatus" label="评阅情况" align="center" width="90"></el-table-column>
-      <el-table-column prop="reviewStatusName" label="任务分配情况" align="center" width="100"></el-table-column>
+      <el-table-column prop="taskAllocationStatus" label="任务分配情况" align="center" width="100"></el-table-column>
       <el-table-column label="操作" align="center" width="220" fixed="right">
         <template slot-scope="scope">
           <template v-if="scope.row.evaluationId && (scope.row.hasManualScoreType || scope.row.allowManualGrading)">

src/pages/myReview/list/index.vue

@@ -5,7 +5,7 @@
       <ul class="filter">
         <li>
           <label>评阅时间</label>
-          <el-radio-group v-model="filter.month">
+          <el-radio-group v-model="month" @change="monthChange">
             <el-radio v-for="(item, index) in dateList" :key="index" :label="item.id" border>{{ item.name
               }}</el-radio>
           </el-radio-group>
@@ -117,19 +117,9 @@ export default {
           name: '已完成'
         },
       ],
-      status: [
+      month: '',
-        {
-          id: 1,
-          name: '启用'
-        },
-        {
-          id: 0,
-          name: '禁用'
-        },
-      ],
       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) {

src/pages/myReview/records/index.vue

@@ -32,7 +32,7 @@
         <li>
           <label>评阅状态</label>
           <el-select v-model="filter.status" clearable placeholder="请选择评阅状态" @change="initData">
-            <el-option v-for="(item, i) in status" :key="i" :label="item.name" :value="item.id"></el-option>
+            <el-option v-for="(item, i) in status" :key="i" :value="item.name"></el-option>
           </el-select>
         </li>
         <li>
@@ -70,7 +70,7 @@
         show-overflow-tooltip></el-table-column>
       <el-table-column prop="evaluationStatus" label="评阅状态" align="center" width="90">
         <template slot-scope="scope">
-          <el-tag :type="scope.row.evaluationStatus === '待评阅' ? 'danger' : 'success'">{{ scope.row.evaluationStatus
+          <el-tag :type="scope.row.status === '待评阅' ? 'danger' : 'success'">{{ scope.row.status
             }}</el-tag>
         </template>
       </el-table-column>
@@ -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.cityId = ''
-        this.filter.schoolId = ''
+      this.filter.realSchoolId = ''
     },
     // 省份选择回调
     provinceChange () {

src/pages/myReview/theoryReview/index.vue

@@ -175,7 +175,7 @@
           <template v-if="showUserInfo">
             <p>考生所在院校：{{ info.realSchool }}</p>
             <p>团队名称：{{ info.teamName }}</p>
-            <p>考生班级：{{ info.className }}</p>
+            <!-- <p>考生班级：{{ info.className }}</p> -->
             <p>考生姓名：{{ info.userName }}</p>
             <p>考生学号：{{ info.workNumber }}</p>
           </template>
@@ -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