刘洋 1 year ago
parent
commit
f610104870
4 changed files with 53 additions and 53 deletions
  1. 16 16
      src/devLoginParams.ts
  2. 31 31
      src/features/arbitrate/MarkHeader.vue
  3. 5 5
      src/features/mark/MarkBoardTrack.vue
  4. 1 1
      vite.config.ts

+ 16 - 16
src/devLoginParams.ts

@@ -23,11 +23,11 @@
 // export const LOGIN_CONFIG = {
 //   isAdmin: false,
 //   forceChange: true,
-//   loginName: "spj711-01",
+//   loginName: "spj111-1",
 //   // loginName: "liuyang",
-//   password: "123456",
-//   examId: "295",
-//   markerId: "3340",
+//   password: "654321",
+//   examId: "341",
+//   markerId: "3487",
 //   // markerId: "482",
 //   // markerId: "483",
 // };
@@ -67,23 +67,23 @@
 //   // markerId: "483",
 // };
 /** 224 管理员 */
-// export const LOGIN_CONFIG = {
-//   isAdmin: true,
-//   forceChange: true,
-//   loginName: "admin-test",
-//   password: "123456",
-//   examId: "1",
-//   markerId: null,
-// };
 export const LOGIN_CONFIG = {
   isAdmin: true,
   forceChange: true,
-  // loginName: "fh161301",
-  loginName: "24-FH-111-1",
-  password: "654321",
-  examId: "341",
+  loginName: "admin-test",
+  password: "123456",
+  examId: "1",
   markerId: null,
 };
+// export const LOGIN_CONFIG = {
+//   isAdmin: true,
+//   forceChange: true,
+//   // loginName: "fh161301",
+//   loginName: "24-FH-111-1",
+//   password: "654321",
+//   examId: "341",
+//   markerId: null,
+// };
 
 /** 255 评卷员 */
 // export const LOGIN_CONFIG = {

+ 31 - 31
src/features/arbitrate/MarkHeader.vue

@@ -15,39 +15,29 @@
     </span>
     <template #modeControl>
       <div class="tw-flex">
-        <a-dropdown class="header-bg-color">
-          <template v-if="!store.setting.forceMode" #overlay>
-            <a-menu>
-              <a-menu-item key="1" @click="toggleSettingMode">
-                {{ exchangeModeName }}
-              </a-menu-item>
-            </a-menu>
-          </template>
-          <a-button
+        <!-- <a-dropdown class="header-bg-color"> -->
+
+        <a-button
+          class="header-bg-color"
+          style="
+            color: rgba(255, 255, 255, 0.5);
+            border: none;
+            display: flex;
+            align-items: center;
+          "
+        >
+          <img
+            src="../../assets/trackmode.png"
             style="
-              color: rgba(255, 255, 255, 0.5);
-              border: none;
-              display: flex;
-              align-items: center;
+              width: 11px;
+              height: 12px;
+              display: inline;
+              margin-right: 2px;
             "
-          >
-            <img
-              src="../../assets/trackmode.png"
-              style="
-                width: 11px;
-                height: 12px;
-                display: inline;
-                margin-right: 2px;
-              "
-            />
-            {{ modeName }}
-            <!-- <div
-              v-if="!store.setting.forceMode"
-              class="dropdown-triangle"
-            ></div> -->
-            <div class="dropdown-triangle"></div>
-          </a-button>
-        </a-dropdown>
+          />
+          {{ modeName }}
+        </a-button>
+        <!-- </a-dropdown> -->
       </div>
     </template>
   </CommonMarkHeader>
@@ -116,4 +106,14 @@ let clearTasks = clearArbitrateTask.bind(
 .header-bg-color.ant-btn:hover {
   background-color: var(--app-ant-select-bg-override-color) !important;
 }
+.header-bg-color.ant-btn:focus {
+  background-color: transparent;
+}
+.dropdown-triangle {
+  background-color: #8c8d9b;
+  width: 7px;
+  height: 5px;
+  clip-path: polygon(0 0, 100% 0, 50% 100%);
+  margin-left: 4px;
+}
 </style>

+ 5 - 5
src/features/mark/MarkBoardTrack.vue

@@ -28,9 +28,9 @@
         <div class="total-score tw-ml-5 tw-font-bold" style="height: 50px">
           <transition-group name="score-number-animation" tag="span">
             <span
-              :key="store.currentTask.markResult.markerScore || 0"
+              :key="store.currentTask.markResult?.markerScore || 0"
               class="tw-inline-block"
-              >{{ store.currentTask.markResult.markerScore }}</span
+              >{{ store.currentTask.markResult?.markerScore }}</span
             >
           </transition-group>
         </div>
@@ -167,12 +167,12 @@
             <div style="height: 32px">
               <transition-group name="score-number-animation" tag="span">
                 <span
-                  :key="store.currentTask?.markResult.scoreList[index] || 0"
+                  :key="store.currentTask?.markResult?.scoreList[index] || 0"
                   class="tw-font-medium tw-text-2xl score tw-inline-block"
                 >
                   <!-- 特殊的空格符号 -->
                   <!-- eslint-disable-next-line no-irregular-whitespace -->
-                  {{ store.currentTask?.markResult.scoreList[index] ?? " " }}
+                  {{ store.currentTask?.markResult?.scoreList[index] ?? " " }}
                 </span>
               </transition-group>
             </div>
@@ -376,7 +376,7 @@ const questionScore = $computed(
   () =>
     store.currentTask &&
     store.currentQuestion &&
-    store.currentTask.markResult.scoreList[store.currentQuestion.__index]
+    store.currentTask.markResult?.scoreList[store.currentQuestion.__index]
 );
 
 // const questionScoreSteps = $computed(() => {

+ 1 - 1
vite.config.ts

@@ -3,7 +3,7 @@ import vue from "@vitejs/plugin-vue";
 import ViteComponents from "unplugin-vue-components/vite";
 import { AntDesignVueResolver } from "unplugin-vue-components/resolvers";
 
-const SERVER_URL = "http://192.168.10.225";
+const SERVER_URL = "http://192.168.10.224";
 // const SERVER_URL = "http://192.168.11.103:8090";
 
 const path = require("path");