From de4deddffc9c2e12a2d139c116fb9b7843669990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=82=A5=E7=BE=8A?= <1048382248@qq.com>
Date: Tue, 26 Aug 2025 18:52:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/http/index.ts            |  2 +-
 src/views/exam/classExamRecord.vue |  6 +++++-
 src/views/exam/index.vue           | 17 ++++++++++-------
 src/views/exam/userDetails.vue     |  4 ++++
 src/views/student/index.vue        |  3 ++-
 src/views/teacher/index.vue        |  2 +-
 6 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/utils/http/index.ts b/src/utils/http/index.ts
index 02ee09c..4936746 100644
--- a/src/utils/http/index.ts
+++ b/src/utils/http/index.ts
@@ -241,7 +241,7 @@ class PureHttp {
         })
         .catch(error => {
           if (error.status != 200) {
-              if (error.status == 200) ElMessage.warning("请求失败" + error.message);
+              ElMessage.warning("请求失败" + error.message);
           } 
           reject(error);
         });
diff --git a/src/views/exam/classExamRecord.vue b/src/views/exam/classExamRecord.vue
index 297186b..63c65b9 100644
--- a/src/views/exam/classExamRecord.vue
+++ b/src/views/exam/classExamRecord.vue
@@ -135,7 +135,11 @@ const tableData: TableConfig = {
       search: false,
       width: "95px",
       custom: (row) =>
-        `${row.average1 == 0 ? "--" : Math.round((row.average / row.average1) * 100)}%`,
+        `${
+          row.baseSchoolScore == 0
+            ? "--"
+            : Math.round((row.average / row.baseSchoolScore) * 100)
+        }%`,
     },
   },
   data: [],
diff --git a/src/views/exam/index.vue b/src/views/exam/index.vue
index 4afaff5..6d180be 100644
--- a/src/views/exam/index.vue
+++ b/src/views/exam/index.vue
@@ -5,7 +5,12 @@ import { onMounted, ref } from "vue";
 import { fa } from "element-plus/es/locales.mjs";
 import { hTableAPI } from "@/api/hTable";
 import { getenum } from "@/api/enum";
-import { ruleNumber, ruleRequired, ruleRequiredNumber } from "@/utils/rules";
+import {
+  ruleNumber,
+  ruleRequired,
+  ruleRequiredI,
+  ruleRequiredNumber,
+} from "@/utils/rules";
 import { ImportExamInfo } from "@/api/exam";
 import { ElMessage } from "element-plus";
 import { entryExamInfo } from "./examFun";
@@ -101,15 +106,13 @@ const tableData: TableConfig = {
       edit: true, // 字段允许修改
       setting: {},
     },
-    level: {
+    grade: {
       label: "年级",
-      rules: ruleRequired,
+      rules: ruleRequiredI(6, 2),
       width: "100px",
-      type: "dropdown",
-      setting: {},
       search: true,
       add: true, // 字段允许添加
-      edit: true, // 字段允许修改
+      edit: false, // 字段允许修改
     },
     testPaperType: {
       label: "试卷类型",
@@ -184,7 +187,7 @@ const showTable = ref(false);
 onMounted(async () => {
   //初始化数据原
 
-  tableData.column.level.setting.datasource = (await getenum("GradeEnum")).data;
+  // tableData.column.level.setting.datasource = (await getenum("GradeEnum")).data;
 
   tableData.column.testPaperType.setting.datasource = (
     await getenum("TestPaperTypeEnum")
diff --git a/src/views/exam/userDetails.vue b/src/views/exam/userDetails.vue
index c955282..f341150 100644
--- a/src/views/exam/userDetails.vue
+++ b/src/views/exam/userDetails.vue
@@ -35,6 +35,10 @@ const tableData: TableConfig = {
         FieldName: "ExamId",
         FieldValue: props.data[0].examId + "",
       },
+      {
+        FieldName: "ClassId",
+        FieldValue: props.data[0].classId + "",
+      },
     ], // 默认查询条件
     Conditions: [],
   },
diff --git a/src/views/student/index.vue b/src/views/student/index.vue
index 5ec0c8b..994d96c 100644
--- a/src/views/student/index.vue
+++ b/src/views/student/index.vue
@@ -624,7 +624,8 @@ function pageSizeChange(o) {
   fetchPagedData();
 }
 function pageIndexChange(o) {
-  pagination.index = o - 1;
+  console.log(o, "当前索引");
+  pagination.index = o;
   fetchPagedData();
 }
 
diff --git a/src/views/teacher/index.vue b/src/views/teacher/index.vue
index add117b..92b4ff4 100644
--- a/src/views/teacher/index.vue
+++ b/src/views/teacher/index.vue
@@ -636,7 +636,7 @@ function pageSizeChange(o) {
   fetchPagedData();
 }
 function pageIndexChange(o) {
-  pagination.index = o - 1;
+  pagination.index = o;
   fetchPagedData();
 }