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/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 a1d4b72..994d96c 100644
--- a/src/views/student/index.vue
+++ b/src/views/student/index.vue
@@ -6,35 +6,6 @@
-
-
-
-
-
-
-
-
-
+
-
+
-
+
-
+
-
+
{{ safeDetail.isDiscussion ? "已开展" : "未开展" }}
- {{ safeDetail.discussion || "-" }}
+ {{
+ safeDetail.discussion || "-"
+ }}
{{ safeDetail.isClassMeeting ? "已开展" : "未开展" }}
- {{ safeDetail.classMeeting || "-" }}
+ {{
+ safeDetail.classMeeting || "-"
+ }}
diff --git a/src/views/toschoolinfomanage/index.vue b/src/views/toschoolinfomanage/index.vue
index 53e0e7d..21cb9fd 100644
--- a/src/views/toschoolinfomanage/index.vue
+++ b/src/views/toschoolinfomanage/index.vue
@@ -447,16 +447,22 @@ function handleImport() {
let res = await importExcel(fileE.files[0]);
if (res.code != undefined) {
if (res.code !== 200) return ElMessage.error(res.message);
- else return ElMessage.success("所有数据录入成功");
+ else {
+ loadList();
+ return ElMessage.success("所有数据录入成功");
+ }
} else if (res.type === "application/json") {
let json = await res.text();
if (json !== undefined && json.Code !== 200) {
return ElMessage.error(json.Message);
} else {
- return ElMessage.success("操所有数据录入成功作成功");
+ loadList();
+ return ElMessage.success("所有数据录入成功");
}
- } else if (res === undefined || res.size === 0)
+ } else if (res === undefined || res.size === 0) {
+ loadList();
return ElMessage.success("所有数据录入成功");
+ }
const url = res && window.URL.createObjectURL(res);
const link = document.createElement("a");
link.href = url;