zhangjie 2 years ago
parent
commit
0e95bce1c1

+ 3 - 0
src/assets/styles/adaptive.less

@@ -229,6 +229,9 @@
     .header-user {
       width: 240px;
     }
+    .fast-nav {
+      margin-right: 240px;
+    }
   }
   .marker-action {
     width: 240px;

+ 15 - 13
src/assets/styles/marker.less

@@ -13,7 +13,7 @@
   width: 100%;
   z-index: 9;
 
-  .header-main{
+  .header-main {
     height: 40px;
     padding: 5px 0;
     line-height: 30px;
@@ -137,19 +137,23 @@
     }
   }
 
-  .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;
+      white-space: nowrap;
+      height: 32px;
+      overflow-y: hidden;
+      overflow-x: auto;
     }
 
-    &-item{
+    &-item {
       display: inline-block;
       vertical-align: middle;
       min-width: 30px;
@@ -169,17 +173,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 {
@@ -282,8 +285,8 @@
   padding: 5px;
   background: @color-background;
   z-index: 7;
-  
-  &-low{
+
+  &-low {
     top: 80px;
   }
 }
@@ -934,7 +937,6 @@
   }
 }
 
-
 .ribbon-set-dialog {
   .ribbon-set-form {
     padding-bottom: 30px;
@@ -949,4 +951,4 @@
     border-color: @color-act1;
     background-color: @color-act1;
   }
-}
+}

+ 3 - 3
src/modules/grading/leader/LeaderGrading.vue

@@ -240,7 +240,8 @@ export default {
       "steps",
       "curStep",
       "curArea",
-      "curSubject"
+      "curSubject",
+      "ribbonSet"
     ]),
     markerImageListClasses() {
       return ["marker-image-list", `marker-image-list-${this.page.size}`];
@@ -271,8 +272,7 @@ export default {
       "setCurArea",
       "setCurSubject",
       "setCurUserRoleType",
-      "clearState",
-      "ribbonSet"
+      "clearState"
     ]),
     initData() {
       this.getParamsSetInfo();

+ 9 - 3
src/modules/grading/marker/MarkerGrading.vue

@@ -204,7 +204,14 @@ export default {
     };
   },
   computed: {
-    ...mapState("marker", ["paramsSet", "page", "steps", "curStep", "curArea"]),
+    ...mapState("marker", [
+      "paramsSet",
+      "page",
+      "steps",
+      "curStep",
+      "curArea",
+      "ribbonSet"
+    ]),
     markerImageListClasses() {
       return ["marker-image-list", `marker-image-list-${this.page.size}`];
     }
@@ -227,8 +234,7 @@ export default {
       "setCurArea",
       "setCurStep",
       "setCurUserRoleType",
-      "clearState",
-      "ribbonSet"
+      "clearState"
     ]),
     async initData() {
       await this.getParamsSetInfo();

+ 9 - 3
src/modules/mark/marker/MarkerMarking.vue

@@ -195,7 +195,14 @@ export default {
     };
   },
   computed: {
-    ...mapState("marker", ["paramsSet", "page", "steps", "curStep", "curArea"]),
+    ...mapState("marker", [
+      "paramsSet",
+      "page",
+      "steps",
+      "curStep",
+      "curArea",
+      "ribbonSet"
+    ]),
     markerImageListClasses() {
       return ["marker-image-list", `marker-image-list-${this.page.size}`];
     },
@@ -221,8 +228,7 @@ export default {
       "setCurArea",
       "setCurStep",
       "setCurUserRoleType",
-      "clearState",
-      "ribbonSet"
+      "clearState"
     ]),
     initData() {
       this.getParamsSetInfo();