....

src/modules/marking/views/MarkPaperCheck.vue

@@ -368,8 +368,7 @@ export default {
         this.$notify({
           title: "警告",
           message: "请选择评卷名称",
-          type: "warning",
-          duration: 1000
+          type: "warning"
         });
         return false;
       }

src/modules/marking/views/MarkWorkOverview.vue

@@ -135,7 +135,6 @@
           </el-table>
           <div class="page pull-right">
             <el-pagination
-              background
               @current-change="handleSettingCurrentChange"
               @size-change="handleSizeChange"
               :current-page="currentPage"
@@ -384,47 +383,21 @@ export default {
       this.pageSize = val;
       this.searchSetting();
     },
-    pagingSetting() {
-      var start = (this.currentPage - 1) * this.pageSize;
-      var end =
-        this.currentPage * this.pageSize < this.total
-          ? this.currentPage * this.pageSize
-          : this.total;
-      var tempData = [];
-      console.log(`当前页: ${this.currentPage},开始:${start},结束:${end}`);
-      for (let i = start; i < end; i++) {
-        tempData.push(this.tableData[i]);
-      }
-      this.tableData = tempData;
-    },
-    initSetting() {
-      this.loading = true;
-      this.$http
-        .get(
-          MARKING_API +
-            "/markCourses/all/0/" +
-            this.pageSize +
-            "?workId=" +
-            this.workId
-        )
-        .then(response => {
-          this.tableData = response.data.content;
-          this.total = response.data.totalElements;
-          this.loading = false;
-        });
-    },
     searchSetting() {
       if (!this.markWorkSearchForm.markId) {
         this.$notify({
           title: "警告",
           message: "请选择评卷名称",
-          type: "warning",
-          duration: 1000
+          type: "warning"
         });
         return false;
       }
       this.quertTemp["markId"] = this.markWorkSearchForm.markId;
       this.quertTemp["courseCode"] = this.formSearch.courseCode;
+      this.quertTemp["examId"] = this.examId;
+      this.quertTemp["markWorkName"] = this.markWorkName;
+      this.quertTemp["currentPage"] = this.currentPage;
+      this.quertTemp["pageSize"] = this.pageSize;
       this.loading = true;
       this.$http
         .get(
@@ -585,7 +558,7 @@ export default {
         this.markWorkName = obj.name;
         this.workId = this.markWorkSearchForm.markId;
         this.doPie();
-        this.initSetting();
+        this.searchSetting();
         this.getCourses();
       }
     },
@@ -611,7 +584,12 @@ export default {
             }
           }
         }
+        this.currentPage = parseInt(formData.currentPage);
+        this.pageSize = parseInt(formData.pageSize);
+        this.examId = parseInt(formData.examId);
+        this.markWorkName = formData.markWorkName;
         this.searchSetting();
+        this.getCourses();
       }
     }
   },

src/modules/marking/views/Marker.vue

@@ -185,8 +185,7 @@ export default {
         this.$notify({
           title: "警告",
           message: "请选择评卷名称",
-          type: "warning",
-          duration: 1000
+          type: "warning"
         });
         return false;
       }

src/modules/marking/views/Marking.vue

@@ -7,7 +7,7 @@
             <span>课程：{{ task.courseName }}</span>
           </small>
           <small class="marktitle titlefont">
-            <span>试卷编号：{{ task.paperName }}</span>
+            <span>试卷编号：{{ task.basePaperName }}</span>
           </small>
           <small class="marktitle titlefont">
             <span>待评：{{ task.leftCount }}</span>
@@ -144,9 +144,6 @@
                     </div>
                   </template>
                 </el-table-column>
-                <el-table-column label="状态">
-                  <div><span style="margin-left: 10px">已评</span></div>
-                </el-table-column>
                 <el-table-column label="问题卷">
                   <template slot-scope="scope">
                     <div>
@@ -586,6 +583,7 @@ export default {
       this.answerHtml = null;
       //试卷全部评完且回评时不继续获取试卷
       if (this.backMark && this.allMarked) {
+        this.$loading().close();
         return;
       }
       this.initMarkItem();

src/modules/marking/views/TpScoreBoard.vue

@@ -516,8 +516,9 @@ export default {
             resultItem.markItem.orders +
             ")";
           this.$notify({
+            title: "警告",
             message: itemName + "没有打分，请打分",
-            type: "error"
+            type: "warning"
           });
           return false;
         } else {