From 22095aba9f533ef1f735f447efe7680c6887d922 Mon Sep 17 00:00:00 2001 From: 梁保满 Date: Thu, 25 Jan 2024 10:37:16 +0800 Subject: [PATCH] 接口联调 --- src/api/apis/apis.js | 3 ++- src/components/charts/lineChart.vue | 5 +++-- src/components/charts/radarChart.vue | 4 ++-- src/components/exportDia.vue | 40 ++++++++++++++++++++++++++++++++-------- src/views/basic/ask/analysis.vue | 64 ++++++++++++++++++++++++++++++---------------------------------- src/views/basic/ask/components/answerQustion.vue | 221 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------- src/views/basic/ask/list.vue | 14 ++++++++------ src/views/basic/test/analysis.vue | 2 +- src/views/basic/test/components/multipleSubTest.vue | 23 +++++++++++++---------- src/views/basic/test/components/multipleTest.vue | 26 +++++++++++++------------- src/views/basic/test/components/scoreSet.vue | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------- src/views/basic/test/components/test.vue | 475 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- src/views/basic/test/list.vue | 36 ++++++++++++++++++++++++++---------- src/views/examinationPaper/edit.vue | 470 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- 14 files changed, 838 insertions(+), 659 deletions(-) diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js index ad54316..4450ae5 100644 --- a/src/api/apis/apis.js +++ b/src/api/apis/apis.js @@ -1675,7 +1675,8 @@ export default { return service({ url: setUpUrls.scoreTemplate, method: "POST", - data + data, + responseType: 'arraybuffer', }); }, // 导入即时测报表分数 diff --git a/src/components/charts/lineChart.vue b/src/components/charts/lineChart.vue index 551b985..7cf3ae4 100644 --- a/src/components/charts/lineChart.vue +++ b/src/components/charts/lineChart.vue @@ -9,7 +9,8 @@ export default { id: String, params: Array, xAxis: Array, - colors: Array + colors: Array, + formatterYAxis: true }, watch: { params: { @@ -67,7 +68,7 @@ export default { axisLabel: { color: "#666", formatter: function (name) { - return name + "%" + return that.formatterYAxis ? `${name} %` : name }, }, }, diff --git a/src/components/charts/radarChart.vue b/src/components/charts/radarChart.vue index 334e07c..17594a4 100644 --- a/src/components/charts/radarChart.vue +++ b/src/components/charts/radarChart.vue @@ -57,8 +57,8 @@ export default { radar: { indicator: [...that.params.indicator], splitNumber: 5, - center: ['50%', '48%'], - radius: "80%", + center: ['50%', '65%'], + radius: "90%", shape: "polygon", nameGap: 6, axisLine: { diff --git a/src/components/exportDia.vue b/src/components/exportDia.vue index 6f00e44..7961ee8 100644 --- a/src/components/exportDia.vue +++ b/src/components/exportDia.vue @@ -1,6 +1,7 @@
@@ -50,11 +54,15 @@ export default { } }, watch: { - diaShow: function (nVal) { - if (nVal) { - this.downType = 1 - } + diaShow: { + handler: function (nVal) { + if (nVal) { + this.downType = 1 + } + }, + immediate: true } + }, methods: { changeDownType() { @@ -82,7 +90,23 @@ export default { } else { this.$emit('cancel') } + }, + closeDia() { + this.$emit('cancel') + this.exportType = 1 } } } - \ No newline at end of file + + \ No newline at end of file diff --git a/src/views/basic/ask/analysis.vue b/src/views/basic/ask/analysis.vue index f8508a9..145f9ba 100644 --- a/src/views/basic/ask/analysis.vue +++ b/src/views/basic/ask/analysis.vue @@ -18,7 +18,7 @@ - + @@ -55,6 +55,8 @@ export default { return { role: "", loading: false, + classId: "", + subjectNames: "", id: [], type: 1, tabList: [], @@ -74,6 +76,10 @@ export default { this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role; this.types = Number(this.$route.query.types) + const queryData = JSON.parse(this.$route.query.params) + this.classId = queryData.classId + console.log(this.$route.query) + this.subjectNames = this.$route.query.subjectNames.split(',') if (this.types == 1) { this.tabList = [{ name: "答题表现", value: 1 }, { name: "学生问答表现", value: 2 }, @@ -88,6 +94,7 @@ export default { { name: "学生问答表现", value: 2 }, { name: "学生互动表现", value: 3 }] } + this.type = this.tabList[0].value this.id = JSON.parse(this.$route.query.id) this.status = this.$route.query.status ? this.$route.query.status : 0; this._QueryData(); @@ -105,7 +112,6 @@ export default { this.type = type; this.page = 1; this._QueryData(); - this._QueryDataQuestionRank() }, setDuration(times) { let m = parseInt(times / 1000 / 60); @@ -134,7 +140,7 @@ export default { this.$request.pPeriodDetail : this.$request.periodDetail; let { data, info, status } = await periodDetail({ - periodId: this.id[0], + periodIds: this.id, }); if (status == 0) { this.detail = { ...data }; @@ -157,7 +163,8 @@ export default { query.size = this.size queryData = this.type == 1 ? this.$request.pPeriodQuestionReport - : this.$request.pPeriodStudentReport + : this.$request.pPeriodStudentReport; + } else if (this.types == 2) { queryData = this.type == 1 @@ -172,7 +179,7 @@ export default { query.size = this.size queryData = this.type == 1 ? this.$request.periodQuestionReport - : this.$request.periodStudentReport + : this.$request.periodStudentReport; } else if (this.types == 2) { queryData = this.type == 1 ? this.$request.periodQuestionReport @@ -183,11 +190,13 @@ export default { } if (this.types == 1) { query.type = this.type - 1 + } else if (this.types == 3) { + query.subjectNames = this.subjectNames } this.loading = true; let { data, info, status } = await queryData({ - // periodId: this.id, - periodId: this.id[0], + periodIds: this.id, + classId: this.classId, ...query, }); this.loading = false; @@ -206,43 +215,31 @@ export default { }, async _QueryDataQuestionRank() { let queryData; - if (this.role == "ROLE_PERSONAL") { - if (this.types == 1) { + let query = {}; + if (this.types == 1) { + if (this.role == "ROLE_PERSONAL") { queryData = this.$request.pPeriodStudentReport - } - else if (this.types == 2) { - queryData = this.type == 1 - ? this.$request.pPeriodStudentReport - : this.type == 2 ? this.$request.phaseAnswerReport : this.$request.phaseInteractiveReport; - } else if (this.types == 3) { - this.type == 2 ? this.$request.pPhaseAnswerReport : this.$request.pPhaseInteractiveReport; - } - } else { - if (this.types == 1) { + } else { queryData = this.$request.periodStudentReport - } else if (this.types == 2) { - queryData = this.type == 1 - ? this.$request.periodStudentReport - : this.type == 2 ? this.$request.phaseAnswerReport : this.$request.phaseInteractiveReport; - } else if (this.types == 3) { - queryData = this.type == 2 ? this.$request.cTPhaseAnswerReport : this.$request.cTPhaseInteractiveReport; } - } - - let query = {}; - if (this.types == 1) { query.type = this.type - 1 + } else if (this.types == 2) { + queryData = this.$request.phaseAnswerReport + } else if (this.types == 3) { + queryData = this.$request.cTPhaseAnswerReport + } + if (this.types != 1) { + query.classId = this.classId } this.loading = true; let { data, info, status } = await queryData({ - // periodId: this.id, - periodId: this.id[0], + periodIds: this.id, onlyRate: true, ...query, }); this.loading = false; if (status === 0) { - this.exportStudent = [...data?.list] || [] + this.exportStudent = data?.list && [...data?.list] || [] } else { this.$message.error(info); } @@ -266,8 +263,7 @@ export default { query.studentIds = studentIds } const data = await this.$request.exportPeriodReport({ - // periodId: this.id, - periodId: this.id[0], + periodIds: this.id, ...query }); this.exportLoading = false; diff --git a/src/views/basic/ask/components/answerQustion.vue b/src/views/basic/ask/components/answerQustion.vue index 4695ec2..170ace2 100644 --- a/src/views/basic/ask/components/answerQustion.vue +++ b/src/views/basic/ask/components/answerQustion.vue @@ -1,69 +1,98 @@ - diff --git a/src/views/basic/ask/list.vue b/src/views/basic/ask/list.vue index f346ecd..e6b99c4 100644 --- a/src/views/basic/ask/list.vue +++ b/src/views/basic/ask/list.vue @@ -34,7 +34,7 @@