zhangjie 1 vuosi sitten
vanhempi
commit
8dc550b2f4

+ 20 - 17
src/features/mark/MarkBoardKeyBoard.vue

@@ -20,25 +20,28 @@
       </a-dropdown>
     </div>
     <div class="board-header">
-      <div class="board-header-info">
-        <img src="@/assets/icons/icon-star.svg" /><span>总分</span>
-      </div>
-      <div class="board-header-score">
-        <transition-group name="score-number-animation" tag="span">
-          <span :key="store.currentTask.markResult?.markerScore || 0">{{
-            store.currentTask.markResult?.markerScore
-          }}</span>
-        </transition-group>
+      <div class="board-header-left">
+        <div class="board-header-info">
+          <img src="@/assets/icons/icon-star.svg" />
+          <span>总分</span>
+        </div>
+        <div class="board-header-score">
+          <transition-group name="score-number-animation" tag="span">
+            <span :key="store.currentTask.markResult?.markerScore || 0">{{
+              store.currentTask.markResult?.markerScore
+            }}</span>
+          </transition-group>
+        </div>
       </div>
+      <qm-button
+        class="board-header-submit"
+        size="medium"
+        type="primary"
+        @click="submit"
+      >
+        提交
+      </qm-button>
     </div>
-    <qm-button
-      class="board-submit"
-      size="medium"
-      type="primary"
-      @click="submit"
-    >
-      提交
-    </qm-button>
 
     <div
       v-if="store.currentTaskEnsured.questionList"

+ 19 - 17
src/features/mark/MarkBoardMouse.vue

@@ -20,25 +20,27 @@
       </a-dropdown>
     </div>
     <div class="board-header">
-      <div class="board-header-info">
-        <img src="@/assets/icons/icon-star.svg" /><span>总分</span>
-      </div>
-      <div class="board-header-score">
-        <transition-group name="score-number-animation" tag="span">
-          <span :key="store.currentTask.markResult?.markerScore || 0">{{
-            store.currentTask.markResult?.markerScore
-          }}</span>
-        </transition-group>
+      <div class="board-header-left">
+        <div class="board-header-info">
+          <img src="@/assets/icons/icon-star.svg" /><span>总分</span>
+        </div>
+        <div class="board-header-score">
+          <transition-group name="score-number-animation" tag="span">
+            <span :key="store.currentTask.markResult?.markerScore || 0">{{
+              store.currentTask.markResult?.markerScore
+            }}</span>
+          </transition-group>
+        </div>
       </div>
+      <qm-button
+        class="board-header-submit"
+        size="medium"
+        type="primary"
+        @click="submit"
+      >
+        提交
+      </qm-button>
     </div>
-    <qm-button
-      class="board-submit"
-      size="medium"
-      type="primary"
-      @click="submit"
-    >
-      提交
-    </qm-button>
 
     <div
       v-if="store.currentTask && store.currentTask.questionList"

+ 20 - 17
src/features/mark/MarkBoardTrack.vue

@@ -13,25 +13,28 @@
     }"
   >
     <div class="board-header">
-      <div class="board-header-info">
-        <img src="@/assets/icons/icon-star.svg" /><span>总分</span>
-      </div>
-      <div class="board-header-score">
-        <transition-group name="score-number-animation" tag="span">
-          <span :key="store.currentTask.markResult?.markerScore || 0">{{
-            store.currentTask.markResult?.markerScore
-          }}</span>
-        </transition-group>
+      <div class="board-header-left">
+        <div class="board-header-info">
+          <img src="@/assets/icons/icon-star.svg" />
+          <span>总分</span>
+        </div>
+        <div class="board-header-score">
+          <transition-group name="score-number-animation" tag="span">
+            <span :key="store.currentTask.markResult?.markerScore || 0">{{
+              store.currentTask.markResult?.markerScore
+            }}</span>
+          </transition-group>
+        </div>
       </div>
+      <qm-button
+        class="board-header-submit"
+        size="medium"
+        type="primary"
+        @click="submit"
+      >
+        提交
+      </qm-button>
     </div>
-    <qm-button
-      class="board-submit"
-      size="medium"
-      type="primary"
-      @click="submit"
-    >
-      提交
-    </qm-button>
     <div
       v-if="store.currentTask && store.currentTask.questionList"
       class="board-questions"

+ 22 - 12
src/styles/page.less

@@ -461,12 +461,22 @@
     justify-content: space-between;
     align-items: center;
     .flex-static;
-    border-radius: 4px;
-    border: 1px solid #e5e5e5;
-    padding: 10px 16px;
+    margin-bottom: 16px;
+
+    &-left {
+      width: calc(50% + 8px);
+      border-top-left-radius: 4px;
+      border-bottom-left-radius: 4px;
+      border: 1px solid #e5e5e5;
+      border-right: none;
+      padding: 10px 16px 10px 10px;
+      .flex-between;
+    }
 
     &-info {
       color: #8c8c8c;
+      width: 36px;
+      text-align: center;
 
       > img {
         display: inline-block;
@@ -475,9 +485,7 @@
         height: 16px;
       }
       > span {
-        display: inline-block;
-        vertical-align: middle;
-        margin-left: 5px;
+        display: block;
       }
     }
     &-score {
@@ -497,11 +505,14 @@
         text-align: center;
       }
     }
-  }
-  .board-submit {
-    .flex-static;
-    margin: 16px 0;
-    border-radius: 4px;
+    &-submit {
+      width: calc(50% - 8px);
+      border-radius: 4px;
+      height: 100%;
+      font-size: 26px;
+      border-top-left-radius: 0;
+      border-bottom-left-radius: 0;
+    }
   }
 
   .board-questions {
@@ -542,7 +553,6 @@
     .question-title {
       height: 21px;
       overflow: hidden;
-      text-overflow: ellipsis;
       white-space: nowrap;
     }
     .question-score {