刘洋 vor 2 Jahren
Ursprung
Commit
5ddfdb3552
3 geänderte Dateien mit 34 neuen und 10 gelöschten Zeilen
  1. 17 8
      src/components/shared/ScoringPanelItem.vue
  2. 16 2
      src/layout/main/MenuItem.vue
  3. 1 0
      src/router/index.ts

+ 17 - 8
src/components/shared/ScoringPanelItem.vue

@@ -14,7 +14,7 @@
         </div>
       </template> -->
     </toggle-dialog-render>
-    <div class="flex flex-1 flex-wrap score-list">
+    <div class="flex flex-1 flex-wrap score-list" :class="{ 'dialog-score-list': dialogMode }">
       <div
         v-for="scoreItem in scoreList"
         :key="scoreItem"
@@ -54,10 +54,10 @@
       </toggle-dialog-render>
     </div>
     <toggle-dialog-render dialog>
-      <div class="grid radius-base dialog-score" :class="{ 'score-valid-fail': scoreValidFail }">
+      <div class="grid dialog-score" :class="{ 'score-valid-fail': scoreValidFail }">
         <input
           ref="refInput2"
-          class="score-input"
+          class="score-input radius-base"
           :value="currentScore"
           @focus="onInputFocus"
           @blur="onBlur"
@@ -335,6 +335,9 @@ const onToggleClick = () => {
     font-size: $BaseFont;
     margin-bottom: -8px;
     // margin-left: 8px;
+    &.dialog-score-list {
+      margin-bottom: 0;
+    }
     .score-span {
       width: 46px;
       height: 32px;
@@ -381,20 +384,26 @@ const onToggleClick = () => {
   }
 
   .dialog-score {
-    width: 80px;
-    place-items: center;
-    background: $color--primary;
+    // width: 80px;
+    width: 70px;
+    // place-items: center;
+    // background: $color--primary;
     color: $color--white;
-    font-size: 32px;
+    // font-size: 32px;
     outline: none;
     margin-left: 6px;
     overflow: hidden;
+    position: relative;
+    top: -2px;
     .score-input {
       background: inherit;
       color: inherit;
       font-size: inherit;
       width: 100% !important;
-      height: 100%;
+      // height: 100%;
+      height: calc(100% - 4px);
+      background: $color--primary;
+      font-size: 24px;
     }
   }
 

+ 16 - 2
src/layout/main/MenuItem.vue

@@ -132,6 +132,16 @@ const checkActive = () => {
       background: $color--primary;
     }
   }
+  &.is-collapse {
+    ::v-deep(.el-sub-menu__title) {
+      .router-link-active.router-link-exact-active {
+        background: transparent;
+      }
+    }
+    .menu-item {
+      padding-left: 0;
+    }
+  }
   &.main-layout-sub-menu {
     margin-bottom: $ExtraSmallGapSpace;
   }
@@ -174,11 +184,15 @@ const checkActive = () => {
     }
   }
   .collapse-icon {
-    color: #fff;
+    // color: #fff;
+    color: #666;
+    &.router-link-active {
+      color: $color--primary;
+    }
   }
   &.active-index {
     .collapse-icon {
-      color: $color--primary;
+      // color: $color--primary;
     }
     > .main-layout-sub-menu-title,
     > .el-sub-menu__title > .main-layout-sub-menu-title {

+ 1 - 0
src/router/index.ts

@@ -47,6 +47,7 @@ const pageJumpsMap: any = {
   ExamManage: ['EditExam'],
   UserManage: ['EditUser'],
   RoleManage: ['RoleSetting'],
+  AnalysisMonitoring: ['AnalysisViewMarked'],
 }
 const keepAliveJupms = (from: any, to: any) => {
   const mStore = useMainStore()