随堂问，即时测导出爆表修改

梁保满
1 parent 079cb4cf
Showing 16 changed files with 448 additions and 172 deletions
src/api/apis/apis.js
src/api/urls/apis.js
src/components/exportDia.vue
src/main.js
src/mock/index.js
src/views/basic/ask/analysis.vue
src/views/basic/ask/components/answerQustion.vue
src/views/basic/ask/components/interact.vue
src/views/basic/ask/list.vue
src/views/basic/test/analysis.vue
src/views/basic/test/components/multipleSubTest.vue
src/views/basic/test/components/multipleTest.vue
src/views/basic/test/components/test.vue
src/views/basic/test/list.vue
src/views/examinationPaper/edit.vue
src/views/examinationPaper/index.vue
@@ -1606,15 +1606,6 @@ export default {
   },
-  /** v1.5 */
-  // 教师/个人版查询答题卡列表的分享数量
-  paperShareCount(data) {
-    return service({
-      url: setUpUrls.paperShareCount,
-      method: "POST",
-      data
-    });
-  },
   // 教师/个人版导入备题组卷Word文档
   paperWordUpload(data) {
     return service({
@@ -420,8 +420,6 @@ export default {
   /** v1.5 */
-  // 教师/个人版查询答题卡列表的分享数量
-  paperShareCount: "/api_html/common/paper/paperShareCount",
   // 教师/个人版导入备题组卷Word文档
   paperWordUpload: "/api_html/common/paper/upload",
   // 删除随堂问报表
+<template>
+  <div>
+    <el-dialog :close-on-click-modal="false" :visible.sync="diaShow" width="360px">
+      <div v-show="exportType == 1">
+        <div class="down-item">
+          <p class="tit">是否将学生表现折线图一起导出</p>
+          <el-radio-group v-model="downType" @change="changeDownType">
+            <el-radio :label="1">不导出</el-radio>
+            <el-radio :label="2">导出</el-radio>
+          </el-radio-group>
+        </div>
+        <div class="down-item" v-show="downType == 2">
+          <p class="tit">选择要导出的学生</p>
+          <el-radio-group v-model="exportType">
+            <el-radio :label="1">导出全部</el-radio>
+            <el-radio :label="2">导出制定学生</el-radio>
+          </el-radio-group>
+        </div>
+      </div>
+      <ul v-show="exportType == 2">
+        <p class="export-tit">选择学生</p>
+        <el-table :data="exportStudent" @selection-change="handleSelectionChange" :max-height="300">
+          <el-table-column type="selection"></el-table-column>
+          <el-table-column prop="studentName" label="姓名" align="center"></el-table-column>
+          <el-table-column prop="classRank" label="班名" align="center"></el-table-column>
+          <el-table-column prop="correctRate" label="总正确率" align="center"><template slot-scope="scoped">{{
+            scoped.row.correctRate }}%</template></el-table-column>
+        </el-table>
+      </ul>
+      <div class="dialog-footer" slot="footer">
+        <el-button v-show="downType == 2" size="small" type="primary" round @click="exportData(10)">导出前十</el-button>
+        <el-button size="small" type="primary" round @click="exportData(0)">确 定</el-button>
+        <el-button size="small" type="danger" round @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+export default {
+  name: "exportDia",
+  props: {
+    diaShow: Boolean,
+    exportStudent: Array
+  },
+  data() {
+    return {
+      downType: 1,
+      exportType: 1,
+      multipleSelection: [],
+    }
+  },
+  watch: {
+    diaShow: function (nVal) {
+      if (nVal) {
+        this.downType = 1
+      }
+    }
+  },
+  methods: {
+    changeDownType() {
+      this.exportType = 1
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    exportData(length) {
+      let studentIds = []
+      if (length) {
+        studentIds = this.exportStudent.slice(0, 10).map(item => {
+          return item.studentId
+        })
+      } else {
+        studentIds = this.multipleSelection.map(item => {
+          return item.studentId
+        })
+      }
+      this.$emit('exportData', { studentIds: studentIds })
+    },
+    cancel() {
+      if (this.exportType == 2) {
+        this.exportType = 1
+      } else {
+        this.$emit('cancel')
+      }
+    }
+  }
+}
+</script>
 \ No newline at end of file
@@ -28,7 +28,7 @@ Vue.use(permission)
 NProgress.inc(0.2)
 NProgress.configure({ easing: "ease", speed: 500, showSpinner: false })
-import "@/mock/index.js"
+// import "@/mock/index.js"
 Array.prototype.remove = function (val) {
   var index = this.indexOf(val);
 import Mock from "mockjs"
 Mock.mock(
-  "/api_html/common/paper/paperShareCount", {
+  "/api_html/teaching/paperList", {
   info: "success",
   status: 0,
   data: {
-    myCount: 24,
-    grade: 30
+    myCount: 5,
+    gradeCount: 8,
+    archivedTotal: 6,
+    total: 30,
+    list: [
+      {
+        "sectionName": "小学",
+        "gradeName": "三年级",
+        "id": 107,
+        "tenantId": 9,
+        "regionId": 0,
+        "schoolId": 34,
+        "classId": 696,
+        "thirdId": "",
+        "section": 1,
+        "grade": 3,
+        "subjectName": "语文",
+        "title": "X102_语文_课时 4",
+        "startTime": "2023-04-18 17:43:50",
+        "endTime": "2023-04-18 17:47:06",
+        "calculateStatus": 1,
+        "duration": 196,
+        "status": 0,
+        "consumingDuration": 3140,
+        "classPersonNum": 11,
+        "answeredNum": 1,
+        "unansweredNum": 20,
+        "questionNum": 1,
+        "answerNum": 1,
+        "totalAnswersNum": 1,
+        "totalCorrectAnswersNum": 1,
+        "participationRate": 9.09,
+        "classCorrectRate": 9.09,
+        "answerCorrectRate": 100,
+        "levelConfig": "{\"failed\":0.6,\"pass\":0.8,\"good\":0.9}",
+        "passedNum": 1,
+        "passedRate": 9.09,
+        "excellenNum": 1,
+        "excellenRate": 9.09,
+        "goodNum": 0,
+        "goodRate": 0,
+        "passNum": 0,
+        "passRate": 0,
+        "failedNum": 0,
+        "failedRate": 0,
+        "latestCalculateTime": "2023-04-19 14:08:35",
+        "createdTime": "2023-04-19 14:08:35",
+        "modifiedTime": "2023-04-19 14:08:35",
+        "deleteFlag": 0
+      },
+      {
+        "sectionName": "小学",
+        "gradeName": "二年级",
+        "id": 106,
+        "tenantId": 9,
+        "regionId": 0,
+        "schoolId": 34,
+        "classId": 696,
+        "thirdId": "",
+        "section": 1,
+        "grade": 2,
+        "subjectName": "语文",
+        "title": "X102_语文_课时 2",
+        "startTime": "2023-04-18 15:58:27",
+        "endTime": "2023-04-18 16:01:28",
+        "calculateStatus": 1,
+        "duration": 182,
+        "status": 0,
+        "consumingDuration": 2640,
+        "classPersonNum": 11,
+        "answeredNum": 1,
+        "unansweredNum": 18,
+        "questionNum": 1,
+        "answerNum": 1,
+        "totalAnswersNum": 1,
+        "totalCorrectAnswersNum": 1,
+        "participationRate": 9.09,
+        "classCorrectRate": 9.09,
+        "answerCorrectRate": 100,
+        "levelConfig": "{\"failed\":0.6,\"pass\":0.8,\"good\":0.9}",
+        "passedNum": 1,
+        "passedRate": 9.09,
+        "excellenNum": 1,
+        "excellenRate": 9.09,
+        "goodNum": 0,
+        "goodRate": 0,
+        "passNum": 0,
+        "passRate": 0,
+        "failedNum": 0,
+        "failedRate": 0,
+        "latestCalculateTime": "2023-04-18 16:01:29",
+        "createdTime": "2023-04-18 16:01:28",
+        "modifiedTime": "2023-04-18 16:01:29",
+        "deleteFlag": 0
+      },
+      {
+        "sectionName": "小学",
+        "gradeName": "二年级",
+        "id": 105,
+        "tenantId": 9,
+        "regionId": 0,
+        "schoolId": 34,
+        "classId": 696,
+        "thirdId": "",
+        "section": 1,
+        "grade": 2,
+        "subjectName": "语文",
+        "title": "X102_语文_课时 1",
+        "startTime": "2023-04-18 15:16:11",
+        "endTime": "2023-04-18 15:21:37",
+        "calculateStatus": 1,
+        "duration": 326,
+        "status": 0,
+        "consumingDuration": 76880,
+        "classPersonNum": 11,
+        "answeredNum": 3,
+        "unansweredNum": 16,
+        "questionNum": 1,
+        "answerNum": 1,
+        "totalAnswersNum": 3,
+        "totalCorrectAnswersNum": 2,
+        "participationRate": 27.27,
+        "classCorrectRate": 18.18,
+        "answerCorrectRate": 66.67,
+        "levelConfig": "{\"failed\":0.6,\"pass\":0.8,\"good\":0.9}",
+        "passedNum": 2,
+        "passedRate": 18.18,
+        "excellenNum": 2,
+        "excellenRate": 18.18,
+        "goodNum": 0,
+        "goodRate": 0,
+        "passNum": 0,
+        "passRate": 0,
+        "failedNum": 1,
+        "failedRate": 9.09,
+        "latestCalculateTime": "2023-04-18 15:58:23",
+        "createdTime": "2023-04-18 15:58:23",
+        "modifiedTime": "2023-04-18 15:58:23",
+        "deleteFlag": 0
+      },
+      {
+        "sectionName": "小学",
+        "gradeName": "二年级",
+        "id": 103,
+        "tenantId": 9,
+        "regionId": 0,
+        "schoolId": 34,
+        "classId": 696,
+        "thirdId": "",
+        "section": 1,
+        "grade": 2,
+        "subjectName": "语文",
+        "title": "X102_语文_课时 1",
+        "startTime": "2023-04-18 14:20:16",
+        "endTime": "2023-04-18 14:57:09",
+        "calculateStatus": 1,
+        "duration": 2213,
+        "status": 0,
+        "consumingDuration": 229820,
+        "classPersonNum": 9,
+        "answeredNum": 1,
+        "unansweredNum": 16,
+        "questionNum": 4,
+        "answerNum": 4,
+        "totalAnswersNum": 4,
+        "totalCorrectAnswersNum": 4,
+        "participationRate": 11.11,
+        "classCorrectRate": 11.11,
+        "answerCorrectRate": 100,
+        "levelConfig": "{\"failed\":0.6,\"pass\":0.8,\"good\":0.9}",
+        "passedNum": 1,
+        "passedRate": 11.11,
+        "excellenNum": 1,
+        "excellenRate": 11.11,
+        "goodNum": 0,
+        "goodRate": 0,
+        "passNum": 0,
+        "passRate": 0,
+        "failedNum": 0,
+        "failedRate": 0,
+        "latestCalculateTime": "2023-04-18 15:02:33",
+        "createdTime": "2023-04-18 15:02:32",
+        "modifiedTime": "2023-04-18 15:02:33",
+        "deleteFlag": 0
+      },
+      {
+        "sectionName": "小学",
+        "gradeName": "一年级",
+        "id": 102,
+        "tenantId": 9,
+        "regionId": 0,
+        "schoolId": 34,
+        "classId": 696,
+        "thirdId": "",
+        "section": 1,
+        "grade": 1,
+        "subjectName": "语文",
+        "title": "X102_语文_课时 1",
+        "startTime": "2023-04-18 11:09:20",
+        "endTime": "2023-04-18 13:59:30",
+        "calculateStatus": 1,
+        "duration": 10210,
+        "status": 0,
+        "consumingDuration": 12380,
+        "classPersonNum": 9,
+        "answeredNum": 1,
+        "unansweredNum": 16,
+        "questionNum": 2,
+        "answerNum": 2,
+        "totalAnswersNum": 2,
+        "totalCorrectAnswersNum": 1,
+        "participationRate": 11.11,
+        "classCorrectRate": 5.56,
+        "answerCorrectRate": 50,
+        "levelConfig": "{\"failed\":0.6,\"pass\":0.8,\"good\":0.9}",
+        "passedNum": 0,
+        "passedRate": 0,
+        "excellenNum": 0,
+        "excellenRate": 0,
+        "goodNum": 0,
+        "goodRate": 0,
+        "passNum": 0,
+        "passRate": 0,
+        "failedNum": 1,
+        "failedRate": 11.11,
+        "latestCalculateTime": "2023-04-18 13:59:36",
+        "createdTime": "2023-04-18 13:59:35",
+        "modifiedTime": "2023-04-18 13:59:36",
+        "deleteFlag": 0
+      }
+    ]
   }
 }
 )
@@ -682,8 +911,8 @@ Mock.mock(
           "participationCount": '5',
           "classRank": '1',
           "score": '100',
-          "participationRate":'88',
-          "correctRate":'90',
+          "participationRate": '88',
+          "correctRate": '90',
         },
         {
           "subjectName": "英语",
@@ -691,8 +920,8 @@ Mock.mock(
           "participationCount": '5',
           "classRank": '2',
           "score": '100',
-          "participationRate":'70',
-          "correctRate":'76',
+          "participationRate": '70',
+          "correctRate": '76',
         },
         {
           "subjectName": "语文",
@@ -700,8 +929,8 @@ Mock.mock(
           "participationCount": '5',
           "classRank": '2',
           "score": '100',
-          "participationRate":'99',
-          "correctRate":'100',
+          "participationRate": '99',
+          "correctRate": '100',
         },
       ]
     }],
@@ -35,39 +35,7 @@
             icon="el-icon-printer">打印</el-button>
         </p>
       </div>
-      <el-dialog :close-on-click-modal="false" :visible.sync="diaDown" width="360px">
-        <div v-show="exportType == 1">
-          <div class="down-item">
-            <p class="tit">是否将学生表现折线图一起导出</p>
-            <el-radio-group v-model="downType" @change="changeDownType">
-              <el-radio :label="1">不导出</el-radio>
-              <el-radio :label="2">导出</el-radio>
-            </el-radio-group>
-          </div>
-          <div class="down-item" v-show="downType == 2">
-            <p class="tit">选择要导出的学生</p>
-            <el-radio-group v-model="exportType">
-              <el-radio :label="1">导出全部</el-radio>
-              <el-radio :label="2">导出制定学生</el-radio>
-            </el-radio-group>
-          </div>
-        </div>
-        <ul v-show="exportType == 2">
-          <p class="export-tit">选择学生</p>
-          <el-table :data="exportStudent" @selection-change="handleSelectionChange" :max-height="300">
-            <el-table-column type="selection"></el-table-column>
-            <el-table-column prop="studentName" label="姓名" align="center"></el-table-column>
-            <el-table-column prop="classRank" label="班名" align="center"></el-table-column>
-            <el-table-column prop="correctRate" label="总正确率" align="center"><template slot-scope="scoped">{{
-              scoped.row.correctRate }}%</template></el-table-column>
-          </el-table>
-        </ul>
-        <div class="dialog-footer" slot="footer">
-          <el-button v-show="downType == 2" size="small" type="primary" round @click="exportData(10)">导出前十</el-button>
-          <el-button size="small" type="primary" round @click="exportData(0)">确 定</el-button>
-          <el-button size="small" type="danger" round @click="cancel">取 消</el-button>
-        </div>
-      </el-dialog>
+      <ExportDia :exportStudent="exportStudent" :diaShow="diaShow" @cancel="cancel" @exportData="exportData" />
     </div>
   </div>
 </template>
@@ -96,11 +64,9 @@ export default {
       size: 20,
       total: 0,
       status: 0,
-      diaDown: false,
-      downType: 1,
-      exportType: 1,
+      //导出相关
+      diaShow: false,
       exportStudent: [],
-      multipleSelection: [],
     };
   },
   created() {
@@ -216,7 +182,7 @@ export default {
         }
       }
       if (this.types == 1) {
-        query.type = this.type
+        query.type = this.type - 1
       }
       this.loading = true;
       let { data, info, status } = await queryData({
@@ -265,7 +231,7 @@ export default {
       let query = {};
       if (this.types == 1) {
-        query.type = this.type
+        query.type = this.type - 1
       }
       this.loading = true;
       let { data, info, status } = await queryData({
@@ -282,38 +248,17 @@ export default {
       }
     },
-
+    //导出  
     openDown() {
-      this.diaDown = true;
-      this.downType = 1
+      this.diaShow = true;
     },
     cancel() {
-      if (this.exportType == 2) {
-        this.exportType = 1
-      } else {
-        this.diaDown = false;
-      }
+      this.diaShow = false;
     },
-    changeDownType() {
-      this.exportType = 1
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    },
-    //导出  
-    async exportData(length) {
+    async exportData(arr) {
       if (this.exportLoading == true) return;
       this.exportLoading = true;
-      let studentIds = []
-      if (length) {
-        studentIds = this.exportStudent.slice(0, 10).map(item => {
-          return item.studentId
-        })
-      } else {
-        studentIds = this.multipleSelection.map(item => {
-          return item.studentId
-        })
-      }
+      let studentIds = arr
       let query = {};
       if (studentIds.length == this.exportStudent.length) {
         query.studentIds = []
@@ -147,22 +147,24 @@ export default {
   },
   methods: {
     setDuration(times) {
-      let m = parseInt(times / 1000 / 60);
-      let s = parseInt((times / 1000) % 60);
-      let ms = times;
-      let aTime;
-      if (times == 0) {
-        aTime = `0`;
-      } else {
-        if (m == 0 && s == 0) {
-          aTime = `${ms}毫秒`;
-        } else if (m == 0 && s != 0) {
-          aTime = `${s}秒`;
-        } else if (m != 0 && s != 0) {
-          aTime = `${m}分${s}秒`;
+      if (times) {
+        let m = parseInt(times / 1000 / 60);
+        let s = parseInt((times / 1000) % 60);
+        let ms = times;
+        let aTime;
+        if (times == 0) {
+          aTime = `0`;
+        } else {
+          if (m == 0 && s == 0) {
+            aTime = `${ms}毫秒`;
+          } else if (m == 0 && s != 0) {
+            aTime = `${s}秒`;
+          } else if (m != 0 && s != 0) {
+            aTime = `${m}分${s}秒`;
+          }
         }
+        return aTime;
       }
-      return aTime;
     },
   }
 };
@@ -39,26 +39,25 @@ export default {
     resultData: function () {
       let resultData = []
       if (this.tableData.length) {
-        if (this.types == "3") {
-          let subjectName = [];
-          resultData = data?.list.map((item) => {
-            let params = {};
-            item.dataList.map((items, index) => {
-              if (!subjectName.includes(items.subjectName)) {
-                subjectName.push(items.subjectName);
-              }
-              params["interactionsNum" + items.subjectName] =
-                items.interactionsNum;
-              params["interactionsCorrectNum" + items.subjectName] =
-                items.interactionsCorrectNum;
-            });
-            return {
-              ...item,
-              ...params,
-            };
+
+        let subjectName = [];
+        resultData = this.tableData?.map((item) => {
+          let params = {};
+          item.dataList?.map((items, index) => {
+            if (!subjectName.includes(items.subjectName)) {
+              subjectName.push(items.subjectName);
+            }
+            params["interactionsNum" + items.subjectName] =
+              items.interactionsNum;
+            params["interactionsCorrectNum" + items.subjectName] =
+              items.interactionsCorrectNum;
           });
-          this.phaseInter = [...subjectName];
-        }
+          return {
+            ...item,
+            ...params,
+          };
+        });
+        this.phaseInter = [...subjectName];
       } else {
         resultData = []
         this.optionsList = []
@@ -13,14 +13,14 @@
     </back-box>
     <div v-show="!isDetail" class="table-box">
       <div class="table-cont" v-loading="loading">
-        <p class="btn-box">
+        <p class="btn-box" v-if="tableData.length">
           <el-button type="primary" round @click="linkToDetail2">查看汇总报表</el-button>
         </p>
         <div>
           <el-table :data="tableData" border :show-header="total > 0" style="width: 100%"
             @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="40"></el-table-column>
-            <el-table-column prop="subject" label="科目" align="center" width="80"></el-table-column>
+            <el-table-column prop="subjectName" label="科目" align="center" width="80"></el-table-column>
             <el-table-column prop="title" label="课时名称" align="center"></el-table-column>
             <el-table-column prop="participationRate" label="总参与度" align="center"> <template slot-scope="scoped">{{
               scoped.row.participationRate }}%</template></el-table-column>
@@ -142,6 +142,9 @@ export default {
     },
     //去详情
     linkToDetail2() {
+      if (this.multipleSelection.length == 0) { 
+        this.$message.warning("未选择课时，请选择～")
+        return }
       let subjectArr = []
       const ids = this.multipleSelection.map(item => {
         subjectArr.push(item.subject)
@@ -2,7 +2,7 @@
   <div ref="main" class="page-container">
     <back-box>
       <template slot="title">
-        <span>{{ type == 1 ? '单卷测练报表' : type == 2 ? subject + "汇总报表" : type == 3 ? "多科汇总报表" :
+        <span>{{ type == 1 ? '单卷测练报表' : type == 2 ? subjectName + "汇总报表" : type == 3 ? "多科汇总报表" :
           `多班_${subjectName}_${title}_测练成绩对比分析` }}</span>
       </template>
     </back-box>
@@ -44,8 +44,8 @@ export default {
     this.ids = this.$route.query.ids && this.$route.query.ids.split() || "";
     this.type = this.$route.query.type
     this.classId = this.$route.query.classId || "";
-    this.subjectName = this.$route.query.subjectName || ""
     this.title = this.$route.query.title || ""
+    this.subjectName = this.$route.query.subjectName || ""
   },
   methods: {
@@ -29,7 +29,7 @@
       </el-table>
     </div>
     <div class="down">
-      <el-button @click="exportData" type="primary" plain round icon="fa fa-cloud-download">导出报表</el-button>
+      <el-button @click="openDown" type="primary" plain round icon="fa fa-cloud-download">导出报表</el-button>
       <el-button v-if="!this.$store.getters.code" @click="print" type="primary" plain round
         icon="el-icon-printer">打印</el-button>
     </div>
@@ -38,6 +38,7 @@
         <RadarChart id="radarChart" :params="chartData" />
       </div>
     </el-dialog>
+    <ExportDia :exportStudent="exportStudent" :diaShow="diaShow" @cancel="cancel" @exportData="exportData" />
   </div>
 </template>
 <script>
@@ -46,7 +47,7 @@ import RadarChart from &quot;@/components/charts/radarChart&quot;
 import { downloadFile, tablePrint } from "@/utils";
 export default {
   components: {
-    RadarChart
+    RadarChart,
   },
   props: {
     role: "",
@@ -76,6 +77,10 @@ export default {
       },
       chartDia: false,
       chartTitle: "",
+
+      //导出相关
+      diaShow: false,
+      exportStudent: []
     }
   },
   computed: {
@@ -140,6 +145,7 @@ export default {
           this.chartData.indicator.push({ name: item, max: 100 })
         }
       })
+      // 为了美观
       if (this.chartData.indicator.length < 3) {
         let num = this.chartData.indicator.length
         for (let i = 0; i < 6; i++) {
@@ -191,16 +197,31 @@ export default {
           };
         });
         this.answerList = [...subjectName];
+        this.exportStudent = [...this.tableData]
       } else {
         this.$message.error(info);
       }
     },
     //导出
-    async exportData() {
+    openDown() {
+      this.diaShow = true;
+    },
+    cancel() {
+      this.diaShow = false;
+    },
+    async exportData(arr) {
       if (this.exportLoading == true) return;
       this.exportLoading = true;
+      let studentIds = arr
+      let query = {};
+      if (studentIds.length == this.exportStudent.length) {
+        query.studentIds = []
+      } else if (studentIds.length > 0) {
+        query.studentIds = studentIds
+      }
       const data = await this.$request.exportExamReport({
         examId: this.ids,
+        ...query
       });
       this.exportLoading = false;
       if (data) {
@@ -22,7 +22,7 @@
       </el-table>
     </div>
     <div class="down">
-      <el-button @click="exportData" type="primary" plain round icon="fa fa-cloud-download">导出报表</el-button>
+      <el-button @click="openDown" type="primary" plain round icon="fa fa-cloud-download">导出报表</el-button>
       <el-button v-if="!this.$store.getters.code" @click="print" type="primary" plain round
         icon="el-icon-printer">打印</el-button>
     </div>
@@ -31,6 +31,7 @@
         <LineChart id="lineChart" :params="chartData" :xAxis="xAxis" />
       </div>
     </el-dialog>
+    <ExportDia :exportStudent="exportStudent" :diaShow="diaShow" @cancel="cancel" @exportData="exportData" />
   </div>
   <!-- 单科多卷 -->
 </template>
@@ -56,6 +57,10 @@ export default {
       studentName: "",
       xAxis: [],
       chartData: [],
+
+      //导出相关
+      diaShow: false,
+      exportStudent: []
     }
   },
   computed: {
@@ -180,14 +185,29 @@ export default {
           };
         });
         this.answerList = dataList;
+
+        this.exportStudent = [...this.tableData]
       } else {
         this.$message.error(info);
       }
     },
     //导出
-    async exportData() {
+    openDown() {
+      this.diaShow = true;
+    },
+    cancel() {
+      this.diaShow = false;
+    },
+    async exportData(arr) {
       if (this.exportLoading == true) return;
       this.exportLoading = true;
+      let studentIds = arr
+      let query = {};
+      if (studentIds.length == this.exportStudent.length) {
+        query.studentIds = []
+      } else if (studentIds.length > 0) {
+        query.studentIds = studentIds
+      }
       const exportPhaseExamReport = this.role == "ROLE_PERSONAL"
         ? this.$request.pExportPhaseExamReport
         : this.$request.exportPhaseExamReport;
@@ -200,7 +200,7 @@
       </div>
       <div class="down">
         <div>
-          <el-button @click="exportData" type="primary" plain round icon="fa fa-cloud-download">导出报表</el-button>
+          <el-button @click="openDown" type="primary" plain round icon="fa fa-cloud-download">导出报表</el-button>
           <el-button v-if="!this.$store.getters.code" @click="print" type="primary" plain round
             icon="el-icon-printer">打印</el-button>
         </div>
@@ -239,6 +239,7 @@
           <el-button @click="diaMinScore = false">取 消</el-button>
         </div>
       </el-dialog>
+      <ExportDia :exportStudent="exportStudent" :diaShow="diaShow" @cancel="cancel" @exportData="exportData" />
     </div>
   </div>
 </template>
@@ -247,7 +248,7 @@ import ScoreSet from &quot;./scoreSet.vue&quot;
 import { downloadFile, tablePrint } from "@/utils";
 export default {
   components: {
-    ScoreSet
+    ScoreSet,
   },
   props: {
     role: "",
@@ -310,9 +311,9 @@ export default {
       //答题录分
       diaScoreSet: false,
-      exportType: 1,
-      exportStudent: [],
-      multipleSelection: [],
+      //导出相关
+      diaShow: false,
+      exportStudent: []
     };
   },
   created() {
@@ -492,6 +493,7 @@ export default {
         this.questionList = optionsList.sort((a, b) => {
           return a.id - b.id;
         });
+        this.exportStudent = [...this.tableData2]
       } else {
         this.$message.error(info);
       }
@@ -512,7 +514,7 @@ export default {
       this.loading = false;
       if (status === 0) {
         let optionsList = [{}, {}, {}, {}, {}];
-        let tableData = data?.list.map((item) => {
+        let tableData = data?.list?.map((item) => {
           let params = {};
           const detail = JSON.parse(item.detail);
           let lastOPtion = detail?.find((item) => {
@@ -553,7 +555,7 @@ export default {
             ...params,
           };
         });
-        this.tableData = tableData.sort((a, b) => {
+        this.tableData = tableData?.sort((a, b) => {
           return a.questionIndex - b.questionIndex;
         });
         this.optionsList = [...optionsList];
@@ -563,20 +565,18 @@ export default {
         this.$message.error(info);
       }
     },
+
     //导出
-    async exportData() {
+    openDown() {
+      this.diaShow = true;
+    },
+    cancel() {
+      this.diaShow = false;
+    },
+    async exportData(arr) {
       if (this.exportLoading == true) return;
       this.exportLoading = true;
-      let studentIds = []
-      if (length) {
-        studentIds = this.exportStudent.slice(0, 10).map(item => {
-          return item.studentId
-        })
-      } else {
-        studentIds = this.multipleSelection.map(item => {
-          return item.studentId
-        })
-      }
+      let studentIds = arr
       let query = {};
       if (studentIds.length == this.exportStudent.length) {
         query.studentIds = []
@@ -592,7 +592,7 @@ export default {
         ...query
       });
       this.exportLoading = false;
-      if (data) {
+      if (!data.status) {
         let blob = new Blob([data], {
           type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
         });
@@ -603,7 +603,7 @@ export default {
           blob
         );
       } else {
-        this.$message.error("下载失败");
+        this.$message.error(data.info);
       }
     },
   },
@@ -175,7 +175,7 @@ export default {
           title: obj.title,
           score: obj.examPaperScore || 0,
           type: 1,
-          subject: obj.subjectName
+          subjectName: obj.subjectName
         },
       });
     },
@@ -395,7 +395,6 @@ export default {
     this.type = this.$route.query.type || 1;
     this.form.title = this.$route.query.title || "";
     this._QueryDetail();
-    this._GradeList()
   },
   methods: {
     // v1.5
@@ -201,7 +201,6 @@ export default {
     }
     await this._QuerySubjectList();
     this._QueryData();
-    this._QueryTotal();
   },
   methods: {
     refreshStic() {
@@ -267,7 +266,7 @@ export default {
     },
     changPaperType(type) {
       this.query.type = type
-      this.changShare(1)
+      this.changShare(0)
     },
     changePage(page) {
       this.page = page;
@@ -311,14 +310,12 @@ export default {
     async getData(bool) {
       this.page = 1;
       this._QueryData(bool);
-      this._QueryTotal();
     },
     //切换班级
     async changClazz() {
       this.page = 1;
       await this._QuerySubjectList();
       this._QueryData(false);
-      this._QueryTotal();
     },
     //切换类型
     async changShare(share) {
@@ -423,6 +420,8 @@ export default {
       });
       this.loading = false;
       if (status === 0) {
+        this.totalCount.my = data?.myCount || 0;
+        this.totalCount.share = data?.gradeCount || 0;
         this.archivedTotal = data.archivedTotal;
         this.total = data.total;
         this.tableData = (data.list && [...data.list]) || [];
@@ -430,24 +429,6 @@ export default {
         this.$message.error(info);
       }
     },
-    async _QueryTotal() {
-      //获取答题卡列表
-      let query = { ...this.query };
-      for (let key in query) {
-        if (!query[key]) {
-          delete query[key]
-        }
-      }
-      const { data, status, info } = await this.$request.paperShareCount({
-        ...query,
-      });
-      if (status === 0) {
-        this.totalCount.my = data?.myCount || 0;
-        this.totalCount.share = data?.grade || 0;
-      } else {
-        this.$message.error(info);
-      }
-    },
     //v1.5