zhangjie 1 year ago
parent
commit
0e9d961b8f

+ 6 - 2
src/modules/mark/components/ModifyMarkSetting.vue

@@ -4,7 +4,7 @@
     :visible.sync="modalIsShow"
     title="评卷设置"
     top="10px"
-    width="600px"
+    width="660px"
     :close-on-click-modal="false"
     :close-on-press-escape="false"
     append-to-body
@@ -16,7 +16,7 @@
       :model="modalForm"
       :rules="rules"
       :key="modalForm.paperNumber"
-      label-width="140px"
+      label-width="160px"
     >
       <el-form-item prop="markMode" label="评卷模式:">
         <el-select v-model="modalForm.markMode">
@@ -166,6 +166,10 @@ export default {
         paperNumber: this.instance.paperNumber,
       });
       this.modalForm = this.$objAssign(initModalForm, res || {});
+      this.markTime = [
+        this.modalForm.markStartTime,
+        this.modalForm.markEndTime,
+      ];
     },
     visibleChange() {
       this.initData(this.instance);

+ 7 - 15
src/modules/mark/components/markParam/MarkParamClass.vue

@@ -1,32 +1,24 @@
 <template>
   <div class="mark-param-class">
-    <div class="box-justify part-box part-box-pad">
-      <div></div>
-      <div>
-        <el-button type="primary" @click="toImport">导入</el-button>
-      </div>
-    </div>
-
     <div class="part-box part-box-pad">
       <el-table :data="classList" border>
         <el-table-column type="index" width="50"> </el-table-column>
 
-        <el-table-column label="班级">
+        <el-table-column label="班级" width="200">
           <template slot-scope="scope">
-            <el-tag size="medium" type="info">
+            <el-tag size="medium">
               {{ scope.row.className }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="评阅题目" prop="groupQuestions" width="200">
+        <el-table-column label="评阅题目" prop="groupQuestions">
         </el-table-column>
-        <el-table-column label="评卷员" width="200">
+        <el-table-column label="评卷员">
           <template slot-scope="scope">
             <el-tag
               v-for="item in scope.row.classMarkerList"
               :key="item"
               size="medium"
-              type="info"
               class="mb-1 mr-1"
             >
               {{ item.name }}({{ item.orgName }})
@@ -128,11 +120,11 @@ export default {
     },
     toSelectMarker(row) {
       this.curClass = row;
+      this.modalForm.selectedMarkerIds = row.classMarkerList.map(
+        (item) => item.userId
+      );
       this.modalIsShow = true;
     },
-    toImport() {
-      // TODO:
-    },
     async conform() {
       const valid = await this.$refs.modalFormComp.validate().catch(() => {});
       if (!valid) return;

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

@@ -70,6 +70,9 @@ export default {
       return `${this.basicInfo.courseName}-标答文件`;
     },
   },
+  mounted() {
+    this.initData();
+  },
   methods: {
     async initData() {
       const params = {