From 696f2d424187a37d5ebe0c3873a664212006ef52 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Mon, 5 Feb 2024 11:56:51 +0800
Subject: [PATCH] fix:报表导出问题

---
 src/components/exportDia.vue                        |  30 +++++++++++++++++++++++++-----
 src/views/basic/ask/analysis.vue                    | 272 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------
 src/views/basic/setUp/teacher.vue                   | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------
 src/views/basic/test/components/multipleSubTest.vue | 196 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------
 src/views/basic/test/components/scoreSet.vue        |  60 ++++++++++++++++++++++++++++++++++--------------------------
 src/views/examinationPaper/add.vue                  |   6 +++---
 6 files changed, 440 insertions(+), 258 deletions(-)

diff --git a/src/components/exportDia.vue b/src/components/exportDia.vue
index c774a4e..d26abe4 100644
--- a/src/components/exportDia.vue
+++ b/src/components/exportDia.vue
@@ -26,6 +26,7 @@
       <ul v-show="exportType == 2">
         <p class="export-tit">选择学生</p>
         <el-table
+          ref="multipleTable"
           :data="exportStudent"
           @selection-change="handleSelectionChange"
           :max-height="300"
@@ -38,11 +39,21 @@
           ></el-table-column>
           <el-table-column label="班名" align="center">
             <template slot-scope="scoped">
-              <span v-if="scoped.row.classRank || scoped.row.rank">{{
-                scoped.row.classRank || scoped.row.rank
-              }}</span>
+              <span
+                v-if="
+                  scoped.row.classRank ||
+                  scoped.row.rank ||
+                  scoped.row['classRank多科汇总']
+                "
+                >{{
+                  scoped.row.classRank ||
+                  scoped.row.rank ||
+                  scoped.row["classRank多科汇总"]
+                }}</span
+              >
               <span v-else>{{
-                scoped.row.examList && scoped.row.examList[0].classRank
+                (scoped.row.examList && scoped.row.examList[0].classRank) ||
+                (scoped.row.datalist && scoped.row.datalist[0].classRank)
               }}</span>
             </template>
           </el-table-column>
@@ -54,8 +65,11 @@
               <span v-else-if="!isNaN(scoped.row.scoringRate)">
                 {{ scoped.row.scoringRate }}%
               </span>
+              <span v-else-if="scoped.row['score多科汇总']">
+                {{ Number(scoped.row["score多科汇总"]) }}
+              </span>
               <span v-else>{{
-                scoped.row.examList && scoped.row.examList[0].score
+                Number(scoped.row.examList && scoped.row.examList[0].score)
               }}</span>
             </template></el-table-column
           >
@@ -107,12 +121,17 @@ export default {
       handler: function (nVal) {
         if (nVal) {
           this.downType = 1;
+          this.exportType = 1;
+          this.multipleSelection = [];
         }
       },
       immediate: true,
     },
   },
   methods: {
+    cancelSelection() {
+      this.$refs.multipleTable.clearSelection();
+    },
     changeDownType() {
       this.exportType = 1;
     },
@@ -131,6 +150,7 @@ export default {
         });
       }
       this.$emit("exportData", this.downType == 1 ? null : studentIds);
+      this.cancelSelection();
     },
     cancel() {
       if (this.exportType == 2) {
diff --git a/src/views/basic/ask/analysis.vue b/src/views/basic/ask/analysis.vue
index 63b9b10..41920b2 100644
--- a/src/views/basic/ask/analysis.vue
+++ b/src/views/basic/ask/analysis.vue
@@ -3,56 +3,110 @@
     <back-box>
       <template slot="title">
         <span>{{
-          types == 1 ? "单课分析" :
-          types == 2 ? `${className}-${subjectNames[0]}汇总分析` :
-            `${className}-多科汇总分析` }}</span>
+          types == 1
+            ? "单课分析"
+            : types == 2
+            ? `${className}-${subjectNames[0]}汇总分析`
+            : `${className}-多科汇总分析`
+        }}</span>
       </template>
     </back-box>
     <div class="page-content">
       <div class="tab-box">
