优化 考试流程
This commit is contained in:
parent
5041c554d2
commit
de4deddffc
|
|
@ -241,7 +241,7 @@ class PureHttp {
|
||||||
})
|
})
|
||||||
.catch(error => {
|
.catch(error => {
|
||||||
if (error.status != 200) {
|
if (error.status != 200) {
|
||||||
if (error.status == 200) ElMessage.warning("请求失败" + error.message);
|
ElMessage.warning("请求失败" + error.message);
|
||||||
}
|
}
|
||||||
reject(error);
|
reject(error);
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -135,7 +135,11 @@ const tableData: TableConfig = {
|
||||||
search: false,
|
search: false,
|
||||||
width: "95px",
|
width: "95px",
|
||||||
custom: (row) =>
|
custom: (row) =>
|
||||||
`${row.average1 == 0 ? "--" : Math.round((row.average / row.average1) * 100)}%`,
|
`${
|
||||||
|
row.baseSchoolScore == 0
|
||||||
|
? "--"
|
||||||
|
: Math.round((row.average / row.baseSchoolScore) * 100)
|
||||||
|
}%`,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
data: [],
|
data: [],
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,12 @@ import { onMounted, ref } from "vue";
|
||||||
import { fa } from "element-plus/es/locales.mjs";
|
import { fa } from "element-plus/es/locales.mjs";
|
||||||
import { hTableAPI } from "@/api/hTable";
|
import { hTableAPI } from "@/api/hTable";
|
||||||
import { getenum } from "@/api/enum";
|
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 { ImportExamInfo } from "@/api/exam";
|
||||||
import { ElMessage } from "element-plus";
|
import { ElMessage } from "element-plus";
|
||||||
import { entryExamInfo } from "./examFun";
|
import { entryExamInfo } from "./examFun";
|
||||||
|
|
@ -101,15 +106,13 @@ const tableData: TableConfig = {
|
||||||
edit: true, // 字段允许修改
|
edit: true, // 字段允许修改
|
||||||
setting: {},
|
setting: {},
|
||||||
},
|
},
|
||||||
level: {
|
grade: {
|
||||||
label: "年级",
|
label: "年级",
|
||||||
rules: ruleRequired,
|
rules: ruleRequiredI(6, 2),
|
||||||
width: "100px",
|
width: "100px",
|
||||||
type: "dropdown",
|
|
||||||
setting: {},
|
|
||||||
search: true,
|
search: true,
|
||||||
add: true, // 字段允许添加
|
add: true, // 字段允许添加
|
||||||
edit: true, // 字段允许修改
|
edit: false, // 字段允许修改
|
||||||
},
|
},
|
||||||
testPaperType: {
|
testPaperType: {
|
||||||
label: "试卷类型",
|
label: "试卷类型",
|
||||||
|
|
@ -184,7 +187,7 @@ const showTable = ref(false);
|
||||||
onMounted(async () => {
|
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 = (
|
tableData.column.testPaperType.setting.datasource = (
|
||||||
await getenum("TestPaperTypeEnum")
|
await getenum("TestPaperTypeEnum")
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,10 @@ const tableData: TableConfig = {
|
||||||
FieldName: "ExamId",
|
FieldName: "ExamId",
|
||||||
FieldValue: props.data[0].examId + "",
|
FieldValue: props.data[0].examId + "",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
FieldName: "ClassId",
|
||||||
|
FieldValue: props.data[0].classId + "",
|
||||||
|
},
|
||||||
], // 默认查询条件
|
], // 默认查询条件
|
||||||
Conditions: [],
|
Conditions: [],
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -624,7 +624,8 @@ function pageSizeChange(o) {
|
||||||
fetchPagedData();
|
fetchPagedData();
|
||||||
}
|
}
|
||||||
function pageIndexChange(o) {
|
function pageIndexChange(o) {
|
||||||
pagination.index = o - 1;
|
console.log(o, "当前索引");
|
||||||
|
pagination.index = o;
|
||||||
fetchPagedData();
|
fetchPagedData();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -636,7 +636,7 @@ function pageSizeChange(o) {
|
||||||
fetchPagedData();
|
fetchPagedData();
|
||||||
}
|
}
|
||||||
function pageIndexChange(o) {
|
function pageIndexChange(o) {
|
||||||
pagination.index = o - 1;
|
pagination.index = o;
|
||||||
fetchPagedData();
|
fetchPagedData();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue