bug md

src/assets/styles/main.less

@@ -188,8 +188,8 @@
   &-act {
     img {
       // box-shadow: 0px 10px 20px 0px rgba(34, 192, 255, 0.5);
-      // box-shadow: 0 0 20px rgba(34, 192, 255, 0.6);
-      box-shadow: -20px 0px 40px 0px rgba(224, 225, 235, 1);
+      box-shadow: 0 0 20px rgba(34, 192, 255, 0.6);
+      // box-shadow: -20px 0px 40px 0px rgba(224, 225, 235, 1);
     }
   }
 
@@ -239,11 +239,14 @@
     }
   }
   &-actions {
+    margin-top: 20px;
+  }
+  &-multibar {
     width: 30%;
     border-radius: @box-border-radius-small;
     background-color: @background-color;
     height: 20px;
-    margin: 20px auto 0;
+    margin: 0 auto;
     cursor: pointer;
 
     &:hover {

src/components/common/ImportFile/ImportFile.vue

@@ -128,6 +128,11 @@ export default {
       if (this.addFilenameParam)
         this.uploadData[this.addFilenameParam] = file.name;
       this.$refs.UploadComp.clearFiles();
+
+      this.res = {
+        success: true,
+        msg: ""
+      };
     },
     handleError(error, response) {
       this.res = {

src/modules/grading/Grading.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="grading home">
-    <view-header key="1" v-if="IS_ADMIN">
+    <view-header key="1" :show-reset-pwd="false" v-if="IS_ADMIN">
       <div class="grading-subnav" slot="navSub">
         <div class="grading-title">
           <h1>{{ curSubject.name }}</h1>

src/modules/grading/GradingDetail.vue

@@ -138,15 +138,17 @@
                   @click="toReview(index)"
                 />
               </div>
-              <div
-                :class="[
-                  'image-view-actions',
-                  { 'image-view-selected': image.selected },
-                  { 'image-view-disabled': image.sample }
-                ]"
-                :title="image.sample ? '标准卷' : '选中批量操作'"
-                @click="selectMultiplePaper(image)"
-              ></div>
+              <div class="image-view-actions">
+                <div
+                  :class="[
+                    'image-view-multibar',
+                    { 'image-view-selected': image.selected },
+                    { 'image-view-disabled': image.sample }
+                  ]"
+                  :title="image.sample ? '标准卷' : '选中批量操作'"
+                  @click="selectMultiplePaper(image)"
+                ></div>
+              </div>
             </div>
           </div>
           <div class="part-page" v-if="total > size">

src/modules/grading/GradingOperation.vue

@@ -130,15 +130,17 @@
                       @click="toReview(index)"
                     />
                   </div>
-                  <div
-                    :class="[
-                      'image-view-actions',
-                      { 'image-view-selected': image.selected },
-                      { 'image-view-disabled': image.sample }
-                    ]"
-                    :title="image.sample ? '标准卷' : '选中批量分档'"
-                    @click="selectMultiplePaper(image)"
-                  ></div>
+                  <div class="image-view-actions">
+                    <div
+                      :class="[
+                        'image-view-multibar',
+                        { 'image-view-selected': image.selected },
+                        { 'image-view-disabled': image.sample }
+                      ]"
+                      :title="image.sample ? '标准卷' : '选中批量分档'"
+                      @click="selectMultiplePaper(image)"
+                    ></div>
+                  </div>
                 </div>
               </div>
               <div class="part-page">

src/modules/grading/components/GradeHistoryPaper.vue

@@ -59,7 +59,8 @@ export default {
         questionId: this.questionId
       };
 
