zhangjie 2 년 전
부모
커밋
1bb4c6f42f
5개의 변경된 파일33개의 추가작업 그리고 10개의 파일을 삭제
  1. 3 0
      src/api.js
  2. 3 0
      src/assets/styles/main.less
  3. 6 1
      src/modules/grading/marker/MarkerHistory.vue
  4. 4 4
      src/modules/main/CheckData.vue
  5. 17 5
      src/modules/main/components/CheckDataResult.vue

+ 3 - 0
src/api.js

@@ -197,6 +197,9 @@ export const checkDataList = workId => {
 export const dataItemCheck = ({ workId, checkItem, paramValue }) => {
 export const dataItemCheck = ({ workId, checkItem, paramValue }) => {
   return $post(`/api/check_data/check`, { workId, checkItem, paramValue });
   return $post(`/api/check_data/check`, { workId, checkItem, paramValue });
 };
 };
+export const checkDataDetailList = datas => {
+  return $get(`/api/check_data/page_error`, datas);
+};
 // grading -------------------------->
 // grading -------------------------->
 // grading-user-manage
 // grading-user-manage
 export const gradingUserList = datas => {
 export const gradingUserList = datas => {

+ 3 - 0
src/assets/styles/main.less

@@ -793,6 +793,9 @@
   .ivu-modal-content {
   .ivu-modal-content {
     background-color: @background-color;
     background-color: @background-color;
   }
   }
+  .ivu-modal-body{
+    padding-bottom: 20px;
+  }
 }
 }
 
 
 // grading-rule-set
 // grading-rule-set

+ 6 - 1
src/modules/grading/marker/MarkerHistory.vue

@@ -123,7 +123,12 @@ export default {
         (this.stage === "ROUGH_LEVEL" && info.roughSample)
         (this.stage === "ROUGH_LEVEL" && info.roughSample)
       )
       )
         return "设立标准卷";
         return "设立标准卷";
-      if (info.oneClick) return "一键定档";
+
+      if (
+        (this.stage === "LEVEL" && info.oneClick) ||
+        (this.stage === "ROUGH_LEVEL" && info.roughOneClick)
+      )
+        return "一键定档";
       if (info.isRejectedByLeader) return "打回";
       if (info.isRejectedByLeader) return "打回";
       return "";
       return "";
     },
     },

+ 4 - 4
src/modules/main/CheckData.vue

@@ -39,7 +39,7 @@
               size="small"
               size="small"
               type="primary"
               type="primary"
               :loading="loading"
               :loading="loading"
-              :disabled="!citem.content"
+              :disabled="!(citem.content || citem.errorCount > 0)"
               @click="toView(citem)"
               @click="toView(citem)"
               >详情</Button
               >详情</Button
             >
             >
@@ -59,7 +59,7 @@
     </div>
     </div>
 
 
     <!-- CheckDataResult -->
     <!-- CheckDataResult -->
-    <CheckDataResult ref="CheckDataResult" :content="curCheckItemContent" />
+    <CheckDataResult ref="CheckDataResult" :data="curCheckItem" />
   </div>
   </div>
 </template>
 </template>
 
 
@@ -79,7 +79,7 @@ export default {
       paramCheckItems: ["LEVEL_DIFF", "SCORE_DIFF"],
       paramCheckItems: ["LEVEL_DIFF", "SCORE_DIFF"],
       loading: false,
       loading: false,
       fetching: false,
       fetching: false,
-      curCheckItemContent: [],
+      curCheckItem: {},
       TASK_STATUS: {
       TASK_STATUS: {
         INIT: "未开始",
         INIT: "未开始",
         RUNNING: "执行中",
         RUNNING: "执行中",
@@ -159,7 +159,7 @@ export default {
         });
         });
         return;
         return;
       }
       }
-      this.curCheckItemContent = JSON.parse(row.content);
+      this.curCheckItem = row;
       this.$refs.CheckDataResult.open();
       this.$refs.CheckDataResult.open();
     },
     },
     async submit(row) {
     async submit(row) {

+ 17 - 5
src/modules/main/components/CheckDataResult.vue

@@ -4,6 +4,7 @@
     v-model="modalIsShow"
     v-model="modalIsShow"
     title="校验详情"
     title="校验详情"
     :mask-closable="false"
     :mask-closable="false"
+    footer-hide
     width="800"
     width="800"
     @on-visible-change="visibleChange"
     @on-visible-change="visibleChange"
   >
   >
@@ -29,13 +30,15 @@
 </template>
 </template>
 
 
 <script>
 <script>
+import { checkDataDetailList } from "@/api";
+
 export default {
 export default {
   name: "check-data-result",
   name: "check-data-result",
   props: {
   props: {
-    content: {
-      type: Array,
+    data: {
+      type: Object,
       default() {
       default() {
-        return [];
+        return {};
       }
       }
     }
     }
   },
   },
@@ -95,16 +98,25 @@ export default {
     };
     };
   },
   },
   methods: {
   methods: {
-    visibleChange(visible) {
+    async visibleChange(visible) {
       if (visible) {
       if (visible) {
         this.toPage(1);
         this.toPage(1);
       } else {
       } else {
         this.$emit("on-close");
         this.$emit("on-close");
       }
       }
     },
     },
+    async getList() {
+      const data = await checkDataDetailList({
+        checkDataId: this.data.id,
+        page: this.current - 1,
+        size: this.size
+      });
+      this.total = data.totalCount;
+      this.students = data.data;
+    },
     toPage(page) {
     toPage(page) {
       this.current = page;
       this.current = page;
-      this.students = this.content.slice((page - 1) * this.size, this.size);
+      this.getList();
     },
     },
     toView(row) {
     toView(row) {
       window.open(
       window.open(