新打分分档页面完成

src/assets/styles/marker.less

@@ -22,7 +22,6 @@
   .header-part {
     display: inline-block;
     vertical-align: top;
-    min-width: 80px;
     padding: 0 15px;
     margin-left: 10px;
     background: @color-background;
@@ -74,6 +73,16 @@
     }
   }
 }
+.header-step-dropdown {
+  .header-step-item {
+    > i {
+      color: @color-text-act;
+      &:last-child {
+        color: @color-text;
+      }
+    }
+  }
+}
 
 // .marker-body
 .marker-body {

src/modules/grading/marker/MarkerHeader.vue

@@ -3,6 +3,7 @@
     <div class="header-group">
       <div class="header-part">
         <Dropdown
+          v-if="areas.length > 1"
           placement="bottom"
           transfer
           trigger="click"
@@ -21,6 +22,7 @@
             >
           </DropdownMenu>
         </Dropdown>
+        <p v-else>{{ curArea.areaName }}</p>
       </div>
       <div v-if="showStatistics" class="header-part" @click="toStatistics">
         <p>统计分析 <Icon type="ios-arrow-down"></Icon></p>
@@ -33,11 +35,15 @@
           transfer
           v-model="pageVisible"
         >
-          <p>
+          <p v-if="showPaperRelateCount">
             当前页：<span>{{ page.current }}</span
             >/<span>{{ page.totalPage }} </span>
             <Icon type="ios-arrow-down"></Icon>
           </p>
+          <p v-else>
+            <span>翻页操作</span>
+            <Icon type="ios-arrow-down"></Icon>
+          </p>
 
           <div class="marker-page" slot="content">
             <div class="marker-page-shortcut">
@@ -62,14 +68,14 @@
                 </div>
               </div>
             </div>
-            <div class="marker-page-set">
+            <div v-if="showPaperRelateCount" class="marker-page-set">
               <span>当前页：</span>
               <p>
                 <span>{{ page.current }}</span
                 >/<span>{{ page.totalPage }} </span>
               </p>
             </div>
-            <div class="marker-page-set">
+            <div v-if="showPaperRelateCount" class="marker-page-set">
               <span>总张数：</span>
               <p>
                 <span>{{ page.total }}</span>
@@ -97,7 +103,7 @@
           placement="bottom"
           transfer
           trigger="click"
-          transfer-class-name="marker-dropdown"
+          transfer-class-name="marker-dropdown header-step-dropdown"
           @on-click="stepClick"
         >
           <span class="el-dropdown-link">
@@ -107,6 +113,7 @@
           </span>
           <DropdownMenu slot="list">
             <DropdownItem
+              class="header-step-item"
               v-for="step in steps.otherStep"
               :key="step.type"
               :name="step.name"
@@ -115,12 +122,15 @@
               <i v-if="showPaperRelateCount">（{{ step.count }}）</i>
             </DropdownItem>
             <DropdownItem
+              class="header-step-item"
               v-for="step in steps.levelStep"
               :key="step.name"
               :name="step.name"
             >
               <i>{{ step.name }}</i>
-              <i v-if="showPaperRelateCount">（{{ step.count }}）</i>
+              <i v-if="showPaperRelateCount"
+                >（{{ step.count }} / {{ step.gcount }}）</i
+              >
             </DropdownItem>
           </DropdownMenu>
         </Dropdown>

src/modules/mark/leader/LeaderMarking.vue

@@ -263,7 +263,7 @@ export default {
         });
       const msInfo = data.find(item => item.id === "manualScore");
       if (msInfo) {
-        levelStep.push({
+        otherStep.push({
           count: msInfo.count,
           name: "输分试卷",
           type: "manualScore"

src/modules/mark/marker/MarkerMarking.vue

@@ -282,7 +282,7 @@ export default {
         });
       const msInfo = data.find(item => item.id === "manualScore");
       if (msInfo) {
-        levelStep.push({
+        otherStep.push({
           count: msInfo.count,
           name: "输分试卷",
           type: "manualScore"