zhangjie 7 달 전
부모
커밋
165948eb2e

+ 3 - 2
src/components/PreviewFile.vue

@@ -16,6 +16,7 @@
       id="frame-content"
       width="100%"
       height="600px"
+      style="border: 0"
     >
     </iframe>
 
@@ -64,13 +65,13 @@ export default {
 
           this.$nextTick(() => {
             document.getElementById("frame-content").height =
-              window.innerHeight - 50;
+              window.innerHeight - 51;
           });
         })
         .catch((error) => console.error("Error fetching PDF:", error));
     },
     resizeEvent() {
-      document.getElementById("frame-content").height = window.innerHeight - 50;
+      document.getElementById("frame-content").height = window.innerHeight - 51;
     },
     registResizeEvent() {
       window.addEventListener("resize", this.resizeEvent);

+ 4 - 1
src/modules/exam/components/createExamAndPrintTask/InfoExamTask.vue

@@ -416,7 +416,7 @@
         <h4 class="mb-2">附件说明:</h4>
         <el-input
           class="mb-2"
-          v-model="examTaskDetail.remark"
+          v-model="examTask.remark"
           type="textarea"
           resize="none"
           :rows="2"
@@ -822,6 +822,9 @@ export default {
           paperAttachmentIds: JSON.stringify(item.paperAttachmentIds),
         };
       });
+      this.examTask.paperConfirmAttachmentIds = JSON.stringify(
+        this.paperConfirmAttachments
+      );
     },
     async examAndRoomChange() {
       this.updateTaskInfo({ infoExamTask: this.examTask });

+ 1 - 3
src/modules/exam/components/taskApply/TaskFlow.vue

@@ -151,9 +151,7 @@
               :label="key"
             >
               {{ val }}
-              <span
-                v-if="auditModal.approvePass === 'EXCHANGE'"
-                class="color-danger"
+              <span v-if="key === 'EXCHANGE'" class="color-danger"
                 >(当前审核环节不归自己审核,需要转给其他人审核)</span
               >
             </el-radio>

+ 6 - 3
src/modules/mark/components/markParam/MarkParamObjectiveAnswer.vue

@@ -254,7 +254,7 @@ export default {
     this.initData();
   },
   methods: {
-    async initData() {
+    async initData(defaultPaperType = null) {
       const params = {
         examId: this.basicInfo.examId,
         paperNumber: this.basicInfo.paperNumber,
@@ -293,7 +293,10 @@ export default {
         this.tableDict[paperType] = tableData;
       });
 
-      this.curPaperType = this.paperTypes[0];
+      this.curPaperType =
+        defaultPaperType && this.tableDict[defaultPaperType]
+          ? defaultPaperType
+          : this.paperTypes[0];
       this.prevPaperType = this.curPaperType;
       this.tableData = this.tableDict[this.curPaperType];
     },
@@ -461,7 +464,7 @@ export default {
     },
     importAnswerSuccess() {
       this.$message.success("导入成功!");
-      this.initData();
+      this.initData(this.curPaperType);
     },
   },
 };