From f9916d4cc91660e4829a5d7ee25b2c90c6058b6b Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Fri, 26 Jan 2024 17:22:33 +0800
Subject: [PATCH] 导出摸板

---
 src/views/basic/ask/analysis.vue                    |  9 ++++++---
 src/views/basic/test/components/multipleSubTest.vue | 10 ++++++----
 src/views/basic/test/components/multipleTest.vue    |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/views/basic/ask/analysis.vue b/src/views/basic/ask/analysis.vue
index c5ce7ee..cefb2c6 100644
--- a/src/views/basic/ask/analysis.vue
+++ b/src/views/basic/ask/analysis.vue
@@ -276,10 +276,10 @@ export default {
       let exportPeriodReport = ""
       if (this.id.length == 1) {
         query.periodId = this.id[0]
-        exportPeriodReport = this.$request.exportPeriodReport
+        exportPeriodReport = this.role == "ROLE_PERSONAL" ? this.$request.pExportPhaseAnswerReport : this.$request.exportPeriodReport
       } else {
         query.periodIds = this.id
-        exportPeriodReport = this.role == "ROLE_PERSONAL" ? this.$request.pExportPhaseAnswerReport : this.$request.exportPhaseAnswerReport
+        exportPeriodReport = this.$request.cTExportPhaseAnswerReport
       }
       const data = await exportPeriodReport({
         classId: this.classId,
@@ -290,7 +290,10 @@ export default {
         let blob = new Blob([data], {
           type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
         });
-        downloadFile(this.status ? "随堂问-已归档单课时报表.xlsx" : "随堂问-单课时报表.xlsx", blob);
+        let name = this.types == 1 ? "随堂问-单课时报表.xlsx" :
+          this.types == 2 ? `随堂问-${this.className}-${this.subjectNames[0]}汇总分析报表.xlsx` :
+            `随堂问-${this.className}-多科汇总分析报表.xlsx`
+        downloadFile(this.status ? "随堂问-已归档单课时报表.xlsx" : name, blob);
       } else {
         this.$message.error("下载失败");
       }
diff --git a/src/views/basic/test/components/multipleSubTest.vue b/src/views/basic/test/components/multipleSubTest.vue
index 58e2e12..3fcb603 100644
--- a/src/views/basic/test/components/multipleSubTest.vue
+++ b/src/views/basic/test/components/multipleSubTest.vue
@@ -244,7 +244,9 @@ export default {
       } else if (studentIds.length > 0) {
         query.studentIds = studentIds
       }
-      const data = await this.$request.exportExamReport({
+
+
+      const data = await this.$request.cTExportPhaseExamReport({
         classId: this.classId,
         examIds: this.ids,
         ...query
@@ -256,11 +258,11 @@ export default {
         });
         downloadFile(
           this.status
-            ? "即时测-已归档单卷测练报表.xlsx"
-            : "即时测-单卷测练报表.xlsx",
+            ? "即时测-已归档多科汇总报表.xlsx"
+            : "即时测-多科汇总报表.xlsx",
           blob
         );
-        this.$message.error("下载成功");
+        this.$message.success("下载成功");
         this.cancel()
       } else {
         this.$message.error("下载失败");
diff --git a/src/views/basic/test/components/multipleTest.vue b/src/views/basic/test/components/multipleTest.vue
index 999888a..db2f881 100644
--- a/src/views/basic/test/components/multipleTest.vue
+++ b/src/views/basic/test/components/multipleTest.vue
@@ -224,7 +224,7 @@ export default {
           type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
         });
         downloadFile("即时测-单科多卷报表.xlsx", blob);
-        this.$message.error("下载成功");
+        this.$message.success("下载成功");
         this.cancel()
       } else {
         this.$message.error("下载失败");
--
libgit2 0.21.4