zhangjie 4 жил өмнө
parent
commit
325f1a5481

+ 2 - 1
src/modules/grading/GradingStandardPaperManage.vue

@@ -178,7 +178,8 @@ export default {
       this.canCancel = !isLevelOrScore;
       this.canCancel = !isLevelOrScore;
 
 
       await this.getAreaList();
       await this.getAreaList();
-      this.questionId = this.areas[0].id;
+      this.questionId = this.areas[0] && this.areas[0].id;
+      if (!this.questionId) return;
       await this.getWorkLevels();
       await this.getWorkLevels();
       this.switchLevel(0);
       this.switchLevel(0);
     },
     },

+ 16 - 1
src/modules/grading/GradingUserManage.vue

@@ -147,10 +147,25 @@ export default {
       const data = await gradingUserList(datas);
       const data = await gradingUserList(datas);
       this.users = data.map(item => {
       this.users = data.map(item => {
         item.roleName = ROLE_TYPE[item.role];
         item.roleName = ROLE_TYPE[item.role];
-        item.rightName = MARKER_RIGHT_TYPE[item.markRight];
+        item.rightName =
+          item.role === "MARK_LEADER"
+            ? this.getMarkLeadRoleName(item)
+            : MARKER_RIGHT_TYPE[item.markRight];
         return item;
         return item;
       });
       });
     },
     },
+    getMarkLeadRoleName(item) {
+      const roles = {
+        oneClickLevel: "一键定档",
+        standardVolume: "设立标准卷",
+        levelCallback: "打回"
+      };
+      let roleNames = [];
+      Object.keys(roles).map(k => {
+        if (item[k]) roleNames.push(roles[k]);
+      });
+      return roleNames.join(",");
+    },
     async toResetPwd(row) {
     async toResetPwd(row) {
       await resetPwd({ userId: row.id, password: "123456" });
       await resetPwd({ userId: row.id, password: "123456" });
       this.$Message.success("重置密码成功!");
       this.$Message.success("重置密码成功!");

+ 7 - 2
src/modules/grading/components/GradeAction.vue

@@ -52,10 +52,13 @@
     </div>
     </div>
     <!-- 档位信息 -->
     <!-- 档位信息 -->
     <!-- 已评(已评档位),打回(建议档位) -->
     <!-- 已评(已评档位),打回(建议档位) -->
-    <h3 class="action-grade-info-title" v-if="curPaperOrTask.rejected">
+    <h3
+      class="action-grade-info-title"
+      v-if="curPaperOrTask.rejected && curPaperOrTask.isRejectedByLeader"
+    >
       建议档位:
       建议档位:
     </h3>
     </h3>
-    <div class="action-grade-info" v-if="rights.gradeInfo">
+    <div class="action-grade-info" v-if="rights.gradeInfo && curLevel.name">
       <h3 class="grade-info-name">{{ curLevel.name }}</h3>
       <h3 class="grade-info-name">{{ curLevel.name }}</h3>
       <div class="grade-info-range">
       <div class="grade-info-range">
         <p>分数范围</p>
         <p>分数范围</p>
@@ -309,6 +312,8 @@ export default {
         : this.curPaperOrTask.level;
         : this.curPaperOrTask.level;
       if (levelName) {
       if (levelName) {
         this.curLevel = this.levels.find(item => item.name === levelName);
         this.curLevel = this.levels.find(item => item.name === levelName);
+      } else {
+        this.curLevel = {};
       }
       }
     },
     },
     async getMarkHistory() {
     async getMarkHistory() {

+ 4 - 0
src/modules/main/QualityAnalysis.vue

@@ -224,6 +224,10 @@ export default {
       };
       };
     },
     },
     async toSearch() {
     async toSearch() {
+      this.levelsPropReportData = null;
+      this.distanceReportData = null;
+      this.deviationReportData = null;
+      this.callbackReportData = null;
       const datas = filterObjNull({
       const datas = filterObjNull({
         ...this.filter
         ...this.filter
       });
       });