zhangjie 3 недель назад
Родитель
Сommit
a3a91f8d53

+ 54 - 28
src/assets/styles/pages.scss

@@ -946,7 +946,7 @@
 
     &.is-fullscreen {
       .el-dialog__body {
-        padding: 70px 20px 20px;
+        padding: 60px 20px 10px;
         height: 100%;
         display: flex;
         flex-direction: column;
@@ -957,6 +957,45 @@
       margin-right: 20px;
     }
   }
+  .el-step__title {
+    line-height: 30px;
+  }
+  // el-table
+  .el-table__body {
+    .el-table__cell {
+      padding-top: 6px;
+      padding-bottom: 6px;
+    }
+    .input-column {
+      .cell {
+        padding: 0 2px;
+        margin: -6px 0;
+      }
+
+      .el-table__cell {
+        padding: 1px 0;
+      }
+      .el-input__inner {
+        border-radius: 3px;
+        padding-left: 8px;
+        padding-right: 8px;
+      }
+
+      .error-tips {
+        font-size: 12px;
+        line-height: 1;
+        margin: 0;
+      }
+    }
+    .el-input.is-error .el-input__inner {
+      border-color: $--color-danger;
+    }
+  }
+  .part-box {
+    padding: 10px 15px;
+    margin-bottom: 10px;
+  }
+  // main
   .mark-param-head {
     flex: 0;
   }
@@ -1058,40 +1097,27 @@
   //     line-height: 32px;
   //   }
   // }
-}
-.modify-mark-params {
-  // el-table
-  .el-table__body {
-    .el-table__cell {
-      padding-top: 6px;
-      padding-bottom: 6px;
-    }
-    .input-column {
-      .cell {
-        padding: 0 2px;
-        margin: -6px 0;
-      }
 
-      .el-table__cell {
-        padding: 1px 0;
-      }
-      .el-input__inner {
-        border-radius: 3px;
-        padding-left: 8px;
-        padding-right: 8px;
+  .mark-param-subjective-answer {
+    .select-file {
+      .el-input {
+        display: none;
       }
+    }
+  }
 
-      .error-tips {
-        font-size: 12px;
-        line-height: 1;
-        margin: 0;
+  .mark-param-group {
+    .subjective-answer {
+      display: flex;
+
+      > span {
+        display: block;
+        line-height: 32px;
       }
     }
-    .el-input.is-error .el-input__inner {
-      border-color: $--color-danger;
-    }
   }
 }
+
 // modify-marker-question
 .modify-marker-question {
   .el-dialog {

+ 7 - 1
src/components/SelectFile.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="select-file" style="display: inline-block">
+  <div class="select-file">
     <el-input
       :style="{ width: inputWidth }"
       v-model.trim="attachmentName"
@@ -95,3 +95,9 @@ export default {
   },
 };
 </script>
+
+<style scoped>
+.select-file {
+  display: inline-block;
+}
+</style>

+ 1 - 1
src/modules/mark/components/markParam/MarkParamClass.vue

@@ -24,7 +24,7 @@
           >
         </el-breadcrumb>
       </div>
-      <div>
+      <div class="box-static">
         <el-button type="primary" @click="toPrev(1)">上一步</el-button>
         <el-button type="primary" @click="toNext(1)">下一步</el-button>
       </div>

+ 17 - 29
src/modules/mark/components/markParam/MarkParamGroup.vue

@@ -1,16 +1,21 @@
 <template>
   <div class="mark-param-group">
-    <div class="box-justify part-box part-box-pad">
-      <div>
-        <p v-if="unsetQuestionNos" class="tips-info tips-error">
-          试题{{
-            unsetQuestionNos
-          }}未设置评卷员,请点击列表里设置评卷员选择评卷员
-        </p>
-      </div>
-      <div>
-        <el-button type="primary" @click="toPrev(1)">上一步</el-button>
-        <el-button type="primary" @click="toNext(1)">下一步</el-button>
+    <div class="part-box part-box-pad">
+      <p v-if="unsetQuestionNos" class="tips-info tips-error mb-1">
+        试题{{ unsetQuestionNos }}未设置评卷员,请点击列表里设置评卷员选择评卷员
+      </p>
+      <div class="box-justify">
+        <!-- subjective answer -->
+        <div class="subjective-answer">
+          <span>请上传标答PDF文档:</span>
+          <mark-param-subjective-answer
+            @rendered="updateTableHeight"
+          ></mark-param-subjective-answer>
+        </div>
+        <div class="box-static">
+          <el-button type="primary" @click="toPrev(1)">上一步</el-button>
+          <el-button type="primary" @click="toNext(1)">下一步</el-button>
+        </div>
       </div>
     </div>
 
@@ -119,19 +124,6 @@
           </template>
         </el-table-column>
       </el-table>
-
-      <!-- subjective answer -->
-      <el-form
-        ref="subjectiveAnswerRef"
-        class="no-margin mt-2"
-        label-width="150px"
-      >
-        <el-form-item label="请上传标答PDF文档:">
-          <mark-param-subjective-answer
-            @rendered="updateTableHeight"
-          ></mark-param-subjective-answer>
-        </el-form-item>
-      </el-form>
     </div>
 
     <!-- ModifyMarkType -->
@@ -558,11 +550,7 @@ export default {
       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;
+        this.tableHeight = window.innerHeight - tableOffsetTop - 25;
         // console.log(this.tableHeight);
       });
     },

+ 1 - 1
src/modules/mark/components/markParam/MarkParamObjectiveAnswer.vue

@@ -11,7 +11,7 @@
         </p>
       </div>
 
-      <div>
+      <div class="box-static">
         <el-select
           v-if="paperTypes.length > 1"
           v-model="curPaperType"

+ 3 - 3
src/modules/mark/components/markParam/MarkParamStructure.vue

@@ -268,7 +268,7 @@
         </el-table-column>
       </el-table>
       <!-- tips -->
-      <div class="mt-2">
+      <!-- <div class="mt-2">
         <p class="tips-info">
           1.请确认展示的试卷结构与提交的试卷、答题卡是否一致?
         </p>
@@ -278,7 +278,7 @@
         <p class="tips-info tips-error">
           3.开始阅卷后不允许修改试卷结构,请确认清楚后再提交!
         </p>
-      </div>
+      </div> -->
     </div>
   </div>
 </template>
@@ -712,7 +712,7 @@ export default {
       this.$nextTick(() => {
         if (!this.$refs.TableList) return;
         const tableOffsetTop = this.$refs.TableList.$el.offsetTop;
-        this.tableHeight = window.innerHeight - tableOffsetTop - 115;
+        this.tableHeight = window.innerHeight - tableOffsetTop - 25;
         // console.log(this.tableHeight);
       });
     },

+ 3 - 2
src/modules/mark/components/markParam/MarkParamSubjectiveAnswer.vue

@@ -4,6 +4,8 @@
       v-for="item in subjectiveAnswerList"
       :key="item.paperType"
       label-width="50px"
+      inline
+      class="no-margin"
     >
       <el-form-item
         prop="file"
@@ -15,9 +17,8 @@
           :disabled="item.loading"
           @file-change="(data) => fileChange(data, item)"
         ></select-file>
-      </el-form-item>
-      <el-form-item v-if="item.answerFileUrl">
         <span
+          v-if="item.answerFileUrl"
           class="cont-link"
           title="点击查看已上传标答文件"
           @click="toViewAnswer(item)"