From 0974ad6b2e6882e5e7f32972779f75e24203c53c Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Fri, 26 Nov 2021 21:00:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BA=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/achievement/teach/index.vue | 28 +++++++++++++++++++++++----
 src/pages/achievement/vir/index.vue   | 22 +++++++++++++++++++--
 src/pages/assessment/list/index.vue   | 11 ++++++++---
 3 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/src/pages/achievement/teach/index.vue b/src/pages/achievement/teach/index.vue
index 55a0946..a5ce34b 100644
--- a/src/pages/achievement/teach/index.vue
+++ b/src/pages/achievement/teach/index.vue
@@ -77,8 +77,11 @@
 </template>
 
 <script>
+import { mapState, mapActions } from "vuex";
+import Setting from "@/setting";
 import util from "@/libs/util";
 import echarts from "echarts";
+import axios from 'axios';
 
 export default {
     data() {
@@ -97,7 +100,8 @@ export default {
             pageSize: 10,
             total: 0,
             peopleNum: 0, // 总人数
-            avgScore: 0 // 平均分
+            avgScore: 0, // 平均分
+            token: btoa(util.local.get(Setting.tokenKey)),
         };
     },
     watch: {
@@ -143,11 +147,27 @@ export default {
         exportData() { // 导出(有勾选：就导勾选中的；没有勾选：就导全部)
             if (this.multipleSelection.length) {
                 let ids = this.multipleSelection.map(item => {
-                    return item.projectId;
+                    return item.reportId;
                 });
-                location.href = `${this.api.exportAssessmentInfo}?ids=${ids.toString()}`;
+                axios.get(`${this.api.exportAssessmentInfo}?assessmentId=${this.assessmentId}&classId=${this.classId}&ids=${ids.toString()}`,{
+                    headers: {
+                        token: this.token
+                    },
+                    responseType: 'blob'
+                }).then((res) => {
+                    util.downloadFileDirect(`按数据库统计使用概况导出.xls`,new Blob([res.data]))
+                }).catch(res => {})
+                // location.href = `${this.api.exportAssessmentInfo}?assessmentId=${this.assessmentId}&classId=${this.classId}&token=${this.token}&ids=${ids.toString()}`;
             } else {
-                location.href = `${this.api.exportAssessmentInfo}?ids=`;
+                axios.get(`${this.api.exportAssessmentInfo}?assessmentId=${this.assessmentId}&classId=${this.classId}&ids=`,{
+                    headers: {
+                        token: this.token
+                    },
+                    responseType: 'blob'
+                }).then((res) => {
+                    util.downloadFileDirect(`按数据库统计使用概况导出.xls`,new Blob([res.data]))
+                }).catch(res => {})
+                // location.href = `${this.api.exportAssessmentInfo}?assessmentId=${this.assessmentId}&classId=${this.classId}&token=${this.token}&ids=`;
             }
         },
         handleDelete(row) { // 删除
diff --git a/src/pages/achievement/vir/index.vue b/src/pages/achievement/vir/index.vue
index e018550..d96dd8e 100644
--- a/src/pages/achievement/vir/index.vue
+++ b/src/pages/achievement/vir/index.vue
@@ -62,6 +62,8 @@
 </template>
 
 <script>
+import { mapState, mapActions } from "vuex";
+import axios from 'axios'
 import Setting from "@/setting";
 import util from "@/libs/util";
 import echarts from "echarts";
@@ -127,9 +129,25 @@ export default {
                 let ids = this.multipleSelection.map(item => {
                     return item.reportId;
                 });
-                location.href = `${this.api.exportPracticeInfo}?projectId=${this.projectId}&token=${this.token}&ids=${ids.toString()}`;
+                axios.get(`${this.api.exportPracticeInfo}?projectId=${this.projectId}&ids=${ids.toString()}`,{
+                    headers: {
+                        token: this.token
+                    },
+                    responseType: 'blob'
+                }).then((res) => {
+                    util.downloadFileDirect(`按数据库统计使用概况导出.xls`,new Blob([res.data]))
+                }).catch(res => {})
+                // location.href = `${this.api.exportPracticeInfo}?projectId=${this.projectId}&ids=${ids.toString()}`;
             } else {
-                location.href = `${this.api.exportPracticeInfo}?projectId=${this.projectId}&token=${this.token}&ids=`;
+                axios.get(`${this.api.exportPracticeInfo}?projectId=${this.projectId}&ids=`,{
+                    headers: {
+                        token: this.token
+                    },
+                    responseType: 'blob'
+                }).then((res) => {
+                    util.downloadFileDirect(`按数据库统计使用概况导出.xls`,new Blob([res.data]))
+                }).catch(res => {})
+                // location.href = `${this.api.exportPracticeInfo}?projectId=${this.projectId}&ids=`;
             }
         },
         handleDelete(row) {
diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue
index bd53800..c12f1b9 100644
--- a/src/pages/assessment/list/index.vue
+++ b/src/pages/assessment/list/index.vue
@@ -187,7 +187,8 @@ export default {
             multipleSelection: [], // 多选
             listLoading:false,// 列表加载
             ticker: null, // 倒计时定时器
-            sss:1
+            sss:1,
+            datassdata:0,
         };
     },
     watch: {
@@ -263,6 +264,7 @@ export default {
             }
         },
         getData() {
+            this.datassdata = this.datassdata+1
             this.listLoading = true;
             this.listData.splice(0);
             this.sss = 0
@@ -300,8 +302,11 @@ export default {
                         }
                     }
                 });
-                this.sss = 1
-                this.beginTimer()
+                this.sss = 1;
+                if(this.datassdata == 1){
+                    this.beginTimer()
+                }
+                // setTimeout(,3000)
                 this.listLoading = false;
             }).catch(err => {
                 this.listLoading = false;