Forráskód Böngészése

发任务修改以及快捷档位导航宽度修改

zhangjie 2 éve
szülő
commit
a37ea6db36

+ 7 - 0
src/assets/styles/marker.less

@@ -135,7 +135,14 @@
   }
 
   .fast-nav{
+    position: absolute;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    right: 400px;
     padding: 5px 10px;
+    background-color: @color-background-light;
+    z-index: 9;
 
     &-list{
       font-size: 0;

+ 9 - 5
src/modules/grading/components/ModifyFormalGradingTask.vue

@@ -32,7 +32,7 @@
           ></Option>
         </Select>
       </FormItem>
-      <FormItem label="已数量">
+      <FormItem label="已定档任务数量">
         <Input
           size="large"
           v-model.trim="modalForm.successCount"
@@ -42,17 +42,20 @@
       <FormItem size="large" label="待评数量">
         <Input v-model.trim="modalForm.waitCount" readonly></Input>
       </FormItem>
+      <FormItem size="large" label="待发任务数量">
+        <Input v-model.trim="modalForm.waitPublishCount" readonly></Input>
+      </FormItem>
       <FormItem size="large" label="整体进度">
         <Input v-model.trim="modalForm.progress" readonly></Input>
       </FormItem>
       <FormItem prop="taskCount" label="分配任务数量">
         <InputNumber
           size="large"
-          :min="modalForm.waitCount ? 1 : 0"
-          :max="modalForm.waitCount"
+          :min="modalForm.waitPublishCount ? 1 : 0"
+          :max="modalForm.waitPublishCount"
           :precision="0"
           v-model.trim="modalForm.taskCount"
-          :disabled="!modalForm.waitCount || !canPublish"
+          :disabled="!modalForm.waitPublishCount || !canPublish"
           style="width: 120px"
           clearable
         ></InputNumber>
@@ -62,7 +65,7 @@
       <Button
         shape="circle"
         type="primary"
-        :disabled="isSubmit || !canPublish || !modalForm.waitCount"
+        :disabled="isSubmit || !canPublish || !modalForm.waitPublishCount"
         @click="submit"
         >发布</Button
       >
@@ -86,6 +89,7 @@ const initModalForm = {
   successCount: 0,
   waitCount: 0,
   progress: 0,
+  waitPublishCount: 0,
   taskCount: null
 };
 

+ 23 - 6
src/modules/grading/marker/MarkerHeader.vue

@@ -1,7 +1,11 @@
 <template>
   <div class="marker-header">
     <!-- fast-level-nav -->
-    <div v-if="ribbonSet.fastLevelNav" class="header-group fast-nav">
+    <div
+      v-if="ribbonSet.fastLevelNav"
+      class="header-group fast-nav"
+      :style="fastLevelNavStyles"
+    >
       <div class="fast-nav-list">
         <div
           v-for="step in steps.levelStep"
@@ -37,7 +41,7 @@
       </div>
     </div>
     <!-- left action -->
-    <div v-if="!ribbonSet.fastLevelNav" class="header-group">
+    <div class="header-group">
       <div class="header-part">
         <Dropdown
           v-if="areas.length > 1"
@@ -66,7 +70,7 @@
       </div>
     </div>
     <!-- header-page -->
-    <div v-if="!ribbonSet.fastLevelNav" class="header-group header-page">
+    <div class="header-group header-page">
       <div v-if="showPaperRelateCount" class="page-total">
         共{{ page.total }}张
       </div>
@@ -269,10 +273,14 @@
       >
         <p>标准卷 <Icon type="ios-arrow-down"></Icon></p>
       </div>
-      <div class="header-part header-history" @click="toHistory">
+      <div
+        class="header-part header-history"
+        id="header-history"
+        @click="toHistory"
+      >
         <p>操作记录 <Icon type="ios-arrow-down"></Icon></p>
       </div>
-      <div class="header-user">
+      <div class="header-user" id="header-user">
         <Dropdown
           placement="bottom"
           transfer
@@ -343,7 +351,8 @@ export default {
       markers: [],
       markFilter: {
         markerId: ""
-      }
+      },
+      fastLevelNavStyles: {}
     };
   },
   computed: {
@@ -384,6 +393,14 @@ export default {
         };
       })
       .filter(item => item.key !== "examNumber");
+
+    this.fastLevelNavStyles = {
+      right:
+        document.getElementById("header-history").offsetWidth +
+        document.getElementById("header-user").offsetWidth +
+        20 +
+        "px"
+    };
   },
   methods: {
     ...mapMutations("marker", ["setPage", "setAreas", "setRibbonSet"]),