bug fix

src/assets/styles/base.scss

@@ -398,6 +398,15 @@ body {
     }
   }
 }
+.btn-act-primary {
+  &.el-button--text:not(.is-disabled) {
+    color: $--color-primary !important;
+    &:hover {
+      font-weight: 600;
+      color: mix(#000, $--color-primary, 20%) !important;
+    }
+  }
+}
 
 .btn-white {
   background-color: #fff !important;

src/assets/styles/pages.scss

@@ -890,7 +890,7 @@
 
     &.is-fullscreen {
       .el-dialog__body {
-        padding-top: 70px;
+        padding: 70px 20px 20px;
       }
     }
     .el-dialog__title {
@@ -1396,3 +1396,24 @@
     display: none;
   }
 }
+
+// mark-detail
+.mark-detail {
+  .el-dialog {
+    background-color: $--color-background;
+
+    &.is-fullscreen {
+      .el-dialog__body {
+        padding: 70px 20px 20px;
+      }
+    }
+    .el-dialog__title {
+      display: inline-block;
+      margin-right: 20px;
+    }
+  }
+
+  .part-box-head {
+    margin: 0 0 10px;
+  }
+}

src/modules/mark/components/ScoreCheckDetail.vue

@@ -1,5 +1,6 @@
 <template>
   <el-dialog
+    class="mark-detail"
     :visible.sync="modalIsShow"
     top="0"
     :close-on-click-modal="false"
@@ -158,12 +159,12 @@
         <el-table-column
           prop="studentCode"
           label="学号"
-          width="180"
+          width="140"
         ></el-table-column>
         <el-table-column
           prop="secretNumber"
           label="密号"
-          width="180"
+          width="120"
         ></el-table-column>
         <el-table-column
           prop="className"
@@ -171,12 +172,12 @@
           min-width="100"
         ></el-table-column>
         <el-table-column
-          prop="objectiveScoreString"
+          prop="objectiveScore"
           label="客观分"
           width="80"
         ></el-table-column>
         <el-table-column
-          prop="subjectiveScoreString"
+          prop="subjectiveScore"
           label="主观分"
           width="80"
         ></el-table-column>
@@ -222,7 +223,7 @@
             <el-button
               class="btn-primary"
               type="text"
-              :disabled="!scope.row.subjectiveScoreString"
+              :disabled="!scope.row.subjectiveScoreList"
               @click="toCheckQuestion(scope.row, 'subjective')"
               >主观题检查</el-button
             >
@@ -312,6 +313,9 @@ export default {
     open() {
       this.modalIsShow = true;
     },
+    initData() {
+      this.search();
+    },
     async getList() {
       const datas = {
         ...this.filter,

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

@@ -88,7 +88,7 @@
         <el-table-column
           class-name="action-column"
           label="操作"
-          width="200"
+          width="140"
           fixed="right"
         >
           <template slot-scope="scope">

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

@@ -21,7 +21,7 @@
         >
       </div>
     </div>
-    <div class="part-box pard-box-pad">
+    <div class="part-box part-box-pad">
       <div class="part-box-head">
         <h3>班级阅卷进度</h3>
       </div>
@@ -39,7 +39,7 @@
         >
           <template slot-scope="scope">
             <el-button
-              class="btn-primary"
+              class="btn-act-primary"
               type="text"
               @click="toMarker(scope.row)"
               >{{ scope.row.markerCount }}</el-button
@@ -78,7 +78,7 @@
         >
           <template slot-scope="scope">
             <el-button
-              class="btn-primary"
+              class="btn-act-primary"
               type="text"
               @click="toArbitrate(scope.row)"
               >{{ scope.row.arbitrateCount }}</el-button
@@ -100,7 +100,7 @@
         </el-pagination>
       </div>
     </div>
-    <div class="part-box pard-box-pad">
+    <div class="part-box part-box-pad">
       <div class="part-box-head">
         <h3>评阅题目进度</h3>
       </div>
@@ -118,7 +118,7 @@
         >
           <template slot-scope="scope">
             <el-button
-              class="btn-primary"
+              class="btn-act-primary"
               type="text"
               @click="toMarker(scope.row)"
               >{{ scope.row.markerCount }}</el-button
@@ -162,7 +162,7 @@
         >
           <template slot-scope="scope">
             <el-button
-              class="btn-primary"
+              class="btn-act-primary"
               type="text"
               @click="toArbitrate(scope.row)"
               >{{ scope.row.arbitrateCount }}</el-button

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

@@ -62,11 +62,6 @@
           label="完成任务数"
           width="100"
         ></el-table-column>
-        <el-table-column
-          prop="rejectCount"
-          label="打回次数"
-          width="100"
-        ></el-table-column>
         <el-table-column prop="adoptionRate" label="评卷采用率" width="100">
           <span slot-scope="scope">{{ scope.row.adoptionRate || 0 }}%</span>
         </el-table-column>

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

@@ -586,7 +586,7 @@ export default {
       const valid2 = await this.$refs.modalFormRef.validate().catch(() => {});
       if (!valid1 || !valid2) return;
 
-      let datas = { ...this.instance };
+      let datas = Object.assign({}, this.instance, this.rowInfo);
       datas.markers = this.selectedUsers.map((item) => {
         return {
           id: item.id,

src/modules/mark/views/MarkManage.vue

@@ -75,7 +75,7 @@
         <el-table-column
           class-name="action-column"
           label="操作"
-          width="200"
+          width="160"
           fixed="right"
         >
           <template slot-scope="scope">