bug fix

src/assets/styles/mark.less

@@ -134,7 +134,8 @@
 .progress-table {
   height: 100%;
   .progress-line {
-    width: 230px;
+    max-width: 230px;
+    min-width: 100px;
   }
   .kzz-table {
     margin-bottom: 10px;

src/assets/styles/marker.less

@@ -13,8 +13,7 @@
   width: 100%;
   z-index: 9;
 
-  
-  .header-main{
+  .header-main {
     height: 40px;
     padding: 5px 0;
     line-height: 30px;
@@ -138,20 +137,19 @@
     }
   }
 
-  .fast-nav{
+  .fast-nav {
     padding: 4px 10px 5px;
     background-color: @color-background-light;
     margin-right: 280px;
-    border-top: 1px solid  @color-background-light2;
-    border-right: 1px solid  @color-background;
+    border-top: 1px solid @color-background-light2;
+    border-right: 1px solid @color-background;
     text-align: center;
 
-
-    &-list{
+    &-list {
       font-size: 0;
     }
 
-    &-item{
+    &-item {
       display: inline-block;
       vertical-align: middle;
       min-width: 30px;
@@ -171,17 +169,16 @@
         color: @color-text-act;
       }
 
-      &.is-danger:hover{
+      &.is-danger:hover {
         background-color: @color-act2;
       }
     }
 
-    &-close{
+    &-close {
       border-radius: 50%;
       padding: 0;
       margin-left: 20px;
     }
-
   }
 }
 .header-step-dropdown {
@@ -248,7 +245,7 @@
   background: @color-background;
   z-index: 7;
 
-  &-low{
+  &-low {
     top: 80px;
   }
 }
@@ -835,11 +832,13 @@
 // leader-progress
 .leader-progress {
   .ivu-modal {
-    width: 600px !important;
+    width: 660px !important;
   }
   .progress-line {
     color: @color-text;
     background-color: tint(@color-background, 5%);
+    max-width: 230px;
+    min-width: 100px;
 
     .progress-rate {
       background-color: @color-act1;

src/modules/grading/GradingProgress.vue

@@ -95,6 +95,12 @@
                 </td>
                 <td>进度：{{ item.progress }}%</td>
                 <td>打回：{{ item.rejectedCount }}</td>
+                <td v-if="IS_ROUGH_THIN_LEVEL">
+                  改大档：{{ item.shiftCount }}
+                </td>
+                <td v-if="IS_ROUGH_THIN_LEVEL">
+                  改大档打小档：{{ item.shiftScoreCount }}
+                </td>
               </tr>
             </table>
 
@@ -212,6 +218,11 @@ export default {
     },
     IS_SCORE() {
       return this.curSubject.stage === "SCORE";
+    },
+    IS_ROUGH_THIN_LEVEL() {
+      return (
+        this.curSubject.roughLevelEnable && this.curSubject.stage === "LEVEL"
+      );
     }
   },
   mounted() {

src/modules/grading/leader/LeaderProgress.vue

@@ -55,17 +55,15 @@
           科组长：{{ kzz.loginName }}，仲裁：{{ kzz.arbitrated }}
         </div>
         <table class="table table-dark">
-          <colgroup>
-            <col width="120" />
-            <col width="310" />
-            <col width="60" />
-            <col width="80" />
-          </colgroup>
           <tr>
             <th>评卷员</th>
             <th>进度</th>
             <th></th>
             <th>打回</th>
+            <td v-if="IS_ROUGH_THIN_LEVEL">改大档</td>
+            <td v-if="IS_ROUGH_THIN_LEVEL">
+              改大档打小档
+            </td>
           </tr>
           <tr v-for="(item, aindex) in group.markerProgress" :key="aindex">
             <td>{{ item.loginName }}</td>
@@ -77,6 +75,10 @@
             </td>
             <td class="td-nopad">{{ item.progress }}%</td>
             <td>{{ item.rejectedCount }}</td>
+            <td v-if="IS_ROUGH_THIN_LEVEL">{{ item.shiftCount }}</td>
+            <td v-if="IS_ROUGH_THIN_LEVEL">
+              {{ item.shiftScoreCount }}
+            </td>
           </tr>
         </table>
       </div>
@@ -146,6 +148,11 @@ export default {
     IS_SCORE() {
       return this.curSubject.stage === "SCORE";
     },
+    IS_ROUGH_THIN_LEVEL() {
+      return (
+        this.curSubject.roughLevelEnable && this.curSubject.stage === "LEVEL"
+      );
+    },
     title() {
       const infos = {
         ROUGH_LEVEL: "粗分档",