diff --git a/src/views/standard/test/analysis.vue b/src/views/standard/test/analysis.vue index 938a3cf..d47eec4 100644 --- a/src/views/standard/test/analysis.vue +++ b/src/views/standard/test/analysis.vue @@ -1003,7 +1003,7 @@ div::-webkit-scrollbar-thumb { .setMinScore { position: absolute; bottom: 0; - right: 50px; + right: 0px; } } .score-ipt { diff --git a/src/views/standard/test/contrast.vue b/src/views/standard/test/contrast.vue index 5296236..07e3439 100644 --- a/src/views/standard/test/contrast.vue +++ b/src/views/standard/test/contrast.vue @@ -46,11 +46,13 @@ align="center" fixed > - + + + 编号 *等级名称 - *等级最高 - *等级最低 - + *等级最高 + *等级最低 +

-

+

- {{ fromData.levelType == 1 ? "%" : "分" }} - + % +

-

+

~

+

- {{ fromData.levelType == 1 ? "%" : "分" }} + % +

-

+

{ + nums.push(Number(item[1])); + nums.push(Number(item[2])); + }); + 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])) { + ERR_OK = true; + this.$message.warning("高等级比例不能低于低等级比例!请检查"); + break; + } } + if (ERR_OK) return; this.tableData = []; this.tableData2 = []; this.defaultLevels.levelType = this.fromData.levelType; @@ -381,6 +413,15 @@ export default { async _QueryData(params) { let query = {}; if (params) { + if (params.levelType == 0) { + params.levels = params.levels.map((item) => { + console.log(item); + item[1] = ((item[1] / 100) * this.examPaperScore).toFixed(1); + item[2] = ((item[2] / 100) * this.examPaperScore).toFixed(1); + return item; + }); + } + query = { ...params }; } const { data, info, status } = await this.$request.examMultiClassReport({ @@ -389,6 +430,7 @@ export default { }); if (status === 0) { this.title = data.title; + this.examPaperScore = data.examPaperScore || 100; this.subjectNames = data.subjectName; this.tableData = data.classes || []; this.tableData2 = @@ -501,11 +543,18 @@ export default { padding-right: 5px; } display: flex; + .item { + width: 40px; + } .item1 { padding-left: 10px; - width: 15%; + width: 10%; } .item2 { + width: 18%; + } + .item3 { + padding-left: 12px; flex: 1; } .score-ipt { diff --git a/src/views/standard/test/index.vue b/src/views/standard/test/index.vue index 3912140..81aea6a 100644 --- a/src/views/standard/test/index.vue +++ b/src/views/standard/test/index.vue @@ -539,7 +539,12 @@ >

-

已考试卷信息

+

+ 已考试卷信息 + (相同报表名称后的数字代表同一份试卷的考试次数,例如:模拟卷_1指模拟卷第1次考试成绩,模拟卷_2指模拟卷第2次考试成绩) +

共筛选出{{ classTable.length }}个班级的已考试卷,不同班级请选择同一份试卷进行对比 { + data?.list?.map((item) => { item.loading = false; return item; }) || []; @@ -1354,6 +1359,7 @@ div::-webkit-scrollbar-thumb { } .red { font-style: normal; + font-size: 12px; color: #f30; } .sel {