diff --git a/public/tex-mml-chtml.js b/public/Temp/js/tex-mml-chtml.js index b7da2e5..b7da2e5 100644 --- a/public/tex-mml-chtml.js +++ b/public/Temp/js/tex-mml-chtml.js diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js index 4450ae5..a0d5e8d 100644 --- a/src/api/apis/apis.js +++ b/src/api/apis/apis.js @@ -1287,6 +1287,15 @@ export default { data }); }, + // 导出随堂问单科多课时报表 + pExportPhaseAnswerReport(data) { + return service({ + url: setUpUrls.pExportPhaseAnswerReport, + method: "POST", + data, + responseType: 'arraybuffer', + }); + }, /** 平台管理 */ //账户管理 @@ -1593,7 +1602,8 @@ export default { return service({ url: setUpUrls.exportExamMultiReport, method: "POST", - data + data, + responseType: 'arraybuffer', }); }, // 查询即时测多班默认等级列表 @@ -1651,7 +1661,8 @@ export default { return service({ url: setUpUrls.exportTClassAndStudent, method: "POST", - data + data, + responseType: 'arraybuffer', }); }, // 删除班级信息(新) diff --git a/src/api/axios.js b/src/api/axios.js index 70fd450..529fa41 100644 --- a/src/api/axios.js +++ b/src/api/axios.js @@ -20,17 +20,15 @@ service.interceptors.request.use( (config) => { NProgress.start(); // config.headers["Content-Type"] = "application/json;charset=UTF-8"; - const source = axios.CancelToken.source(); store.commit("setTokenSources", [source.token, source.cancel]); config.cancelToken = source.token; - const role = store.getters.info.showRole || store.getters.info.permissions[0].role; + const role = store.getters.info?.showRole if (role == "ROLE_BANZHUREN") { - const classes = store.getters.classes + const classes = store.getters?.classes config.manager = 1 config.classes = classes } - console.log(config) return config; }, (error) => { diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js index cf7c8d4..d013f3c 100644 --- a/src/api/urls/apis.js +++ b/src/api/urls/apis.js @@ -364,6 +364,9 @@ export default { // 载指定版本授课端 pGetAppDownloadUrl: "/api_html/personal/getAppDownloadUrl", + //导出随堂问单科多课时报表 + pExportPhaseAnswerReport: "/api_html/personal/exportPhaseAnswerReport", + // 修改密码 changePwd: "/api_html/changePwd", diff --git a/src/components/exportDia.vue b/src/components/exportDia.vue index 87032b9..dfbc32f 100644 --- a/src/components/exportDia.vue +++ b/src/components/exportDia.vue @@ -24,13 +24,17 @@ - + @@ -89,7 +93,7 @@ export default { return item.studentId }) } - this.$emit('exportData', { studentIds: studentIds }) + this.$emit('exportData', studentIds) }, cancel() { if (this.exportType == 2) { @@ -116,4 +120,30 @@ export default { cursor: pointer; } } + +:deep(.el-dialog) { + .el-dialog__body { + padding: 0 20px 10px; + } + + .down-item { + font-size: 15px; + margin-bottom: 10px; + + .tit { + line-height: 18px; + padding: 10px 0; + } + } + + .export-tit { + text-align: center; + font-size: 16px; + padding-bottom: 10px; + } +} + +.dialog-footer { + text-align: center; +} \ No newline at end of file diff --git a/src/views/basic/ask/analysis.vue b/src/views/basic/ask/analysis.vue index 145f9ba..c5ce7ee 100644 --- a/src/views/basic/ask/analysis.vue +++ b/src/views/basic/ask/analysis.vue @@ -2,7 +2,10 @@
@@ -14,7 +17,7 @@
- + @@ -56,6 +59,7 @@ export default { role: "", loading: false, classId: "", + className: "", subjectNames: "", id: [], type: 1, @@ -76,6 +80,7 @@ export default { this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role; this.types = Number(this.$route.query.types) + this.className = this.$route.query.className const queryData = JSON.parse(this.$route.query.params) this.classId = queryData.classId console.log(this.$route.query) @@ -189,13 +194,16 @@ export default { } } if (this.types == 1) { + query.periodId = this.id[0] query.type = this.type - 1 - } else if (this.types == 3) { - query.subjectNames = this.subjectNames + } else { + query.periodIds = this.id + if (this.types == 3) { + query.subjectNames = this.subjectNames + } } this.loading = true; let { data, info, status } = await queryData({ - periodIds: this.id, classId: this.classId, ...query, }); @@ -223,17 +231,20 @@ export default { queryData = this.$request.periodStudentReport } query.type = this.type - 1 - } else if (this.types == 2) { - queryData = this.$request.phaseAnswerReport - } else if (this.types == 3) { - queryData = this.$request.cTPhaseAnswerReport + query.periodId = this.id[0] + } else { + query.periodIds = this.id + 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({ - periodIds: this.id, onlyRate: true, ...query, }); @@ -262,8 +273,16 @@ export default { } else if (studentIds.length > 0) { query.studentIds = studentIds } - const data = await this.$request.exportPeriodReport({ - periodIds: this.id, + let exportPeriodReport = "" + if (this.id.length == 1) { + query.periodId = this.id[0] + exportPeriodReport = this.$request.exportPeriodReport + } else { + query.periodIds = this.id + exportPeriodReport = this.role == "ROLE_PERSONAL" ? this.$request.pExportPhaseAnswerReport : this.$request.exportPhaseAnswerReport + } + const data = await exportPeriodReport({ + classId: this.classId, ...query }); this.exportLoading = false; diff --git a/src/views/basic/ask/components/detail.vue b/src/views/basic/ask/components/detail.vue index 66869e3..6facd18 100644 --- a/src/views/basic/ask/components/detail.vue +++ b/src/views/basic/ask/components/detail.vue @@ -23,7 +23,8 @@
  • 科目：{{ detail.subjectName }}
    • -
  • 课时总数：{{ detail.title }}
    • +
  • 课时名称：{{ detail.title }}
    • +
  • 课时总数：{{ id.length }}
  • 课时时长：{{ detail.duration }}分钟
  • 反馈时长：{{ setDuration(detail.consumingDuration) }} @@ -45,6 +46,7 @@