zhangjie 2 rokov pred
rodič
commit
1d57d96a50

+ 2 - 1
src/modules/grading/leader/LeaderGrading.vue

@@ -572,7 +572,8 @@ export default {
           action: levelInfo.markLeaderOnlyRight.action,
           action: levelInfo.markLeaderOnlyRight.action,
           level: levelInfo.selectedLevel,
           level: levelInfo.selectedLevel,
           originLevel: levelInfo.curLevel,
           originLevel: levelInfo.curLevel,
-          paperIds: levelInfo.paperIds
+          paperIds: levelInfo.paperIds,
+          leaderConfirm: this.paramsSet.leaderConfirm
         };
         };
         if (datas.action === "reject") {
         if (datas.action === "reject") {
           datas.range = markers.map(item => item.id).join();
           datas.range = markers.map(item => item.id).join();

+ 1 - 1
src/modules/grading/marker/MarkerGrading.vue

@@ -237,7 +237,7 @@ export default {
       const datas = {
       const datas = {
         ...this.filter,
         ...this.filter,
         ...this.typeFilter[this.curStep.type],
         ...this.typeFilter[this.curStep.type],
-        workId: this.workId,
+        ...this.workSubject,
         page: this.page.current - 1,
         page: this.page.current - 1,
         size: this.page.size
         size: this.page.size
       };
       };

+ 1 - 2
src/modules/mark/marker/MarkerMarking.vue

@@ -232,8 +232,7 @@ export default {
       const datas = {
       const datas = {
         ...this.filter,
         ...this.filter,
         ...this.typeFilter[this.curStep.type],
         ...this.typeFilter[this.curStep.type],
-        subject: this.subject,
-        workId: this.workId,
+        ...this.workSubject,
         page: this.page.current - 1,
         page: this.page.current - 1,
         size: this.page.size
         size: this.page.size
       };
       };