Bladeren bron

feat: 仲裁提交放开以及评卷完成提示调整

zhangjie 1 maand geleden
bovenliggende
commit
8a8cabf9ec
2 gewijzigde bestanden met toevoegingen van 16 en 21 verwijderingen
  1. 2 7
      src/features/mark/MarkBoardTrack.vue
  2. 14 14
      src/features/mark/MarkHeader.vue

+ 2 - 7
src/features/mark/MarkBoardTrack.vue

@@ -55,12 +55,11 @@
         </div> -->
         </div> -->
 
 
         <qm-button
         <qm-button
-          v-if="canAllSelective"
+          v-if="canAllSelective && !disabledArbitrateType"
           type="primary"
           type="primary"
           shape="round"
           shape="round"
           size="middle"
           size="middle"
           style="height: 76px; border-radius: 10px; padding: 12px"
           style="height: 76px; border-radius: 10px; padding: 12px"
-          :disabled="disabledArbitrateType"
           @click="setAllUnselective"
           @click="setAllUnselective"
         >
         >
           未选做
           未选做
@@ -70,7 +69,6 @@
           shape="round"
           shape="round"
           size="middle"
           size="middle"
           style="height: 76px; border-radius: 10px; padding: 12px"
           style="height: 76px; border-radius: 10px; padding: 12px"
-          :disabled="disabledArbitrateType"
           @click="submit"
           @click="submit"
         >
         >
           提交
           提交
@@ -317,10 +315,7 @@ import { message, Modal } from "ant-design-vue";
 const route = useRoute();
 const route = useRoute();
 // const curQuestionIndex = ref<number>(0);
 // const curQuestionIndex = ref<number>(0);
 const disabledArbitrateType = computed(() => {
 const disabledArbitrateType = computed(() => {
-  return (
-    route.path === "/admin/exam/arbitrate/start" &&
-    store.setting?.arbitrateType === "QUESTION"
-  );
+  return route.path === "/admin/exam/arbitrate/start";
 });
 });
 const canAllSelective = computed(() => {
 const canAllSelective = computed(() => {
   return (
   return (

+ 14 - 14
src/features/mark/MarkHeader.vue

@@ -450,26 +450,26 @@ watchEffect(() => {
     store.setting.topCount > 0 &&
     store.setting.topCount > 0 &&
     store.setting.topCount === store.status.personCount
     store.setting.topCount === store.status.personCount
   ) {
   ) {
-    // Modal.confirm({
-    //   centered: true,
-    //   mask: true,
-    //   zIndex: 6000,
-    //   maskStyle: { opacity: 0.97 },
-    //   content: `分配任务份已完成,是否继续?`,
-    //   okText: "继续",
-    //   cancelText: "退出",
-    //   onCancel: logout,
-    // });
     Modal.confirm({
     Modal.confirm({
       centered: true,
       centered: true,
       mask: true,
       mask: true,
       zIndex: 6000,
       zIndex: 6000,
       maskStyle: { opacity: 0.97 },
       maskStyle: { opacity: 0.97 },
-      content: `任务已完成,请返回`,
-      okText: "退出",
-      cancelButtonProps: { style: { display: "none" } },
-      onOk: logout,
+      content: `分配任务份已完成,是否继续?`,
+      okText: "继续",
+      cancelText: "退出",
+      onCancel: logout,
     });
     });
+    // Modal.confirm({
+    //   centered: true,
+    //   mask: true,
+    //   zIndex: 6000,
+    //   maskStyle: { opacity: 0.97 },
+    //   content: `任务已完成,请返回`,
+    //   okText: "退出",
+    //   cancelButtonProps: { style: { display: "none" } },
+    //   onOk: logout,
+    // });
   }
   }
 });
 });