bug md

src/api.js

@@ -328,9 +328,13 @@ export const taskSnSearch = (type, code, questionId) => {
   }
 };
 // mark step change level
-export const markStepChangeLevel = ({ subjectId, paperId, level }) => {
+export const markStepChangeLevel = ({ subjectId, paperId, level, userId }) => {
   // paperId,level
-  return $post(`/api/changelevel/${subjectId}/changeLevel`, { paperId, level });
+  return $post(`/api/changelevel/${subjectId}/changeLevel`, {
+    paperId,
+    level,
+    userId
+  });
 };
 export const changeLevelPaperList = datas => {
   // 纪检人员、超级管理员和科组长查询改档列表
@@ -377,3 +381,6 @@ export const inspectionConfirmCheckGrade = datas => {
   // id,auditStatus
   return $post(`/api/changelevel/changeLevelAudit`, datas);
 };
+export const logTypeList = () => {
+  return $get(`/api/marklog/listTypes`);
+};

src/assets/styles/mark.less

@@ -687,7 +687,7 @@
         line-height: 26px;
         border-radius: 8px;
         background-color: @white;
-        font-size: 16px;
+        font-size: 14px;
       }
     }
   }

src/constants/enumerate.js

@@ -90,7 +90,7 @@ export const EXPORT_IMAGE_NAME_TYPE = {
 // image-type
 export const IMAGE_TYPE = {
   1: "原图",
-  2: "裁切图"
+  2: "水印图"
 };
 
 // paper-level-known-type

src/modules/grading/GradingOperation.vue

@@ -344,6 +344,8 @@ export default {
         type: "reject"
       });
       let levelStep = data.map(item => {
+        // 评卷员不展示kdpt
+        item.kdpt = null;
         return {
           ...item,
           name: item.id,

src/modules/grading/components/GradeAction.vue

@@ -301,11 +301,15 @@ export default {
       // 只有科组长和超管才会展示评卷记录
       const data = await markHistoryList(this.curPaperOrTask.id, "LEVEL");
       this.gradingHistory = data.map(item => {
+        let level = item.result || "未评";
+        if (this.stepType === "reject" && !item.result) {
+          level = `${level}(${item.originLevel})`;
+        }
         return {
           id: item.id,
           markerId: item.markerId,
           name: item.marker,
-          value: item.result || "未评"
+          value: level
         };
       });
     },

src/modules/grading/components/GradeStep.vue

@@ -51,7 +51,7 @@
         <p class="step-name">{{ step.name }}</p>
         <p>
           <span>{{ step.count }}/</span><span>{{ step.percent }}%</span
-          ><span>({{ step.kdpt }}%)</span>
+          ><span v-if="step.kdpt !== null">({{ step.kdpt }}%)</span>
         </p>
       </div>
     </div>

src/modules/inspection/InspectionActionLogs.vue

@@ -49,10 +49,10 @@
             style="width: 130px"
           >
             <Option
-              v-for="(val, key) in ACTION_TYPE"
-              :key="key"
-              :value="key * 1"
-              :label="val"
+              v-for="item in actionTypes"
+              :key="item.id"
+              :value="item.id * 1"
+              :label="item.name"
             ></Option>
           </Select>
         </FormItem>
@@ -71,7 +71,7 @@
             class="btn-form-search"
             size="small"
             type="primary"
-            @click="toPage(1)"
+            @click="toSearch"
             >查询</Button
           >
         </FormItem>
@@ -104,8 +104,7 @@
 </template>
 
 <script>
-import { inspectionActionLogPageList, workList } from "@/api";
-import { ACTION_TYPE } from "@/constants/enumerate";
+import { inspectionActionLogPageList, workList, logTypeList } from "@/api";
 import { filterObjNull, qsParams } from "@/plugins/utils";
 
 export default {
@@ -121,7 +120,9 @@ export default {
         startTime: null,
         endTime: null
       },
-      ACTION_TYPE,
+      actionTypes: [],
+      ACTION_TYPE: {},
+      SUBJECT_TYPE: {},
       current: 1,
       size: this.GLOBAL.pageSize,
       total: 0,
@@ -144,7 +145,10 @@ export default {
         },
         {
           title: "科目",
-          key: "subject"
+          key: "subject",
+          render: (h, param) => {
+            return h("div", this.SUBJECT_TYPE[param.row.subject]);
+          }
         },
         {
           title: "准考证号",
@@ -159,7 +163,7 @@ export default {
           title: "操作类型",
           key: "operType",
           render: (h, param) => {
-            return h("div", ACTION_TYPE[param.row.operType]);
+            return h("div", this.ACTION_TYPE[param.row.operType]);
           }
         },
         {
@@ -184,11 +188,18 @@ export default {
   methods: {
     async initData() {
       await this.getWorkList();
+      await this.getActionTypeList();
       this.filter.workId = this.works[0].id;
       this.subjects = this.works[0].subjects;
       this.filter.subject = this.subjects[0].subject;
       this.getList();
     },
+    async getActionTypeList() {
+      this.actionTypes = await logTypeList();
+      this.actionTypes.map(item => {
+        this.ACTION_TYPE[item.id] = item.name;
+      });
+    },
     async getWorkList() {
       this.works = await workList();
     },
@@ -207,6 +218,12 @@ export default {
       this.current = page;
       this.getList();
     },
+    toSearch() {
+      this.subjects.map(item => {
+        this.SUBJECT_TYPE[item.subject] = item.name;
+      });
+      this.toPage(1);
+    },
     workChange() {
       this.filter.subject = null;
       const curWork = this.works.find(item => item.id === this.filter.workId);

src/modules/inspection/InspectionGrading.vue

@@ -105,7 +105,7 @@
           <Button shape="circle" type="primary" @click="confirm(1)"
             >同意改档</Button
           >
-          <Button shape="circle" type="error" @click="confirm(0)"
+          <Button shape="circle" type="error" @click="confirm(2)"
             >不同意改档</Button
           >
         </div>
@@ -255,13 +255,12 @@ export default {
       this.getAreaList();
     },
     async confirm(isAgree) {
-      if (isAgree) {
+      if (isAgree === 1) {
         this.updateCheckGradeState(isAgree);
         return;
       }
 
       this.$Modal.confirm({
-        title: "操作警告",
         content: "确定不同意当前改档吗？",
         onOk: () => {
           this.updateCheckGradeState(isAgree);
@@ -271,7 +270,8 @@ export default {
     async updateCheckGradeState(auditStatus) {
       await inspectionConfirmCheckGrade({
         id: this.curPaper.id,
-        auditStatus
+        auditStatus,
+        userId: this.$ls.get("user", { id: "" }).id
       });
       this.toActionNextPaper();
     },

src/modules/main/PaperManage.vue

@@ -40,6 +40,7 @@
             v-model="filter.endNumber"
             :min="filter.startNumber"
             :precision="0"
+            :active-change="false"
             placeholder="输入结束编号"
             clearable
           ></InputNumber>

src/modules/main/StudentManage.vue

@@ -81,6 +81,7 @@
             :min="filter.startNumber"
             v-model="filter.endNumber"
             :precision="0"
+            :active-change="false"
             placeholder="输入终止考号"
             clearable
           ></InputNumber>

src/modules/mark-set/ExportPaper.vue

@@ -90,6 +90,7 @@
               <InputNumber
                 v-model="scoreFilter.startScore"
                 :min="1"
+                :max="1000"
                 :precision="0"
                 placeholder="输入起始分数"
                 clearable
@@ -99,7 +100,9 @@
               <InputNumber
                 v-model="scoreFilter.endScore"
                 :min="scoreFilter.startScore"
+                :max="1000"
                 :precision="0"
+                :active-change="false"
                 placeholder="输入终止分数"
                 clearable
               ></InputNumber>

src/modules/mark/MarkDetail.vue

@@ -428,7 +428,8 @@ export default {
           await markStepChangeLevel({
             subjectId: this.subjectId,
             paperId: levelInfo.paperId,
-            level: levelInfo.selectedLevel
+            level: levelInfo.selectedLevel,
+            userId: this.$ls.get("user", { id: "" }).id
           });
           this.$Message.success("申请改档成功！");
           this.getStepLevels();

src/modules/quality/Quality.vue

@@ -59,6 +59,7 @@
                 v-model="filter.endNumber"
                 :min="filter.startNumber"
                 :precision="0"
+                :active-change="false"
                 placeholder="输入终止编号"
                 clearable
               ></InputNumber>
@@ -68,7 +69,6 @@
                 v-model="paperType"
                 @on-change="typeChange"
                 placeholder="类型"
-                clearable
               >
                 <Option
                   v-for="(val, key) in CAFA_EXCEPTION_TYPE"
@@ -80,13 +80,13 @@
             </FormItem>
             <FormItem>
               <Input
-                v-model.trim="filter.name"
+                v-model.trim="filter.studentName"
                 placeholder="输入姓名"
                 clearable
               ></Input>
             </FormItem>
             <FormItem>
-              <Select v-model="filter.sort" placeholder="排序方式">
+              <Select v-model="filter.sortBy" placeholder="排序方式">
                 <Option
                   v-for="(val, key) in SORT_RULE_TYPE"
                   :key="key"
@@ -157,15 +157,15 @@ export default {
         areaCode: null,
         startNumber: null,
         endNumber: null,
-        isManual: false,
-        missing: true,
-        name: "",
-        sort: "1"
+        isManual: null,
+        missing: null,
+        studentName: "",
+        sortBy: "1"
       },
-      paperType: "0",
+      paperType: "2",
       selectPaperType: "0",
       SORT_RULE_TYPE,
-      CAFA_EXCEPTION_TYPE,
+      CAFA_EXCEPTION_TYPE: {},
       current: 1,
       size: 8,
       total: 0,
@@ -184,6 +184,7 @@ export default {
     }
   },
   mounted() {
+    this.CAFA_EXCEPTION_TYPE = { ...CAFA_EXCEPTION_TYPE, 2: "全部" };
     this.initData();
   },
   methods: {
@@ -210,6 +211,9 @@ export default {
           areaCode: item.areaCode
         };
       });
+      if (this.areas.length === 1) {
+        this.filter.areaCode = this.areas[0].areaCode;
+      }
     },
     async getList() {
       const datas = {
@@ -250,18 +254,19 @@ export default {
     subjectChange() {
       this.areas = [];
       this.filter.areaCode = null;
+      if (!this.filter.subject) return;
       this.getAreaList();
     },
     typeChange() {
       if (this.paperType === "1") {
         this.filter.isManual = true;
-        this.filter.missing = false;
+        this.filter.missing = null;
       } else if (this.paperType === "0") {
-        this.filter.isManual = false;
+        this.filter.isManual = null;
         this.filter.missing = true;
       } else {
-        this.filter.isManual = false;
-        this.filter.missing = false;
+        this.filter.isManual = null;
+        this.filter.missing = null;
       }
     },
     // paper view