刘洋 10 月之前
父節點
當前提交
9e0c2b972b
共有 3 個文件被更改,包括 37 次插入17 次删除
  1. 16 16
      src/devLoginParams.ts
  2. 10 0
      src/features/mark/MarkBoardKeyBoard.vue
  3. 11 1
      src/features/mark/MarkBoardMouse.vue

+ 16 - 16
src/devLoginParams.ts

@@ -97,14 +97,14 @@
 // };
 // };
 
 
 /** 255 评卷员 */
 /** 255 评卷员 */
-export const LOGIN_CONFIG = {
-  isAdmin: false,
-  forceChange: true,
-  loginName: "pjy-3001-5-1",
-  password: "123456",
-  examId: "414",
-  markerId: "4242",
-};
+// export const LOGIN_CONFIG = {
+//   isAdmin: false,
+//   forceChange: true,
+//   loginName: "pjy-3001-5-1",
+//   password: "123456",
+//   examId: "414",
+//   markerId: "4242",
+// };
 
 
 /** 225 管理员 */
 /** 225 管理员 */
 
 
@@ -117,14 +117,14 @@ export const LOGIN_CONFIG = {
 //   markerId: null,
 //   markerId: null,
 // };
 // };
 
 
-// export const LOGIN_CONFIG = {
-//   isAdmin: true,
-//   forceChange: true,
-//   loginName: "fwy",
-//   password: "123456",
-//   examId: "393",
-//   markerId: null,
-// };
+export const LOGIN_CONFIG = {
+  isAdmin: true,
+  forceChange: true,
+  loginName: "fwy2",
+  password: "123456",
+  examId: "416",
+  markerId: null,
+};
 
 
 // export const loginName = "admin-ch";
 // export const loginName = "admin-ch";
 // export const password = "123456";
 // export const password = "123456";

+ 10 - 0
src/features/mark/MarkBoardKeyBoard.vue

@@ -148,6 +148,7 @@
             class="tw-cursor-pointer tw-font-bold unselective"
             class="tw-cursor-pointer tw-font-bold unselective"
             :class="{
             :class="{
               'current-score': question.hasSetUnselective,
               'current-score': question.hasSetUnselective,
+              disabled: notInActive(index),
             }"
             }"
             @click="setUnselect(question, index)"
             @click="setUnselect(question, index)"
           >
           >
@@ -381,6 +382,9 @@ const buttonHeightForSelective = $computed(() =>
 );
 );
 
 
 function setUnselect(question: Question, index: number) {
 function setUnselect(question: Question, index: number) {
+  if (notInActive(index)) {
+    return;
+  }
   if (!question.hasSetUnselective) {
   if (!question.hasSetUnselective) {
     const markResult = store.currentTask.markResult;
     const markResult = store.currentTask.markResult;
     markResult.scoreList[index] = null;
     markResult.scoreList[index] = null;
@@ -405,6 +409,12 @@ function setUnselect(question: Question, index: number) {
   background-color: var(--app-container-bg-color);
   background-color: var(--app-container-bg-color);
 
 
   border-radius: 30px;
   border-radius: 30px;
+  &.disabled {
+    background-color: #f5f5f5 !important;
+    // pointer-events: none;
+    cursor: not-allowed !important;
+    color: rgba(0, 0, 0, 0.25) !important;
+  }
 }
 }
 .mark-board-track-container {
 .mark-board-track-container {
   max-width: 290px;
   max-width: 290px;

+ 11 - 1
src/features/mark/MarkBoardMouse.vue

@@ -114,6 +114,7 @@
                 class="tw-cursor-pointer tw-font-bold unselective"
                 class="tw-cursor-pointer tw-font-bold unselective"
                 :class="{
                 :class="{
                   'current-score': question.hasSetUnselective,
                   'current-score': question.hasSetUnselective,
+                  disabled: notInActive(index),
                 }"
                 }"
                 @click="setUnselect(question, index)"
                 @click="setUnselect(question, index)"
               >
               >
@@ -176,6 +177,9 @@ function chooseScore(question: Question, score: number) {
 }
 }
 
 
 function setUnselect(question: Question, index: number) {
 function setUnselect(question: Question, index: number) {
+  if (notInActive(index)) {
+    return;
+  }
   if (!question.hasSetUnselective) {
   if (!question.hasSetUnselective) {
     const markResult = store.currentTask.markResult;
     const markResult = store.currentTask.markResult;
     markResult.scoreList[index] = null;
     markResult.scoreList[index] = null;
@@ -228,7 +232,7 @@ const buttonHeightForSelective = $computed(() =>
 );
 );
 </script>
 </script>
 
 
-<style scoped>
+<style scoped lang="less">
 .unselective {
 .unselective {
   width: 72px;
   width: 72px;
 
 
@@ -240,6 +244,12 @@ const buttonHeightForSelective = $computed(() =>
 
 
   border-radius: 30px;
   border-radius: 30px;
   margin-bottom: 8px;
   margin-bottom: 8px;
+  &.disabled {
+    background-color: #f5f5f5 !important;
+    // pointer-events: none;
+    cursor: not-allowed !important;
+    color: rgba(0, 0, 0, 0.25) !important;
+  }
 }
 }
 .mark-board-track-container {
 .mark-board-track-container {
   max-width: 290px;
   max-width: 290px;