fix: bug

src/assets/styles/common-comp.scss

@@ -63,7 +63,7 @@
     height: 80px;
     line-height: 80px;
     top: 50%;
-    margin-top: -80px;
+    margin-top: -40px;
     text-align: center;
     color: #d0d0d0;
     z-index: 9;

src/components/ImageContain.vue

@@ -40,7 +40,7 @@
       <i class="el-icon-loading"></i>
     </div>
     <!-- action -->
-    <div v-if="showAction" :class="[`${prefixCls}-action`]">
+    <div v-if="showAction && image.url" :class="[`${prefixCls}-action`]">
       <ul>
         <li title="合适大小" @click.stop="toOrigin">
           <i class="el-icon-rank" />

src/components/base/CourseSelect.vue

@@ -12,7 +12,7 @@
       v-for="item in optionList"
       :key="item.code"
       :value="item.code"
-      :label="item.name"
+      :label="`${item.name}（${item.code}）`"
     >
     </el-option>
   </el-select>

src/constants/enumerate.js

@@ -39,7 +39,9 @@ export const DATA_TASK_TYPE = {
   STUDENT_IMPORT: "导入学生",
   EXAM_STUDENT_IMPORT: "导入考生",
   PAPER_SCAN_TASK_IMPORT: "导入任务",
+  STUDENT_PDF_GENERATE: "PDF生成",
   PAPER_DOWNLOAD: "批量下载",
+  PICTURE_DOWNLOAD: "图片下载",
 };
 export const DATA_TASK_STATUS = {
   INIT: "未开始",

src/modules/record/api.js

@@ -124,3 +124,6 @@ export const buildStudentPdf = (datas) => {
 export const pictureListPage = (datas) => {
   return $postParam("/api/admin/paper/picture/page", datas);
 };
+export const pictureDownload = (datas) => {
+  return $postParam("/api/admin/paper/picture/download", datas);
+};

src/modules/record/components/ArchivesDetailStudentDialog.vue

@@ -61,19 +61,23 @@
               v-if="showFix"
               type="primary"
               size="small"
-              :disabled="!canFix"
+              :disabled="!canFixOrDelete"
               @click="toFix"
               >纠错</el-button
             >
             <el-button
               type="primary"
               size="small"
-              :disabled="!curImageRotate"
+              :disabled="!canSaveRotate"
               :loading="loading"
               @click="toSaveRotate"
               >保存旋转</el-button
             >
-            <el-button type="danger" size="small" @click="toDelete"
+            <el-button
+              type="danger"
+              size="small"
+              :disabled="!canFixOrDelete"
+              @click="toDelete"
               >删除</el-button
             >
             <p v-if="showFix" class="tips-info tips-error">
@@ -155,9 +159,12 @@ export default {
     };
   },
   computed: {
-    canFix() {
+    canFixOrDelete() {
       return Boolean(this.multipleSelection.length || this.curImage.url);
     },
+    canSaveRotate() {
+      return Boolean(this.curImageRotate && this.curImage.url);
+    },
   },
   methods: {
     async reloadData() {
@@ -270,21 +277,25 @@ export default {
       this.curImage.url = newUrl;
     },
     async toDelete() {
-      const res = await this.$confirm(`确认要删除当前页已扫描数据?`, "提示", {
+      const tips = this.multipleSelection.length
+        ? `确认要删除当前已选择的扫描数据?`
+        : `确认要删除当前页的扫描数据?`;
+      const res = await this.$confirm(tips, "提示", {
         type: "warning",
       }).catch(() => {});
       if (res !== "confirm") return;
 
-      const { paperLibraryId } = this.getImageInfo(this.curImage.url);
-
+      const paperLibraryIds = this.multipleSelection.length
+        ? this.multipleSelection
+        : [this.curPage.paperLibraryId];
       await deleteDocumentImage({
-        studentId: this.student.studentId,
-        paperLibraryId,
+        paperLibraryIds: paperLibraryIds.join(),
       });
       this.$message.success("操作成功！");
       this.reloadData();
     },
     selectImage(index) {
+      if (!this.imageList[index]) return;
       this.curImage = { url: this.imageList[index] };
       this.curImageRotate = 0;
       this.curPage = this.getImageInfo(this.curImage.url);

src/modules/record/components/DocumentDetailDialog.vue

@@ -234,6 +234,7 @@
     <archives-detail-student-dialog
       ref="ArchivesDetailStudentDialog"
       :student="curRow"
+      @close="getList"
     ></archives-detail-student-dialog>
     <!-- DataTaskDialog -->
     <data-task-dialog

src/modules/record/components/ScanTaskDetailDialog.vue

@@ -7,6 +7,7 @@
     append-to-body
     fullscreen
     @open="visibleChange"
+    @close="closeHandle"
   >
     <template slot="title">
       <h3>
@@ -103,6 +104,9 @@ export default {
       this.dataList = [];
       this.toPage(1);
     },
+    closeHandle() {
+      this.$emit("close");
+    },
     cancel() {
       this.modalIsShow = false;
     },

src/modules/record/views/PictureManage.vue

@@ -129,6 +129,9 @@
             @click="toDownload"
             >下载图片</el-button
           >
+          <el-button type="primary" icon="el-icon-s-order" @click="toDataTask"
+            >图片下载结果</el-button
+          >
         </el-form-item>
       </el-form>
     </div>
@@ -241,17 +244,23 @@
       :show-fix="false"
       @close="getList"
     ></archives-detail-student-dialog>
+    <!-- DataTaskDialog -->
+    <data-task-dialog
+      ref="DataTaskDialog"
+      task-type="PICTURE_DOWNLOAD"
+    ></data-task-dialog>
   </div>
 </template>
 
 <script>
-import { pictureListPage } from "../api";
+import { pictureListPage, pictureDownload } from "../api";
 import { EQUAL_TYPE } from "@/constants/enumerate";
 import ArchivesDetailStudentDialog from "../components/ArchivesDetailStudentDialog.vue";
+import DataTaskDialog from "../../base/components/DataTaskDialog.vue";
 
 export default {
   name: "picture-manage",
-  components: { ArchivesDetailStudentDialog },
+  components: { ArchivesDetailStudentDialog, DataTaskDialog },
   data() {
     return {
       filter: {
@@ -300,7 +309,17 @@ export default {
     handleSelectionChange(val) {
       this.multipleSelection = val.map((item) => item.studentId);
     },
-    toDownload() {},
+    async toDownload() {
+      if (!this.multipleSelection.length) {
+        this.$message.error("请选择要下的数据");
+        return;
+      }
+      await pictureDownload({ studentIds: this.multipleSelection.join() });
+      this.$message.success("任务提交成功，结果请在图片下载结果中查看！");
+    },
+    toDataTask() {
+      this.$refs.DataTaskDialog.open();
+    },
     toDetail(row) {
       if (!row.bindCount) return;
 

src/modules/record/views/ScanTaskManage.vue

@@ -122,6 +122,7 @@
     <scan-task-detail-dialog
       ref="ScanTaskDetailDialog"
       :task="curRow"
+      @close="getList"
     ></scan-task-detail-dialog>
   </div>
 </template>