-      this.papers = await actionHistory(datas);
+      const data = await actionHistory(datas);
+      this.papers = data.reverse();
       this.$nextTick(() => {
         const index = this.papers.length ? this.papers.length - 1 : 0;
         this.$refs.PaperCarousel.setCurPaper(index);

src/modules/grading/components/ModifyFormalGradingTask.vue

@@ -48,10 +48,11 @@
       <FormItem prop="taskCount" label="分配任务数量">
         <InputNumber
           size="large"
-          :min="1"
+          :min="modalForm.waitCount ? 1 : 0"
           :max="modalForm.waitCount"
           :precision="0"
           v-model.trim="modalForm.taskCount"
+          :disabled="!modalForm.waitCount || !canPublish"
           style="width: 120px"
           clearable
         ></InputNumber>
@@ -61,7 +62,7 @@
       <Button
         shape="circle"
         type="primary"
-        :disabled="isSubmit || !canPublish"
+        :disabled="isSubmit || !canPublish || !modalForm.waitCount"
         @click="submit"
         >发布</Button
       >
@@ -85,7 +86,7 @@ const initModalForm = {
   successCount: 0,
   waitCount: 0,
   progress: 0,
-  taskCount: 1
+  taskCount: null
 };
 
 export default {

src/modules/grading/components/ModifyLeaderGrading.vue

@@ -87,7 +87,6 @@ export default {
   },
   methods: {
     initData() {
-      console.log(this.levelInfo);
       const isMuliple = this.levelInfo.paperIds.includes(",");
       this.noneedLevelOrReject =
         this.levelInfo.curLevel === this.levelInfo.selectedLevel;
@@ -95,6 +94,7 @@ export default {
       this.standardVolume = user.standardVolume && !isMuliple;
       this.levelCallback = user.levelCallback;
       this.oneClickLevel = user.oneClickLevel;
+      this.selectedMarkers = [];
       // this.selectedMarkers = this.markers.map(item => item.id);
     },
     visibleChange(visible) {

src/modules/inspection/InspectionActionLogs.vue

@@ -36,7 +36,7 @@
         </FormItem>
         <FormItem>
           <Input
-            v-model.trim="filter.name"
+            v-model.trim="filter.studentName"
             placeholder="输入姓名"
             clearable
           ></Input>
@@ -116,7 +116,7 @@ export default {
         workId: null,
         subject: null,
         examNumber: "",
-        name: "",
+        studentName: "",
         operType: null,
         startTime: null,
         endTime: null

src/modules/inspection/InspectionCollectLogs.vue

@@ -36,7 +36,7 @@
         </FormItem>
         <FormItem>
           <Input
-            v-model.trim="filter.name"
+            v-model.trim="filter.studentName"
             placeholder="输入姓名"
             clearable
           ></Input>
@@ -49,8 +49,8 @@
             style="width: 130px"
           >
             <Option
-              v-for="(user, uindex) in collectionUsers"
-              :key="uindex"
+              v-for="user in collectionUsers"
+              :key="user.id"
               :value="user.id"
               :label="user.name"
             ></Option>
@@ -119,7 +119,7 @@ export default {
         workId: null,
         subject: null,
         examNumber: "",
-        name: "",
+        studentName: "",
         createUserId: null,
         startTime: null,
         endTime: null
@@ -183,7 +183,12 @@ export default {
       this.getList();
     },
     async getCollectionUsers(workId) {
-      this.collectionUsers = await clientUserPageList({ workId });
+      const data = await clientUserPageList({
+        workId,
+        curPage: 0,
+        pageSize: 100
+      });
+      this.collectionUsers = data.data.filter(item => item.enabled);
     },
     async getWorkList() {
       this.works = await workList();

src/modules/inspection/InspectionGrading.vue

@@ -95,9 +95,9 @@
         <div
           :class="[
             'action-grade-result',
-            { 'action-grade-result-error': curPaper.auditStatus === 0 }
+            { 'action-grade-result-error': curPaper.auditStatus === 2 }
           ]"
-          v-if="curPaper.auditStatus === null"
+          v-if="curPaper.auditStatus !== 0"
         >
           <p>{{ curPaper.auditStatus === 1 ? "同意改档" : "不同意改档" }}</p>
         </div>

src/modules/mark/MarkHome.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="mark-home home">
-    <view-header key="1" v-if="IS_ADMIN">
+    <view-header key="1" :show-reset-pwd="false" v-if="IS_ADMIN">
       <div class="grading-subnav" slot="navSub">
         <div class="grading-title">
           <h1>{{ curSubject.name }}</h1>

src/modules/mark/MarkOperation.vue

@@ -85,6 +85,11 @@
                       :alt="image.title"
                       @click="toReview(index)"
                     />
+                    <span
+                      class="image-info"
+                      v-if="image.score || image.score === 0"
+                      >{{ image.score }}分</span
+                    >
                   </div>
                 </div>
               </div>

src/modules/mark/components/MarkAction.vue

@@ -69,7 +69,9 @@
         <span>原始档位：</span><span>{{ curPaperOrTask.originLevel }}</span>
       </p>
       <p>
-        <span>申请档位：</span><span>{{ curPaperOrTask.redoLevel }}</span>
+        <span v-if="IS_MARKER">建议档位：</span>
+        <span v-else>申请档位：</span>
+        <span>{{ curPaperOrTask.redoLevel }}</span>
       </p>
     </div>
     <div
@@ -144,6 +146,13 @@
     <div class="action-grade-pass" v-if="rights.levelList">
       <Button @click="toPass">跳过</Button>
     </div>
+    <!-- mark confirm grade change -->
+    <div
+      class="action-grade-change-confirm"
+      v-if="IS_MARKER && stepType === 'shift'"
+    >
+      <Button type="primary" @click="gradeChangeConfirm">确认改档</Button>
+    </div>
 
     <!-- 评卷记录 -->
     <div class="action-grade-history" v-if="rights.markHis">
@@ -274,7 +283,7 @@ export default {
         MARKER: {
           done: ["levelList", "gradeInfo", "markInfo"],
           undo: ["levelList", "gradeInfo"],
-          shift: ["gradeList", "gradeChange"],
+          shift: ["gradeChange"],
           shiftScore: ["levelList", "gradeInfo"]
         }
       },
@@ -397,13 +406,16 @@ export default {
         this.btnClicked = false;
       }, 500);
 
-      // 科组长改档
+      // 科组长改档 / 评卷同意改档
       this.$emit("on-leader-level", {
         paperId: this.curPaperOrTask.id,
         curLevel: this.curPaperOrTask.level,
         selectedLevel: level.name
       });
     },
+    gradeChangeConfirm() {
+      this.selectLevel({ name: this.curPaperOrTask.redoLevel });
+    },
     selectScore(score) {
       if (this.btnClicked) return;
       this.btnClicked = true;