-        <span class="tab-item" v-for="(item, index) in tabList" :key="index" :class="type == item.value ? 'active' : ''"
-          @click="setType(item.value)">{{ item.name }}</span>
+        <span
+          class="tab-item"
+          v-for="(item, index) in tabList"
+          :key="index"
+          :class="type == item.value ? 'active' : ''"
+          @click="setType(item.value)"
+          >{{ item.name }}</span
+        >
       </div>
       <div v-loading="loading">
         <div id="print-content">
-
           <!-- 学生答题情况 -->
           <Detail v-if="type == 1" :types="types" :detail="detail" :id="id" />
           <!-- 学生答题情况 -->
           <Example v-if="type == 1" :types="types" :tableData="tableData" />
           <!-- 学生问答 -->
-          <AnswerQustion v-if="type == 2" :types="types" :tableData="tableData" :subjectNames="subjectNames" />
+          <AnswerQustion
+            v-if="type == 2"
+            :types="types"
+            :tableData="tableData"
+            :subjectNames="subjectNames"
+          />
           <!-- 学生互动表现 -->
           <Interact v-if="type == 3" :types="types" :tableData="tableData" />
           <!-- 签到明细 -->
           <Report v-if="type == 4" :tableData="tableData" />
         </div>
         <div class="pagination-box" v-show="type == 1">
-          <el-pagination small="" layout="total,prev, pager, next" :hide-on-single-page="true" :total="total"
-            @current-change="changePage" :current-page="page" :page-size="size">
+          <el-pagination
+            small=""
+            layout="total,prev, pager, next"
+            :hide-on-single-page="true"
+            :total="total"
+            @current-change="changePage"
+            :current-page="page"
+            :page-size="size"
+          >
           </el-pagination>
         </div>
         <p class="down">
-          <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>
+          <el-button
+            v-if="types == 1"
+            @click="exportData"
+            type="primary"
+            plain
+            round
+            icon="fa fa-cloud-download"
+            >导出报表</el-button
+          >
+          <el-button
+            v-else
+            @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
+          >
         </p>
       </div>
-      <ExportDia :exportStudent="exportStudent" :diaShow="diaShow" @cancel="cancel" @exportData="exportData" :type="types==3?'雷达图':'折线图'"/>
+      <ExportDia
+        :exportStudent="exportStudent"
+        :diaShow="diaShow"
+        @cancel="cancel"
+        @exportData="exportData"
+        :type="types == 3 ? '雷达图' : '折线图'"
+      />
     </div>
   </div>
 </template>
 
 <script>
 import { downloadFile, tablePrint } from "@/utils";
