diff --git a/src/views/standard/test/contrast.vue b/src/views/standard/test/contrast.vue
index 5921159..3ca566e 100644
--- a/src/views/standard/test/contrast.vue
+++ b/src/views/standard/test/contrast.vue
@@ -17,11 +17,7 @@
>{{ item }}
- 对比成绩等级设置
@@ -149,7 +145,7 @@
:close-on-click-modal="false"
title="等级设置"
:visible.sync="diaLogBox"
- width="720px"
+ width="800px"
@closed="closeDia"
>
@@ -160,9 +156,9 @@
v-model="fromData.type"
@change="changeType"
>
-
-
-
+
+
+
@@ -200,17 +196,17 @@
type="number"
v-model="item[1]"
:min="item[2]"
- :max="
- index == 0 ? 100 : fromData.levels[index - 1][2] - 0.1
- "
+ :max="index == 0 ? 100 : fromData.levels[index - 1][2]"
@keydown.native="keydownRange($event)"
>
%
- ({{
+ ({{ index != 0 ? "含" : ""
+ }}{{
Number(((item[1] / 100) * examPaperScore).toFixed(1))
}}分)
+ {{ index != 0 ? "含" : "" }}
~
@@ -219,15 +215,19 @@
type="number"
v-model="item[2]"
:min="0"
- :max="item[1] - 1"
+ :max="item[1]"
@keydown.native="keydownRange($event)"
>
%
- ({{
+ ({{ index < fromData.levels.length - 1 ? "不含" : ""
+ }}{{
Number(((item[2] / 100) * examPaperScore).toFixed(1))
}}分)
+ {{
+ index < fromData.levels.length - 1 ? "不含" : ""
+ }}
{
+ let arrTxt = ["优秀", "良好", "合格", "不合格"];
+ return [arrTxt[index], item[1], item[2]];
+ });
+ } else if (val == 1) {
+ this.fromData.levels = this.fromData.levels.map((item, index) => {
+ let arrTxt = ["A", "B", "C", "D"];
+ return [arrTxt[index], item[1], item[2]];
+ });
+ } else {
+ this.fromData.levels = this.fromData.levels.map((item, index) => {
+ return ["", item[1], item[2]];
+ });
+ }
}
},
savefrom() {
@@ -373,7 +379,7 @@ export default {
});
for (let i = 0; i < nums.length; i++) {
console.log(nums[i + 1] && nums[i + 1] >= nums[i]);
- if (nums[i + 1] && nums[i + 1] >= nums[i]) {
+ if (nums[i + 1] && nums[i + 1] > nums[i]) {
ERR_OK = true;
this.$message.warning("高等级比例不能低于低等级比例!请检查");
break;
@@ -382,6 +388,7 @@ export default {
if (ERR_OK) return;
this.tableData = [];
this.tableData2 = [];
+ this.defaultLevels.type = this.fromData.type;
this.defaultLevels.levelType = this.fromData.levelType;
this.defaultLevels.levels = [...this.fromData.levels];
sessionStorage.setItem("levelFromData", JSON.stringify(this.fromData));
@@ -396,6 +403,7 @@ export default {
const { data, info, status } = await this.$request.defaultLevels();
if (status === 0) {
this.defaultLevels = { ...data } || {
+ type: 0,
levelType: 0,
levels: [
["优秀", 100, 90],
@@ -406,6 +414,10 @@ export default {
};
this.fromData.levelType = this.defaultLevels.levelType;
this.fromData.levels = [...this.defaultLevels.levels];
+ sessionStorage.setItem(
+ "levelFromData",
+ JSON.stringify(this.defaultLevels)
+ );
} else {
this.$message.error(info);
}