bug md

src/constants/enumerate.js

@@ -106,8 +106,8 @@ export const PAPER_UPLOAD_TYPE = {
 
 // score-handle-type
 export const SCORE_HANDLE_TYPE = {
-  0: "四舍五入",
-  1: "非零进一"
+  0: "非零进一",
+  1: "四舍五入"
 };
 
 // apply-change-level-status

src/modules/grading-set/GradingLevelSet.vue

@@ -203,7 +203,7 @@ export default {
       workId: this.$route.params.workId,
       letterRelateNumber: {},
       levels: [],
-      worKDetail: {},
+      workDetail: {},
       isSubmit: false
     };
   },
@@ -221,7 +221,7 @@ export default {
     },
     async getData() {
       const data = await workDetail(this.workId);
-      this.worKDetail = data;
+      this.workDetail = data;
       this.levels = data.levels.map(item => {
         item.canEdit = false;
         return item;
@@ -402,7 +402,8 @@ export default {
 
       if (this.isSubmit) return;
       this.isSubmit = true;
-      const data = await updateWork(this.worKDetail).catch(() => {
+      this.workDetail.levels = this.levels;
+      const data = await updateWork(this.workDetail).catch(() => {
         this.isSubmit = false;
       });
 

src/modules/grading/GradingDetail.vue

@@ -173,7 +173,8 @@ import {
   levelStatData,
   areaList,
   workLevelList,
-  taskSnSearch
+  taskSnSearch,
+  subjectDetail
 } from "@/api";
 import ImagePreview from "@/components/common/ImagePreview";
 import GradeStep from "./components/GradeStep";
@@ -224,6 +225,7 @@ export default {
       workId: this.$route.params.workId,
       subjectId: this.$route.params.subjectId,
       subject: "",
+      curSubject: {},
       curUserRoleType: "MARKER",
       current: 1,
       size: 6,
@@ -267,6 +269,9 @@ export default {
     IS_MARK_LEADER() {
       return this.curUserRoleType === "MARK_LEADER";
     },
+    IS_TEST() {
+      return this.curSubject.test === 2;
+    },
     imagePreviewClasses() {
       return this.IS_ADMIN
         ? "grading-detail-image-preview"
@@ -280,6 +285,7 @@ export default {
   },
   methods: {
     async initData() {
+      await this.getSubjectDetail();
       // 获取档位列表
       this.getWorkLevels();
       // 获取考区列表，一个考区对应一个questionId
@@ -309,6 +315,9 @@ export default {
       this.current = page;
       this.getList();
     },
+    async getSubjectDetail() {
+      this.curSubject = await subjectDetail(this.subjectId);
+    },
     async getStepLevels() {
       const data = await levelStatData(this.subjectId, this.filter.questionId);
       const undoIndex = data.findIndex(item => item.id === null);
@@ -317,6 +326,14 @@ export default {
         const undo = { ...data[undoIndex] };
         data.splice(undoIndex, 1);
 
+        if (this.IS_MARK_LEADER && this.IS_TEST) {
+          otherStep.push({
+            name: "待评",
+            count: undo.count,
+            type: "undo"
+          });
+        }
+
         otherStep.push({
           name: "打回",
           count: undo.rejected,

src/modules/grading/components/GradeAction.vue

@@ -200,6 +200,7 @@ export default {
           arbitrate: ["search", "gradeHis"]
         },
         MARK_LEADER: {
+          undo: ["search", "gradeList", "gradeInfo"],
           done: ["search", "gradeList", "gradeHis", "gradeInfo"],
           reject: ["search", "gradeList", "gradeInfo", "gradeHis"],
           arbitrate: ["search", "gradeList", "gradeHis"]

src/modules/login/LoginHome.vue

@@ -135,11 +135,11 @@ export default {
         const stage = curSubject.stage;
         routerType = `${role}_${stage}`;
 
+        if (stage === "INIT") {
+          this.$Message.error("当前工作未开启分档！");
+          return;
+        }
         if (role === "MARKER") {
-          if (stage === "INIT") {
-            this.$Message.error("当前工作未开启分档！");
-            return;
-          }
           if (
             (stage === "LEVEL" && markRight === "ALLOW_SCORING") ||
             (stage === "SCORE" && markRight === "ALLOW_LEVELING")

src/modules/main/StudentManage.vue

@@ -20,7 +20,7 @@
           type="success"
           icon="recode-white icon"
           shape="circle"
-          @click="toEdit({})"
+          @click="toAdd"
           >添加考生</Button
         >
       </div>
@@ -332,6 +332,7 @@ export default {
           const [subject, hasScan] = status.split(":");
           student[subject] = hasScan;
         });
+        student.workId = this.filter.workId;
         return student;
       });
       this.total = data.totalCount;
@@ -375,6 +376,10 @@ export default {
       this.rooms = curSchool ? curSchool.rooms : [];
       this.filter.examRoom = null;
     },
+    toAdd() {
+      this.curStudent = { workId: this.filter.workId };
+      this.$refs.ModifyStudent.open();
+    },
     toEdit(row) {
       this.curStudent = row;
       this.$refs.ModifyStudent.open();

src/modules/main/WorkOverview.vue

@@ -12,7 +12,7 @@
         <li>
           <span><i class="icon ivu-icon-area"></i></span>
           <span>考区数：</span>
-          <span>{{ overviewInfo.stuAbsentCount }}</span>
+          <span>{{ overviewInfo.questionCount }}</span>
         </li>
       </ul>
       <div class="overview-actions">

src/modules/main/components/ModifyStudent.vue

@@ -92,7 +92,9 @@ import { updateStudent } from "@/api";
 const initModalForm = {
   id: null,
   name: "",
+  workId: null,
   examNumber: "",
+  areaName: "",
   areaCode: "",
   school: "",
   examRoom: ""
@@ -171,11 +173,9 @@ export default {
   methods: {
     initData(val) {
       this.$refs.modalFormComp.resetFields();
+      this.modalForm = this.$objAssign(initModalForm, val);
       if (val.id) {
-        this.modalForm = this.$objAssign(initModalForm, val);
         this.reviewInfo();
-      } else {
-        this.modalForm = { ...initModalForm };
       }
     },
     visibleChange(visible) {
@@ -198,6 +198,7 @@ export default {
         item => item.areaCode === this.modalForm.areaCode
       );
       this.schools = curArea.schools;
+      this.modalForm.areaName = curArea.areaName;
       this.rooms = [];
       this.modalForm.examRoom = null;
       if (curArea.schools.length === 1) {