-import Detail from "./components/detail.vue"
-import Example from "./components/example.vue"
-import AnswerQustion from "./components/answerQustion.vue"
-import Interact from "./components/interact.vue"
-import Report from "./components/report.vue"
+import Detail from "./components/detail.vue";
+import Example from "./components/example.vue";
+import AnswerQustion from "./components/answerQustion.vue";
+import Interact from "./components/interact.vue";
+import Report from "./components/report.vue";
 export default {
   components: {
-    Detail, Example, AnswerQustion, Interact, Report
+    Detail,
+    Example,
+    AnswerQustion,
+    Interact,
+    Report,
   },
   data() {
     return {
@@ -79,32 +133,37 @@ export default {
     this.role =
       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)
-    this.subjectNames = this.$route.query.subjectNames.split(',')
+    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);
+    this.subjectNames = this.$route.query.subjectNames.split(",");
     if (this.types == 1) {
-      this.tabList = [{ name: "答题表现", value: 1 },
-      { name: "学生问答表现", value: 2 },
-      { name: "学生互动表现", value: 3 },
-      { name: "签到明细", value: 4 },]
+      this.tabList = [
+        { name: "答题表现", value: 1 },
+        { name: "学生问答表现", value: 2 },
+        { name: "学生互动表现", value: 3 },
+        { name: "签到明细", value: 4 },
+      ];
     } else if (this.types == 2) {
-      this.tabList = [{ name: "答题表现", value: 1 },
-      { name: "学生问答表现", value: 2 },
-      { name: "学生互动表现", value: 3 }]
+      this.tabList = [
+        { name: "答题表现", value: 1 },
+        { name: "学生问答表现", value: 2 },
+        { name: "学生互动表现", value: 3 },
+      ];
     } else if (this.types == 3) {
       this.tabList = [
         { name: "学生问答表现", value: 2 },
-        { name: "学生互动表现", value: 3 }]
+        { name: "学生互动表现", value: 3 },
+      ];
     }
-    this.type = this.tabList[0].value
-    this.id = JSON.parse(this.$route.query.id)
+    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();
-    this.types != 1 ?this._QueryDataQuestionRank():'';
-    this.types != 3 ? this.periodDetail() : '';
+    this.types != 1 ? this._QueryDataQuestionRank() : "";
+    this.types != 3 ? this.periodDetail() : "";
   },
   methods: {
     print() {
@@ -141,9 +200,10 @@ export default {
       this._QueryData();
     },
     async periodDetail() {
-      const periodDetail = this.role == "ROLE_PERSONAL" ?
-        this.$request.pPeriodDetail :
-        this.$request.periodDetail;
+      const periodDetail =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pPeriodDetail
+          : this.$request.periodDetail;
       let { data, info, status } = await periodDetail({
         periodIds: this.id,
       });
@@ -164,42 +224,54 @@ export default {
       let query = {};
       if (this.role == "ROLE_PERSONAL") {
         if (this.types == 1) {
-          query.page = this.page
-          query.size = this.size
-          queryData = this.type == 1
-            ? this.$request.pPeriodQuestionReport
-            : this.$request.pPeriodStudentReport;
-
-        }
-        else if (this.types == 2) {
-          queryData = this.type == 1
-            ? this.$request.pPeriodQuestionReport
-            : this.type == 2 ? this.$request.phaseAnswerReport : this.$request.phaseInteractiveReport;
+          query.page = this.page;
+          query.size = this.size;
+          queryData =
+            this.type == 1
+              ? this.$request.pPeriodQuestionReport
+              : this.$request.pPeriodStudentReport;
+        } else if (this.types == 2) {
+          queryData =
+            this.type == 1
+              ? this.$request.pPeriodQuestionReport
+              : this.type == 2
+              ? this.$request.phaseAnswerReport
+              : this.$request.phaseInteractiveReport;
         } else if (this.types == 3) {
-          queryData = this.type == 2 ? this.$request.pPhaseAnswerReport : this.$request.pPhaseInteractiveReport;
+          queryData =
+            this.type == 2
+              ? this.$request.pPhaseAnswerReport
+              : this.$request.pPhaseInteractiveReport;
         }
       } else {
         if (this.types == 1) {
-          query.page = this.page
-          query.size = this.size
-          queryData = this.type == 1
-            ? this.$request.periodQuestionReport
-            : this.$request.periodStudentReport;
+          query.page = this.page;
+          query.size = this.size;
+          queryData =
+            this.type == 1
+              ? this.$request.periodQuestionReport
+              : this.$request.periodStudentReport;
         } else if (this.types == 2) {
-          queryData = this.type == 1
-            ? this.$request.periodQuestionReport
-            : this.type == 2 ? this.$request.phaseAnswerReport : this.$request.phaseInteractiveReport;
+          queryData =
+            this.type == 1
+              ? this.$request.periodQuestionReport
+              : this.type == 2
+              ? this.$request.phaseAnswerReport
+              : this.$request.phaseInteractiveReport;
         } else if (this.types == 3) {
-          queryData = this.type == 2 ? this.$request.cTPhaseAnswerReport : this.$request.cTPhaseInteractiveReport;
+          queryData =
+            this.type == 2
+              ? this.$request.cTPhaseAnswerReport
+              : this.$request.cTPhaseInteractiveReport;
         }
       }
       if (this.types == 1) {
-        query.periodId = this.id[0]
-        query.type = this.type - 1
+        query.periodId = this.id[0];
+        query.type = this.type - 1;
       } else {
-        query.periodIds = this.id
+        query.periodIds = this.id;
         if (this.types == 3) {
-          query.subjectNames = this.subjectNames
+          query.subjectNames = this.subjectNames;
         }
       }
       this.loading = true;
@@ -209,7 +281,7 @@ export default {
       });
       this.loading = false;
       if (status === 0) {
-        this.tableData = data?.list || []
+        this.tableData = data?.list || [];
         this.total = data.count;
       } else {
         this.$message.error(info);
@@ -218,15 +290,15 @@ export default {
     async _QueryDataQuestionRank() {
       let queryData;
       let query = {};
-      
-        query.periodIds = this.id
-        if (this.types == 2) {
-          queryData = this.$request.phaseAnswerReport
-        } else if (this.types == 3) {
-          queryData = this.$request.cTPhaseAnswerReport
-        }
+
+      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
+        query.classId = this.classId;
       }
       this.loading = true;
       let { data, info, status } = await queryData({
@@ -234,15 +306,15 @@ export default {
         ...query,
       });
       this.loading = false;
-      console.log(data)
+      console.log(data);
       if (status === 0) {
-        this.exportStudent = data?.list && [...data?.list] || []
+        this.exportStudent = (data?.list && [...data?.list]) || [];
       } else {
         this.$message.error(info);
       }
     },
 
-    //导出  
+    //导出
     openDown() {
       this.diaShow = true;
     },
@@ -252,39 +324,48 @@ export default {
     async exportData(arr) {
       if (this.exportLoading == true) return;
       this.exportLoading = true;
-      let studentIds = arr
+      let studentIds = arr;
       let query = {};
-      if(studentIds != null){
+      if (studentIds != null) {
         if (studentIds.length > 0) {
-          query.studentIds = studentIds
+          query.studentIds = studentIds;
         } else {
-          query.studentIds = []
+          query.studentIds = [];
         }
       }
-      let exportPeriodReport = ""
+      let exportPeriodReport = "";
       if (this.types == 1) {
-        query.periodId = this.id[0]
-        exportPeriodReport = this.role == "ROLE_PERSONAL" ? this.$request.pExportPeriodReport : this.$request.exportPeriodReport
-      } else if(this.types == 2){
-        query.periodIds = this.id
-        exportPeriodReport = this.role == "ROLE_PERSONAL" ?this.$request.pExportPhaseAnswerReport:this.$request.exportPhaseAnswerReport
-      }else{
-        query.periodIds = this.id
-        exportPeriodReport = this.$request.cTExportPhaseAnswerReport
+        query.periodId = this.id[0];
+        exportPeriodReport =
+          this.role == "ROLE_PERSONAL"
+            ? this.$request.pExportPeriodReport
+            : this.$request.exportPeriodReport;
+      } else if (this.types == 2) {
+        query.periodIds = this.id;
+        exportPeriodReport =
+          this.role == "ROLE_PERSONAL"
+            ? this.$request.pExportPhaseAnswerReport
+            : this.$request.exportPhaseAnswerReport;
+      } else {
+        query.periodIds = this.id;
+        exportPeriodReport = this.$request.cTExportPhaseAnswerReport;
       }
       const data = await exportPeriodReport({
         classId: this.classId,
-        ...query
+        ...query,
       });
       this.exportLoading = false;
       if (data) {
-        this.cancel()
+        this.cancel();
         let blob = new Blob([data], {
           type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
         });
-        let name = this.types == 1 ? "随堂问-单课时报表.xlsx" :
-          this.types == 2 ? `随堂问-${this.className}-${this.subjectNames[0]}汇总分析报表.xlsx` :
-            `随堂问-${this.className}-多科汇总分析报表.xlsx`
+        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("下载失败");
@@ -351,7 +432,6 @@ div::-webkit-scrollbar-thumb {
 }
 
 .el-dialog {
-
   .down-item {
     font-size: 15px;
     margin-bottom: 10px;
diff --git a/src/views/basic/setUp/teacher.vue b/src/views/basic/setUp/teacher.vue
index addcc81..ca209ac 100644
--- a/src/views/basic/setUp/teacher.vue
+++ b/src/views/basic/setUp/teacher.vue
@@ -538,13 +538,14 @@ export default {
   async created() {
     this.code = this.$store.getters.csCode;
     this._QueryData(4);
-    await this._QueryDataGrade();
+    await this._QueryDataGrade(1); //筛选用
+    await this._QueryDataGrade(2); //配置角色用
     // this._RoleList();
   },
   methods: {
     async changeType() {
       this.query.gradeClassSub = [];
-      this.query.type = 0;
+      // this.query.type = 0;
       this.query.teacherName = "";
       this.query.phone = "";
       if (this.query.classType === 0) {
@@ -554,7 +555,7 @@ export default {
       }
 
       this._QueryData(6);
-      await this._QueryDataGrade();
+      await this._QueryDataGrade(1);
     },
     //选择删除
     handleCheckAllChange(val) {
@@ -982,10 +983,14 @@ export default {
         this.$message.error(info);
       }
     },
-    async _QueryDataGrade() {
+    async _QueryDataGrade(type) {
+      let query = {};
+      if (type == 1) {
+        query.type = this.query.classType;
+      }
       //年级数据
       const { data, status, info } = await this.$request.gradeList({
-        type: this.query.classType,
+        ...query,
       });
       if (status === 0) {
         this.classList = [];
@@ -1000,23 +1005,9 @@ export default {
                 label: items,
               };
             });
-            // 学校-年级
-            this.gradeClassList.push({
-              value: item.grade,
-              label: item.gradeName,
-              id: item.grade,
-              children: item.classList.map((clazz) => {
-                return {
-                  value: clazz.id,
-                  label: clazz.className,
-                  id: clazz.id,
-                };
-              }),
-            });
-
-            if (this.query.classType == 0) {
-              //学校-年级-科目
-              this.gradeClassSubList.push({
+            if (type == 2) {
+              // 学校-年级
+              this.gradeClassList.push({
                 value: item.grade,
                 label: item.gradeName,
                 id: item.grade,
@@ -1025,29 +1016,10 @@ export default {
                     value: clazz.id,
                     label: clazz.className,
                     id: clazz.id,
-                    children: [...subList],
-                  };
-                }),
-              });
-              //学校-科目-班级
-              this.gradeSubListClass.push({
-                value: item.grade,
-                label: item.gradeName,
-                id: item.grade,
-                children: item.subjectNames.map((items) => {
-                  return {
-                    value: items,
-                    label: items,
-                    children: item.classList.map((clazz) => {
-                      return {
-                        value: clazz.id,
-                        label: clazz.className,
-                      };
-                    }),
                   };
                 }),
               });
-            } else {
+
               let subjectNames = item.classList.map((clazz) => {
                 return {
                   value: clazz.subjectName,
@@ -1061,32 +1033,72 @@ export default {
                 };
               });
 
-              //学校-年级-科目
-              this.gradeClassSubList.push({
+              //学校-科目-班级
+              this.gradeSubListClass.push({
                 value: item.grade,
                 label: item.gradeName,
                 id: item.grade,
-                children: item.classList.map((clazz) => {
+                children: item.subjectNames.map((items) => {
+                  let child = [];
+                  item.classList.map((clazz) => {
+                    if (clazz.subjectName) {
+                      if (items == clazz.subjectName) {
+                        child.push({
+                          value: clazz.id,
+                          label: clazz.className,
+                        });
+                      }
+                    } else {
+                      child.push({
+                        value: clazz.id,
+                        label: clazz.className,
+                      });
+                    }
+                  });
                   return {
-                    value: clazz.id,
-                    label: clazz.className,
-                    id: clazz.id,
-                    children: [
-                      {
-                        value: clazz.subjectName,
-                        label: clazz.subjectName,
-                      },
-                    ],
+                    value: items,
+                    label: items,
+                    children: child,
                   };
                 }),
               });
-
-              this.gradeSubListClass.push({
-                value: item.grade,
-                label: item.gradeName,
-                id: item.grade,
-                children: subjectNames,
-              });
+            } else {
+              if (this.query.classType == 0) {
+                //学校-年级-科目
+                this.gradeClassSubList.push({
+                  value: item.grade,
+                  label: item.gradeName,
+                  id: item.grade,
+                  children: item.classList.map((clazz) => {
+                    return {
+                      value: clazz.id,
+                      label: clazz.className,
+                      id: clazz.id,
+                      children: [...subList],
+                    };
+                  }),
+                });
+              } else {
+                //学校-年级-科目
+                this.gradeClassSubList.push({
+                  value: item.grade,
+                  label: item.gradeName,
+                  id: item.grade,
+                  children: item.classList.map((clazz) => {
+                    return {
+                      value: clazz.id,
+                      label: clazz.className,
+                      id: clazz.id,
+                      children: [
+                        {
+                          value: clazz.subjectName,
+                          label: clazz.subjectName,
+                        },
+                      ],
+                    };
+                  }),
+                });
+              }
             }
 
             let classList = item.classList.map((clazz) => {
diff --git a/src/views/basic/test/components/multipleSubTest.vue b/src/views/basic/test/components/multipleSubTest.vue
index 0a15dac..6e7331d 100644
--- a/src/views/basic/test/components/multipleSubTest.vue
+++ b/src/views/basic/test/components/multipleSubTest.vue
@@ -2,47 +2,111 @@
   <div class="table-box" ref="main" v-loading="loading">
     <div id="print-content">
       <!-- 多科多卷 -->
-      <el-table :data="tableData" :max-height="tableMaxHeight" border style="width: 100%">
-        <el-table-column prop="studentCode" label="学号" align="center" fixed></el-table-column>
+      <el-table
+        :data="tableData"
+        :max-height="tableMaxHeight"
+        border
+        style="width: 100%"
+      >
+        <el-table-column
+          prop="studentCode"
+          label="学号"
+          align="center"
+          fixed
+        ></el-table-column>
 
         <el-table-column prop="studentName" label="姓名" fixed align="center">
-          <template slot-scope="scoped"><span class="click-b" @click="toPortrait(scoped.row)">
+          <template slot-scope="scoped"
+            ><span class="click-b" @click="toPortrait(scoped.row)">
               {{ scoped.row.studentName }}
-            </span></template>
+            </span></template
+          >
         </el-table-column>
-        <el-table-column align="center" v-for="(item, index) in answerList" :key="index" :label="item">
-          <el-table-column :prop="'examCount' + item" label="测练数" align="center"
-            :class-name="index % 2 == 0 ? 'bg' : ''"></el-table-column>
-          <el-table-column :prop="'participationCount' + item" label="参与数" align="center"
-            :class-name="index % 2 == 0 ? 'bg' : ''"></el-table-column>
-          <el-table-column :prop="'score' + item" label="总分" align="center"
-            :class-name="index % 2 == 0 ? 'bg' : ''"></el-table-column>
-          <el-table-column :prop="'classRank' + item" label="班名" align="center"
-            :class-name="index % 2 == 0 ? 'bg' : ''"></el-table-column>
+        <el-table-column
+          align="center"
+          v-for="(item, index) in answerList"
+          :key="index"
+          :label="item"
+        >
+          <el-table-column
+            :prop="'examCount' + item"
+            label="测练数"
+            align="center"
+            :class-name="index % 2 == 0 ? 'bg' : ''"
+          ></el-table-column>
+          <el-table-column
+            :prop="'participationCount' + item"
+            label="参与数"
+            align="center"
+            :class-name="index % 2 == 0 ? 'bg' : ''"
+          ></el-table-column>
+          <el-table-column
+            :prop="'score' + item"
+            label="总分"
+            align="center"
+            :class-name="index % 2 == 0 ? 'bg' : ''"
+          ></el-table-column>
+          <el-table-column
+            :prop="'classRank' + item"
+            label="班名"
+            align="center"
+            :class-name="index % 2 == 0 ? 'bg' : ''"
+          ></el-table-column>
         </el-table-column>
         <el-table-column label="查看雷达图" align="center">
           <template slot-scope="scoped">
-            <el-button @click="openChart(scoped.row)" type="primary" size="mini" circle
-              icon="el-icon-arrow-right"></el-button>
+            <el-button
+              @click="openChart(scoped.row)"
+              type="primary"
+              size="mini"
+              circle
+              icon="el-icon-arrow-right"
+            ></el-button>
           </template>
         </el-table-column>
       </el-table>
     </div>
     <div class="down">
-      <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>
+      <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>
-    <el-dialog class="chart-dia" :visible.sync="chartDia" :title="chartTitle" width="800">
+    <el-dialog
+      class="chart-dia"
+      :visible.sync="chartDia"
+      :title="chartTitle"
+      width="800"
+    >
       <div class="chart-box">
         <RadarChart id="radarChart" :params="chartData" />
       </div>
     </el-dialog>
-    <ExportDia :exportStudent="exportStudent" :diaShow="diaShow" @cancel="cancel" @exportData="exportData" type="雷达图"/>
+    <ExportDia
+      :exportStudent="exportStudent"
+      :diaShow="diaShow"
+      @cancel="cancel"
+      @exportData="exportData"
+      lastLabel="总分"
+      type="雷达图"
+    />
   </div>
 </template>
 <script>
-import RadarChart from "@/components/charts/radarChart"
+import RadarChart from "@/components/charts/radarChart";
 
 import { downloadFile, tablePrint } from "@/utils";
 export default {
@@ -65,37 +129,38 @@ export default {
       chartData: {
         indicator: [
           {
-            name: '', max: 100,
+            name: "",
+            max: 100,
             axisLabel: {
               show: true,
               showMaxLabel: true,
             },
           },
         ],
-        seriesData: []
+        seriesData: [],
       },
       chartDia: false,
       chartTitle: "",
 
       //导出相关
       diaShow: false,
-      exportStudent: []
-    }
+      exportStudent: [],
+    };
   },
   computed: {
     subjectList: function () {
-      return this.subjectName?.split(",")
-    }
+      return this.subjectName?.split(",");
+    },
   },
   created() {
-    this.phaseExamReport()
+    this.phaseExamReport();
   },
   mounted() {
     this.tableMaxHeight = this.$refs.main.offsetHeight;
   },
   methods: {
     print() {
-      tablePrint("print-content", this.title + this.tabList[this.type]);
+      tablePrint("print-content", this.subjectName + "汇总报表");
     },
     toPortrait(obj) {
       //暂时不上线
@@ -135,63 +200,61 @@ export default {
     },
     //查看雷达图
     openChart(obj) {
-
-      this.chartTitle = obj.studentName + '-多科-多课时作答表现图'
+      this.chartTitle = obj.studentName + "-多科-多课时作答表现图";
       let max = 0;
-      const dataList = obj.dataList.slice(1, obj.dataList.length)
-      let subjectList = dataList.map(item => {
-        let score = Number(item.highestScore || item.score)
-        max = score > max ? score : max
-        return item.subjectName
-      })
-      max += 10
-      max = max > 150 ? 150 : max
+      const dataList = obj.dataList.slice(1, obj.dataList.length);
+      let subjectList = dataList.map((item) => {
+        let score = Number(item.highestScore || item.score);
+        max = score > max ? score : max;
+        return item.subjectName;
+      });
+      max += 10;
+      max = max > 150 ? 150 : max;
       this.chartData = {
         indicator: [
           {
-            name: '', max: max,
+            name: "",
+            max: max,
             axisLabel: {
               show: true,
               showMaxLabel: true,
             },
           },
         ],
-        seriesData: []
-      }
+        seriesData: [],
+      };
       subjectList.map((item, index) => {
         if (index < 1) {
-          this.chartData.indicator[index].name = item
-          this.chartData.indicator[index].max = max
+          this.chartData.indicator[index].name = item;
+          this.chartData.indicator[index].max = max;
         } else {
-          this.chartData.indicator.push({ name: item, max: max })
+          this.chartData.indicator.push({ name: item, max: max });
         }
-      })
+      });
       // 为了美观
       if (this.chartData.indicator.length < 3) {
-        let num = this.chartData.indicator.length
+        let num = this.chartData.indicator.length;
         for (let i = 0; i < 6; i++) {
           if (i >= num) {
-            this.chartData.indicator.push({ name: "", max: max })
+            this.chartData.indicator.push({ name: "", max: max });
           }
         }
       }
       this.chartData.seriesData = [
         {
-          value: dataList.map(item => item.highestScore),
-          name: '班级最高分'
+          value: dataList.map((item) => item.highestScore),
+          name: "班级最高分",
         },
         {
-          value: dataList.map(item => item.avgScore),
-          name: '班平均分'
+          value: dataList.map((item) => item.avgScore),
+          name: "班平均分",
         },
         {
-          value: dataList.map(item => item.score),
-          name: '本人得分'
+          value: dataList.map((item) => item.score),
+          name: "本人得分",
         },
-      ]
-      this.chartDia = true
-
-
+      ];
+      this.chartDia = true;
     },
     async phaseExamReport() {
       this.loading = true;
@@ -222,7 +285,7 @@ export default {
           };
         });
         this.answerList = [...subjectName];
-        this.exportStudent = [...this.tableData]
+        this.exportStudent = [...this.tableData];
       } else {
         this.$message.error(info);
       }
@@ -237,21 +300,20 @@ export default {
     async exportData(arr) {
       if (this.exportLoading == true) return;
       this.exportLoading = true;
-      let studentIds = arr
+      let studentIds = arr;
       let query = {};
-      if(studentIds != null){
+      if (studentIds != null) {
         if (studentIds.length > 0) {
-          query.studentIds = studentIds
+          query.studentIds = studentIds;
         } else {
-          query.studentIds = []
+          query.studentIds = [];
         }
       }
 
-
       const data = await this.$request.cTExportPhaseExamReport({
         classId: this.classId,
         examIds: this.ids,
-        ...query
+        ...query,
       });
       this.exportLoading = false;
       if (data) {
@@ -265,12 +327,12 @@ export default {
           blob
         );
         this.$message.success("下载成功");
-        this.cancel()
+        this.cancel();
       } else {
         this.$message.error("下载失败");
       }
     },
-  }
+  },
 };
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/basic/test/components/scoreSet.vue b/src/views/basic/test/components/scoreSet.vue
index 6451544..602d473 100644
--- a/src/views/basic/test/components/scoreSet.vue
+++ b/src/views/basic/test/components/scoreSet.vue
@@ -178,36 +178,44 @@ export default {
       if (status === 0) {
         let studentList = data.students || [];
         this.questionList = data?.questionList || [];
+        if (this.questionList.length == 0) {
+          this.questionList = Object.keys(studentList[0].scoreMap).map(
+            (item) => {
+              return {
+                questionId: item,
+                questionScore: 20,
+              };
+            }
+          );
+        }
         this.tableData =
-          (this.questionList.length &&
-            studentList.map((item) => {
-              item.all = item.all || 0; //总分
-              item.object = item.object || 0; //客观题分数
-              item.subject = item.subject || 0; //主观题分数
-              if (!item.scoreMap) item.scoreMap = {};
-              this.questionList.map((question) => {
-                let keys = question.questionId;
-                if (!item.scoreMap[keys]) {
-                  if (item.scoreMap[keys] == 0) {
-                    item.scoreMap[keys] = 0;
-                  } else {
-                    item.scoreMap[keys] = "";
-                  }
+          studentList.map((item) => {
+            item.all = item.all || 0; //总分
+            item.object = item.object || 0; //客观题分数
+            item.subject = item.subject || 0; //主观题分数
+            if (!item.scoreMap) item.scoreMap = {};
+            this.questionList.map((question) => {
+              let keys = question.questionId;
+              if (!item.scoreMap[keys]) {
+                if (item.scoreMap[keys] == 0) {
+                  item.scoreMap[keys] = 0;
                 } else {
-                  let num = Number(item.scoreMap[keys]);
-                  item.scoreMap[keys] = num;
-                  // item.score += num
-                  // if (question.questionType == 5) {
-                  //   item.subjectiveScore += num
-                  // } else {
-                  //   item.objectiveScore += num
-                  // }
+                  item.scoreMap[keys] = "";
                 }
-              });
+              } else {
+                let num = Number(item.scoreMap[keys]);
+                item.scoreMap[keys] = num;
+                // item.score += num
+                // if (question.questionType == 5) {
+                //   item.subjectiveScore += num
+                // } else {
+                //   item.objectiveScore += num
+                // }
+              }
+            });
 
-              return item;
-            })) ||
-          [];
+            return item;
+          }) || [];
         this.setTableHeight();
       } else {
         this.$message.error(info);
diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue
index cd20762..4f9f6f5 100644
--- a/src/views/examinationPaper/add.vue
+++ b/src/views/examinationPaper/add.vue
@@ -2022,9 +2022,9 @@ export default {
               id: item.tagId,
             };
           }) || [];
-        if (this.type != 2) {
-          this.form.tagId = this.answerTypeList[0]?.id || "";
-        }
+        // if (this.type != 2) {
+        //   this.form.tagId = this.answerTypeList[0]?.id || "";
+        // }
       } else {
         this.$message.error(info);
       }
--
libgit2 0.21.4