Bladeren bron

1.3.15的需求

刘洋 1 jaar geleden
bovenliggende
commit
6a8b31f1a4
2 gewijzigde bestanden met toevoegingen van 45 en 21 verwijderingen
  1. 19 19
      src/devLoginParams.ts
  2. 26 2
      src/features/admin/confirmPaper/ConfirmPaper.vue

+ 19 - 19
src/devLoginParams.ts

@@ -9,17 +9,17 @@
 // export const markerId="419";
 
 /** 244 评卷员 */
-export const LOGIN_CONFIG = {
-  isAdmin: false,
-  forceChange: true,
-  loginName: "1-339-5-1",
-  // loginName: "liuyang",
-  password: "123456",
-  examId: "1",
-  markerId: "147",
-  // markerId: "482",
-  // markerId: "483",
-};
+// export const LOGIN_CONFIG = {
+//   isAdmin: false,
+//   forceChange: true,
+//   loginName: "1-339-5-1",
+//   // loginName: "liuyang",
+//   password: "123456",
+//   examId: "1",
+//   markerId: "147",
+//   // markerId: "482",
+//   // markerId: "483",
+// };
 // export const LOGIN_CONFIG = {
 //   isAdmin: false,
 //   forceChange: true,
@@ -67,14 +67,14 @@ export const LOGIN_CONFIG = {
 //   // 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: "admin-test",
+  password: "123456",
+  examId: "1",
+  markerId: null,
+};
 // export const LOGIN_CONFIG = {
 //   isAdmin: true,
 //   forceChange: true,

+ 26 - 2
src/features/admin/confirmPaper/ConfirmPaper.vue

@@ -139,7 +139,19 @@
         </div>
 
         <div class="tw-flex tw-justify-between tw-bg-white tw-p-4">
+          <a-tooltip v-if="!allViewed" placement="top">
+            <template #title>请先浏览完该学生的所有试卷</template>
+            <a-button
+              :disabled="!allViewed"
+              type="primary"
+              shape="round"
+              @click="saveStudentAnswer"
+            >
+              保存
+            </a-button>
+          </a-tooltip>
           <a-button
+            v-else
             :disabled="!student?.upload"
             type="primary"
             shape="round"
@@ -207,7 +219,7 @@
 <script lang="ts" setup>
 import { httpApp } from "@/plugins/axiosApp";
 import { message } from "ant-design-vue";
-import { onMounted, reactive } from "vue";
+import { onMounted, reactive, watch } from "vue";
 import { useRoute } from "vue-router";
 import { CheckSetting, StudentInfo } from "./check";
 import "viewerjs/dist/viewer.css";
@@ -323,7 +335,7 @@ async function getStudent(studentId: number) {
   stu?.sheetUrls.forEach((v, i, a) => (a[i] = setting.fileServer + v));
   currentStudentId = stu.id;
   currentImage = 0;
-
+  browsedImageIndexes = [0];
   if (!stu.success) {
     void message.error(stu.message, 24 * 60 * 60);
     dataError = true;
@@ -419,6 +431,18 @@ async function saveStudentAnswer() {
 
 //#region : 显示大图,供查看和翻转
 let currentImage = $ref(0);
+let browsedImageIndexes = $ref([0]);
+let allViewed = $computed(() => {
+  let indexes = Array.from(new Set(browsedImageIndexes));
+  return indexes.length == (student?.sheetUrls || []).length;
+});
+watch(
+  () => currentImage,
+  () => {
+    browsedImageIndexes.push(currentImage);
+    console.log(browsedImageIndexes);
+  }
+);
 function switchImageArrow({
   left = false,
   right = false,