飞书bug及优化

梁保满
1 parent dbbfc6c5
Showing 21 changed files with 1373 additions and 852 deletions
src/api/apis/apis.js
src/api/axios.js
src/api/urls/apis.js
src/components/upload.vue
src/router/index.js
src/utils/index.js
src/views/analysis/index.vue
src/views/ask/analysis.vue
src/views/ask/index.vue
src/views/dataSync/index.vue
src/views/device/index.vue
src/views/examinationPaper/add.vue
src/views/index/mainIndex.vue
src/views/login/index.vue
src/views/setUp/account.vue
src/views/setUp/school.vue
src/views/setUp/student.vue
src/views/setUp/teacher.vue
src/views/test/analysis.vue
src/views/test/editAnswer.vue
@@ -201,6 +201,7 @@ export default {
       url: setUpUrls.subjectiveScoreTemplate,
       method: "POST",
       data,
+      responseType: 'arraybuffer',
     });
   },
   //任课老师-导入主观题得分
@@ -236,11 +237,14 @@ export default {
     });
   },
   //任课老师-数据导出
-  exportData(data) {
+  exportData() {
     return service({
       url: setUpUrls.exportData,
       method: "POST",
-      data,
+      responseType: 'arraybuffer',
+      headers:{
+        'Content-Type':'application/octet-stream'
+      }
     });
   },
   //任课老师-数据导入
@@ -251,6 +255,33 @@ export default {
       data,
     });
   },
+  //任课老师-导出阶段问答报表
+  exportPhaseAnswerReport(data) {
+    return service({
+      url: setUpUrls.exportPhaseAnswerReport,
+      method: "POST",
+      data,
+      responseType: 'arraybuffer',
+    });
+  },
+  //任课老师-导出阶段互动报表
+  exportPhaseInteractiveReport(data) {
+    return service({
+      url: setUpUrls.exportPhaseInteractiveReport,
+      method: "POST",
+      data,
+      responseType: 'arraybuffer',
+    });
+  },
+  //任课老师-导出单课时报表
+  exportPeriodReport(data) {
+    return service({
+      url: setUpUrls.exportPeriodReport,
+      method: "POST",
+      data,
+      responseType: 'arraybuffer',
+    });
+  },
   // 查询角色列表
@@ -501,6 +532,15 @@ export default {
       data,
     });
   },
