diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js index 7ea48cb..876b238 100644 --- a/src/api/apis/apis.js +++ b/src/api/apis/apis.js @@ -1593,6 +1593,15 @@ export default { return service({ url: setUpUrls.exportExamMultiReport, method: "POST", + responseType: 'arraybuffer', + data, + }); + }, + // 查询即时测多班默认等级列表 + defaultLevels(data) { + return service({ + url: setUpUrls.defaultLevels, + method: "POST", data }); }, diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js index 7495d0f..aeeadff 100644 --- a/src/api/urls/apis.js +++ b/src/api/urls/apis.js @@ -415,4 +415,6 @@ export default { examMultiClassReport: "/api_html/teaching/examMultiClassReport", //导出即时测多班报表 exportExamMultiReport: "/api_html/teaching/exportExamMultiReport", + //查询即时测多班默认等级列表 + defaultLevels: "/api_html/teaching/defaultLevels", } diff --git a/src/views/standard/setUp/account.vue b/src/views/standard/setUp/account.vue index 58ed870..21278e6 100644 --- a/src/views/standard/setUp/account.vue +++ b/src/views/standard/setUp/account.vue @@ -213,7 +213,12 @@ - + -
+
确 定 取 消
- + -
+
确 定 取 消
- + { if (valid) { + this.loadingSave = true; let params = { ...this.formAddCount }; params.password = encryptLoginPassword(params.password); const { data, status, info } = await this.$request.addUser({ ...params, }); + this.loadingSave = false; if (status === 0) { this.$message.success(info); this._QueryData(4); @@ -559,6 +577,7 @@ export default { saveCount() { this.$refs.formCount.validate(async (valid) => { if (valid) { + this.loadingSave = true; const { data, status, info } = this.role != "ROLE_JITUAN" ? await this.$request.updateUser({ @@ -569,6 +588,7 @@ export default { type: 3, ...this.formCount, }); + this.loadingSave = false; if (status === 0) { this.$message.success(info); this.diaCount = false; diff --git a/src/views/standard/setUp/conglomerate.vue b/src/views/standard/setUp/conglomerate.vue index cae63c6..23d1067 100644 --- a/src/views/standard/setUp/conglomerate.vue +++ b/src/views/standard/setUp/conglomerate.vue @@ -109,7 +109,7 @@ -
+
确 定 取 消
@@ -159,7 +159,7 @@ -
+
确 定 取 消
@@ -212,7 +212,7 @@ -
+
确 定 @@ -242,7 +242,7 @@ -
+
确 定 @@ -319,6 +319,8 @@ export default { schoolName: "", }, showDelSclBtn: false, + + loadingSave: false, }; }, created() { @@ -397,10 +399,12 @@ export default { this.$refs["formCL"].validate(async (valid) => { // 验证通过：保存 if (valid) { + this.loadingSave = true; const { data, status, info } = await this.$request.saveRegion({ regionId: this.formCL.regionId, regionName: this.formCL.regionName, }); + this.loadingSave = false; if (status === 0) { this._QueryData(); this.$message.success(info); @@ -419,12 +423,14 @@ export default { this.$refs["formAdmin"].validate(async (valid) => { // 验证通过：保存 if (valid) { + this.loadingSave = true; let params = { ...this.formAdmin }; params.password = encryptLoginPassword(this.formAdmin.password); delete params.schoolName; const { data, status, info } = await this.$request.addSchoolManager({ ...params, }); + this.loadingSave = false; if (status === 0) { this.$message.success(info); this.diaAdmin = false; @@ -442,11 +448,13 @@ export default { this.$refs["formSchool"].validate(async (valid) => { // 验证通过：保存 if (valid) { + this.loadingSave = true; let query = { ...this.formSchool }; query.sections = query.sections.join(","); const { data, status, info } = await this.$request.saveSchool({ ...query, }); + this.loadingSave = false; if (status === 0) { this.$message.success(info); this.diaSchool = false; @@ -466,9 +474,11 @@ export default { this.$refs["formSchool2"].validate(async (valid) => { // 验证通过：保存 if (valid) { + this.loadingSave = true; const { data, status, info } = await this.$request.saveSchool({ ...this.setFormSchool, }); + this.loadingSave = false; if (status === 0) { this.$message.success(info); this.diaSchool2 = false; diff --git a/src/views/standard/test/analysis.vue b/src/views/standard/test/analysis.vue index ec47aba..2e5d0db 100644 --- a/src/views/standard/test/analysis.vue +++ b/src/views/standard/test/analysis.vue @@ -482,8 +482,8 @@ - - + + @@ -494,8 +494,9 @@ :min="0" :max="100" @input="lowRange.range[1] > 100 ? (lowRange.range[1] = 100) : ''" + @keydown.native="keydownRange($event)" >{{ lowRange.type == 0 ? "%" : "分" }}(含) + >{{ lowRange.type == 1 ? "%" : "分" }}(含) {{ lowRange.type == 0 ? "%" : "分" }}(含) + >{{ lowRange.type == 1 ? "%" : "分" }}(含) -
+
保存 取 消
@@ -565,12 +572,16 @@ export default { size: 20, total: 0, // 设置低分值 - loadingTange:false, + loadingTange: false, diaMinScore: false, lowRange: { - type: 1, + type: 0, range: [60, 0], }, + defaultLowRange: { + type: 0, + range: [], + }, }; }, created() { @@ -637,26 +648,34 @@ export default { }, // 切换低分设置类型设置默认分值 changeScore() { - this.lowRange.range = [60, 0]; + this.lowRange.range = [...this.defaultLowRange.range]; + }, + // 禁止输入负数 + keydownRange(event) { + if (event.key == "-" || event.key == "e") { + event.returnValue = ""; + } }, // 关闭低分设置 closeDiaMinScore() { - this.lowRange.type = 1; - this.lowRange.range = [60, 0]; + this.lowRange.type = this.defaultLowRange.type; + this.lowRange.range = [...this.defaultLowRange.range]; }, // 保存低分设置 async _SavelowRange() { this.loadingTange = true; - let data = await this.$request.setLowRange({ + let { data, status, info } = await this.$request.setLowRange({ classId: this.classId, subjectName: this.subjectName, ...this.lowRange, }); this.loadingTange = false; - if (data && !data.code) { - this.$message.success(data.info); + if (status === 0) { + this.$message.success(info); this.diaMinScore = false; - this.$message.error(data.info); + this.examDetail(); + } else { + this.$message.error(info); } }, async _QueryData() { @@ -676,10 +695,12 @@ export default { this.paperModifyLog = { ...data?.paperModifyLog }; } this.examReport = { ...data?.examReport }; - this.lowRange = data.lowRange || { + this.defaultLowRange = data.lowRange || { type: 1, range: [60, 0], }; + this.lowRange.type = this.defaultLowRange.type; + this.lowRange.range = [...this.defaultLowRange.range]; } else { this.$message.error(info); } diff --git a/src/views/standard/test/contrast.vue b/src/views/standard/test/contrast.vue index fcddaa3..75b6933 100644 --- a/src/views/standard/test/contrast.vue +++ b/src/views/standard/test/contrast.vue @@ -2,7 +2,7 @@
@@ -36,6 +36,7 @@ @@ -44,36 +45,29 @@ label="班级" align="center" fixed - width="100" - >< + > @@ -131,6 +124,7 @@
- - - + + + @@ -200,6 +190,7 @@ class="score-ipt" v-model="item[0]" :maxlength="12" + @keydown.native="keydownRange($event)" >

@@ -209,6 +200,7 @@ v-model="item[1]" :min="item[2]" :max="index == 0 ? 150 : fromData.levels[index - 1][2]" + @keydown.native="keydownRange($event)" > {{ fromData.levelType == 1 ? "%" : "分" }} -

@@ -219,6 +211,7 @@ v-model="item[2]" :min="0" :max="item[1]" + @keydown.native="keydownRange($event)" > {{ fromData.levelType == 1 ? "%" : "分" }}

@@ -266,6 +259,7 @@ export default { tabList: ["班级对比情况", "学生成绩排名"], type: 0, loading: false, + exportLoading: false, diaLogBox: false, fromData: { type: 1, @@ -277,7 +271,10 @@ export default { ["不合格", 59.9, 0], ], }, - + defaultLevels: { + levelType: 0, + levels: [], + }, tableMaxHeight: 600, tableData: [], tableData2: [], @@ -285,13 +282,24 @@ export default { }, created() { this.ids = this.$route.query.ids; - this.title = this.$route.query.title || ""; - this.subjectNames = this.$route.query.subjectNames; + this._QueryDefaultLevels(); this._QueryData(); }, + destroyed() { + sessionStorage.setItem("levelFromData", ""); + }, methods: { + // 禁止输入负数 + keydownRange(event) { + if (event.key == "-" || event.key == "e") { + event.returnValue = ""; + } + }, print() { - tablePrint("print-content", this.title + "_成绩对比分析"); + tablePrint( + "print-content", + `多班_${this.subjectNames}_${this.title}_测练成绩对比分析` + ); }, setType(type) { console.log(this.$refs.main.offsetHeight - 50); @@ -299,23 +307,21 @@ export default { this.type = type; }, closeDia() { - this.fromData.type = 1; - this.fromData.levelType = 0; - this.fromData.levels = [ - ["优秀", 100, 90], - ["良好", 89.9, 70], - ["合格", 69.9, 60], - ["不合格", 59.9, 0], - ]; + let levelFromData = sessionStorage.getItem("levelFromData"); + if (levelFromData) { + levelFromData = JSON.parse(levelFromData); + this.fromData.type = levelFromData.type; + this.fromData.levelType = levelFromData.levelType; + this.fromData.levels = [...levelFromData.levels]; + } else { + this.fromData.type = 1; + this.fromData.levelType = this.defaultLevels.levelType; + this.fromData.levels = [...this.defaultLevels.levels]; + } }, changeType(val) { if (val == 1) { - this.fromData.levels = [ - ["优秀", 100, 90], - ["良好", 89.9, 70], - ["合格", 69.9, 60], - ["不合格", 59.9, 0], - ]; + this.fromData.levels = [...this.defaultLevels.levels]; } else if (val == 2) { this.fromData.levels = [ ["A", 100, 90], @@ -332,7 +338,6 @@ export default { ]; } }, - changeLevelType() {}, savefrom() { this.tableData = []; this.tableData2 = []; @@ -343,12 +348,34 @@ export default { return; } } + this.defaultLevels.levelType = this.fromData.levelType; + this.defaultLevels.levels = [...this.fromData.levels]; + sessionStorage.setItem("levelFromData", JSON.stringify(this.fromData)); + this.diaLogBox = false; this._QueryData({ levelType: this.fromData.levelType, levels: this.fromData.levels, }); }, + async _QueryDefaultLevels() { + const { data, info, status } = await this.$request.defaultLevels(); + if (status === 0) { + this.defaultLevels = { ...data } || { + levelType: 0, + levels: [ + ["优秀", 100, 90], + ["良好", 89.9, 70], + ["合格", 69.9, 60], + ["不合格", 59.9, 0], + ], + }; + this.fromData.levelType = this.defaultLevels.levelType; + this.fromData.levels = [...this.defaultLevels.levels]; + } else { + this.$message.error(info); + } + }, async _QueryData(params) { let query = {}; if (params) { @@ -358,8 +385,10 @@ export default { examIds: this.ids, ...query, }); - if (status == 200) { - this.tableData = data.classs || []; + if (status === 0) { + this.title = data.title; + this.subjectNames = data.subjectName; + this.tableData = data.classes || []; this.tableData2 = data.students || []; } else { this.$message.error(info); @@ -371,14 +400,19 @@ export default { if (this.exportLoading == true) return; this.exportLoading = true; const data = await this.$request.exportExamMultiReport({ - examId: this.id, + examIds: this.ids, + levels: this.fromData.levels, + levelType: this.fromData.levelType, }); this.exportLoading = false; if (data) { let blob = new Blob([data], { type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", }); - downloadFile("即时测-单卷测练报表.xlsx", blob); + downloadFile( + `多班_${this.subjectNames}_${this.title}_测练成绩对比分析`, + blob + ); } else { this.$message.error("下载失败"); } @@ -487,4 +521,7 @@ export default { } } } +.p1{ + line-height:18px; +} \ No newline at end of file diff --git a/src/views/standard/test/index.vue b/src/views/standard/test/index.vue index d000330..ec4e5e5 100644 --- a/src/views/standard/test/index.vue +++ b/src/views/standard/test/index.vue @@ -33,6 +33,9 @@ collapse-tags > + > +
@@ -547,9 +554,20 @@