From a7c526806b13a2d537658254202d1325ffae3a2a 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 14:51:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=97=B6=E5=AD=A6=E6=A0=A1=E8=AE=B8=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=85=88=E9=80=89=E6=89=8D=E8=83=BD=E9=80=89=E4=B8=8B?= =?UTF-8?q?=E5=B1=9E=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/student/index.vue | 35 +++-------------------------------- src/views/teacher/index.vue | 6 +++--- 2 files changed, 6 insertions(+), 35 deletions(-) diff --git a/src/views/student/index.vue b/src/views/student/index.vue index a1d4b72..c380733 100644 --- a/src/views/student/index.vue +++ b/src/views/student/index.vue @@ -6,37 +6,8 @@ - - - - - - - - - + - + - + - + - + - + Date: Tue, 26 Aug 2025 16:02:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=AD=A3=E5=BC=8F?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE=20=E6=B7=BB=E5=8A=A0=20?= =?UTF-8?q?=E8=B5=B4=E6=A0=A1=E4=BF=A1=E6=81=AF=E5=BC=80=E5=B1=95=E5=B7=A5?= =?UTF-8?q?=E4=BD=9Cui=E5=AE=BD=E5=BA=A6=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 2 +- src/views/toschoolinfomanage/editModal.vue | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.env.production b/.env.production index ca7f985..55ffd00 100644 --- a/.env.production +++ b/.env.production @@ -14,6 +14,6 @@ VITE_COMPRESSION = "none" # 接口地址 -VITE_API_BASEURL = "http://localhost:5199/api" +VITE_API_BASEURL = "https://learn-archives-admin.23544.com/api" #数据中心后台地址 VITE_API_USERCENTER_URL = "https://dcb.23544.com/api" \ No newline at end of file diff --git a/src/views/toschoolinfomanage/editModal.vue b/src/views/toschoolinfomanage/editModal.vue index 0ff8e35..ba7aaac 100644 --- a/src/views/toschoolinfomanage/editModal.vue +++ b/src/views/toschoolinfomanage/editModal.vue @@ -53,7 +53,9 @@ > {{ safeDetail.isDiscussion ? "已开展" : "未开展" }} - {{ safeDetail.discussion || "-" }} + {{ + safeDetail.discussion || "-" + }} {{ safeDetail.isClassMeeting ? "已开展" : "未开展" }} - {{ safeDetail.classMeeting || "-" }} + {{ + safeDetail.classMeeting || "-" + }} From 5041c554d25000ce1187d8530d2f67c83642e093 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 17:30:35 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=AD=A6=E7=94=9F?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2=E5=AD=A6=E6=A0=A1=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/student/index.vue | 2 +- src/views/toschoolinfomanage/index.vue | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/views/student/index.vue b/src/views/student/index.vue index c380733..5ec0c8b 100644 --- a/src/views/student/index.vue +++ b/src/views/student/index.vue @@ -7,7 +7,7 @@ - + Date: Tue, 26 Aug 2025 18:52:23 +0800 Subject: [PATCH 4/4] =?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(); }