+  //  导出设备使用分析
+  exportUsageAnalysis(data) {
+    return service({
+      url: setUpUrls.exportUsageAnalysis,
+      method: "POST",
+      data,
+      responseType: 'arraybuffer',
+    });
+  },
   /**
    * 集团管理员-学校管理
@@ -641,4 +681,20 @@ export default {
       data,
     });
   },
+  //  导出学校使用对比
+  exportSchoolContrast(data) {
+    return service({
+      url: setUpUrls.exportSchoolContrast,
+      method: "POST",
+      data,
+    });
+  },
+  //  导出年级使用对比
+  exportGradeContrast(data) {
+    return service({
+      url: setUpUrls.exportGradeContrast,
+      method: "POST",
+      data,
+    });
+  },
 };
@@ -15,7 +15,7 @@ const service = axios.create({
 service.interceptors.request.use(
   (config) => {
     NProgress.start();
-    config.headers["Content-Type"] = "application/json;charset=UTF-8";
+    // config.headers["Content-Type"] = "application/json;charset=UTF-8";
     const source = axios.CancelToken.source();
     store.commit("setTokenSources", [source.token, source.cancel]);
@@ -47,16 +47,15 @@ service.interceptors.response.use(
             window.location.href = res.data;
           } else {
             router.push({ path: "/login" });
-            if (res.message.includes("不存在")) {
+            if (res.info.includes("不存在")) {
               Message({
-                message: res.message,
+                info: res.info,
                 type: "error",
                 duration: 3 * 1000,
               });
             }
           }
         }
-        return
       } else {
         // Cookies.set("access_token", response.data.message, { expires: 1 / 12 })
       }
@@ -73,7 +72,7 @@ service.interceptors.response.use(
       if (data.status === 999) {
         console.log(data.data)
         if (data.data) {
-            window.location.href = data.data;
+          window.location.href = data.data;
         } else {
           Message({
             message: data.info,
@@ -63,6 +63,12 @@ export default {
   exportData: "/api_html/teaching/exportData",
   //任课老师-数据导入
   importData: "/api_html/teaching/importData",
+  //任课老师-导出阶段问答报表
+  exportPhaseAnswerReport: "/api_html/teaching/exportPhaseAnswerReport",
+  //任课老师-导出阶段互动报表
+  exportPhaseInteractiveReport: "/api_html/teaching/exportPhaseInteractiveReport",
+  //任课老师-导出单课时报表
+  exportPeriodReport: "/api_html/teaching/exportPeriodReport",
@@ -130,6 +136,8 @@ export default {
   usageAnalysis: "/api_html/school/manager/usageAnalysis",
   // 发卡记录
   cardList: "/api_html/school/manager/cardList",
+  // 导出设备使用分析
+  exportUsageAnalysis: "/api_html/school/manager/exportUsageAnalysis",
   // 查询区域列表
@@ -167,4 +175,8 @@ export default {
   schoolContrast: "/api_html/tenant/schoolContrast",
   //  年级使用对比
   gradeContrast: "/api_html/tenant/gradeContrast",
+  //  导出学校使用对比
+  exportSchoolContrast: "/api_html/tenant/exportSchoolContrast",
+  //  导出年级使用对比
+  exportGradeContrast: "/api_html/tenant/exportGradeContrast",
 }
@@ -76,17 +76,18 @@ export default {
       // }
     },
     upSuccess(res) {
-      if (res && res.code == 0 && res.success) {
+      debugger
+      if (res && res.status == 0 ) {
         this.$message.success("上传成功");
         this.$emit("upSuccess");
       } else {
-        this.$message.error(res.message);
+        this.$message.error(res.info);
       }
     },
     upError(res) {
+      debugger
       if (res && res.status == 0) {
-        this.$message.success("上传成功");
-        this.$emit("upSuccess");
+        this.$message.error("上传失败");
       } else {
         this.$message.error(res.message);
       }
@@ -168,22 +168,22 @@ let addrouters = [  //测试用，后续后端获取
     ]
   },
-  {
-    path: "/portrait",
-    iconCls: "fa fa-users", // 图标样式class
-    name: "学生画像",
-    component: Layout,
-    alone: true,
-    children: [
-      {
-        path: "/portrait",
-        iconCls: "fa fa-users", // 图标样式class
-        name: "",
-        component: Portrait,
-        children: []
-      }
-    ]
-  },
+  // {
+  //   path: "/portrait",
+  //   iconCls: "fa fa-users", // 图标样式class
+  //   name: "学生画像",
+  //   component: Layout,
+  //   alone: true,
+  //   children: [
+  //     {
+  //       path: "/portrait",
+  //       iconCls: "fa fa-users", // 图标样式class
+  //       name: "",
+  //       component: Portrait,
+  //       children: []
+  //     }
+  //   ]
+  // },
   {
     path: "/setUpConglomerate",
@@ -246,22 +246,22 @@ let addrouters = [  //测试用，后续后端获取
       },
     ]
   },
-  {
-    path: "/card",
-    iconCls: "fa fa-id-card", // 图标样式class
-    name: "发卡记录",
-    component: Layout,
-    alone: true,
-    children: [
-      {
-        path: "/card",
-        iconCls: "fa fa-id-card", // 图标样式class
-        name: "",
-        component: Card,
-        children: []
-      }
-    ]
-  },
+  // {
+  //   path: "/card",
+  //   iconCls: "fa fa-id-card", // 图标样式class
+  //   name: "发卡记录",
+  //   component: Layout,
+  //   alone: true,
+  //   children: [
+  //     {
+  //       path: "/card",
+  //       iconCls: "fa fa-id-card", // 图标样式class
+  //       name: "",
+  //       component: Card,
+  //       children: []
+  //     }
+  //   ]
+  // },
   {
     path: "/device",
     iconCls: "fa fa-dashboard", // 图标样式class
@@ -709,3 +709,35 @@ export function formatGradeClass(data) {
   });
   return gradeNameArr;
 }
+export function formatGradeNameClass(data) {
+  let gradeName = [];
+  let gradeNameArr = [];
+  data.map((item) => {
+    if (!gradeName.includes(item.gradeName)) {
+      gradeName.push(item.gradeName);
+      gradeNameArr.push({
+        value: item.gradeName,
+        label: item.gradeName,
+        grade: item.grade,
+        children: [
+          {
+            value: item.classCode,
+            label: item.className,
+          },
+        ],
+      });
+    } else {
+      let gradeIndex = 0;
+      gradeNameArr.map((items, index) => {
+        if (items.value == item.gradeName) {
+          gradeIndex = index;
+        }
+      });
+      gradeNameArr[gradeIndex].children.push({
+        value: item.classCode,
+        label: item.className,
+      });
+    }
+  });
+  return gradeNameArr;
+}
@@ -96,9 +96,7 @@
             :label="
               role == 'ROLE_JITUAN'
                 ? item.schoolName || item.gradeName
-                : query.gradeName == ''
-                ? item.gradeName
-                : item.className
+                : item.gradeName || item.className
             "
           >
             <template>
@@ -116,7 +114,7 @@
           </el-table-column>
         </el-table>
         <p class="down" v-if="role != 'ROLE_JITUAN'">
-          <el-button plain round icon="fa fa-cloud-download"
+          <el-button @click="downExc" plain round icon="fa fa-cloud-download"
             >导出报表</el-button
           >
         </p>
@@ -126,10 +124,11 @@
 </template>
 <script>
-import { formatDate } from "@/utils";
+import { formatDate,downloadFile } from "@/utils";
 export default {
   data() {
     return {
+      exportLoading: false,
       role: "",
       date: "", //今天-本周-本月-本季度
       type: 1, //集团管理员 表格切换
@@ -159,6 +158,35 @@ export default {
     }
   },
   methods: {
+    async downExc() {
+      if (this.exportLoading == true) return;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          if (key == "gradeName") {
+            query[key] = this.query[key] == "全部" ? "" : this.query[key];
+          } else {
+            query[key] = this.query[key];
+          }
+        }
+      }
+      if (this.role == "ROLE_JITUAN") {
+        delete query.gradeName;
+      } else {
+        delete query.regionId;
+      }
+      this.exportLoading = true;
+      const data = await this.$request.exportUsageAnalysis({ ...query });
+      this.exportLoading = false;
+      if (data) {
+        let blob = new Blob([data], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        downloadFile("使用分析.xlsx", blob);
+      } else {
+        this.$message.error("下载失败");
+      }
+    },
     changeType(val) {
       if (val == 1) {
         this.query.regionId = "";
@@ -185,7 +213,7 @@ export default {
             //中国式星期天是一周的最后一天
             day = 7;
           }
-          day--
+          day--;
           let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
           that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
           that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
@@ -241,7 +269,7 @@ export default {
       for (let key in this.query) {
         if (this.query[key] != "") {
           if (key == "gradeName") {
-            query[key] = this.query[key]=="全部"?"":this.query[key];
+            query[key] = this.query[key] == "全部" ? "" : this.query[key];
           } else {
             query[key] = this.query[key];
           }
@@ -282,12 +310,12 @@ export default {
                 }
               }
             } else {
-              if (this.query.gradeName == "") {
+              if (this.query.gradeName == "全部") {
                 if (!dataIdsList.includes(items.grade)) {
                   dataIdsList.push(items.grade);
                   dataList.push(items);
                 }
-              } else if (this.query.gradeName) {
+              } else{
                 if (!dataIdsList.includes(items.classId)) {
                   dataIdsList.push(items.classId);
                   dataList.push(items);
@@ -316,7 +344,7 @@ export default {
                   }
                 }
               } else {
-                if (this.query.gradeName == "") {
+                if (this.query.gradeName == "全部") {
                   if (items.grade == ids) {
                     params["examCount" + index] = items.examCount;
                     params["periodCount" + index] = items.periodCount;
@@ -335,8 +363,8 @@ export default {
             ...params,
           };
         });
-        this.dataList = dataList.sort((a,b)=>{
-          return a.grade-b.grade
+        this.dataList = dataList.sort((a, b) => {
+          return a.grade - b.grade;
         });
       } else {
         this.$message.error(info);
@@ -41,7 +41,7 @@
           <li class="info-item">签到人数：{{ detail.answeredNum }}</li>
           <li class="info-item">题目总数：{{ detail.questionNum }}</li>
           <li class="info-item">答题总数：{{ detail.totalAnswersNum }}</li>
-          <li class="info-item">课时时长：{{ detail.duration / 60 }}分钟</li>
+          <li class="info-item">课时时长：{{ detail.duration }}分钟</li>
           <li class="info-item">总参与度：：{{ detail.participationRate }}%</li>
           <li class="info-item">
             班级总正确率：{{ detail.classCorrectRate }}%
@@ -50,7 +50,7 @@
             已答总正确率：{{ detail.answerCorrectRate }}%
           </li>
           <li class="info-item">
-            反馈时长：{{ detail.consumingDuration / 60 }}分钟
+            反馈时长：{{ detail.consumingDuration }}分钟
           </li>
         </ul>
         <el-table v-if="type == 1" :data="tableData" border style="width: 100%">
@@ -103,16 +103,24 @@
               >{{ scoped.row.answerCorrectRate }}%</template
             ></el-table-column
           >
-          <el-table-column
-            prop="correctAnswer"
-            label="正确答案"
-            align="center"
-          > <template slot-scope="scoped">{{scoped.row.correctAnswer==1?"✓":scoped.row.correctAnswer==2?"✗":scoped.row.correctAnswer}}</template></el-table-column>
-          <el-table-column
-            prop="fallible"
-            label="干扰答案"
-            align="center"
-          ><template slot-scope="scoped">{{scoped.row.fallible==1?"✓":scoped.row.fallible==2?"✗":scoped.row.fallible}}</template></el-table-column>
+          <el-table-column prop="correctAnswer" label="正确答案" align="center">
+            <template slot-scope="scoped">{{
+              scoped.row.correctAnswer == 1
+                ? "✓"
+                : scoped.row.correctAnswer == 2
+                ? "✗"
+                : scoped.row.correctAnswer
+            }}</template></el-table-column
+          >
+          <el-table-column prop="fallible" label="干扰答案" align="center"
+            ><template slot-scope="scoped">{{
+              scoped.row.fallible == 1
+                ? "✓"
+                : scoped.row.fallible == 2
+                ? "✗"
+                : scoped.row.fallible
+            }}</template></el-table-column
+          >
           <!-- <el-table-column prop="screenshot" label="题干" align="center">
             <template slot-scope="scoped">
               <el-image
@@ -141,7 +149,7 @@
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="correctAnswerNum"
+            prop="duration"
             label="答题耗时"
             align="center"
           ></el-table-column>
@@ -177,6 +185,17 @@
               >{{ scoped.row.answerCorrectRate }}%</template
             ></el-table-column
           >
+          <el-table-column
+            v-for="(item, index) in optionsList"
+            :key="index"
+            :label="'Q' + (index + 1)"
+            align="center"
+            ><template slot-scope="scoped">
+              <span :class="scoped.row['isRight' + index] ? '' : 'red'">{{
+                scoped.row["answer" + index]
+              }}</span>
+            </template>
+          </el-table-column>
         </el-table>
         <el-table v-if="type == 3" :data="tableData" border style="width: 100%">
           <el-table-column
@@ -266,7 +285,7 @@
             icon="fa fa-cloud-download"
             >导出报表</el-button
           >
-          <el-button @click="edit" type="primary" round>修改答案</el-button>
+          <!-- <el-button @click="edit" type="primary" round>修改答案</el-button> -->
         </p>
       </div>
     </div>
@@ -296,6 +315,7 @@ export default {
       },
       detail: {},
       tableData: [],
+      optionsList: [],
       page: 1,
       size: 20,
       total: 0,
@@ -364,6 +384,12 @@ export default {
       });
       if (status == 0) {
         this.detail = { ...data };
+        this.detail.duration = this.detail.duration
+          ? (this.detail.duration / 60).toFixed(2)
+          : 0;
+        this.detail.consumingDuration = this.detail.consumingDuration
+          ? (this.detail.consumingDuration / 60).toFixed(2)
+          : 0;
       } else {
         this.$message.error(info);
       }
@@ -390,7 +416,34 @@ export default {
       });
       this.loading = false;
       if (status === 0) {
-        this.tableData = [...data?.list];
+        if (this.type == 2) {
+          let optionsList = [];
+          this.tableData = data?.list.map((item) => {
+            let params = {};
+            const detail = JSON.parse(item.detail);
+            if (detail.length > optionsList.length) {
+              optionsList = [...detail];
+            }
+            detail.map((items, index) => {
+              params["isRight" + index] = items.isRight;
+              params["answer" + index] =
+                items.answer == 1
+                  ? "✓"
+                  : items.answer == 2
+                  ? "✗"
+                  : items.answer;
+            });
+            return {
+              ...item,
+              ...params,
+            };
+          });
+          this.optionsList = [...optionsList];
+        } else {
+          this.tableData = data?.list.sort((a,b)=>{
+            return a.questionIndex-b.questionIndex
+          });
+        }
         this.total = data.count;
       } else {
         this.$message.error(info);
@@ -398,12 +451,17 @@ export default {
     },
     //导出
     async exportData() {
-      // if (this.exportLoading = true) return;
+      if (this.exportLoading == true) return;
       this.exportLoading = true;
-      const { data, status, info } = await this.$request.exportData();
+      const data = await this.$request.exportPeriodReport({
+        periodId: this.id,
+      });
       this.exportLoading = false;
       if (data) {
-        downloadFile(this.detail.title + "报表", data);
+        let blob = new Blob([data], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        downloadFile("随堂问-单课时报表.xlsx", blob);
       } else {
         this.$message.error(info);
       }
@@ -428,6 +486,7 @@ div::-webkit-scrollbar-thumb {
   display: flex;
   justify-content: space-between;
 }
+.red{color:#f30}
 .page-content {
   padding: 20px 20px 0;
 }
@@ -7,7 +7,12 @@
     </back-box>
     <div class="answer-header">
       <div class="sel-box">
-        <el-select class="sel" v-model="query.classId" placeholder="选择班级">
+        <el-select
+          class="sel"
+          v-model="query.classId"
+          placeholder="选择班级"
+          @change="changeclass"
+        >
           <el-option
             v-for="item in classList"
             :key="item.value"
@@ -105,331 +110,346 @@
         <span>总课时数：10</span>
         <span>互动总数：22</span>
       </p> -->
-      <div v-show="tabIndex == 1">
-        <el-table
-          :data="tableData"
-          border
-          style="width: 100%"
-          @sort-change="sortChange"
-        >
-          <el-table-column
-            prop="title"
-            label="课时"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="questionNum"
-            label="题目总数"
-            align="center"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            prop="startTime"
-            label="上课时间"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="participationRate"
-            label="参与度"
-            sortable="custom"
-            align="center"
-          >
-            <template slot-scope="scoped"
-              >{{ scoped.row.participationRate }}%</template
-            ></el-table-column
+      <div class="table-cont" v-loading="loading">
+        <div v-show="tabIndex == 1">
+          <el-table
+            :data="tableData"
+            border
+            style="width: 100%"
+            @sort-change="sortChange"
           >
-          <el-table-column
-            prop="answerCorrectRate"
-            label="已答总正确率"
-            sortable="custom"
-            align="center"
-          >
-            <template slot-scope="scoped"
-              >{{ scoped.row.answerCorrectRate }}%</template
+            <el-table-column
+              prop="title"
+              label="课时"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="questionNum"
+              label="题目总数"
+              align="center"
+              width="100"
+            ></el-table-column>
+            <el-table-column
+              prop="startTime"
+              label="上课时间"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="participationRate"
+              label="参与度"
+              sortable="custom"
+              align="center"
             >
-          </el-table-column>
-          <el-table-column
-            prop="classCorrectRate"
-            label="班级总正确率"
-            sortable="custom"
-            align="center"
-            ><template slot-scope="scoped"
-              >{{ scoped.row.classCorrectRate }}%</template
-            ></el-table-column
-          >
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scoped">
-              <el-tooltip
-                effect="dark"
-                v-if="scoped.row.answerNum == 0"
-                content="设置答案"
-                placement="top"
-              >
-                <el-button
-                  type="primary"
-                  circle
-                  size="mini"
-                  icon="fa fa-file-text"
-                  @click="edit(scoped.row)"
-                ></el-button>
-              </el-tooltip>
-              <el-tooltip v-else effect="dark" content="详情" placement="top">
-                <el-button
-                  type="primary"
-                  circle
-                  size="mini"
-                  icon="fa fa-arrow-right"
-                  @click="linkTo(scoped.row)"
-                ></el-button>
-              </el-tooltip>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <div v-show="tabIndex == 2">
-        <el-table
-          v-if="role == 'ROLE_JIAOSHI'"
-          :data="tableData"
-          border
-          style="width: 100%"
-          :default-sort="{ prop: 'answerTimes', order: 'descending' }"
-        >
-          <el-table-column
-            prop="studentCode"
-            label="学号"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="studentName"
-            label="姓名"
-            align="center"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            prop="answerTimes"
-            label="累计答题次数"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="correctAnswerTimes"
-            label="累计答对次数"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="participationRate"
-            label="总参与度"
-            sortable
-            align="center"
-          >
-            <template slot-scope="scoped"
-              >{{ scoped.row.participationRate }}%</template
-            ></el-table-column
-          >
-          <el-table-column
-            prop="correctRate"
-            label="总正确率"
-            sortable
-            align="center"
-          >
-            <template slot-scope="scoped"
-              >{{ scoped.row.correctRate }}%</template
-            ></el-table-column
-          >
-          <el-table-column
-            prop="answerCorrectRate"
-            label="已答总正确率"
-            sortable
-            align="center"
-          >
-            <template slot-scope="scoped"
-              >{{ scoped.row.answerCorrectRate }}%</template
+              <template slot-scope="scoped"
+                >{{ scoped.row.participationRate }}%</template
+              ></el-table-column
             >
-          </el-table-column>
-          <el-table-column
-            prop="classRank"
-            label="总正确率班排名"
-            sortable
-            align="center"
-          ></el-table-column>
-        </el-table>
-        <el-table :max-height="tableMaxHeight" v-else :data="tableData" border style="width: 100%">
-          <el-table-column
-            prop="studentCode"
-            label="学号"
-            align="center"
-            fixed
-          ></el-table-column>
-          <el-table-column
-            prop="studentName"
-            label="姓名"
-            align="center"
-            fixed
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            v-for="(item, index) in phaseOption"
-            :key="index"
-            :label="item"
-            align="center"
-          >
             <el-table-column
+              prop="answerCorrectRate"
+              label="已答总正确率"
+              sortable="custom"
               align="center"
-              :label="index == 0 ? '总课时数' : '课时数'"
-              :prop="'periodCount' + item"
             >
+              <template slot-scope="scoped"
+                >{{ scoped.row.answerCorrectRate }}%</template
+              >
             </el-table-column>
             <el-table-column
+              prop="classCorrectRate"
+              label="班级总正确率"
+              sortable="custom"
               align="center"
-              :label="index == 0 ? '总出题数' : '出题数'"
-              :prop="'questionNum' + item"
+              ><template slot-scope="scoped"
+                >{{ scoped.row.classCorrectRate }}%</template
+              ></el-table-column
             >
+            <el-table-column label="操作" align="center">
+              <template slot-scope="scoped">
+                <el-tooltip
+                  effect="dark"
+                  v-if="scoped.row.answerNum == 0"
+                  content="设置答案"
+                  placement="top"
+                >
+                  <el-button
+                    type="primary"
+                    circle
+                    size="mini"
+                    icon="fa fa-file-text"
+                    @click="edit(scoped.row)"
+                  ></el-button>
+                </el-tooltip>
+                <el-tooltip v-else effect="dark" content="详情" placement="top">
+                  <el-button
+                    type="primary"
+                    circle
+                    size="mini"
+                    icon="fa fa-arrow-right"
+                    @click="linkTo(scoped.row)"
+                  ></el-button>
+                </el-tooltip>
+              </template>
             </el-table-column>
+          </el-table>
+        </div>
+        <div v-show="tabIndex == 2">
+          <el-table
+            v-if="role == 'ROLE_JIAOSHI'"
+            :max-height="tableMaxHeight"
+            :data="tableData"
+            border
+            style="width: 100%"
+          >
             <el-table-column
+              prop="studentCode"
+              label="学号"
+              fixed
               align="center"
-              :label="index == 0 ? '总参与度' : '参与度'"
-              :prop="'participationRate' + item"
-            >
-            </el-table-column>
+            ></el-table-column>
             <el-table-column
+              prop="studentName"
+              label="姓名"
+              fixed
               align="center"
-              :label="index == 0 ? '总正确率' : '正确率'"
-              :prop="'correctRate' + item"
-            ><template slot-scope="scoped">{{scoped.row['correctRate' + item]}}%</template>
-            </el-table-column>
-          </el-table-column>
-        </el-table>
-      </div>
-      <div v-show="tabIndex == 3">
-        <el-table
-          v-if="role == 'ROLE_JIAOSHI'"
-          :data="tableData"
-          border
-          style="width: 100%"
-          :default-sort="{ prop: 'answerTimes', order: 'descending' }"
-        >
-          <el-table-column
-            prop="studentCode"
-            label="学号"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="studentName"
-            label="姓名"
-            align="center"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            prop="rushAnswerTimes"
-            label="抢答成功次数"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="rushAnswerCorrectTimes"
-            label="抢答答对次数"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="checkAnswerTimes"
-            label="抽答次数"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="checkAnswerCorrectTimes"
-            label="抽答答对次数"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="interactionsNum"
-            label="参与得分"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="interactionsCorrectNum"
-            label="对错得分"
-            sortable
-            align="center"
-          ></el-table-column>
-        </el-table>
-        <el-table v-else :data="tableData" border style="width: 100%">
-          <el-table-column
-            prop="studentCode"
-            label="学号"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="studentName"
-            label="姓名"
-            align="center"
-            width="100"
-          ></el-table-column>
-          <el-table-column
-            v-for="(item, index) in phaseInter"
-            :key="index"
-            :label="item"
-            align="center"
-          >
+              width="100"
+            ></el-table-column>
             <el-table-column
+              prop="answerTimes"
+              label="累计答题次数"
+              sortable
               align="center"
-              v-if="index == 0"
-              label="参与分"
+            ></el-table-column>
+            <el-table-column
+              prop="correctAnswerTimes"
+              label="累计答对次数"
+              sortable
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="participationRate"
+              label="总参与度"
               sortable
-              :prop="'interactionsNum' + item"
+              align="center"
+            >
+              <template slot-scope="scoped"
+                >{{ scoped.row.participationRate }}%</template
+              ></el-table-column
             >
-            </el-table-column>
             <el-table-column
-              v-else
+              prop="correctRate"
+              label="总正确率"
+              sortable
               align="center"
-              label="互动数"
-              :prop="'interactionsNum' + item"
             >
-            </el-table-column>
+              <template slot-scope="scoped"
+                >{{ scoped.row.correctRate }}%</template
+              ></el-table-column
+            >
             <el-table-column
-              v-if="index == 0"
+              prop="answerCorrectRate"
+              label="已答总正确率"
+              sortable
               align="center"
-              label="对错分"
+            >
+              <template slot-scope="scoped"
+                >{{ scoped.row.answerCorrectRate }}%</template
+              >
+            </el-table-column>
+            <el-table-column
+              prop="classRank"
+              label="总正确率班排名"
               sortable
-              :prop="'interactionsCorrectNum' + item"
+              align="center"
+            ></el-table-column>
+          </el-table>
+          <el-table
+            :max-height="tableMaxHeight"
+            v-else
+            :data="tableData"
+            border
+            style="width: 100%"
+          >
+            <el-table-column
+              prop="studentCode"
+              label="学号"
+              align="center"
+              fixed
+            ></el-table-column>
+            <el-table-column
+              prop="studentName"
+              label="姓名"
+              align="center"
+              fixed
+              width="100"
+            ></el-table-column>
+            <el-table-column
+              v-for="(item, index) in phaseOption"
+              :key="index"
+              :label="item"
+              align="center"
             >
+              <el-table-column
+                align="center"
+                :label="index == 0 ? '总课时数' : '课时数'"
+                :prop="'periodCount' + item"
+              >
+              </el-table-column>
+              <el-table-column
+                align="center"
+                :label="index == 0 ? '总出题数' : '出题数'"
+                :prop="'questionNum' + item"
+              >
+              </el-table-column>
+              <el-table-column
+                align="center"
+                :label="index == 0 ? '总参与度' : '参与度'"
+                :prop="'participationRate' + item"
+                ><template slot-scope="scoped"
+                  >{{ scoped.row["participationRate" + item] }}%</template
+                >
+              </el-table-column>
+              <el-table-column
+                align="center"
+                :label="index == 0 ? '总正确率' : '正确率'"
+                :prop="'correctRate' + item"
+                ><template slot-scope="scoped"
+                  >{{ scoped.row["correctRate" + item] }}%</template
+                >
+              </el-table-column>
             </el-table-column>
+          </el-table>
+        </div>
+        <div v-show="tabIndex == 3">
+          <el-table
+            v-if="role == 'ROLE_JIAOSHI'"
+            :data="tableData"
+            border
+            style="width: 100%"
+          >
+            <el-table-column
+              prop="studentCode"
+              label="学号"
+              fixed
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="studentName"
+              label="姓名"
+              fixed
+              align="center"
+              width="100"
+            ></el-table-column>
             <el-table-column
-              v-else
+              prop="rushAnswerTimes"
+              label="抢答成功次数"
+              sortable
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="rushAnswerCorrectTimes"
+              label="抢答答对次数"
+              sortable
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="checkAnswerTimes"
+              label="抽答次数"
+              sortable
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="checkAnswerCorrectTimes"
+              label="抽答答对次数"
+              sortable
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="interactionsNum"
+              label="参与得分"
+              sortable
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="interactionsCorrectNum"
+              label="对错得分"
+              sortable
+              align="center"
+            ></el-table-column>
+          </el-table>
+          <el-table v-else :data="tableData" border style="width: 100%">
+            <el-table-column
+              prop="studentCode"
+              label="学号"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="studentName"
+              label="姓名"
+              align="center"
+              width="100"
+            ></el-table-column>
+            <el-table-column
+              v-for="(item, index) in phaseInter"
+              :key="index"
+              :label="item"
               align="center"
-              label="参与数"
-              :prop="'interactionsCorrectNum' + item"
             >
+              <el-table-column
+                align="center"
+                v-if="index == 0"
+                label="参与分"
+                sortable
+                :prop="'interactionsNum' + item"
+              >
+              </el-table-column>
+              <el-table-column
+                v-else
+                align="center"
+                label="互动数"
+                :prop="'interactionsNum' + item"
+              >
+              </el-table-column>
+              <el-table-column
+                v-if="index == 0"
+                align="center"
+                label="对错分"
+                sortable
+                :prop="'interactionsCorrectNum' + item"
+              >
+              </el-table-column>
+              <el-table-column
+                v-else
+                align="center"
+                label="参与数"
+                :prop="'interactionsCorrectNum' + item"
+              >
+              </el-table-column>
             </el-table-column>
-          </el-table-column>
-        </el-table>
-      </div>
-      <div class="pagination-box" v-show="tabIndex == 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>
+          </el-table>
+        </div>
+        <div class="pagination-box" v-show="tabIndex == 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>
+        </div>
+        <p class="down" v-if="tabIndex == 3 || tabIndex == 2">
+          <el-button
+            @click="exportData"
+            type="info"
+            plain
+            round
+            icon="fa fa-cloud-download"
+            >导出报表</el-button
+          >
+        </p>
       </div>
-      <p class="down" v-if="tabIndex == 3 || tabIndex == 2">
-        <el-button
-          @click="exportData"
-          type="info"
-          plain
-          round
-          icon="fa fa-cloud-download"
-          >导出报表</el-button
-        >
-      </p>
     </div>
     <set-answer
       :diaVisible="dialogVisible"
@@ -446,7 +466,7 @@ import { formatDate, deepClone, downloadFile } from &quot;utils&quot;;
 export default {
   data() {
     return {
-      tableMaxHeight:300,
+      tableMaxHeight: 300,
       role: "",
       loading: false,
       dialogVisible: false,
@@ -603,7 +623,7 @@ export default {
       this._QueryData();
     },
     tabChange() {
-      this.tableMaxHeight = this.$refs.main.offsetHeight
+      this.tableMaxHeight = this.$refs.main.offsetHeight;
       this.page = 1;
       this.tableData = [];
       this._QueryData();
@@ -623,6 +643,11 @@ export default {
       this.page = page;
       this._QueryData();
     },
+    async changeclass(){
+      await this._QuerySubjectList()
+      this.page = 1
+      this._QueryData()
+    },
     async changClazz() {
       await this._QuerySubjectList();
       // await this.setDate(1);
@@ -769,7 +794,7 @@ export default {
       if (status === 0) {
         if (this.role == "ROLE_BANZHUREN") {
           let subjectName = [];
-          this.tableData = data?.list.map((item) => {
+          let tableData = data?.list.map((item) => {
             let params = {};
             item.dataList.map((items, index) => {
               if (!subjectName.includes(items.subjectName)) {
@@ -789,8 +814,16 @@ export default {
             };
           });
           this.phaseOption = [...subjectName];
+          this.tableData = tableData.sort((a, b) => {
+            return a.studentCode - b.studentCode;
+          });
         } else {
-          this.tableData = (data?.list && [...data?.list]) || [];
+          this.tableData =
+            (data?.list &&
+              [...data?.list].sort((a, b) => {
+                return a.studentCode - b.studentCode;
+              })) ||
+            [];
         }
         this.total = data.count;
       } else {
@@ -838,7 +871,7 @@ export default {
       if (status === 0) {
         if (this.role == "ROLE_BANZHUREN") {
           let subjectName = [];
-          this.tableData = data?.list.map((item) => {
+          let tableData = data?.list.map((item) => {
             let params = {};
             item.dataList.map((items, index) => {
               if (!subjectName.includes(items.subjectName)) {
@@ -855,24 +888,71 @@ export default {
             };
           });
           this.phaseInter = [...subjectName];
+          this.tableData = tableData.sort((a, b) => {
+            return a.studentCode - b.studentCode;
+          });
         } else {
-          this.tableData = (data?.list && [...data?.list]) || [];
+          this.tableData =
+            (data?.list &&
+              [...data?.list].sort((a, b) => {
+                return a.studentCode - b.studentCode;
+              })) ||
+            [];
         }
         this.total = data.count;
       } else {
         this.$message.error(info);
       }
     },
+    setDownQuery() {},
     //导出
     async exportData() {
-      if ((this.exportLoading = true)) return;
+      if (this.exportLoading == true) return;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
+            query["subjectName"] = this.query[key];
+          } else {
+            query[key] = this.query[key];
+          }
+        }
+      }
+      if (this.role == "ROLE_BANZHUREN") {
+        if (
+          query["subjectNames"] &&
+          query["subjectNames"].length == 1 &&
+          query["subjectNames"][0] == "全部"
+        ) {
+          query["subjectNames"] = this.subjectList.map((item) => {
+            return item.value;
+          });
+          query["subjectNames"].shift();
+        }
+        if (!query["subjectNames"]) {
+          this.$message.warning("请选择科目");
+          return;
+        }
+      }
       this.exportLoading = true;
-      const { data, status, info } = await this.$request.exportData();
+      const exportData =
+        this.tabIndex == 2
+          ? this.$request.exportPhaseAnswerReport
+          : this.$request.exportPhaseInteractiveReport;
+      const data = await exportData({ ...query });
       this.exportLoading = false;
       if (data) {
-        downloadFile("报表", data);
+        let blob = new Blob([data], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        downloadFile(
+          this.tabIndex == 2
+            ? "随堂问-阶段问答报表.xlsx"
+            : "随堂问-阶段互动报表.xlsx",
+          blob
+        );
       } else {
-        this.$message.error(info);
+        this.$message.error("下载失败");
       }
     },
   },
@@ -889,14 +969,17 @@ div::-webkit-scrollbar-thumb {
 }
 </style>
 <style lang="scss" scoped>
-.main{
-  height:100%;
+.main {
+  height: 100%;
 }
 .table-box {
   margin: 0 20px;
   padding: 16px;
   background: #f8f8f8;
   border-radius: 5px;
+  .table-cont {
+    min-height: 300px;
+  }
   :deep(.fa-arrow-right) {
     padding-left: 2px;
   }
@@ -16,7 +16,6 @@
           ref="upload"
           :action="url"
           :multiple="false"
-          :data="{ id: id }"
           :with-credentials="true"
           :limit="1"
           :on-change="change"
@@ -35,9 +34,11 @@
         <p class="txt">
           本功能将云平台的数据导出到U盘。待导出数据包括4套答题卡。
         </p>
-        <div class="btn-box btn-box2">
-          <i class="fa fa-cloud-download" @click="getAppDownloadUrl"></i>
-          <el-button type="primary" round>发卡软件下载</el-button>
+        <div class="btn-box btn-box2" v-loading="downLoading">
+          <i class="fa fa-cloud-download" @click="downloadFile"></i>
+          <el-button type="primary" round @click="downloadFile"
+            >文件下载</el-button
+          >
         </div>
       </div>
     </div>
@@ -45,25 +46,35 @@
 </template>
 <script>
+import { downloadFile } from "@/utils";
 export default {
   data() {
     return {
-      url: "xxx",
-      id: "",
+      downLoading: false,
+      // url: "/api_html/teaching/importData",
+      url: "",
+      file: {},
     };
   },
   methods: {
-    async getAppDownloadUrl() {
-      const { data, status, info } = await this.$request.getAppDownloadUrl();
-      if (status == 0) {
-        // this.tableData = [...data.list] || [];
-        const a = document.createElement("a");
-        a.href = data.downloadUrl;
-        document.body.appendChild(a);
-        a.click();
-        a.remove();
+    async downloadFile() {
+      if (this.downLoading) return;
+      this.downLoading = true;
+      const data = await this.$request.exportData();
+      this.downLoading = false;
+      console.log(data)
+      if (data) {
+        let blob = new Blob([data], {type: 'application/octet-stream'})
+        const url = URL.createObjectURL(blob);
+        const link = document.createElement("a");
+        document.body.appendChild(link);
+        link.download = "文件.json";
+        link.href = url;
+        link.click();
+        document.body.removeChild(link);
+        URL.revokeObjectURL(url);
       } else {
-        this.$message.error(info);
+        this.$message.error("下载失败，请重试");
       }
     },
     async submitUpload() {
@@ -128,12 +139,12 @@ export default {
       text-align: center;
     }
   }
-  .upload-demo{
+  .upload-demo {
     display: flex;
     justify-content: center;
   }
   :deep(.el-upload) {
-    margin:0 auto;
+    margin: 0 auto;
   }
   .btn-box {
     display: flex;
@@ -120,7 +120,7 @@
               ></el-table-column>
               <el-table-column label="关联班级" align="center">
                 <template slot-scope="scoped">
-                  <p v-for="item in scoped.row.classList" :key="item.classId">
+                  <p v-for="(item,index) in scoped.row.classList" :key="index">
                     {{ item.className }}
                   </p>
                 </template>
@@ -347,7 +347,7 @@
                 align="center"
               ></el-table-column>
               <el-table-column
-                prop="otaVersionNumber"
+                prop="otaVersionName"
                 label="版本号"
                 align="center"
               ></el-table-column>
@@ -388,7 +388,7 @@
       </div>
     </div>
     <el-dialog title="设备导入" :visible.sync="diaUp" width="400">
-      <up-load id="downDevice" :url="url" fileName="设备信息">
+      <up-load id="downDevice" :url="url" @upSuccess="upSuccess" fileName="设备信息">
         <p class="down-txt" slot="down">
           通过Excel名单导入设备，需要提供设备编码，点击
           <el-link type="danger" @click="downExcel">模板下载</el-link> 。
@@ -446,7 +446,7 @@
               clearable
               v-model="form.classIds"
               :options="gradeList"
-              :props="{ expandTrigger: 'hover',checkStrictly: true }"
+              :props="{ expandTrigger: 'hover', checkStrictly: true }"
               :show-all-levels="false"
             ></el-cascader>
           </el-col>
@@ -477,7 +477,8 @@
 import pieChart from "@/components/charts/pieChart";
 import scatterChart from "@/components/charts/scatterChart";
 import _ from "lodash";
-import { downloadFile, formatClass } from "@/utils";
+import { downloadFile, formatClass, formatGradeNameClass } from "@/utils";
+import api from "@/api/apis/apis";
 export default {
   components: { pieChart, scatterChart },
   watch: {
@@ -508,7 +509,11 @@ export default {
       gradeList: [],
       gradeListAll: [],
       schoolAll: [],
-      props: { multiple: true, checkStrictly: true },
+      props: {
+        multiple: true,
+        checkStrictly: true,
+        lazy: true,
+      },
       type: 1,
       query: {
         classId: [],
@@ -532,7 +537,7 @@ export default {
         { label: "3月以上", value: 6 },
       ],
       form: {
-        deviceId:"",
+        deviceId: "",
         frequency: "",
         pairingCode: "",
         classIds: [],
@@ -566,6 +571,32 @@ export default {
       }
     });
     this.role = role ? role : this.$store.getters.info.permissions[0].role;
+    if (this.role == "ROLE_JITUAN") {
+      this.props.lazyLoad = function (node, resolve) {
+        const { level } = node;
+        if (level == 2) {
+          console.log(node);
+          api
+            .tenantClassList({
+              schoolId: node.data.value,
+            })
+            .then((res) => {
+              let children = formatGradeNameClass(res.data?.list).sort(
+                (a, b) => {
+                  return a.grade - b.grade;
+                }
+              );
+              console.log();
+
+              const nodes = [...children];
+              // 通过调用resolve将子节点数据返回，通知组件数据加载完成
+              resolve(nodes);
+            });
+        } else {
+          resolve(node);
+        }
+      };
+    }
     this.stationReport();
     this._QueryGradeList();
     this._QueryData();
@@ -574,18 +605,21 @@ export default {
     }
   },
   methods: {
+    upSuccess(){//导入成功
+    this.diaUp = false
+      this._QueryData();
+    },
     edit(obj) {
-      for(let key in this.form){
-        if(key=="classIds"){
-          this.form[key] = obj.classList?.map(item=>{
-            return [item.classId]
-          })
-        }else{
-          this.form[key] = obj[key]
-
+      for (let key in this.form) {
+        if (key == "classIds") {
+          this.form[key] = obj.classList?.map((item) => {
+            return [item.classId];
+          });
+        } else {
+          this.form[key] = obj[key];
         }
       }
-      this.diaAnswerEqu=true
+      this.diaAnswerEqu = true;
     },
     linkTo(obj, type) {
       this.$router.push({
@@ -708,7 +742,7 @@ export default {
         });
         downloadFile(`设备信息.xlsx`, blob);
       } else {
-        this.$message.error(data.message);
+        this.$message.error(data.info);
       }
     },
@@ -718,15 +752,17 @@ export default {
         if (valid) {
           if (this.loadingAnswerEqu) return;
           this.loadingAnswerEqu = true;
-          let query = {...this.form}
-          query.classIds = query.classIds.map(item=>{
-            return item[1]
-          })
-          const { data, status, info } = await this.$request.updateDevice({...query});
+          let query = { ...this.form };
+          query.classIds = query.classIds.map((item) => {
+            return item[1];
+          });
+          const { data, status, info } = await this.$request.updateDevice({
+            ...query,
+          });
           this.loadingAnswerEqu = false;
           console.log(status);
           if (status === 0) {
-            this.diaAnswerEqu=false
+            this.diaAnswerEqu = false;
             this._QueryData();
           } else {
             this.$message.error(info);
@@ -859,18 +895,43 @@ export default {
         if (this.role == "ROLE_JITUAN") {
           query.regionIds = [];
           query.schoolIds = [];
+          query.gradeNames = [];
+          query.classIds = [];
           this.query.classId?.map((item) => {
             if (item.length == 1) {
               if (!query.regionIds.includes(item[0])) {
                 query.regionIds.push(item[0]);
               }
-            } else {
+            } else if (item.length == 2) {
               if (!query.schoolIds.includes(item[1])) {
                 query.schoolIds.push(item[1]);
               }
-              if (query.regionIds.includes(item[0])) {
-                query.regionIds.remove(item[0]);
+              query.regionIds.includes(item[0])
+                ? query.regionIds.remove(item[0])
+                : "";
+            } else if (item.length == 3) {
+              if (!query.gradeNames.includes(item[2])) {
+                query.gradeNames.push(item[2]);
               }
+              query.regionIds.includes(item[0])
+                ? query.regionIds.remove(item[0])
+                : "";
+              query.schoolIds.includes(item[1])
+                ? query.schoolIds.remove(item[1])
+                : "";
+            } else if (item.length == 4) {
+              if (!query.classIds.includes(item[3])) {
+                query.classIds.push(item[3]);
+              }
+              query.regionIds.includes(item[0])
+                ? query.regionIds.remove(item[0])
+                : "";
+              query.schoolIds.includes(item[1])
+                ? query.schoolIds.remove(item[1])
+                : "";
+              query.gradeNames.includes(item[2])
+                ? query.gradeNames.remove(item[2])
+                : "";
             }
           });
         } else {
@@ -917,10 +978,12 @@ export default {
       this.loading = false;
       if (status == 0) {
         this.tableData =
-          data?.list&&data?.list.map((item) => {
-            item.upgradeFlag = item.upgradeFlag == 1 ? true : false;
-            return item;
-          }) || [];
+          (data?.list &&
+            data?.list.map((item) => {
+              item.upgradeFlag = item.upgradeFlag == 1 ? true : false;
+              return item;
+            })) ||
+          [];
         this.total = data.count;
       } else {
         this.$message.error(info);
@@ -937,8 +1000,8 @@ export default {
 .tab-box {
   margin-bottom: 12px;
 }
-.sel{
-  width:100%;
+.sel {
+  width: 100%;
 }
 .content {
   background: #f8f8f8;
@@ -25,7 +25,7 @@
         >
           <el-form-item label="答题卡名称：" prop="title">
             <el-input
-            class="sel2"
+              class="sel2"
               type="text"
               placeholder="请输入答题卡名称"
               v-model.trim="form.title"
@@ -37,6 +37,7 @@
           </el-form-item>
           <el-form-item label="测验类型：">
             <el-select v-model="form.tagId" placeholder="选择测验类型">
+              <el-option label="--" value=""> </el-option>
               <el-option
                 v-for="item in answerTypeList"
                 :key="item.id"
@@ -81,7 +82,7 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="考试时长：" prop="examsDuration">
+          <el-form-item label="考试时长：">
             <el-input-number
               size="medium"
               :min="1"
@@ -328,6 +329,7 @@
                     :value="item.value"
                   >
                   </el-option>
+                  <el-option label="混合题题型" :value="6"> </el-option>
                 </el-select>
               </el-form-item>
               <el-form-item label="默认题数：">
@@ -340,6 +342,38 @@
                   label="label"
                 ></el-input-number>
               </el-form-item>
+              <el-form-item
+                label="默认选项："
+                v-show="
+                  questionForm.questionType != 4 ||
+                  questionForm.questionType != 5
+                "
+              >
+                <el-input-number
+                  v-model="questionForm.selectNum"
+                  :min="3"
+                  :max="7"
+                  :step-strictly="true"
+                  :step="1"
+                  label="label"
+                ></el-input-number>
+              </el-form-item>
+              <el-form-item
+                label="默认分数："
+                v-show="
+                  questionForm.questionType != 4 ||
+                  questionForm.questionType != 5
+                "
+              >
+                <el-input-number
+                  v-model="questionForm.score"
+                  :min="1"
+                  :max="100"
+                  :step-strictly="true"
+                  :step="1"
+                  label="label"
+                ></el-input-number>
+              </el-form-item>
             </el-form>
           </div>
           <div class="dialog-footer" slot="footer">
@@ -465,6 +499,8 @@ const questionForm = {
   questionTitle: "",
   questionType: 2,
   number: 10,
+  selectNum: 4,
+  score: 1,
 };
 const subQuesOptions = {
   questionType: 2,
@@ -486,12 +522,12 @@ export default {
       return Number(score).toFixed(2);
     },
   },
-  watch:{
-    step:function(){
-      this.$nextTick(function(){
-        this.$refs.content.scrollTop = 0
-      })
-    }
+  watch: {
+    step: function () {
+      this.$nextTick(function () {
+        this.$refs.content.scrollTop = 0;
+      });
+    },
   },
   data() {
     return {
@@ -680,7 +716,12 @@ export default {
       let subQuestions = [];
       let questionsOptions = {
         ...subQuesOptions,
-        questionType: this.questionForm.questionType,
+        selectNum: this.questionForm.selectNum,
+        score: this.questionForm.score,
+        questionType:
+          this.questionForm.questionType == 6
+            ? 2
+            : this.questionForm.questionType,
       };
       switch (questionsOptions.questionType) {
         case 2:
@@ -840,8 +881,8 @@ export default {
         // item.questionIndex = index + 1;
         item.questionType = 0;
         item.subQuestions.map((items, indexs) => {
-          items.questionId = this.setNum(index,indexs)
-          items.questionIndex = this.setNum(index,indexs);
+          items.questionId = this.setNum(index, indexs);
+          items.questionIndex = this.setNum(index, indexs);
         });
       });
       const { data, status, info } = await this.$request.addPaper({
@@ -956,12 +997,12 @@ export default {
 .red {
   color: #f30;
 }
-.sel2{
-  width:480px;
+.sel2 {
+  width: 480px;
 }
-.content-box{
-  width:100%;
-  height:100%;
+.content-box {
+  width: 100%;
+  height: 100%;
   overflow-y: auto;
 }
 .content {
@@ -1086,6 +1127,26 @@ export default {
   border-top: 1px solid #e2e2e2;
   margin: 12px 0;
 }
+.qs-options {
+  .answer-s {
+    display: inline-block;
+    width: 30px;
+    height: 30px;
+    border: 1px solid #e2e2e2;
+    border-radius: 3px;
+    margin: 0 6px;
+    font-size: 16px;
+    color: #333;
+    text-align: center;
+    line-height: 30px;
+    cursor: pointer;
+    &.active {
+      background: #5e78fa;
+      border-color: #5e78fa;
+      color: #fff;
+    }
+  }
+}
 .sub-questions {
   width: 100%;
   display: flex;
@@ -115,7 +115,7 @@
           </div>
           <div class="text" v-else-if="item.path == '/analysis'">
             <p class="p1">使用分析</p>
-            <p class="p2">按软件功能、题型统计使用频率。</p>
+            <p class="p2">按学校、学段统计使用频率。</p>
           </div>
         </li>
       </template>
@@ -173,6 +173,24 @@ export default {
   },
   watch: {
     "$store.getters.info.showRoleName": function (val) {
+      this._Init(val)
+      this._QueryData();
+    },
+  },
+  created() {
+    this._Init(this.$store.getters.info.showRoleName);
+    this._QueryData();
+  },
+  methods: {
+    getImgs(path) {
+      return require(`@/assets/nav${path}.png`);
+    },
+    links(path) {
+      this.$router.push({
+        path: path,
+      });
+    },
+    _Init(val) {
       let type = "";
       this.$store.getters.info.permissions.map((item) => {
         if (item.roleName == val) {
@@ -187,39 +205,16 @@ export default {
         };
       });
     },
-  },
-  created() {
-    let type = "";
-    this.$store.getters.info.permissions.map((item) => {
-      if (item.roleName == this.$store.getters.info.showRoleName) {
-        type = item.role;
+    _QueryData() {
+      if (this.type == "ROLE_XUEXIAO") {
+        this.schoolIndex();
+      } else if (this.type == "ROLE_JIAOSHI") {
+        this.teacherIndex();
+      } else if (this.type == "ROLE_JITUAN") {
+        this.tenantIndex();
+      } else if (this.type == "ROLE_BANZHUREN") {
+        this.classIndex();
       }
-    });
-    this.type = type ? type : this.$store.getters.info.permissions[0].role;
-    this.navList = this.$store.getters.addRouters.map((item) => {
-      return {
-        name: item.name,
-        path: item.children[0].path,
-      };
-    });
-    if (this.type == "ROLE_XUEXIAO") {
-      this.schoolIndex();
-    } else if (this.type == "ROLE_JIAOSHI" ) {
-      this.teacherIndex();
-    } else if (this.type == "ROLE_JITUAN") {
-      this.tenantIndex();
-    }else if (this.type == "ROLE_BANZHUREN") {
-      this.classIndex();
-    }
-  },
-  methods: {
-    getImgs(path) {
-      return require(`@/assets/nav${path}.png`);
-    },
-    links(path) {
-      this.$router.push({
-        path: path,
-      });
     },
     async teacherIndex() {
       const { data, status, info } = await this.$request.teacherIndex();
@@ -94,15 +94,17 @@ export default {
       passwordType: "password",
       loginForm: {
         // username: "15911715665",
-        // password: "Csiy88888",
-        username: "18687826606",
-        password: "Pw826606#",
+        // password: "715665",
+        // username: "18687826606",
+        // password: "Pw826606#",
         // username: "18893712576",
         // password: "712576",
-        // username: "13247726488",
-        // password: "726488",
+        username: "13247726488",
+        password: "726488",
         // username: "13319607658",
         // password: "Pw607658#",
+        // username: "18213902650",
+        // password: "Pw902650#",
       },
       loginRules: {
         username: [
@@ -184,7 +184,6 @@
       </el-table>
       <div class="pagination-box">
         <el-pagination
-          small=""
           layout="total,prev, pager, next"
           :hide-on-single-page="true"
           :total="total"
@@ -283,7 +282,10 @@
             </el-select>
           </el-col>
         </el-form-item>
-        <el-form-item label="选择管辖范围：" :prop="formAddCount.roleId == 3?'regionId':'schoolId'">
+        <el-form-item
+          label="选择管辖范围："
+          :prop="formAddCount.roleId == 3 ? 'regionId' : 'schoolId'"
+        >
           <el-col :span="12">
             <el-select
               v-show="formAddCount.roleId == 3"
@@ -320,7 +322,7 @@
       </div>
     </el-dialog>
     <el-dialog title="导入账号名单" :visible.sync="diaUp" width="600">
-      <up-load id="downTeacher" :url="url" fileName="教师名单">
+      <up-load id="downTeacher" :url="url"  @upSuccess="upSuccess" fileName="教师名单">
         <p class="down-txt" slot="down">
           通过Excel名单导入账号名单，点击
           <el-link type="danger" @click="downExcel">模板下载</el-link> 。
@@ -415,6 +417,10 @@ export default {
     this._QueryData(4);
   },
   methods: {
+    upSuccess(){//导入成功
+    this.diaUp = false
+      this._QueryData(4);
+    },
     async downExcel() {
       let data = await this.$request.downDevice();
       if (data && !data.code) {
@@ -503,7 +509,7 @@ export default {
                 });
           if (status === 0) {
             this.$message.success(info);
-            this.diaCount=false
+            this.diaCount = false;
             this._QueryData(4);
           } else {
             this.$message.error(info);
@@ -648,7 +654,6 @@ export default {
       let query = this.setQuery(type);
       this.loading = true;
       this.tableData = [];
-      this.total = 0;
       const { data, status, info } =
         this.role != "ROLE_JITUAN"
           ? await this.$request.userPage({
@@ -81,7 +81,7 @@
       </div>
     </div>
     <el-dialog title="导入学校名单" :visible.sync="diaUp" width="400">
-      <up-load id="downDevice" :url="url" fileName="学校名单">
+      <up-load id="downDevice" :url="url"  @upSuccess="upSuccess" fileName="学校名单">
         <p class="down-txt" slot="down">
           通过Excel名单导入学校名单，点击
           <el-link type="danger" @click="downExcel">模板下载</el-link> 。
@@ -292,6 +292,11 @@ export default {
     this._QuerySubject();
   },
   methods: {
+    upSuccess(){//导入成功
+    this.diaUp = false
+      this._QueryDataSchool();
+      this._QueryDataGrade();
+    },
     setGrade(obj) {
       this.formGrade.subjectNames = obj.subjectNames;
       this.formGrade.classList = obj.classList;
@@ -4,7 +4,7 @@
       <template slot="title">
         <span>学生管理</span>
       </template>
-      <template slot="btns">
+      <template slot="btns" v-if="!code">
         <el-tooltip effect="dark" content="添加学生" placement="bottom">
           <el-button
             type="primary"
@@ -44,7 +44,11 @@
               :class="query.classId == item.id ? 'active' : ''"
               @click="classDetail(item)"
             >
-              <i class="el-icon-edit-outline" @click.stop="setClass(item)"></i>
+              <i
+                v-if="!code"
+                class="el-icon-edit-outline"
+                @click.stop="setClass(item)"
+              ></i>
               {{ item.className }}（{{ item.studentCount }}）
             </li>
           </ul>
@@ -85,6 +89,7 @@
               :key="item.id"
             >
               <el-popconfirm
+                v-if="!code"
                 title="确定删除吗？"
                 @confirm="removeStu(item, index)"
               >
@@ -122,12 +127,20 @@
         </el-form-item>
         <el-form-item label="学生姓名：" prop="studentName">
           <el-col :span="10">
-            <el-input maxlength="30" placeholder="输入学生姓名" v-model.trim="formStu.studentName" />
+            <el-input
+              maxlength="30"
+              placeholder="输入学生姓名"
+              v-model.trim="formStu.studentName"
+            />
           </el-col>
         </el-form-item>
         <el-form-item label="长学号：" prop="studentCode">
           <el-col :span="10">
-            <el-input maxlength="12" placeholder="输入学生长学号" v-model.trim="formStu.studentCode" />
+            <el-input
+              maxlength="12"
+              placeholder="输入学生长学号"
+              v-model.trim="formStu.studentCode"
+            />
           </el-col>
         </el-form-item>
         <el-form-item label="短学号：">
@@ -193,6 +206,7 @@ import { downloadFile } from &quot;@/utils&quot;;
 export default {
   data() {
     return {
+      code: "",
       url: "",
       diaStu: false,
       diaClass: false,
@@ -244,6 +258,7 @@ export default {
     };
   },
   async created() {
+    this.code = localStorage.getItem("csCode") || "";
     await this._QueryDataGrade();
     await this._QueryClass();
     this._QueryData(3);
@@ -317,6 +332,14 @@ export default {
       this.loading = true;
       this.$refs.formBox.validate(async (valid) => {
         if (valid) {
+          let hasName = this.studentList.find((item) => {
+            return item.studentName == this.formStu.studentName;
+          });
+          console.log(hasName);
+          if (hasName) {
+            this.$message.warning("学生姓名已存在");
+            return;
+          }
           const { data, status, info } = await this.$request.addStudent({
             classId: this.query.classId,
             ...query,
@@ -217,7 +217,7 @@
       </div>
     </div>
     <el-dialog title="导入教师名单" :visible.sync="diaUp" width="600">
-      <up-load id="downTeacher" :url="url" fileName="教师名单">
+      <up-load id="downTeacher" :url="url"  @upSuccess="upSuccess" fileName="教师名单">
         <p class="down-txt" slot="down">
           通过Excel名单导入教师名单，点击
           <el-link type="danger" @click="downExcel">模板下载</el-link> 。
@@ -423,6 +423,10 @@ export default {
     await this._QueryClass();
   },
   methods: {
+    upSuccess(){//导入成功
+    this.diaUp = false
+      this._QueryData(10);
+    },
     addRoleList() {
       //添加教师角色
       this.formTeacher.roleList.push({
@@ -53,326 +53,334 @@
           >作答明细表</span
         >
       </div>
-      <el-table :max-height="tableMaxHeight" v-show="type == 1" :data="tableData" border style="width: 100%">
-        <el-table-column
-          prop="questionIndex"
-          label="题号"
-          align="center"
-          fixed
-          width="60"
-        ></el-table-column>
-        <el-table-column
-          prop="questionType"
-          label="题型"
-          align="center"
-          fixed
-          width="100"
-          ><template slot-scope="scope">{{
-            setSubPro(scope.row.questionType)
-          }}</template></el-table-column
+      <div class="table-box" v-loading="loading">
+        <el-table
+          :max-height="tableMaxHeight"
+          v-show="type == 1"
+          :data="tableData"
+          border
+          style="width: 100%"
         >
-        <el-table-column
-          prop="score"
-          width="100"
-          label="满分值"
-          sortable
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          width="110"
-          prop="highestScore"
-          label="班最高分"
-          sortable
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          width="110"
-          prop="lowestScore"
-          label="班最低分"
-          sortable
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          width="110"
-          prop="avgScore"
-          label="班平均分"
-          sortable
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="classScoringRate"
-          width="120"
-          sortable
-          label="班级得分率"
-          align="center"
-          ><template slot-scope="scoped"
-            >{{ scoped.row.classScoringRate }}%</template
-          ></el-table-column
-        >
-        <el-table-column prop="correctAnswer" label="答案" align="center"
-          ><template slot-scope="scoped">{{
-            scoped.row.correctAnswer == 1
-              ? "✓"
-              : scoped.row.correctAnswer == 2
-              ? "✗"
-              : scoped.row.correctAnswer
-          }}</template>
-        </el-table-column>
-        <el-table-column
-          v-for="(item, index) in optionsList"
-          :key="index"
-          :label="'选项' + (index + 1)"
-          :prop="'count' + index"
-          align="center"
-        >
-        </el-table-column>
-      </el-table>
-      <div class="hui-box" v-show="type == 1">
-        <span class="s-txt">汇总</span>
-        <ul class="hui-ul">
-          <li class="hui-li">
-            <span class="hui-s s1">主观题</span>
-            <span class="hui-s s1">{{ paperModifyLog.subjectiveScore }}</span>
-            <span class="hui-s s2">{{
-              paperModifyLog.subjectiveHighestScore
-            }}</span>
-            <span class="hui-s s2">{{
-              paperModifyLog.subjectiveLowestScore
-            }}</span>
-            <span class="hui-s s2">{{
-              paperModifyLog.subjectiveAvgScore
-            }}</span>
-            <span class="hui-s s3"
-              >{{ paperModifyLog.subjectiveClassScoringRate }}%</span
-            >
-          </li>
-          <li class="hui-li">
-            <span class="hui-s s1">客观题</span>
-            <span class="hui-s s1">{{ paperModifyLog.objectiveScore }}</span>
-            <span class="hui-s s2">{{
-              paperModifyLog.objectiveHighestScore
-            }}</span>
-            <span class="hui-s s2">{{
-              paperModifyLog.objectiveLowestScore
-            }}</span>
-            <span class="hui-s s2">{{ paperModifyLog.objectiveAvgScore }}</span>
-            <span class="hui-s s3"
-              >{{ paperModifyLog.objectiveClassScoringRate }}%</span
-            >
-          </li>
-          <li class="hui-li">
-            <span class="hui-s s1">整卷</span>
-            <span class="hui-s s1">{{ paperModifyLog.examPaperScore }}</span>
-            <span class="hui-s s2">{{ paperModifyLog.highestScore }}</span>
-            <span class="hui-s s2">{{ paperModifyLog.lowestScore }}</span>
-            <span class="hui-s s2">{{ paperModifyLog.avgScore }}</span>
-            <span class="hui-s s3">{{ paperModifyLog.classScoringRate }}%</span>
-          </li>
-        </ul>
-      </div>
-      <el-table
-        v-show="type == 2"
-        :max-height="tableMaxHeight"
-        :data="tableData2"
-        border
-        style="width: 100%"
-        :default-sort="{ prop: 'dadui', order: 'descending' }"
-      >
-        <el-table-column
-          prop="studentCode"
-          label="学号"
-          align="center"
-          fixed
-        ></el-table-column>
-        <el-table-column
-          prop="studentName"
-          label="姓名"
-          fixed
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="examScore"
-          label="总分"
-          sortable
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="scoringRate"
-          label="得分率"
-          sortable
-          align="center"
-          ><template slot-scope="scope"
-            >{{ scope.row.scoringRate }}%</template
-          ></el-table-column
-        >
-        <el-table-column
-          prop="classRank"
-          label="班名"
-          sortable
-          align="center"
-        ></el-table-column>
-        <el-table-column label="客观题" align="center">
           <el-table-column
-            prop="objectiveExamScore"
-            label="得分"
+            prop="questionIndex"
+            label="题号"
             align="center"
+            fixed
+            width="60"
           ></el-table-column>
           <el-table-column
-            prop="objectiveScoringRate"
-            label="得分率"
+            prop="questionType"
+            label="题型"
             align="center"
-            ><template slot-scope="scope"
-              >{{ scope.row.objectiveScoringRate }}%</template
-            ></el-table-column
+            fixed
+            width="100"
+            ><template slot-scope="scope">{{
+              setSubPro(scope.row.questionType)
+            }}</template></el-table-column
           >
-        </el-table-column>
-        <el-table-column label="主观题" align="center">
           <el-table-column
-            prop="subjectiveExamScore"
-            label="得分"
+            prop="score"
+            width="100"
+            label="满分值"
+            sortable
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="subjectiveScoringRate"
-            label="得分率"
+            width="110"
+            prop="highestScore"
+            label="班最高分"
+            sortable
             align="center"
-            ><template slot-scope="scope"
-              >{{ scope.row.subjectiveScoringRate }}%</template
+          ></el-table-column>
+          <el-table-column
+            width="110"
+            prop="lowestScore"
+            label="班最低分"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            width="110"
+            prop="avgScore"
+            label="班平均分"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="classScoringRate"
+            width="120"
+            sortable
+            label="班级得分率"
+            align="center"
+            ><template slot-scope="scoped"
+              >{{ scoped.row.classScoringRate }}%</template
             ></el-table-column
           >
-        </el-table-column>
-      </el-table>
-      <el-table
-        v-show="type == 3"
-        :max-height="tableMaxHeight"
-        :data="tableData2"
-        border
-        style="width: 100%"
-        :default-sort="{ prop: '', order: 'descending' }"
-      >
-        <el-table-column
-          prop="studentCode"
-          label="学号"
-          fixed
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="studentName"
-          label="姓名"
-          fixed
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="examScore"
-          label="总分"
-          sortable
-          align="center"
-        ></el-table-column>
-        <el-table-column label="分数组成" align="center">
+          <el-table-column prop="correctAnswer" label="答案" align="center"
+            ><template slot-scope="scoped">{{
+              scoped.row.correctAnswer == 1
+                ? "✓"
+                : scoped.row.correctAnswer == 2
+                ? "✗"
+                : scoped.row.correctAnswer
+            }}</template>
+          </el-table-column>
+          <el-table-column
+            v-for="(item, index) in optionsList"
+            :key="index"
+            :label="item.title"
+            :prop="'count' + index"
+            align="center"
+            ><template slot-scope="scope">{{
+              scope.row.questionType == "5"
+                ? ""
+                : scope.row["option" + index]
+                ? `${scope.row["option" + index]}(${
+                    scope.row["present" + index]
+                  })`
+                : ""
+            }}</template>
+          </el-table-column>
+        </el-table>
+        <div class="hui-box" v-show="type == 1">
+          <span class="s-txt">汇总</span>
+          <ul class="hui-ul">
+            <li class="hui-li">
+              <span class="hui-s s1">主观题</span>
+              <span class="hui-s s1">{{ examReport.subjectiveScore }}</span>
+              <span class="hui-s s2">{{
+                examReport.subjectiveHighestScore
+              }}</span>
+              <span class="hui-s s2">{{
+                examReport.subjectiveLowestScore
+              }}</span>
+              <span class="hui-s s2">{{ examReport.subjectiveAvgScore }}</span>
+              <span class="hui-s s3"
+                >{{ examReport.subjectiveClassScoringRate }}%</span
+              >
+            </li>
+            <li class="hui-li">
+              <span class="hui-s s1">客观题</span>
+              <span class="hui-s s1">{{ examReport.objectiveScore }}</span>
+              <span class="hui-s s2">{{
+                examReport.objectiveHighestScore
+              }}</span>
+              <span class="hui-s s2">{{
+                examReport.objectiveLowestScore
+              }}</span>
+              <span class="hui-s s2">{{ examReport.objectiveAvgScore }}</span>
+              <span class="hui-s s3"
+                >{{ examReport.objectiveClassScoringRate }}%</span
+              >
+            </li>
+            <li class="hui-li">
+              <span class="hui-s s1">整卷</span>
+              <span class="hui-s s1">{{ examReport.examPaperScore }}</span>
+              <span class="hui-s s2">{{ examReport.highestScore }}</span>
+              <span class="hui-s s2">{{ examReport.lowestScore }}</span>
+              <span class="hui-s s2">{{ examReport.avgScore }}</span>
+              <span class="hui-s s3">{{ examReport.classScoringRate }}%</span>
+            </li>
+          </ul>
+        </div>
+        <el-table
+          v-show="type == 2"
+          :max-height="tableMaxHeight"
+          :data="tableData2"
+          border
+          style="width: 100%"
+          :default-sort="{ prop: 'dadui', order: 'descending' }"
+        >
           <el-table-column
-            prop="objectiveExamScore"
-            label="客观题分"
+            prop="studentCode"
+            label="学号"
             align="center"
+            fixed
           ></el-table-column>
           <el-table-column
-            prop="subjectiveExamScore"
-            label="主观题分"
+            prop="studentName"
+            label="姓名"
+            fixed
             align="center"
           ></el-table-column>
-        </el-table-column>
-        <el-table-column
-          align="center"
-          v-for="(item, index) in questionList"
-          :key="index"
-          :label="'题目' + item.id"
-          :prop="'score' + item.id"
-        >
-        </el-table-column>
-      </el-table>
-      <el-table
-      :max-height="tableMaxHeight"
-        v-show="type == 4"
-        :data="tableData2"
-        border
-        style="width: 100%"
-        :default-sort="{ prop: '', order: 'descending' }"
-      >
-        <el-table-column
-          prop="studentCode"
-          label="学号"
-          fixed
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="studentName"
-          label="姓名"
-          fixed
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="className"
-          label="班级"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="examScore"
-          label="总分"
-          sortable
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          align="center"
-          v-for="(item, index) in questionList"
-          :key="index"
-          :label="'题目' + item.id"
-        >
-          <template slot-scope="scope">
-            <span
-              v-if="scope.row['answer' + item.id]"
-              :class="scope.row['isRight' + item.id] ? '' : 'error'"
+          <el-table-column
+            prop="examScore"
+            label="总分"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="scoringRate"
+            label="得分率"
+            sortable
+            align="center"
+            ><template slot-scope="scope"
+              >{{ scope.row.scoringRate }}%</template
+            ></el-table-column
+          >
+          <el-table-column
+            prop="classRank"
+            label="班名"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column label="客观题" align="center">
+            <el-table-column
+              prop="objectiveExamScore"
+              label="得分"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="objectiveScoringRate"
+              label="得分率"
+              align="center"
+              ><template slot-scope="scope"
+                >{{ scope.row.objectiveScoringRate }}%</template
+              ></el-table-column
             >
-              {{ scope.row["answer" + item.id] }}
-            </span>
-            <span
-              v-else
-              :class="scope.row['questionType' + item.id] == 5 ? '' : 'error'"
+          </el-table-column>
+          <el-table-column label="主观题" align="center">
+            <el-table-column
+              prop="subjectiveExamScore"
+              label="得分"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="subjectiveScoringRate"
+              label="得分率"
+              align="center"
+              ><template slot-scope="scope"
+                >{{ scope.row.subjectiveScoringRate }}%</template
+              ></el-table-column
             >
-              {{ scope.row["questionType" + item.id] == 5 ? "*" : "-" }}
-            </span>
-          </template>
-        </el-table-column>
-      </el-table>
-      <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-table-column>
+        </el-table>
+        <el-table
+          v-show="type == 3"
+          :max-height="tableMaxHeight"
+          :data="tableData2"
+          border
+          style="width: 100%"
+          :default-sort="{ prop: '', order: 'descending' }"
         >
-        </el-pagination>
-      </div>
-      <div class="down">
-        <el-button
-          @click="exportData"
-          type="info"
-          plain
-          round
-          icon="fa fa-cloud-download"
-          >导出报表</el-button
+          <el-table-column
+            prop="studentCode"
+            label="学号"
+            fixed
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="studentName"
+            label="姓名"
+            fixed
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="examScore"
+            label="总分"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column label="分数组成" align="center">
+            <el-table-column
+              prop="objectiveExamScore"
+              label="客观题分"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="subjectiveExamScore"
+              label="主观题分"
+              align="center"
+            ></el-table-column>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            v-for="(item, index) in questionList"
+            :key="index"
+            :label="'题目' + item.id"
+            :prop="'score' + item.id"
+          >
+          </el-table-column>
+        </el-table>
+        <el-table
+          :max-height="tableMaxHeight"
+          v-show="type == 4"
+          :data="tableData2"
+          border
+          style="width: 100%"
+          :default-sort="{ prop: '', order: 'descending' }"
         >
-        <div>
+          <el-table-column
+            prop="studentCode"
+            label="学号"
+            fixed
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="studentName"
+            label="姓名"
+            fixed
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="className"
+            label="班级"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="examScore"
+            label="总分"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            align="center"
+            v-for="(item, index) in questionList"
+            :key="index"
+            :label="'题目' + item.id"
+          >
+            <template slot-scope="scope">
+              <span
+                v-if="scope.row['answer' + item.id]"
+                :class="scope.row['isRight' + item.id] ? '' : 'error'"
+              >
+                {{ scope.row["answer" + item.id] }}
+              </span>
+              <span
+                v-else
+                :class="scope.row['questionType' + item.id] == 5 ? '' : 'error'"
+              >
+                {{ scope.row["questionType" + item.id] == 5 ? "*" : "-" }}
+              </span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="down">
           <el-button
-            v-if="paperModifyLog.subjectiveScore != 0"
-            @click="diaUp = true"
-            type="primary"
+            @click="exportData"
+            type="info"
+            plain
             round
-            v-loading="exportLoading"
-            >导入主观题分数</el-button
+            icon="fa fa-cloud-download"
+            >导出报表</el-button
           >
-          <el-button @click="edit" type="primary" round>修改答案</el-button>
+          <div>
+            <el-button
+              v-if="examReport.subjectiveScore != 0"
+              @click="diaUp = true"
+              type="primary"
+              round
+              v-loading="exportLoading"
+              >导入主观题分数</el-button
+            >
+            <el-button
+              @click="edit"
+              type="primary"
+              v-if="examReport.subjectiveScore != examReport.examPaperScore"
+              round
+              >修改答案</el-button
+            >
+          </div>
         </div>
       </div>
       <div class="edit-dia" v-show="dialogVisible" height="100%">
@@ -385,7 +393,12 @@
         />
       </div>
       <el-dialog title="导入主观题分数" :visible.sync="diaUp" width="600">
-        <up-load :url="url" :examId="id" fileName="教师名单">
+        <up-load
+          :url="url"
+          :examId="id"
+          @upSuccess="upSuccess"
+          fileName="教师名单"
+        >
           <template slot="down">
             <p class="down-txt">
               第一步：下载模板并编辑完成学生分数
@@ -409,7 +422,7 @@ export default {
   components: { editAnswer },
   data() {
     return {
-      tableMaxHeight:300,
+      tableMaxHeight: 600,
       loading: false,
       exportLoading: false,
       diaUp: false,
@@ -422,6 +435,8 @@ export default {
       paperModifyLog: {
         realName: "",
         modifiedTime: "",
+      },
+      examReport: {
         subjectiveScore: 0,
         subjectiveHighestScore: "",
         subjectiveLowestScore: "",
@@ -454,9 +469,15 @@ export default {
     this._QueryData();
   },
   methods: {
-    setType(type){
-      this.tableMaxHeight = this.$refs.main.offsetHeight-120
-      this.type=type
+    upSuccess() {
+      //导入成功
+      this.diaUp = false;
+      this._QueryData();
+    },
+    setType(type) {
+      console.log(this.$refs.main.offsetHeight - 50);
+      this.tableMaxHeight = this.$refs.main.offsetHeight;
+      this.type = type;
     },
     setSubPro(type) {
       let tit;
@@ -517,9 +538,10 @@ export default {
       });
       this.loading = false;
       if (status === 0) {
-        if (data.examReport) {
-          this.paperModifyLog = { ...data.examReport };
+        if (data.paperModifyLog) {
+          this.paperModifyLog = { ...data?.paperModifyLog };
         }
+        this.examReport = { ...data?.examReport };
       } else {
         this.$message.error(info);
       }
@@ -556,7 +578,6 @@ export default {
           if (detail.length > optionsList.length) {
             optionsList = [...detail];
           }
-          console.log(detail);
           detail.map((items, index) => {
             params["que" + items.id] = items.id;
             params["score" + items.id] = Number(items.score).toFixed(2);
@@ -570,7 +591,10 @@ export default {
             ...params,
           };
         });
-        this.questionList = [...optionsList];
+        console.log();
+        this.questionList = optionsList.sort((a, b) => {
+          return a.id - b.id;
+        });
       } else {
         this.$message.error(info);
       }
@@ -581,40 +605,69 @@ export default {
       let { data, info, status } = await this.$request.examQuestionReport({
         examId: this.id,
         page: this.page,
-        size: this.size,
+        // size: this.size,
+        size: 9999,
       });
       this.loading = false;
       if (status === 0) {
-        let optionsList = [];
-        this.tableData = data?.list.map((item) => {
+        let optionsList = [{}, {}, {}, {}, {}];
+        let tableData = data?.list.map((item) => {
           let params = {};
-
           const detail = JSON.parse(item.detail);
-          if (detail.length > optionsList.length) {
-            optionsList = [...detail];
-          }
-          console.log(detail);
-          detail.map((items, index) => {
-            params["count" + index] = items.count;
-            params["option" + index] =
-              items.option == 1 ? "✓" : items.option == 2 ? "✗" : items.option;
+          let lastOPtion = detail?.find((item) => {
+            return item.option == "未答";
+          });
+          let defaultArr = detail?.filter((item) => {
+            return item.option != "未答";
+          });
+          
+          optionsList.map((items, index) => {
+            if (index != 4) {
+              params["count" + index] =
+                defaultArr[index]?.option != "未答" ? defaultArr[index]?.count : "";
+              params["present" + index] =
+                defaultArr[index]?.option != "未答" ? defaultArr[index]?.present : "";
+              params["option" + index] =
+                defaultArr[index]?.option != "未答"
+                  ? defaultArr[index]?.option == 1
+                    ? "✓"
+                    : defaultArr[index]?.option == 2
+                    ? "✗"
+                    : defaultArr[index]?.option
+                  : "";
+              items["title"] = "选项" + (index + 1);
+            } else {
+              items["title"] = "未答";
+              params["count" + index] = lastOPtion.count;
+              params["present" + index] = lastOPtion.present;
+              params["option" + index] =
+                lastOPtion.option == 1
+                  ? "✓"
+                  : lastOPtion.option == 2
+                  ? "✗"
+                  : lastOPtion.option;
+            }
           });
           return {
             ...item,
             ...params,
           };
         });
+        this.tableData = tableData.sort((a, b) => {
+          return a.questionIndex - b.questionIndex;
+        });
         this.optionsList = [...optionsList];
         this.total = data.count;
+        this.setType(1);
       } else {
         this.$message.error(info);
       }
     },
     //导出
     async exportData() {
-      if ((this.exportLoading = true)) return;
+      if (this.exportLoading == true) return;
       this.exportLoading = true;
-      const { data, status, info } = await this.$request.exportData();
+      const { data, status, info } = await this.$request.exportPeriodReport();
       this.exportLoading = false;
       if (data) {
         downloadFile(this.title + "报表", data);
@@ -638,7 +691,10 @@ div::-webkit-scrollbar-thumb {
 <style lang="scss" scoped>
 .page-container {
   position: relative;
-  min-height: 100%;
+  height: 100%;
+  .table-box {
+    min-height: 100%;
+  }
   &.active {
     overflow: hidden;
   }
@@ -671,7 +727,7 @@ div::-webkit-scrollbar-thumb {
   background-color: #ffebec;
   font-size: 14px;
   color: #fd9795;
-  margin: 10px 20px 20px 20px;
+  margin: 10px 20px 0 20px;
   display: flex;
   &-p {
     flex: 1;
@@ -294,7 +294,6 @@
 import { deepClone, checkAnswer } from "utils";
 export default {
   props: {
-    id: "",
     title: "",
     score: "",
   },
@@ -310,6 +309,7 @@ export default {
   },
   data() {
     return {
+      id:"",
       diaSetAns: false,
       form: {},
       questionList: [],
@@ -488,6 +488,7 @@ export default {
     },
     async edit(id) {
       //修改答案
+      this.id = id
       const { data, status, info } = await this.$request.examQuestionList({
         examId: id,
       });
@@ -7,11 +7,7 @@
     </back-box>
     <div class="answer-header">
       <div class="sel-box">
-        <el-select
-          class="sel"
-          v-model="query.classId"
-          placeholder="选择班级"
-        >
+        <el-select class="sel" v-model="query.classId" placeholder="选择班级" @change="changeclass">
           <el-option
             v-for="item in classList"
             :key="item.value"
@@ -93,10 +89,10 @@
         style="margin-bottom: 20px"
       >
         <el-radio-button :label="1">单卷测练报表</el-radio-button>
-        <el-radio-button :label="2">阶段测练报表</el-radio-button>
+        <el-radio-button :label="2" v-show="this.query.startDay!=this.query.endDay">阶段测练报表</el-radio-button>
       </el-radio-group>
       <div v-show="tabIndex == 1" v-loading="loading">
-        <el-table :data="tableData" border style="width: 100%">
+        <el-table :data="tableData" :show-header="tableData.length?true:false"  border style="width: 100%">
           <el-table-column
             prop="title"
             label="试卷名称"
@@ -120,24 +116,24 @@
           ></el-table-column>
           <el-table-column prop="avgScore" label="班平均分" align="center"
             ><template slot-scope="scoped">{{
-              scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-              scoped.row.answerNum == 0
+              (scoped.row.subjectiveScore == scoped.row.examPaperScore || scoped.row.answerNum == 0) &&
+              scoped.row.recordStatus == 0
                 ? "-"
                 : scoped.row.avgScore
             }}</template></el-table-column
           >
           <el-table-column prop="highestScore" label="班最高分" align="center"
             ><template slot-scope="scoped">{{
-              scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-              scoped.row.answerNum == 0
+              (scoped.row.subjectiveScore == scoped.row.examPaperScore || scoped.row.answerNum == 0) &&
+              scoped.row.recordStatus == 0
                 ? "-"
                 : scoped.row.highestScore
             }}</template></el-table-column
           >
           <el-table-column prop="lowestScore" label="班最低分" align="center"
             ><template slot-scope="scoped">{{
-              scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-              scoped.row.answerNum == 0
+              (scoped.row.subjectiveScore == scoped.row.examPaperScore || scoped.row.answerNum == 0) &&
+              scoped.row.recordStatus == 0
                 ? "-"
                 : scoped.row.lowestScore
             }}</template></el-table-column
@@ -148,10 +144,12 @@
             sortable
             align="center"
             ><template slot-scope="scoped">{{
-              scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-              scoped.row.answerNum == 0
+              (scoped.row.subjectiveScore == scoped.row.examPaperScore || scoped.row.answerNum == 0) &&
+              scoped.row.recordStatus == 0
                 ? "-"
-                : scoped.row.excellenNum?`${scoped.row.excellenNum}/${scoped.row.excellenRate}%`:scoped.row.excellenNum 
+                : scoped.row.excellenNum
+                ? `${scoped.row.excellenNum}/${scoped.row.excellenRate}%`
+                : scoped.row.excellenNum
             }}</template></el-table-column
           >
           <el-table-column
@@ -161,10 +159,12 @@
             align="center"
             ><template slot-scope="scoped"
               >{{
-                scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                scoped.row.answerNum == 0
+                (scoped.row.subjectiveScore == scoped.row.examPaperScore || scoped.row.answerNum == 0) &&
+                scoped.row.recordStatus == 0
                   ? "-"
-                  : scoped.row.goodNum?`${scoped.row.goodNum}/${scoped.row.goodRate}%`:scoped.row.goodNum
+                  : scoped.row.goodNum
+                  ? `${scoped.row.goodNum}/${scoped.row.goodRate}%`
+                  : scoped.row.goodNum
               }}
             </template></el-table-column
           >
@@ -175,10 +175,12 @@
             align="center"
             ><template slot-scope="scoped"
               >{{
-                scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                scoped.row.answerNum == 0
-                  ?  "-"
-                  : scoped.row.passNum?`${scoped.row.passNum}/${scoped.row.passRate}%`:scoped.row.passNum
+                (scoped.row.subjectiveScore == scoped.row.examPaperScore || scoped.row.answerNum == 0) &&
+                scoped.row.recordStatus == 0
+                  ? "-"
+                  : scoped.row.passNum
+                  ? `${scoped.row.passNum}/${scoped.row.passRate}%`
+                  : scoped.row.passNum
               }}
             </template></el-table-column
           >
@@ -188,16 +190,18 @@
             sortable
             align="center"
             ><template slot-scope="scoped">{{
-              scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-              scoped.row.answerNum == 0
+              (scoped.row.subjectiveScore == scoped.row.examPaperScore || scoped.row.nswerNum  == 0) &&
+              scoped.row.arecordStatus== 0 
                 ? "-"
-                : scoped.row.failedNum?`${scoped.row.failedNum}/${scoped.row.failedRate}%`:scoped.row.failedNum
+                : scoped.row.failedNum
+                ? `${scoped.row.failedNum}/${scoped.row.failedRate}%`
+                : scoped.row.failedNum
             }}</template></el-table-column
           >
           <el-table-column label="操作" align="center">
             <template slot-scope="scoped">
               <el-tooltip
-                v-if="scoped.row.answerNum != 0"
+                v-if="scoped.row.answerNum != 0 || (scoped.row.recordStatus != 0 &&scoped.row.subjectiveScore == scoped.row.examPaperScore)"
                 effect="dark"
                 content="详情"
                 placement="top"
@@ -211,9 +215,9 @@
                 ></el-button>
               </el-tooltip>
               <el-tooltip
-                v-else
+                v-if="scoped.row.answerNum == 0 && scoped.row.subjectiveScore != scoped.row.examPaperScore"
                 effect="dark"
-                content="修改答案"
+                content="设置答案"
                 placement="top"
               >
                 <el-button
@@ -225,7 +229,7 @@
                 ></el-button>
               </el-tooltip>
               <el-tooltip
-                v-if="scoped.row.subjectiveScore == scoped.row.examPaperScore"
+                v-if="scoped.row.subjectiveScore == scoped.row.examPaperScore && scoped.row.recordStatus == 0"
                 effect="dark"
                 content="导入主观题"
                 placement="top"
@@ -256,8 +260,10 @@
       </div>
       <div v-show="tabIndex == 2" v-loading="loading">
         <el-table
+          :max-height="tableMaxHeight"
           v-if="role == 'ROLE_JIAOSHI'"
           :data="tableData"
+          :show-header="tableData.length?true:false"
           border
           style="width: 100%"
         >
@@ -291,7 +297,14 @@
             ></el-table-column>
           </el-table-column>
         </el-table>
-        <el-table :max-height="tableMaxHeight" v-else :data="tableData" border style="width: 100%">
+        <el-table
+        :show-header="tableData.length?true:false"
+          :max-height="tableMaxHeight"
+          v-else
+          :data="tableData"
+          border
+          style="width: 100%"
+        >
           <el-table-column
             prop="studentCode"
             label="学号"
@@ -340,7 +353,7 @@
       </p>
     </div>
     <el-dialog title="导入主观题分数" :visible.sync="diaUp" width="600">
-      <up-load :url="url" :examId="examId" fileName="教师名单">
+      <up-load :url="url" :examId="examId" @upSuccess="upSuccess" fileName="主观题分数" v-loading="loadingDown">
         <template slot="down">
           <p class="down-txt">
             第一步：下载模板并编辑完成学生分数
@@ -372,10 +385,11 @@ export default {
   components: { editAnswer },
   data() {
     return {
-      tableMaxHeight:300,
+      tableMaxHeight: 300,
       role: "",
       loading: false,
       diaUp: false,
+      loadingDown:false,
       url: "/api_html/teaching/importSubjectiveScore",
       examId: "",
       dialogVisible: false,
@@ -417,13 +431,13 @@ export default {
     }
   },
   methods: {
-     changeSub(val) {
+    changeSub(val) {
       let sub;
       if (val && val.length) {
         let leng = val.length - 1;
         sub = val[leng];
       }
-      console.log(val)
+      console.log(val);
       this.query.subjectNames = val.filter((item) => {
         return sub != "全部" ? item != "全部" : item == "全部";
       });
@@ -529,14 +543,25 @@ export default {
       this.dialogVisible = true;
     },
     changeTab() {
-      this.tableMaxHeight = this.$refs.main.offsetHeight-100
+      this.tableMaxHeight = this.$refs.main.offsetHeight;
       this.page = 1;
       this._QueryData();
     },
+    upSuccess(){//导入成功
+    this.diaUp = false
+      this._QueryData();
+    },
+    async changeclass(){
+      await this._QuerySubjectList()
+      this.page = 1
+      this._QueryData()
+    },
     async downExcel() {
+      this.loadingDown = true
       let data = await this.$request.subjectiveScoreTemplate({
-        examId: this.id,
+        examId: this.examId,
       });
+      this.loadingDown = false
       if (data && !data.code) {
         let blob = new Blob([data], {
           type: "application/vnd.ms-excel;charset=utf-8",
@@ -629,7 +654,7 @@ export default {
           });
           query["subjectNames"].shift();
         }
-         if (!query["subjectNames"]) {
+        if (!query["subjectNames"]) {
           this.$message.warning("请选择科目");
           return;
         }
@@ -754,7 +779,7 @@ div::-webkit-scrollbar-thumb {
 <style lang="scss" scoped>
 .page-container {
   position: relative;
-  min-height: 100%;
+  height: 100%;
   &.active {
     overflow: hidden;
   }