fix: bug

card/assets/styles/card-preview.scss

@@ -49,19 +49,20 @@
 
   .package-number {
     position: absolute;
-    width: 200px;
+    min-width: 200px;
     height: 40px;
     top: 10px;
     right: 25%;
-    margin-left: -100px;
+    transform: translateX(-50%);
+    -webkit-transform: translateX(-50%);
     text-align: center;
     z-index: 99;
     display: none;
 
     img {
-      display: block;
+      display: inline-block;
       height: 28px;
-      width: 100%;
+      width: auto;
       border: none;
     }
     p {

card/assets/styles/card-temp.css

@@ -42,19 +42,20 @@
 }
 .page-box .package-number {
   position: absolute;
-  width: 200px;
+  min-width: 200px;
   height: 40px;
   top: 10px;
   right: 25%;
-  margin-left: -100px;
+  transform: translateX(-50%);
+  -webkit-transform: translateX(-50%);
   text-align: center;
   z-index: 99;
   display: none;
 }
 .page-box .package-number img {
-  display: block;
+  display: inline-block;
   height: 28px;
-  width: 100%;
+  width: auto;
   border: none;
 }
 .page-box .package-number p {

src/assets/styles/element-ui-costom.scss

@@ -192,6 +192,12 @@
       font-size: 12px;
     }
   }
+
+  &.no-margin {
+    .el-form-item {
+      margin-bottom: 0;
+    }
+  }
 }
 // input
 .el-input {

src/modules/base/components/ModifyExam.vue

@@ -31,6 +31,7 @@
           v-model="modalForm.semesterId"
           placeholder="学年学期"
           clearable
+          :disabled="isEdit"
           style="width: 100%"
         ></semester-select>
       </el-form-item>

src/modules/mark/components/markDetail/MarkDetailProgress.vue

@@ -26,7 +26,7 @@
         >
       </div>
     </div>
-    <div v-if="openMarkClass" class="part-box part-box-pad">
+    <div v-if="openClassMark" class="part-box part-box-pad">
       <div class="part-box-head">
         <h3>班级评卷进度</h3>
       </div>
@@ -239,7 +239,7 @@ export default {
       summary: {},
       questionList: [],
       curRow: {},
-      openMarkClass: false,
+      openClassMark: false,
       downloading: false,
     };
   },
@@ -249,7 +249,7 @@ export default {
   methods: {
     async initData() {
       await this.getSummary();
-      if (this.openMarkClass) this.toPage(1);
+      if (this.openClassMark) this.toPage(1);
     },
     async getSummary() {
       const res = await markProgressSummary({
@@ -263,7 +263,7 @@ export default {
         percent: "",
       };
       this.questionList = res.groupInfo || [];
-      this.openMarkClass = res.openMarkClass;
+      this.openClassMark = res.classMark;
     },
     async getList() {
       const datas = {

src/modules/mark/components/markParam/MarkParamGroup.vue

@@ -16,9 +16,11 @@
 
     <div class="part-box part-box-pad group-body">
       <el-table
+        ref="TableList"
         :data="subjectiveTaskList"
         border
         :span-method="openMergeMarker ? objectSpanMethod : undefined"
+        :height="tableHeight"
       >
         <el-table-column label="大题名称" prop="mainTitle"> </el-table-column>
         <el-table-column label="大题号" prop="mainNumber" width="80">
@@ -94,9 +96,15 @@
       </el-table>
 
       <!-- subjective answer -->
-      <el-form class="mt-2" label-width="150px">
+      <el-form
+        ref="subjectiveAnswerRef"
+        class="no-margin mt-2"
+        label-width="150px"
+      >
         <el-form-item label="请上传标答PDF文档：">
-          <mark-param-subjective-answer></mark-param-subjective-answer>
+          <mark-param-subjective-answer
+            @rendered="updateTableHeight"
+          ></mark-param-subjective-answer>
         </el-form-item>
       </el-form>
     </div>
@@ -164,6 +172,7 @@ export default {
       paperList: [],
       cardPages: [],
       fillQuestionRanges: [],
+      tableHeight: 200,
     };
   },
   computed: {
@@ -184,6 +193,7 @@ export default {
     this.initFillQuestionRanges();
     this.getPaperList();
     this.getCardPages();
+    this.registResize();
   },
   methods: {
     ...mapMutations("markParam", [
@@ -468,6 +478,25 @@ export default {
       if (!this.checkData()) return;
       this.$emit("next", step);
     },
+    // table height
+    updateTableHeight() {
+      this.$nextTick(() => {
+        if (!this.$refs.TableList) return;
+        const tableOffsetTop = this.$refs.TableList.$el.offsetTop;
+        const formHeight = this.$refs.subjectiveAnswerRef
+          ? this.$refs.subjectiveAnswerRef.$el.offsetHeight + 10
+          : 0;
+        this.tableHeight =
+          window.innerHeight - tableOffsetTop - formHeight - 50;
+        // console.log(this.tableHeight);
+      });
+    },
+    registResize() {
+      window.addEventListener("resize", this.updateTableHeight);
+    },
+  },
+  beforeDestroy() {
+    window.removeEventListener("resize", this.updateTableHeight);
   },
 };
 </script>

src/modules/mark/components/markParam/MarkParamSubjectiveAnswer.vue

@@ -81,6 +81,7 @@ export default {
       });
 
       this.updateSubjectiveAnswer();
+      this.$emit("rendered");
     },
     initSubjectiveAnswerList() {
       this.subjectiveAnswerList = this.basicInfo.paperType

src/modules/mark/components/markParam/ModifyMarkType.vue

@@ -145,7 +145,8 @@ export default {
     },
     doubleEnableChange() {
       this.modalForm.arbitrateThreshold = undefined;
-      this.modalForm.doubleRate = 100;
+      this.modalForm.doubleRate = this.modalForm.doubleEnable ? 100 : 0;
+      this.modalForm.scorePolicy = this.modalForm.doubleEnable ? "AVG" : "";
     },
     // confirm
     async confirm() {