diff --git a/src/views/basic/test/components/contrast.vue b/src/views/basic/test/components/contrast.vue index 689913d..f7c1078 100644 --- a/src/views/basic/test/components/contrast.vue +++ b/src/views/basic/test/components/contrast.vue @@ -162,8 +162,9 @@ export default { }; }, async created() { - await this._QueryData(); + this.examPaperScore = Number(this.$route.query.examPaperScore || 100) await this._QueryDefaultLevels(); + await this._QueryData(); }, destroyed() { sessionStorage.setItem("levelFromData", ""); @@ -256,10 +257,7 @@ export default { 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, - }); + this._QueryData(); }, async _QueryDefaultLevels() { @@ -285,17 +283,15 @@ export default { this.$message.error(info); } }, - async _QueryData(params) { + async _QueryData() { let query = {}; - if (params) { - let paramObj = JSON.parse(JSON.stringify(params)) - if (paramObj.levelType == 0) { - paramObj.levels = paramObj.levels.map((item) => { - item[1] = ((item[1] / 100) * this.examPaperScore).toFixed(1); - item[2] = ((item[2] / 100) * this.examPaperScore).toFixed(1); - return item; - }); - } + let paramObj = JSON.parse(JSON.stringify(this.fromData)) + if (paramObj.levelType == 0) { + paramObj.levels = paramObj.levels.map((item) => { + item[1] = ((item[1] / 100) * this.examPaperScore).toFixed(1); + item[2] = ((item[2] / 100) * this.examPaperScore).toFixed(1); + return item; + }); query = { ...paramObj }; } const { data, info, status } = await this.$request.examMultiClassReport({ diff --git a/src/views/basic/test/list.vue b/src/views/basic/test/list.vue index 755b118..267b373 100644 --- a/src/views/basic/test/list.vue +++ b/src/views/basic/test/list.vue @@ -237,6 +237,7 @@ export default { subjectName: obj.subjectName, title: obj.title, type: 4, + examPaperScore: obj.examPaperScore, params: this.$route.query.params }, });