Просмотр исходного кода

未选做的按钮换地方了

刘洋 10 месяцев назад
Родитель
Сommit
089bf3d6b8

+ 2 - 2
src/devLoginParams.ts

@@ -12,12 +12,12 @@
 // export const LOGIN_CONFIG = {
 //   isAdmin: false,
 //   forceChange: true,
-//   loginName: "1-339-2-1",
+//   loginName: "1-339-1-1",
 //   // loginName: "liuyang",
 //   password: "123456",
 //   examId: "1",
 //   // markerId: "438",
-//   markerId: "597",
+//   markerId: "594",
 // };
 /** 244 评卷员 */
 // export const LOGIN_CONFIG = {

+ 1 - 1
src/features/arbitrate/ArbitrateMarkList.vue

@@ -37,7 +37,7 @@
                 v-for="(item, i) in str2Arr(markDetail.scoreList)"
                 :key="item"
                 :class="[{ active: isActive(i) }, 'score-single']"
-                >{{ item == "-1" ? "-" : item
+                >{{ item == "-1" ? "/" : item
                 }}<span class="split">{{
                   i == str2Arr(markDetail.scoreList).length - 1 ? "" : " , "
                 }}</span>

+ 7 - 1
src/features/library/inspect/MarkBoardInspect.vue

@@ -59,12 +59,18 @@
                 <span class="tw-flex-1 tw-text-center">
                   {{ question.score === -1 ? "未选做" : question.score || 0 }}
                 </span>
-                <input
+                <!-- <input
                   :disabled="question.score === -1"
                   title="打回"
                   type="checkbox"
                   :checked="questionChecked(question)"
                   @change="questionCheckChanged(question)"
+                /> -->
+                <input
+                  title="打回"
+                  type="checkbox"
+                  :checked="questionChecked(question)"
+                  @change="questionCheckChanged(question)"
                 />
               </div>
             </template>

+ 26 - 3
src/features/mark/MarkBoardTrack.vue

@@ -171,18 +171,22 @@
                 >
                   <!-- 特殊的空格符号 -->
                   <!-- eslint-disable-next-line no-irregular-whitespace -->
-                  {{ store.currentTask?.markResult?.scoreList[index] ?? " " }}
+                  {{
+                    question.hasSetUnselective
+                      ? "未选做"
+                      : store.currentTask?.markResult?.scoreList[index] ?? " "
+                  }}
                 </span>
               </transition-group>
             </div>
-            <a-button
+            <!-- <a-button
               v-if="question.selective"
               :type="question.hasSetUnselective ? 'primary' : 'default'"
               size="small"
               class="set-unselect"
               @click="setUnselect(question, index)"
               >未选做</a-button
-            >
+            > -->
           </div>
         </template>
       </div>
@@ -237,6 +241,7 @@
         >
           {{ s }}
         </div>
+
         <a-tooltip placement="bottom" :destroyTooltipOnHide="true">
           <template #title>作答错误,或只书写题号等情况</template>
           <div
@@ -257,6 +262,22 @@
           </div>
         </a-tooltip>
+        <a-button
+          v-if="store.currentTask.questionList[curQuestionIndex].selective"
+          :type="
+            store.currentTask.questionList[curQuestionIndex].hasSetUnselective
+              ? 'primary'
+              : 'default'
+          "
+          class="set-unselect"
+          @click="
+            setUnselect(
+              store.currentTask.questionList[curQuestionIndex],
+              curQuestionIndex
+            )
+          "
+          >未选做</a-button
+        >
       </div>
     </div>
     <div
@@ -304,6 +325,7 @@ import { cloneDeep } from "lodash-es";
 import { useRoute } from "vue-router";
 
 const route = useRoute();
+const curQuestionIndex = ref<number>(0);
 
 const props = defineProps<{ modal?: boolean; arbitrateIndex?: string }>();
 const activeIndex = computed(() => {
@@ -389,6 +411,7 @@ const willChooseQuestion = (question: any, index: number) => {
   if (notInActive(index)) {
     return;
   }
+  curQuestionIndex.value = index;
   chooseQuestion(question);
 };
 let sliceImagesWithTrackListCopy = ref([]);

+ 7 - 1
src/features/student/studentInspect/MarkBoardInspect.vue

@@ -77,12 +77,18 @@
                 <span class="tw-text-center question-score">
                   {{ question.score === -1 ? "未选做" : question.score || 0 }}
                 </span>
-                <input
+                <!-- <input
                   :disabled="question.score === -1"
                   title="打回"
                   type="checkbox"
                   :checked="questionChecked(question)"
                   @change="questionCheckChanged(question)"
+                /> -->
+                <input
+                  title="打回"
+                  type="checkbox"
+                  :checked="questionChecked(question)"
+                  @change="questionCheckChanged(question)"
                 />
               </div>
             </template>

+ 2 - 2
src/styles/global.css

@@ -59,9 +59,9 @@ button.ant-btn-primary {
   background-color: var(--app-primary-button-bg-color);
 }
 .set-unselect {
-  position: absolute !important;
+  /* position: absolute !important;
   bottom: 3px;
-  right: 3px;
+  right: 3px; */
   font-size: 12px !important;
   
 }