From 9309dc5d890aab5ff73ff7df9be2945454fdec58 Mon Sep 17 00:00:00 2001
From: 梁保满 <lbm@liangbaomandeMacBook-Pro.local>
Date: Tue, 3 Jan 2023 19:33:22 +0800
Subject: [PATCH] 任课老师接口完成

---
 src/api/apis/apis.js               |  227 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/api/urls/apis.js               |   68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 src/assets/css/index.scss          |    2 +-
 src/components/setAnswer.vue       |  459 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/components/upload.vue          |   19 ++++++++++++++++++-
 src/views/ask/analysis.vue         |  467 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------
 src/views/ask/index.vue            |  558 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/examinationPaper/add.vue |    8 ++++----
 src/views/index/mainIndex.vue      |   12 +++++++++++-
 src/views/login/index.vue          |   16 ++++++++++------
 src/views/setUp/account.vue        |   28 ++++++++++++++++------------
 src/views/setUp/student.vue        |    2 +-
 src/views/setUp/teacher.vue        |    4 ++--
 src/views/test/analysis.vue        |  498 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/test/editAnswer.vue      |  814 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/test/index.vue           | 1057 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 16 files changed, 2640 insertions(+), 1599 deletions(-)
 create mode 100644 src/views/test/editAnswer.vue

diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js
index 8943bb9..1bee16d 100644
--- a/src/api/apis/apis.js
+++ b/src/api/apis/apis.js
@@ -26,6 +26,233 @@ export default {
       data,
     });
   },
+  // 班主任首页数据
+  classIndex(data) {
+    return service({
+      url: setUpUrls.classIndex,
+      method: "POST",
+      data,
+    });
+  },
+   //班主任-查询管理的班级
+   cTClassList(data) {
+    return service({
+      url: setUpUrls.cTClassList,
+      method: "POST",
+      data,
+    });
+  },
+  //班主任-查询管理班级授课科目
+  cTSubjectList(data) {
+    return service({
+      url: setUpUrls.cTSubjectList,
+      method: "POST",
+      data,
+    });
+  },
+  //班主任-查询阶段问答报表
+  cTPhaseAnswerReport(data) {
+    return service({
+      url: setUpUrls.cTPhaseAnswerReport,
+      method: "POST",
+      data,
+    });
+  },
+  //班主任-查询阶段互动报表
+  cTPhaseInteractiveReport(data) {
+    return service({
+      url: setUpUrls.cTPhaseInteractiveReport,
+      method: "POST",
+      data,
+    });
+  },
+  //班主任-查询阶段测练报表
+  cTPhaseExamReport(data) {
+    return service({
+      url: setUpUrls.cTPhaseExamReport,
+      method: "POST",
+      data,
+    });
+  },
+
+   //任课老师-查询管理的班级
+   tClassList(data) {
+    return service({
+      url: setUpUrls.tClassList,
+      method: "POST",
+      data,
+    });
+  },
+  //任课老师-查询管理班级授课科目
+  tSubjectList(data) {
+    return service({
+      url: setUpUrls.tSubjectList,
+      method: "POST",
+      data,
+    });
+  },
+  //任课老师-分页查询课时报表列表
+  periodReportList(data) {
+    return service({
+      url: setUpUrls.periodReportList,
+      method: "POST",
+      data,
+    });
+  },
+  //任课老师-查询阶段问答报表
+  phaseAnswerReport(data) {
+    return service({
+      url: setUpUrls.phaseAnswerReport,
+      method: "POST",
+      data,
+    });
+  },
+  //任课老师-查询阶段互动报表
+  phaseInteractiveReport(data) {
+    return service({
+      url: setUpUrls.phaseInteractiveReport,
+      method: "POST",
+      data,
+    });
+  },
+  //任课老师-查询课时题目列表
+  periodQuestionList(data) {
+    return service({
+      url: setUpUrls.periodQuestionList,
+      method: "POST",
+      data,
+    });
+  },
+  //任课老师-设置课时报表答案
+  setPeriodAnswer(data) {
+    return service({
+      url: setUpUrls.setPeriodAnswer,
+      method: "POST",
+      data,
+    });
+  },
+  //任课老师-查询课时报表详情
+  periodDetail(data) {
+    return service({
+      url: setUpUrls.periodDetail,
+      method: "POST",
+      data,
+    });
+  },
+  //任课老师-分页查询课时题目统计列表
+  periodQuestionReport(data) {
+    return service({
+      url: setUpUrls.periodQuestionReport,
+      method: "POST",
+      data,
+    });
+  },
+  //任课老师-查询课时学生答题明细
+  periodStudentReport(data) {
+    return service({
+      url: setUpUrls.periodStudentReport,
+      method: "POST",
+      data,
+    });
+  },
+  //任课老师-分页查询即时测报表
+  examReportList(data) {
+    return service({
+      url: setUpUrls.examReportList,
+      method: "POST",
+      data,
+    });
+  },
+  //任课老师-查询阶段测练报表
+  phaseExamReport(data) {
+    return service({
+      url: setUpUrls.phaseExamReport,
+      method: "POST",
+      data,
+    });
+  },
+  //任课老师-查询即时测报表题目列表
+  examQuestionList(data) {
+    return service({
+      url: setUpUrls.examQuestionList,
+      method: "POST",
+      data,
+    });
+  },
+  //任课老师-设置即时测报表答案
+  setExamAnswer(data) {
+    return service({
+      url: setUpUrls.setExamAnswer,
+      method: "POST",
+      data,
+    });
+  },
+  //任课老师-查询即时测报表详情
+  examDetail(data) {
+    return service({
+      url: setUpUrls.examDetail,
+      method: "POST",
+      data,
+    });
+  },
+  //任课老师-下载导入主观题分模板
+  subjectiveScoreTemplate(data) {
+    return service({
+      url: setUpUrls.subjectiveScoreTemplate,
+      method: "POST",
+      data,
+    });
+  },
+  //任课老师-导入主观题得分
+  importSubjectiveScore(data) {
+    return service({
+      url: setUpUrls.importSubjectiveScore,
+      method: "POST",
+      data,
+    });
+  },
+  //任课老师-分页查询即时测题目统计
+  examQuestionReport(data) {
+    return service({
+      url: setUpUrls.examQuestionReport,
+      method: "POST",
+      data,
+    });
+  },
+  //任课老师-查询即时测学生统计
+  examStudentReport(data) {
+    return service({
+      url: setUpUrls.examStudentReport,
+      method: "POST",
+      data,
+    });
+  },
+  //任课老师-重新判分
+  reScore(data) {
+    return service({
+      url: setUpUrls.reScore,
+      method: "POST",
+      data,
+    });
+  },
+  //任课老师-数据导出
+  exportData(data) {
+    return service({
+      url: setUpUrls.exportData,
+      method: "POST",
+      data,
+    });
+  },
+  //任课老师-数据导入
+  importData(data) {
+    return service({
+      url: setUpUrls.importData,
+      method: "POST",
+      data,
+    });
+  },
+
+
   // 查询角色列表
   roleList(data) {
     return service({
diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js
index 7ca92d8..bbdc872 100644
--- a/src/api/urls/apis.js
+++ b/src/api/urls/apis.js
@@ -6,6 +6,68 @@ export default {
   schoolIndex: "/api_html/school/manager/index",
   // 学校管理员首页数据
   tenantIndex: "/api_html/tenant/index",
+  // 班主任首页数据
+  classIndex: "/api_html/class/manager/index",
+  //班主任-查询管理的班级
+  cTClassList: "/api_html/class/manager/classList",
+  //班主任-查询管理班级授课科目
+  cTSubjectList: "/api_html/class/manager/subjectList",
+  //班主任-查询阶段问答报表
+  cTPhaseAnswerReport: "/api_html/class/manager/phaseAnswerReport",
+  //班主任-查询阶段互动报表
+  cTPhaseInteractiveReport: "/api_html/class/manager/phaseInteractiveReport",
+  //班主任-查询阶段测练报表
+  cTPhaseExamReport: "/api_html/class/manager/phaseExamReport",
+  
+  //任课老师-查询管理班级
+  tClassList: "/api_html/teaching/classList",
+  //任课老师-查询管理班级授课科目
+  tSubjectList: "/api_html/teaching/subjectList",
+  //任课老师-分页查询课时报表列表
+  periodReportList: "/api_html/teaching/periodReportList",
+  //任课老师-查询阶段问答报表
+  phaseAnswerReport: "/api_html/teaching/phaseAnswerReport",
+  //任课老师-查询阶段互动报表
+  phaseInteractiveReport: "/api_html/teaching/phaseInteractiveReport",
+  //任课老师-查询课时题目列表
+  periodQuestionList: "/api_html/teaching/periodQuestionList",
+  //任课老师-设置课时报表答案
+  setPeriodAnswer: "/api_html/teaching/setPeriodAnswer",
+  //任课老师-查询课时报表详情
+  periodDetail: "/api_html/teaching/periodDetail",
+  //任课老师-分页查询课时题目统计列表
+  periodQuestionReport: "/api_html/teaching/periodQuestionReport",
+  //任课老师-查询课时学生答题明细
+  periodStudentReport: "/api_html/teaching/periodStudentReport",
+  //任课老师-分页查询即时测报表
+  examReportList: "/api_html/teaching/examReportList",
+  //任课老师-查询阶段测练报表
+  phaseExamReport: "/api_html/teaching/phaseExamReport",
+  //任课老师-查询即时测报表题目列表
+  examQuestionList: "/api_html/teaching/examQuestionList",
+  //任课老师-设置即时测报表答案
+  setExamAnswer: "/api_html/teaching/setExamAnswer",
+  //任课老师-查询即时测报表详情
+  examDetail: "/api_html/teaching/examDetail",
+  //任课老师-下载导入主观题分模板
+  subjectiveScoreTemplate: "/api_html/teaching/subjectiveScoreTemplate",
+  //任课老师-导入主观题得分
+  importSubjectiveScore: "/api_html/teaching/importSubjectiveScore",
+  //任课老师-分页查询即时测题目统计
+  examQuestionReport: "/api_html/teaching/examQuestionReport",
+  //任课老师-查询即时测学生统计
+  examStudentReport: "/api_html/teaching/examStudentReport",
+  //任课老师-重新判分
+  reScore: "/api_html/teaching/reScore",
+  //任课老师-数据导出
+  exportData: "/api_html/teaching/exportData",
+  //任课老师-数据导入
+  importData: "/api_html/teaching/importData",
+
+
+
+
+
   // 查询角色列表
   roleList: "/api_html/school/manager/roleList",
   //  分页查询账号
@@ -68,8 +130,8 @@ export default {
   usageAnalysis: "/api_html/school/manager/usageAnalysis",
   // 发卡记录
   cardList: "/api_html/school/manager/cardList",
-  
-  
+
+
   // 查询区域列表
   regionList: "/api_html/tenant/regionList",
   // 查询学校列表
@@ -100,7 +162,7 @@ export default {
   tenantGradeList: "/api_html/tenant/gradeList",
   // 查询学校班级
   tenantClassList: "/api_html/tenant/classList",
-  
+
   //  学校使用对比
   schoolContrast: "/api_html/tenant/schoolContrast",
   //  年级使用对比
diff --git a/src/assets/css/index.scss b/src/assets/css/index.scss
index fee026d..ddac408 100644
--- a/src/assets/css/index.scss
+++ b/src/assets/css/index.scss
@@ -120,7 +120,7 @@
 .down-txt{
   display: flex;
   align-items: center;
-  justify-content: center;
+  padding-left: 160px;
 }
 .h-title{
   padding-left:12px;
diff --git a/src/components/setAnswer.vue b/src/components/setAnswer.vue
index aed1879..d069f1b 100644
--- a/src/components/setAnswer.vue
+++ b/src/components/setAnswer.vue
@@ -8,145 +8,64 @@
   >
     <div class="el-dialog-content">
       <p class="title">
-        设置答案 <i class="fa fa-exchange" @click="editType = !editType"></i>
+        设置答案 <i class="fa fa-exchange"></i>
         <!-- 设置答案 -->
         <i class="el-icon-close" @click="cancel"></i>
       </p>
-      <div v-if="editType">
-        <div v-for="(item, index) in FormQuestionList" :key="index">
-          <template v-for="(subQuestions, indexs) in item.subQuestions">
-            <div
-              class="sub-questions"
-              :key="indexs"
-              v-if="subQuestions.correctAnswer"
+      <div class="dia-question-box">
+        <p class="dia-tips">点击批量设置答案按钮，批量设置答案</p>
+        <div v-for="(subQuestions, index) in FormQuestionList" :key="index">
+          <p
+            class="set-ans-btn"
+            v-if="
+              subQuestions.qusType &&
+              subQuestions.subNum &&
+              subQuestions.subNum > 4
+            "
+          >
+            <el-button type="primary" @click="setFormAns(index)"
+              >批量设置答案</el-button
             >
-              <div class="qs-num">题{{ subQuestions.questionIndex }}</div>
-              <div class="qs-options qs-options2">
-                <p v-if="subQuestions.questionType == 4" class="answer-box">
-                  <span
-                    class="answer-s"
-                    :class="subQuestions.correctAnswer == 1 ? 'active' : ''"
-                    @click="subQuestions.correctAnswer = 1"
-                    >✓</span
-                  >
-                  <span
-                    class="answer-s"
-                    :class="subQuestions.correctAnswer == 2 ? 'active' : ''"
-                    @click="subQuestions.correctAnswer = 2"
-                    >✗</span
-                  >
-                </p>
-                <p v-if="subQuestions.questionType == 3" class="answer-box">
-                  <span
-                    class="answer-s"
-                    v-for="option in subQuestions.answerOptions"
-                    :class="
-                      subQuestions.correctAnswer.includes(option)
-                        ? 'active'
-                        : ''
-                    "
-                    :key="option"
-                    @click="changAnswer(subQuestions, option)"
-                    >{{ option }}</span
-                  >
-                </p>
-                <p v-if="subQuestions.questionType == 2" class="answer-box">
-                  <span
-                    class="answer-s"
-                    v-for="option in subQuestions.answerOptions"
-                    :class="
-                      subQuestions.correctAnswer == option ? 'active' : ''
-                    "
-                    :key="option"
-                    @click="subQuestions.correctAnswer = option"
-                    >{{ option }}</span
-                  >
-                </p>
-              </div>
-            </div>
-          </template>
-        </div>
-      </div>
-      <div v-else>
-        <p class="dia-tips">
-          请点击选项按钮设置答案,多选题题目之间用“,”隔开，若添加5道题：“AC,AD,BD,AC,CD”
-        </p>
-        <div class="dia-question-box">
-          <div v-for="(item, index) in FormQuestionList2" :key="index">
-            <div class="set-questions">
-              <div class="qs-num">
-                <p class="txt">{{ item.name }}</p>
-                <p class="num">共{{ item.list.length }}题</p>
-              </div>
-              <div class="qs-options">
-                <p class="ipt">
-                  <el-input
-                    v-model="item.answerList"
-                    @keydown.native="keydownAnswer($event)"
-                  ></el-input>
-                </p>
-                <p class="answer-box">
-                  <template v-if="item.list[0].questionType == 4">
-                    <span
-                      class="answer-s active"
-                      @click="
-                        item.answerList.length < item.list.length
-                          ? (item.answerList += '✓')
-                          : ''
-                      "
-                      >✓</span
-                    >
-                    <span
-                      class="answer-s active"
-                      @click="
-                        item.answerList.length < item.list.length
-                          ? (item.answerList += '✗')
-                          : ''
-                      "
-                      >✗</span
-                    >
-                  </template>
-                  <template v-if="item.list[0].questionType == 3">
-                    <span
-                      class="answer-s active"
-                      v-for="option in item.list[0].answerOptions"
-                      :key="option"
-                      @click="setAnswer(item, option)"
-                      >{{ option }}</span
-                    >
-                    <span
-                      class="answer-s active"
-                      @click="
-                        item.answerList.split(',').length < item.list.length
-                          ? (item.answerList += ',')
-                          : ''
-                      "
-                      >,</span
-                    >
-                  </template>
-                  <template
-                    v-if="item.list[0].questionType == 2"
-                    class="answer-box"
-                  >
-                    <span
-                      class="answer-s active"
-                      v-for="option in item.list[0].answerOptions"
-                      :key="option"
-                      @click="
-                        item.answerList.length < item.list.length
-                          ? (item.answerList += option)
-                          : ''
-                      "
-                      >{{ option }}</span
-                    >
-                  </template>
-                  <span
-                    class="answer-s delButton"
-                    @click="item.answerList = item.answerList.slice(0, -1)"
-                    >x</span
-                  >
-                </p>
-              </div>
+          </p>
+          <div class="sub-questions" :key="index" v-else>
+            <div class="qs-num">题{{ subQuestions.questionIndex }}</div>
+            <div class="qs-options qs-options2">
+              <p v-if="subQuestions.questionType == 4" class="answer-box">
+                <span
+                  class="answer-s"
+                  :class="subQuestions.correctAnswer == 1 ? 'active' : ''"
+                  @click="subQuestions.correctAnswer = 1"
+                  >✓</span
+                >
+                <span
+                  class="answer-s"
+                  :class="subQuestions.correctAnswer == 2 ? 'active' : ''"
+                  @click="subQuestions.correctAnswer = 2"
+                  >✗</span
+                >
+              </p>
+              <p v-if="subQuestions.questionType == 3" class="answer-box">
+                <span
+                  class="answer-s"
+                  v-for="option in subQuestions.answerOptions.split(',')"
+                  :class="
+                    subQuestions.correctAnswer.includes(option) ? 'active' : ''
+                  "
+                  :key="option"
+                  @click="changAnswer(subQuestions, option)"
+                  >{{ option }}</span
+                >
+              </p>
+              <p v-if="subQuestions.questionType == 2" class="answer-box">
+                <span
+                  class="answer-s"
+                  v-for="option in subQuestions.answerOptions.split(',')"
+                  :class="subQuestions.correctAnswer == option ? 'active' : ''"
+                  :key="option"
+                  @click="subQuestions.correctAnswer = option"
+                  >{{ option }}</span
+                >
+              </p>
             </div>
           </div>
         </div>
@@ -160,6 +79,84 @@
         >
       </div>
     </div>
+    <el-dialog
+      title="批量设置答案"
+      :visible.sync="diaSetAns"
+      width="400"
+      :modal-append-to-body="false"
+    >
+      <div class="qs-options">
+        <p>{{ setSubPro(formAns.qusType) }}：</p>
+        <p class="ipt">
+          <el-input
+            v-model="formAns.answerList"
+            @keydown.native="keydownAnswer($event)"
+          ></el-input>
+        </p>
+        <p class="answer-box">
+          <template v-if="formAns.qusType == 4">
+            <span
+              class="answer-s active"
+              @click="
+                formAns.answerList.length < formAns.subNum
+                  ? (formAns.answerList += '✓')
+                  : ''
+              "
+              >✓</span
+            >
+            <span
+              class="answer-s active"
+              @click="
+                formAns.answerList.length < formAns.subNum
+                  ? (formAns.answerList += '✗')
+                  : ''
+              "
+              >✗</span
+            >
+          </template>
+          <template v-if="formAns.qusType == 3">
+            <span
+              class="answer-s active"
+              v-for="option in formAns.answerOptions.split(',')"
+              :key="option"
+              @click="setMultiple(formAns, option)"
+              >{{ option }}</span
+            >
+            <span
+              class="answer-s active"
+              @click="
+                formAns.answerList.split(',').length < formAns.subNum
+                  ? (formAns.answerList += ',')
+                  : ''
+              "
+              >,</span
+            >
+          </template>
+          <template v-if="formAns.qusType == 2" class="answer-box">
+            <span
+              class="answer-s active"
+              v-for="option in formAns.answerOptions.split(',')"
+              :key="option"
+              @click="
+                formAns.answerList.length < formAns.subNum
+                  ? (formAns.answerList += option)
+                  : ''
+              "
+              >{{ option }}</span
+            >
+          </template>
+          <span
+            class="answer-s delButton"
+            @click="formAns.answerList = formAns.answerList.slice(0, -1)"
+            >x</span
+          >
+        </p>
+      </div>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="saveFormAns">确 定</el-button>
+        <el-button @click="diaSetAns = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -174,62 +171,116 @@ export default {
   },
   data() {
     return {
+      diaSetAns: false,
       editType: true, //修改答案模式
       FormQuestionList: [],
-      FormQuestionList2: [],
+      FormQuestionList: [],
+      formAns: {
+        endIndex: 0, //相同题目最后一位题目的questionIndex
+        qusType: "", //题目类型
+        subNum: 0, //数量
+        answerOptions: [], //答案选项
+        answerList: "", //答案列表-字符串
+      },
     };
   },
   watch: {
     questionList: {
-      handler: function () {
-        this.FormQuestionList = deepClone(this.questionList);
-        this.FormQuestionList2 = [];
-        console.log(this.questionList);
-        // 组合每道大题中的相同题目
-        let questionList = deepClone(this.questionList);
-        let jsons = {};
-        let answerOptions = [];
-        for (let i = 0; i < questionList.length; i++) {
-          questionList[i].subQuestions.map((items) => {
-            let txt = this.setSubPro(items.questionType);
-            if (jsons[txt]) {
-              jsons[txt].push(items);
+      handler: function (val) {
+        const questions = deepClone(val).sort((a, b) => {
+          return a.questionIndex - b.questionIndex;
+        });
+        this.FormQuestionList = deepClone(questions);
+        let types = [{}];
+        let addndex = 0;
+        this.FormQuestionList?.map((sub, index) => {
+          if (!!sub.questionType) {
+            if (sub.questionType == types[addndex].qusType) {
+              //同类型批量答案+1
+              types[addndex].subNum += 1;
+              if (
+                types[addndex].answerOptions.length < sub.answerOptions.length
+              ) {
+                types[addndex].answerOptions = sub.answerOptions;
+              }
+              types[addndex].answerList += this.setAnswer(
+                sub.questionType,
+                sub.correctAnswer
+              );
+              if (index == this.questionList.length - 1) {
+                //循环最后类型数量大于等于5，保存批量答案
+                if (types[addndex].subNum && types[addndex].subNum >= 5) {
+                  types[addndex].endIndex = sub.questionIndex;
+                  types[addndex].index = index;
+                }
+              }
             } else {
-              jsons[txt] = [items];
-            }
-            if (items.questionType == 2 || items.questionType == 3) {
-              if (items.answerOptions.length > answerOptions.length) {
-                answerOptions = items.answerOptions;
+              if (types[addndex].subNum && types[addndex].subNum >= 5) {
+                //不同类型时如果原有类型数量大于等于5，保存批量答案
+                types[addndex].endIndex =
+                  this.questionList[index - 1].questionIndex;
+                types[addndex].index = index;
+                addndex += 1;
+                types[addndex] = {};
               }
-              jsons[txt][0].answerOptions = answerOptions;
-            }
-          });
-          console.log(jsons);
-        }
-        this.FormQuestionList2 = Object.keys(jsons).map((item) => {
-          let answerList = "";
-          jsons[item].map((items, index) => {
-            if (items.questionType == 2) {
-              answerList += items.correctAnswer;
-            } else if (items.questionType == 3) {
-              answerList +=
-                items.correctAnswer +
-                (jsons[item].length - 1 != index ? "," : "");
-            } else if (items.questionType == 4) {
-              answerList += items.correctAnswer == 1 ? "✓" : "✗";
+              //不同类型初始化批量答案
+              types[addndex].qusType = sub.questionType;
+              types[addndex].subNum = 1;
+              types[addndex].answerOptions = sub.answerOptions;
+              types[addndex].answerList = this.setAnswer(
+                sub.questionType,
+                sub.correctAnswer
+              );
             }
-          });
-          return {
-            name: item,
-            list: jsons[item],
-            answerList: answerList,
-          };
+          }
         });
+        for (let i = 0; i < types.length; i++) {
+          if (types[i].qusType == 3) {
+            types[i].answerList = types[i].answerList.slice(0, -1);
+          }
+          if (types[i].subNum >= 5) {
+            item.subQuestions.splice(
+              types[i].index + i + 1,
+              0,
+              deepClone(types[i])
+            );
+          }
+        }
       },
       deep: true,
     },
   },
   methods: {
+    setFormAns(indexs) {
+      //初始化要修改的答案
+      this.formAns = { ...this.FormQuestionList[indexs] };
+      this.diaSetAns = true;
+    },
+    saveFormAns() {
+      //批量修改答案
+      let EndIndex;
+      let subNum = this.formAns.subNum - 1;
+      this.FormQuestionList.some((item, index) => {
+        if (this.formAns.endIndex == item.questionIndex) {
+          EndIndex = index;
+          return;
+        }
+      });
+      for (let i = 0; i <= subNum; i++) {
+        let correctAnswer = "";
+        if (this.formAns.qusType == 2) {
+          correctAnswer = this.formAns.answerList[subNum - i];
+        } else if (this.formAns.qusType == 3) {
+          correctAnswer = this.formAns.answerList.split(",")[subNum - i];
+
+          console.log(this.formAns.answerList.split(",")[subNum - i]);
+        } else if (this.formAns.qusType == 4) {
+          correctAnswer = this.formAns.answerList[subNum - i] == "✓" ? 1 : 2;
+        }
+        this.questionList[EndIndex - i].correctAnswer = correctAnswer;
+      }
+      this.diaSetAns = false;
+    },
     setSubPro(type) {
       let tit;
       switch (type) {
@@ -270,15 +321,26 @@ export default {
         event.returnValue = "";
       }
     },
-    setAnswer(obj, answer) {
+    setAnswer(type, ans) {
+      let txt = "";
+      if (type == 2) {
+        txt = ans;
+      } else if (type == 3) {
+        txt = ans + ",";
+      } else if (type == 4) {
+        txt = ans == 1 ? "✓" : "✗";
+      }
+      return txt;
+    },
+    setMultiple(obj, answer) {
       //多选答案设置
       obj.answerList += answer;
       let str = obj.answerList;
       let str2 = checkAnswer(
         str,
         3,
-        obj.list[0].answerOptions,
-        obj.list.length
+        obj.answerOptions.split(",").length,
+        obj.answerList.length
       );
       obj.answerList = str2;
     },
@@ -294,39 +356,16 @@ export default {
       }
     },
     async saveAnswer() {
-      let questionList = [],
-        questionList2 = [];
-      if (this.editType) {
-        questionList = [...this.FormQuestionList];
-      } else {
-        this.FormQuestionList2.map((item) => {
-          item.list.map((items, index) => {
-            if (items.questionType == 2 ) {
-              items.correctAnswer = item.answerList.split("")[index];
-            } else if (items.questionType == 3) {
-              items.correctAnswer = item.answerList.split(",")[index];
-            }else if (items.questionType == 4) {
-              items.correctAnswer = item.answerList[index] == "✓" ? 1 : 2;
-            }
-            questionList2.push(items);
-          });
-        });
-        questionList = this.FormQuestionList.map((item) => {
-          let subQuestions = item.subQuestions.map((items) => {
-            items.correctAnswer = questionList2.find((question) => {
-              return question.questionIndex == items.questionIndex;
-            })?.correctAnswer;
-            return items;
-          });
-          return {
-            ...item,
-            subQuestions: [...subQuestions],
-          };
-        });
+      let questionList = [];
+      for (let i = 0; i < this.FormQuestionList.length; i++) {
+        if (this.FormQuestionList[i].qusType) {
+          this.FormQuestionList.splice(i, 1);
+          i--;
+        }
       }
       console.log(questionList);
-      const { data, status, message } = await this.$request.modifyPaper({
-        paperId: this.paperId,
+      const { data, status, message } = await this.$request.setPeriodAnswer({
+        periodId: this.paperId,
         questionList: questionList,
       });
       if (status == 0) {
diff --git a/src/components/upload.vue b/src/components/upload.vue
index dd18682..f950457 100644
--- a/src/components/upload.vue
+++ b/src/components/upload.vue
@@ -7,7 +7,7 @@
         ref="upload"
         :action="url"
         :multiple="false"
-        :data="{ id: id }"
+        :data="{ ...query }"
         :with-credentials="true"
         :limit="1"
         :on-change="change"
@@ -34,6 +34,10 @@ export default {
       type: String,
       default: "",
     },
+    examId: {
+      type: String,
+      default: "",
+    },
     url: {
       type: String,
       default: "",
@@ -44,6 +48,19 @@ export default {
       default: "模板",
     },
   },
+  computed: {
+    query: function () {
+      if (this.id) {
+        return {
+          id: this.id,
+        };
+      } else if (this.examId) {
+        return {
+          examId: this.examId,
+        };
+      }
+    },
+  },
   data() {
     return {
       file: null,
diff --git a/src/views/ask/analysis.vue b/src/views/ask/analysis.vue
index e2bf2e6..af7b4c1 100644
--- a/src/views/ask/analysis.vue
+++ b/src/views/ask/analysis.vue
@@ -10,150 +10,413 @@
         <span
           class="tab-item"
           :class="type == 1 ? 'active' : ''"
-          @click="type = 1"
+          @click="setType(1)"
           >答题表现</span
         >
         <span
           class="tab-item"
           :class="type == 2 ? 'active' : ''"
-          @click="type = 2"
+          @click="setType(2)"
           >学生问答表现</span
         >
         <span
           class="tab-item"
           :class="type == 3 ? 'active' : ''"
-          @click="type = 3"
+          @click="setType(3)"
           >学生互动表现</span
         >
         <span
           class="tab-item"
           :class="type == 4 ? 'active' : ''"
-          @click="type = 4"
+          @click="setType(4)"
           >签到明细</span
         >
       </div>
-      <ul class="info">
-        <li class="info-item">科目：语文</li>
-        <li class="info-item">课时：课时1</li>
-        <li class="info-item">上课时间：2022-11-9 21:30</li>
-        <li class="info-item">下课时间：2022-11-9 21:30</li>
-        <li class="info-item">签到人数：45</li>
-        <li class="info-item">题目总数：8</li>
-        <li class="info-item">答题总数：8</li>
-        <li class="info-item">课时时长：45分钟</li>
-        <li class="info-item">总参与度：：80%</li>
-        <li class="info-item">班级总正确率：82%</li>
-        <li class="info-item">已答总正确率：89%</li>
-        <li class="info-item">反馈时长：15分钟</li>
-      </ul>
-      <el-table
-        :data="tableData"
-        border
-        style="width: 100%"
-        :default-sort="{ prop: 'dadui', order: 'descending' }"
-      >
-        <el-table-column
-          prop="questionIndex"
-          label="题号"
-          align="center"
-        ><template slot-scope="scoped">Q{{scoped.row.questionIndex}}</template></el-table-column>
-        <el-table-column
-          prop="questionType"
-          label="题型"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="dati"
-          label="答题人数"
-          sortable
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="dadui"
-          label="答对人数"
-          sortable
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="canyu"
-          label="班级参与度"
-          sortable
-          align="center"
-        ><template slot-scope="scoped">{{scoped.row.canyu}}%</template></el-table-column>
-        <el-table-column
-          prop="banjidadui"
-          label="班级正确率"
-          sortable
-          align="center"
-        ><template slot-scope="scoped">{{scoped.row.banjidadui}}%</template></el-table-column>
-        <el-table-column
-          prop="yida"
-          label="已答正确率"
-          sortable
-          align="center"
-        ><template slot-scope="scoped">{{scoped.row.yida}}%</template></el-table-column>
-        <el-table-column
-          prop="correctAnswer"
-          label="正确答案"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="ganrao"
-          label="干扰答案"
-          align="center"
-        ></el-table-column>
-      </el-table>
+      <div v-loading="loading">
+        <ul class="info" v-if="type == 1">
+          <li class="info-item">科目：{{ detail.subjectName }}</li>
+          <li class="info-item">课时：{{ detail.title }}</li>
+          <li class="info-item">上课时间：{{ detail.startTime }}</li>
+          <li class="info-item">下课时间：{{ detail.endTime }}</li>
+          <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.participationRate }}%</li>
+          <li class="info-item">
+            班级总正确率：{{ detail.classCorrectRate }}%
+          </li>
+          <li class="info-item">
+            已答总正确率：{{ detail.answerCorrectRate }}%
+          </li>
+          <li class="info-item">
+            反馈时长：{{ detail.consumingDuration / 60 }}分钟
+          </li>
+        </ul>
+        <el-table v-if="type == 1" :data="tableData" border style="width: 100%">
+          <el-table-column prop="questionIndex" label="题号" align="center"
+            ><template slot-scope="scoped"
+              >Q{{ scoped.row.questionIndex }}</template
+            ></el-table-column
+          >
+          <el-table-column prop="questionType" label="题型" align="center">
+            <template slot-scope="scoped">{{
+              setSubPro(scoped.row.questionType)
+            }}</template>
+          </el-table-column>
+          <el-table-column
+            prop="answeredNum"
+            label="答题人数"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="correctAnswerNum"
+            label="答对人数"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="canyu"
+            label="班级参与度"
+            sortable
+            align="center"
+            ><template slot-scope="scoped"
+              >{{ scoped.row.canyu }}%</template
+            ></el-table-column
+          >
+          <el-table-column
+            prop="classCorrectRate"
+            label="班级正确率"
+            sortable
+            align="center"
+            ><template slot-scope="scoped"
+              >{{ scoped.row.classCorrectRate }}%</template
+            ></el-table-column
+          >
+          <el-table-column
+            prop="answerCorrectRate"
+            label="已答正确率"
+            sortable
+            align="center"
+            ><template slot-scope="scoped"
+              >{{ scoped.row.answerCorrectRate }}%</template
+            ></el-table-column
+          >
+          <el-table-column
+            prop="correctAnswer"
+            label="正确答案"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="fallible"
+            label="干扰答案"
+            align="center"
+          ></el-table-column>
+          <el-table-column prop="screenshot" label="题干" align="center">
+            <template slot-scope="scoped">
+              <el-image
+                style="width: 60px; height: 40px"
+                :src="scoped.row.screenshot"
+                :preview-src-list="[scoped.row.screenshot]"
+              >
+              </el-image></template
+          ></el-table-column>
+        </el-table>
+        <el-table v-if="type == 2" :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"
+          ></el-table-column>
+          <el-table-column
+            prop="answerTimes"
+            label="答题次数"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="correctAnswerNum"
+            label="答题耗时"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="correctAnswerTimes"
+            label="答对次数"
+            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
+            ></el-table-column
+          >
+        </el-table>
+        <el-table v-if="type == 3" :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"
+          ></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-if="type == 4" :data="tableData" border style="width: 100%">
+          <el-table-column
+            prop="studentName"
+            label="姓名"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="checkInTime"
+            label="签到时间"
+            sortable
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="makeUpTime"
+            label="补签时间"
+            sortable
+            align="center"
+          ></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-pagination>
+        </div>
+        <p class="down">
+          <el-button
+            @click="exportData"
+            type="info"
+            plain
+            round
+            icon="fa fa-cloud-download"
+            >导出报表</el-button
+          >
+          <el-button @click="edit" type="primary" round>设置答案</el-button>
+        </p>
+      </div>
     </div>
+
+    <set-answer
+      :diaVisible="dialogVisible"
+      :questionList="form.questionList"
+      :paperId="form.id"
+      @saveSuccess="handleSuccess"
+      @cancel="cancel"
+    />
   </div>
 </template>
 
 <script>
+import { downloadFile } from "@/utils";
 export default {
   data() {
     return {
+      dialogVisible: false,
+      loading: false,
       id: "",
       type: 1,
-      tableData: [
-        {
-          questionIndex: 1,
-          questionType: "单选题",
-          dati: 5,
-          dadui: 60,
-          canyu: 50,
-          banjidadui: 80,
-          yida: 90,
-          correctAnswer:"A",
-          ganrao:"C"
-        },
-        {
-          questionIndex: 2,
-          questionType: "单选题",
-          dati: 6,
-          dadui: 80,
-          canyu: 60,
-          banjidadui: 90,
-          yida: 100,
-          correctAnswer:"B",
-          ganrao:"D"
-        },
-      ],
+      form: {
+        id: "",
+        questionList: [],
+      },
+      detail: {},
+      tableData: [],
+      page: 1,
+      size: 20,
+      total: 0,
     };
   },
   created() {
     this.id = this.$route.query.id;
-    // this._QueryData()
+    this._QueryData();
+    this.periodDetail();
   },
   methods: {
+    setType(type) {
+      this.type = type;
+      this.page = 1;
+      this._QueryData();
+    },
+    setSubPro(type) {
+      let tit;
+      switch (type) {
+        case 2:
+          tit = "单选题";
+          break;
+        case 3:
+          tit = "多选题";
+          break;
+        case 4:
+          tit = "判断题";
+          break;
+        case 5:
+          tit = "主观题";
+          break;
+        default:
+          tit = "其他";
+      }
+      return tit;
+    },
+    cancel() {
+      this.dialogVisible = false;
+    },
+    handleSuccess() {
+      this.dialogVisible = false;
+    },
+    async edit() {
+      if (this.editLoading) return;
+      this.editLoading = true;
+      const { data, status, info } = await this.$request.periodQuestionList({
+        examId: this.id,
+      });
+      this.editLoading = false;
+      if (status === 0) {
+        this.form.id = this.id;
+        this.form.questionList = (data.list && [...data.list]) || [];
+        this.dialogVisible = true;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    changePage(page) {
+      this.page = page;
+      this._QueryData();
+    },
+    async periodDetail() {
+      let { data, info, status } = await this.$request.periodDetail({
+        periodId: this.id,
+      });
+      if (status == 0) {
+        this.detail = { ...data };
+      } else {
+        this.$message.error(info);
+      }
+    },
     async _QueryData() {
-      let { data, info, status } = this.$request.quizDetail({
-        id: this.id,
+      const queryData =
+        this.type == 1
+          ? this.$request.periodQuestionReport
+          : this.$request.periodStudentReport;
+      let query = {};
+      if (this.type == 2) {
+        query.type = 1;
+      } else if (this.type == 3) {
+        query.type = 2;
+      } else if (this.type == 4) {
+        query.type = 3;
+      }
+      this.loading = true;
+      let { data, info, status } = await queryData({
+        periodId: this.id,
+        page: this.page,
+        size: this.size,
+        ...query,
       });
+      this.loading = false;
+      if (status === 0) {
+        this.tableData = [...data?.list];
+        this.total = data.count;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //导出
+    async exportData() {
+      // if (this.exportLoading = true) return;
+      this.exportLoading = true;
+      const { data, status, info } = await this.$request.exportData();
+      this.exportLoading = false;
+      if (data) {
+        downloadFile(this.detail.title + "报表", data);
+      } else {
+        this.$message.error(info);
+      }
     },
   },
 };
 </script>
 
 <style lang="scss" scoped>
+.down {
+  padding-top: 20px;
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+}
 .page-content {
   padding: 20px 20px 0;
 }
diff --git a/src/views/ask/index.vue b/src/views/ask/index.vue
index 8f55324..2b7a39c 100644
--- a/src/views/ask/index.vue
+++ b/src/views/ask/index.vue
@@ -25,7 +25,7 @@
           v-if="role == 'ROLE_BANZHUREN'"
           class="sel"
           multiple
-          v-model="query.subjectId"
+          v-model="query.subjectNames"
           placeholder="选择科目"
           @change="_QueryData"
         >
@@ -40,7 +40,7 @@
         <el-select
           v-else
           class="sel"
-          v-model="query.subjectId"
+          v-model="query.subjectNames"
           placeholder="选择科目"
           @change="_QueryData"
         >
@@ -89,60 +89,78 @@
       </div>
     </div>
     <div class="table-box">
-      <el-radio-group v-model="tabIndex" style="margin-bottom: 20px">
+      <el-radio-group
+        v-model="tabIndex"
+        @change="tabChange"
+        style="margin-bottom: 20px"
+      >
         <el-radio-button :label="1">单课时报表</el-radio-button>
-        <el-radio-button :label="2" v-if="this.role != 'ROLE_BANZHUREN'"
+        <!-- <el-radio-button :label="2" v-if="this.role != 'ROLE_BANZHUREN'"
           >阶段问答报表</el-radio-button
+        > -->
+        <el-radio-button :label="2" v-if="query.startDay != query.endDay"
+          >阶段问答报表</el-radio-button
+        >
+        <el-radio-button :label="3" v-if="query.startDay != query.endDay"
+          >阶段互动报表</el-radio-button
         >
-        <el-radio-button :label="3">阶段互动报表</el-radio-button>
       </el-radio-group>
-      <p class="table-tit" v-if="tabIndex != 1">
+      <!-- <p class="table-tit" v-if="tabIndex != 1">
         <span>总课时数：10</span>
         <span>互动总数：22</span>
-      </p>
+      </p> -->
       <div v-if="tabIndex == 1">
         <el-table
           :data="tableData"
           border
           style="width: 100%"
-          :default-sort="{ prop: 'canyudu', order: 'descending' }"
+          @sort-change="sortChange"
         >
           <el-table-column
-            prop="keshi"
+            prop="title"
             label="课时"
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="zongshu"
+            prop="questionNum"
             label="题目总数"
             align="center"
             width="100"
           ></el-table-column>
           <el-table-column
-            prop="shijian"
+            prop="startTime"
             label="上课时间"
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="canyudu"
+            prop="participationRate"
             label="参与度"
-            sortable
+            sortable="custom"
             align="center"
-          > <template slot-scope="scoped">{{scoped.row.canyudu}}%</template></el-table-column>
+          >
+            <template slot-scope="scoped"
+              >{{ scoped.row.participationRate }}%</template
+            ></el-table-column
+          >
           <el-table-column
-            prop="zhengque"
+            prop="answerCorrectRate"
             label="已答总正确率"
-            sortable
+            sortable="custom"
             align="center"
           >
-          <template slot-scope="scoped">{{scoped.row.zhengque}}%</template>
+            <template slot-scope="scoped"
+              >{{ scoped.row.answerCorrectRate }}%</template
+            >
           </el-table-column>
           <el-table-column
-            prop="allzheng"
+            prop="correctRate"
             label="班级总正确率"
-            sortable
+            sortable="custom"
             align="center"
-          ><template slot-scope="scoped">{{scoped.row.allzheng}}%</template></el-table-column>
+            ><template slot-scope="scoped"
+              >{{ scoped.row.correctRate }}%</template
+            ></el-table-column
+          >
           <el-table-column label="操作" align="center">
             <template slot-scope="scoped">
               <el-tooltip effect="dark" content="详情" placement="top">
@@ -169,56 +187,66 @@
       </div>
       <div v-if="tabIndex == 2">
         <el-table
-          :data="tableAsk"
+          :data="tableData"
           border
           style="width: 100%"
-          :default-sort="{ prop: 'cishu', order: 'descending' }"
+          :default-sort="{ prop: 'answerTimes', order: 'descending' }"
         >
           <el-table-column
-            prop="xuehao"
+            prop="studentCode"
             label="学号"
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="xingming"
+            prop="studentName"
             label="姓名"
             align="center"
             width="100"
           ></el-table-column>
           <el-table-column
-            prop="cishu"
+            prop="answerTimes"
             label="累计答题次数"
             sortable
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="dadui"
+            prop="correctAnswerTimes"
             label="累计答对次数"
             sortable
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="canyudu"
+            prop="participationRate"
             label="总参与度"
             sortable
             align="center"
-          > <template slot-scope="scoped">{{scoped.row.canyudu}}%</template></el-table-column>
+          >
+            <template slot-scope="scoped"
+              >{{ scoped.row.participationRate }}%</template
+            ></el-table-column
+          >
           <el-table-column
-            prop="allzheng"
+            prop="correctRate"
             label="总正确率"
             sortable
             align="center"
-          > <template slot-scope="scoped">{{scoped.row.allzheng}}%</template></el-table-column>
+          >
+            <template slot-scope="scoped"
+              >{{ scoped.row.correctRate }}%</template
+            ></el-table-column
+          >
           <el-table-column
-            prop="yidazheng"
+            prop="answerCorrectRate"
             label="已答总正确率"
             sortable
             align="center"
           >
-          <template slot-scope="scoped">{{scoped.row.yidazheng}}%</template>
+            <template slot-scope="scoped"
+              >{{ scoped.row.answerCorrectRate }}%</template
+            >
           </el-table-column>
           <el-table-column
-            prop="zongpaiming"
+            prop="classRank"
             label="总正确率班排名"
             sortable
             align="center"
@@ -227,42 +255,42 @@
       </div>
       <div v-if="tabIndex == 3">
         <el-table
-          :data="tableAsk"
+          :data="tableData"
           border
           style="width: 100%"
-          :default-sort="{ prop: 'cishu', order: 'descending' }"
+          :default-sort="{ prop: 'answerTimes', order: 'descending' }"
         >
           <el-table-column
-            prop="xuehao"
+            prop="studentCode"
             label="学号"
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="xingming"
+            prop="studentName"
             label="姓名"
             align="center"
             width="100"
           ></el-table-column>
           <el-table-column
-            prop="cishu"
+            prop="rushAnswerTimes"
             label="抢答成功次数"
             sortable
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="dadui"
-            label="答对次数"
+            prop="rushAnswerCorrectTimes"
+            label="抢答答对次数"
             sortable
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="chouda"
+            prop="checkAnswerTimes"
             label="抽答次数"
             sortable
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="choudadui"
+            prop="checkAnswerCorrectTimes"
             label="抽答答对次数"
             sortable
             align="center"
@@ -281,218 +309,79 @@
           ></el-table-column>
         </el-table>
       </div>
-      <p class="down" v-if="tabIndex == 3||tabIndex == 2">
-        <el-button type="info" plain round icon="fa fa-cloud-download">导出报表</el-button>
+      <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>
-    <set-answer :diaVisible="dialogVisible" :questionList="form.questionList" :paperId="form.id" @saveSuccess="handleSuccess" @cancel="cancel"/>
+    <set-answer
+      :diaVisible="dialogVisible"
+      :questionList="form.questionList"
+      :paperId="form.id"
+      @saveSuccess="handleSuccess"
+      @cancel="cancel"
+    />
   </div>
 </template>
 
 <script>
-import { formatDate, deepClone, checkAnswer } from "utils";
+import { formatDate, deepClone, downloadFile } from "utils";
 export default {
   data() {
     return {
       role: "",
       loading: false,
-      dialogVisible:false,
+      dialogVisible: false,
       form: { questionList: [] },
       date: "", //今天-昨天-本周
       query: {
         //搜索条件
         classId: "",
-        subjectId: "",
+        subjectNames: "",
         startDay: "",
         endDay: "",
         day: "",
       },
+      custom: {
+        //单课时排序
+        orderField: null,
+        orderType: null,
+      },
       classList: [], //班级
       subjectList: [], //科目
       tabIndex: 1, //选项卡
-      tableData: [
-        //单课时报表
-        {
-          id: 1,
-          keshi: "课时一",
-          zongshu: 10,
-          shijian: "2022-11-9 21:30至22:30",
-          canyudu: 60,
-          zhengque: 90,
-          allzheng: 80,
-          questionList: [
-            {
-              questionTitle: "f",
-              score: 1,
-              subQuestions: [
-                {
-                  questionIndex: 1,
-                  questionType: 2,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 4,
-                  answerOptions: ["A", "B", "C", "D"],
-                  correctAnswer: "B",
-                },
-                {
-                  questionIndex: 2,
-                  questionType: 2,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 4,
-                  answerOptions: ["A", "B", "C", "D", "E", "F"],
-                  correctAnswer: "A",
-                },
-                {
-                  questionIndex: 3,
-                  questionType: 3,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 4,
-                  answerOptions: ["A", "B", "C", "D", "E", "F"],
-                  correctAnswer: "AB",
-                },
-                {
-                  questionIndex: 4,
-                  questionType: 3,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 4,
-                  answerOptions: ["A", "B", "C", "D", "E", "F"],
-                  correctAnswer: "AB",
-                },
-                {
-                  questionIndex: 5,
-                  questionType: 4,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 0,
-                  answerOptions: [],
-                  correctAnswer: "1",
-                },
-              ],
-            },
-            {
-              questionTitle: "f",
-              score: 1,
-              subQuestions: [
-                {
-                  questionIndex: 6,
-                  questionType: 2,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 4,
-                  answerOptions: ["A", "B", "C", "D"],
-                  correctAnswer: "B",
-                },
-                {
-                  questionIndex: 7,
-                  questionType: 2,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 4,
-                  answerOptions: ["A", "B", "C", "D", "E", "F"],
-                  correctAnswer: "A",
-                },
-                {
-                  questionIndex: 8,
-                  questionType: 3,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 4,
-                  answerOptions: ["A", "B", "C", "D", "E", "F"],
-                  correctAnswer: "AB",
-                },
-                {
-                  questionIndex: 9,
-                  questionType: 3,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 4,
-                  answerOptions: ["A", "B", "C", "D", "E", "F"],
-                  correctAnswer: "AB",
-                },
-                {
-                  questionIndex: 10,
-                  questionType: 4,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 0,
-                  answerOptions: [],
-                  correctAnswer: "1",
-                },
-              ],
-            },
-          ],
-        },
-        {
-          id: 2,
-          keshi: "课时二",
-          zongshu: 8,
-          shijian: "2022-11-10 21:30至22:30",
-          canyudu: 70,
-          zhengque: 80,
-          allzheng: 60,
-          questionList: [
-            {
-              questionTitle: "a",
-              score: 1,
-              subQuestions: [
-                {
-                  questionIndex: 2,
-                  questionType: 3,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 4,
-                  answerOptions: ["A", "B", "C", "D"],
-                  correctAnswer: "A,C",
-                },
-              ],
-            },
-          ],
-        },
-      ],
-      tableAsk: [
-        {
-          xuehao: 1,
-          xingming: "丁芳菲",
-          cishu: 5,
-          dadui: 60,
-          canyudu: 90,
-          allzheng: 80,
-          yidazheng: 50,
-          zongpaiming: 5,
-        },
-        {
-          xuehao: 1,
-          xingming: "丁芳菲2",
-          cishu: 3,
-          dadui: 20,
-          canyudu: 80,
-          allzheng: 60,
-          yidazheng: 65,
-          zongpaiming: 4,
-        },
-      ],
-      tableStage: [
-        {
-          xuehao: 1,
-          xingming: "丁芳菲",
-          cishu: 5,
-          dadui: 60,
-          chouda: 90,
-          choudadui: 80,
-          canyu: 50,
-          duicuo: 5,
-        },
-      ],
+      tableData: [],
+      page: 1,
+      size: 20,
+      total: 0,
     };
   },
   async created() {
-    this.role = this.$store.getters.info.permissions.find(item=>item.roleName ==  this.$store.getters.info.showRoleName)?.role;
+    this.role = this.$store.getters.info.permissions.find(
+      (item) => item.roleName == this.$store.getters.info.showRoleName
+    )?.role;
+    this.query.subjectNames = this.role == "ROLE_BANZHUREN" ? [] : "";
     await this._QueryClassList();
     await this._QuerySubjectList();
-    // await this.setDate(1);
+    await this.setDate(1);
     let startDay = this.query?.startDay;
     if (!startDay) {
       this.query.startDay = new Date();
@@ -509,8 +398,7 @@ export default {
         },
       });
     },
-    
-   setDate(index) {
+    setDate(index) {
       const that = this;
       this.date = index == this.date ? "" : index;
       let aYear = new Date().getFullYear();
@@ -540,7 +428,7 @@ export default {
           that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
           break;
         case 4:
-          if (aMonth > 1 && aMonth < 4) {
+          if (aMonth > 0 && aMonth < 4) {
             aMonth = "01";
           } else if (aMonth > 3 && aMonth < 7) {
             aMonth = "04";
@@ -578,23 +466,57 @@ export default {
         }
       }
     },
-    edit(item) {
-      this.form = deepClone(item);
-      this.dialogVisible = true;
+    async edit(item) {
+      if (this.editLoading) return;
+      this.editLoading = true;
+      const { data, status, info } = await this.$request.periodQuestionList({
+        periodId: item.id,
+      });
+      this.editLoading = false;
+      if (status === 0) {
+        this.form.id = item.id;
+        this.form.questionList = (data.list && [...data.list]) || [];
+        this.dialogVisible = true;
+      } else {
+        this.$message.error(info);
+      }
     },
-    cancel(){
-      this.dialogVisible = false
+    cancel() {
+      this.dialogVisible = false;
     },
-    handleSuccess(){
-      this.dialogVisible = false
-      this._QueryData()
+    handleSuccess() {
+      this.dialogVisible = false;
+    },
+    tabChange() {
+      this.page = 1;
+      this._QueryData();
+    },
+    sortChange(obj) {
+      this.custom.orderField =
+        obj.prop == "participationRate"
+          ? 1
+          : obj.prop == "answerCorrectRate"
+          ? 2
+          : 3;
+      this.custom.orderType = obj.order == "ascending" ? 0 : 1;
+      this.page = 1;
+      this._QueryData();
+    },
+    changePage(page) {
+      this.page = page;
+      this._QueryData();
     },
     async changClazz() {
       await this._QuerySubjectList();
-      await this.setDate(1);
+      // await this.setDate(1);
+      this._QueryData()
     },
     async _QueryClassList() {
-      const { data, status, info } = await this.$request.fetchClassList();
+      const fetchClassList =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTClassList
+          : this.$request.tClassList;
+      const { data, status, info } = await fetchClassList();
       if (status === 0) {
         this.classList = data.list.map((item) => {
           return {
@@ -608,43 +530,170 @@ export default {
       }
     },
     async _QuerySubjectList() {
-      const { data, status, info } = await this.$request.fetchSubjectList(
-        {classId: this.query.classId,}
-      );
+      const fetchSubjectList =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTSubjectList
+          : this.$request.tSubjectList;
+
+      const { data, status, info } = await fetchSubjectList({
+        classId: this.query.classId,
+      });
       if (status === 0) {
-        this.subjectList = data.subjectNames?.map((item) => {
-          return {
-            value: item,
-            label: item,
-          };
-        })||[];
+        this.subjectList =
+          data.subjectNames?.map((item) => {
+            return {
+              value: item,
+              label: item,
+            };
+          }) || [];
         if (this.role == "ROLE_BANZHUREN") {
           this.subjectList.unshift({
-            value: "",
+            value: "全部",
             label: "全部",
           });
-          this.query.subjectId = [this.subjectList[0]?.value];
-        }else{
-          this.query.subjectId = this.subjectList[0]?.value;
+          this.query.subjectNames.push(this.subjectList[0]?.value);
+        } else {
+          this.query.subjectNames = this.subjectList[0]?.value;
         }
       } else {
         this.$message.error(info);
       }
     },
     async _QueryData() {
+      if (this.tabIndex == 1) {
+        this.periodReportList();
+      } else if (this.tabIndex == 2) {
+        this.phaseAnswerReport();
+      } else if (this.tabIndex == 3) {
+        this.phaseInteractiveReport();
+      }
+    },
+    //分页查询课时报表列表
+    async periodReportList() {
       this.loading = true;
-      //多课时对比
       let query = {};
       for (let key in this.query) {
         if (this.query[key] != "") {
           query[key] = this.query[key];
         }
       }
-      const { data, status, info } = await this.$request.fetchQuizList({
+      if (this.custom.orderField !== null) {
+        query = { ...query, ...this.custom };
+      }
+      if (this.role != "ROLE_BANZHUREN") {
+        query.subjectNames = [query.subjectNames];
+      } else {
+        if (
+          query["subjectNames"].length == 1 &&
+          query["subjectNames"][0] == "全部"
+        ) {
+          query["subjectNames"] = this.subjectList.map((item) => {
+            return item.value;
+          });
+          query["subjectNames"].shift();
+        }
+      }
+      const { data, status, info } = await this.$request.periodReportList({
+        ...query,
+        page: this.page,
+        size: this.size,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.tableData = (data?.list && [...data?.list]) || [];
+        this.total = data.count;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //查询阶段问答报表
+    async phaseAnswerReport() {
+      this.loading = true;
+      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"].length == 1 &&
+          query["subjectNames"][0] == "全部"
+        ) {
+          query["subjectNames"] = this.subjectList.map((item) => {
+            return item.value;
+          });
+          query["subjectNames"].shift();
+        }
+      }
+      const phaseAnswerReport =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTPhaseAnswerReport
+          : this.$request.phaseAnswerReport;
+
+      const { data, status, info } = await phaseAnswerReport({
         ...query,
       });
       this.loading = false;
       if (status === 0) {
+        this.tableData = (data?.list && [...data?.list]) || [];
+        this.total = data.count;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //查询阶段互动报表
+    async phaseInteractiveReport() {
+      this.loading = true;
+      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"].length == 1 &&
+          query["subjectNames"][0] == "全部"
+        ) {
+          query["subjectNames"] = this.subjectList.map((item) => {
+            return item.value;
+          });
+          query["subjectNames"].shift();
+        }
+      }
+      const phaseInteractiveReport =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTPhaseInteractiveReport
+          : this.$request.phaseInteractiveReport;
+
+      const { data, status, info } = await phaseInteractiveReport({
+        ...query,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.tableData = (data?.list && [...data?.list]) || [];
+        this.total = data.count;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //导出
+    async exportData() {
+      if ((this.exportLoading = true)) return;
+      this.exportLoading = true;
+      const { data, status, info } = await this.$request.exportData();
+      this.exportLoading = false;
+      if (data) {
+        downloadFile("报表", data);
       } else {
         this.$message.error(info);
       }
@@ -667,7 +716,6 @@ export default {
   }
 }
 
-
 .fa-exchange {
   color: #667ffd;
   cursor: pointer;
diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue
index 7e2aa94..faee990 100644
--- a/src/views/examinationPaper/add.vue
+++ b/src/views/examinationPaper/add.vue
@@ -836,12 +836,12 @@ export default {
       this.saveLoading = true;
       //添加题目ID、序号
       this.form.questionList.map((item, index) => {
-        item.questionId = index + 1;
-        item.questionIndex = index + 1;
+        // item.questionId = index + 1;
+        // item.questionIndex = index + 1;
         item.questionType = 0;
         item.subQuestions.map((items, indexs) => {
-          items.questionId = indexs + 1;
-          items.questionIndex = indexs + 1;
+          items.questionId = this.setNum(index,indexs)
+          items.questionIndex = this.setNum(index,indexs);
         });
       });
       const { data, status, info } = await this.$request.addPaper({
diff --git a/src/views/index/mainIndex.vue b/src/views/index/mainIndex.vue
index ab37fbd..9123b2d 100644
--- a/src/views/index/mainIndex.vue
+++ b/src/views/index/mainIndex.vue
@@ -204,10 +204,12 @@ export default {
     });
     if (this.type == "ROLE_XUEXIAO") {
       this.schoolIndex();
-    } else if (this.type == "ROLE_JIAOSHI" || this.type == "ROLE_BANZHUREN") {
+    } 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: {
@@ -243,6 +245,14 @@ export default {
         this.$message.error(info);
       }
     },
+    async classIndex() {
+      const { data, status, info } = await this.$request.classIndex();
+      if (status === 0) {
+        this.dataInfo = { ...data };
+      } else {
+        this.$message.error(info);
+      }
+    },
   },
 };
 </script>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 73d86fe..09fe3ba 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -93,12 +93,16 @@ export default {
       loginForm: {
         // username: "15911715665",
         // password: "Csiy88888",
-        username: "13610050254",
-        password: "Pw050254#",
-        // username: "18946034886",
-        // password: "Pw034886#",
+        // username: "13610050254",
+        // password: "Pw050254#",
         // username: "18332123505",
         // password: "Pw123505#",
+        // username: "18946034886",
+        // password: "Pw034886#",
+        // username: "18893712576",
+        // password: "Pw712576#",
+        username: "13247726488",
+        password: "726488",
         
       },
       loginRules: {
@@ -184,9 +188,9 @@ $cursor: #000;
       border-radius: 0px;
       font-size: 16px;
       color: $light_gray;
-      height: 52px;
+      height:48px;
+      line-height: 48px;
       caret-color: $cursor;
-
       &:-webkit-autofill {
         box-shadow: 0 0 0px 1000px #e5e5e5 inset !important;
         -webkit-text-fill-color: $cursor !important;
diff --git a/src/views/setUp/account.vue b/src/views/setUp/account.vue
index c42ad15..95b5912 100644
--- a/src/views/setUp/account.vue
+++ b/src/views/setUp/account.vue
@@ -194,11 +194,6 @@
         >
         </el-pagination>
       </div>
-      <el-empty
-        v-if="!loading && tableData.length == 0"
-        content="没有更多数据"
-        :image-size="100"
-      ></el-empty>
     </div>
     <el-dialog title="修改账号信息" :visible.sync="diaCount" width="400">
       <el-form
@@ -288,7 +283,7 @@
             </el-select>
           </el-col>
         </el-form-item>
-        <el-form-item label="选择管辖范围：" prop="regionId">
+        <el-form-item label="选择管辖范围：" :prop="formAddCount.roleId == 3?'regionId':'schoolId'">
           <el-col :span="12">
             <el-select
               v-show="formAddCount.roleId == 3"
@@ -385,7 +380,7 @@ export default {
         password: "",
         roleId: "",
         regionId: "",
-        schoolId:""
+        schoolId: "",
       },
       addSelectSchoolList: [],
       ruleAddCount: {
@@ -396,6 +391,9 @@ export default {
         regionId: [
           { required: true, message: "请选择权限区域", trigger: "blur" },
         ],
+        schoolId: [
+          { required: true, message: "请选择权限区域", trigger: "blur" },
+        ],
       },
     };
   },
@@ -460,7 +458,11 @@ export default {
       });
     },
     setCount(obj) {
-      this.formCount.userId = obj.userId;
+      if (this.role != "ROLE_JITUAN") {
+        this.formCount.userId = obj.userId;
+      } else {
+        this.formCount.id = obj.id;
+      }
       this.formCount.loginName = obj.loginName;
       this.formCount.realName = obj.realName;
       this.diaCount = true;
@@ -533,19 +535,21 @@ export default {
       }
     },
     async updateUser(obj, type) {
-      let query = {
-        userId: obj.id,
-        type: type,
-      };
+      let query = {};
+      console.log(query);
       if (type == 1) {
         query.available = obj.available == 0 ? 1 : 0;
       }
       const { data, status, info } =
         this.role != "ROLE_JITUAN"
           ? await this.$request.updateUser({
+              userId: obj.userId,
+              type: type,
               ...query,
             })
           : await this.$request.tenantUpdateUser({
+              id: obj.id,
+              type: type,
               ...query,
             });
       if (status === 0) {
diff --git a/src/views/setUp/student.vue b/src/views/setUp/student.vue
index c922546..7851c16 100644
--- a/src/views/setUp/student.vue
+++ b/src/views/setUp/student.vue
@@ -143,7 +143,7 @@
         </el-form-item>
         <el-form-item label="答题器编码：">
           <el-col :span="10">
-            <el-input maxlength="8" v-model.trim="formStu.clickerSn" />
+            <el-input v-model.trim="formStu.clickerSn" />
           </el-col>
         </el-form-item>
       </el-form>
diff --git a/src/views/setUp/teacher.vue b/src/views/setUp/teacher.vue
index 41e3739..3e03ba2 100644
--- a/src/views/setUp/teacher.vue
+++ b/src/views/setUp/teacher.vue
@@ -252,7 +252,7 @@
           <el-col :span="10">
             <el-input
               type="number"
-              moninput="if(value.length > 11) value = value.slice(0,11)"
+              oninput="if(value.length > 11) value = value.slice(0,11)"
               v-model.trim="formTeacher.loginName"
             />
           </el-col>
@@ -442,7 +442,7 @@ export default {
         teacherName: "",
         loginName: "",
         sex: 1,
-        managerList: [],
+        roleList: [],
       };
       this.diaTeacher = true;
     },
diff --git a/src/views/test/analysis.vue b/src/views/test/analysis.vue
index 2d69710..32d1751 100644
--- a/src/views/test/analysis.vue
+++ b/src/views/test/analysis.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="page-container" :class="dialogVisible ? 'active' : ''">
     <back-box>
       <template slot="title">
         <span>单卷分析</span>
@@ -13,8 +13,10 @@
         }}修改了答案，是否重新记分？
       </p>
       <div class="btn-box">
-        <el-button type="danger" round size="mini">重新计分</el-button>
-        <el-button type="danger" round plain size="mini">暂时不计</el-button>
+        <el-button type="danger" round @click="_ReScore" size="mini"
+          >重新计分</el-button
+        >
+        <el-button type="danger" round plain size="mini" @click="paperModifyLog.modifiedTime = ''">暂时不计</el-button>
       </div>
     </div>
     <div class="page-content">
@@ -44,54 +46,48 @@
           >作答明细表</span
         >
       </div>
-      <el-table
-        v-if="type == 1"
-        :data="tableData"
-        border
-        style="width: 100%"
-        :default-sort="{ prop: 'dadui', order: 'descending' }"
-      >
-        <el-table-column prop="questionIndex" label="题号" align="center"
-          ><template slot-scope="scoped"
-            >Q{{ scoped.row.questionIndex }}</template
-          ></el-table-column
-        >
+      <el-table v-if="type == 1" :data="tableData" border style="width: 100%">
         <el-table-column
-          prop="questionType"
-          label="题型"
+          prop="questionIndex"
+          label="题号"
           align="center"
         ></el-table-column>
+        <el-table-column prop="questionType" label="题型" align="center"
+          ><template slot-scope="scope">{{
+            setSubPro(scope.row.questionType)
+          }}</template></el-table-column
+        >
         <el-table-column
-          prop="manfen"
+          prop="score"
           label="满分值"
           sortable
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="zuigao"
+          prop="highestScore"
           label="班最高分"
           sortable
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="zuidi"
+          prop="lowestScore"
           label="班最低分"
           sortable
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="pingjun"
+          prop="avgScore"
           label="班平均分"
           sortable
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="defenlv"
+          prop="scoringRate"
           sortable
           label="班级得分率"
           align="center"
           ><template slot-scope="scoped"
-            >{{ scoped.row.defenlv }}%</template
+            >{{ scoped.row.scoringRate }}%</template
           ></el-table-column
         >
         <el-table-column
@@ -100,20 +96,12 @@
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="x1"
-          label="选项1"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="x2"
-          label="选项1"
-          align="center"
-        ></el-table-column>
-        <el-table-column
-          prop="weida"
-          label="未答"
-          align="center"
-        ></el-table-column>
+          v-for="(item, index) in optionsList"
+          :key="index"
+          :label="item.option"
+          :prop="item.option"
+        >
+        </el-table-column>
       </el-table>
       <el-table
         v-if="type == 2"
@@ -123,91 +111,100 @@
         :default-sort="{ prop: 'dadui', order: 'descending' }"
       >
         <el-table-column
-          prop="xuehao"
+          prop="studentCode"
           label="学号"
           align="center"
           fixed
         ></el-table-column>
         <el-table-column
-          prop="xingming"
+          prop="studentName"
           label="姓名"
           fixed
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="totalScore"
+          prop="examPaperScore"
           label="总分"
           sortable
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="defenlv"
+          prop="scoringRate"
           label="得分率"
           sortable
           align="center"
-        ></el-table-column>
+          ><template slot-scope="scope"
+            >{{ scope.row.scoringRate }}%</template
+          ></el-table-column
+        >
         <el-table-column
-          prop="rank"
+          prop="classRank"
           label="班名"
           sortable
           align="center"
         ></el-table-column>
         <el-table-column label="客观题" align="center">
           <el-table-column
-            prop="defen1"
+            prop="objectiveExamScore"
             label="得分"
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="defenlv1"
+            prop="objectiveScoringRate"
             label="得分率"
             align="center"
-          ></el-table-column>
+            ><template slot-scope="scope"
+              >{{ scope.row.objectiveScoringRate }}%</template
+            ></el-table-column
+          >
         </el-table-column>
         <el-table-column label="主观题" align="center">
           <el-table-column
-            prop="defen2"
+            prop="subjectiveExamScore"
             label="得分"
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="defenlv2"
+            prop="subjectiveScoringRate"
             label="得分率"
             align="center"
-          ></el-table-column>
+            ><template slot-scope="scope"
+              >{{ scope.row.subjectiveScoringRate }}%</template
+            ></el-table-column
+          >
         </el-table-column>
       </el-table>
       <el-table
         v-if="type == 3"
-        :data="tableData3"
+        :data="tableData2"
         border
         style="width: 100%"
         :default-sort="{ prop: '', order: 'descending' }"
       >
         <el-table-column
-          prop="xuehao"
+          prop="studentCode"
           label="学号"
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="xingming"
+          prop="studentName"
           label="姓名"
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="totalScore"
+          prop="examPaperScore"
           label="总分"
           sortable
           align="center"
         ></el-table-column>
         <el-table-column label="分数组成" align="center">
           <el-table-column
-            prop="keguan"
+            prop="objectiveScore"
             label="客观题分"
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="zhuguan"
+            prop="subjectiveScore"
             label="主观题分"
             align="center"
           ></el-table-column>
@@ -216,43 +213,35 @@
           align="center"
           v-for="(item, index) in questionList"
           :key="index"
-          :label="item.title"
-
+          :label="'题目' + item.id"
+          :prop="'score' + item.id"
         >
-          <template v-for="items in item.subQuestions">
-            <el-table-column
-              :key="items.questionIndex"
-              :prop="'score' + items.questionIndex"
-              :label="`${items.questionIndex}`"
-              align="center"
-            ></el-table-column>
-          </template>
         </el-table-column>
       </el-table>
       <el-table
         v-if="type == 4"
-        :data="tableData4"
+        :data="tableData2"
         border
         style="width: 100%"
         :default-sort="{ prop: '', order: 'descending' }"
       >
         <el-table-column
-          prop="xuehao"
+          prop="studentCode"
           label="学号"
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="xingming"
+          prop="studentName"
           label="姓名"
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="banji"
+          prop="className"
           label="班级"
           align="center"
         ></el-table-column>
         <el-table-column
-          prop="totalScore"
+          prop="examPaperScore"
           label="总分"
           sortable
           align="center"
@@ -261,129 +250,306 @@
           align="center"
           v-for="(item, index) in questionList"
           :key="index"
-          :label="item.title"
+          :label="'题目' + item.id"
         >
-          <template v-for="items in item.subQuestions">
-            <el-table-column
-              :key="items.questionIndex"
-              :prop="'daan' + items.questionIndex"
-              :label="`${items.questionIndex}`"
-              align="center"
-            ></el-table-column>
+          <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="pagination-box" v-show="type == 1">
+        <el-pagination
+          small=""
+          layout="total,prev, pager, next"
+          :hide-on-single-page="true"
+          :total="total"
+          @current-change="changePage"
+          :current-page="page"
+          :page-size="size"
+        >
+        </el-pagination>
+      </div>
+      <div class="down">
+        <el-button
+          @click="exportData"
+          type="info"
+          plain
+          round
+          icon="fa fa-cloud-download"
+          >导出报表</el-button
+        >
+        <div>
+          <el-button
+            @click="diaUp = true"
+            type="primary"
+            round
+            v-loading="exportLoading"
+            >导入主观题分数</el-button
+          >
+          <el-button @click="edit" type="primary" round>设置答案</el-button>
+        </div>
+      </div>
+      <div class="edit-dia" v-show="dialogVisible" height="100%">
+        <editAnswer
+          :id="id"
+          :title="title"
+          :score="score"
+          @cancel="cancel"
+          @saveSuccess="saveSuccess"
+        />
+      </div>
+      <el-dialog title="导入主观题分数" :visible.sync="diaUp" width="600">
+        <up-load :url="url" :examId="id" fileName="教师名单">
+          <template slot="down">
+            <p class="down-txt">
+              第一步：下载模板并编辑完成学生分数
+              <el-link type="danger" @click="downExcel">模板下载</el-link> 。
+            </p>
+            <p class="down-txt">第二步：上传完成编辑的模板文件并导入。</p>
+          </template>
+        </up-load>
+        <div class="dialog-footer" slot="footer">
+          <el-button @click="diaUp = false">取 消</el-button>
+        </div>
+      </el-dialog>
     </div>
   </div>
 </template>
 
 <script>
+import { downloadFile } from "@/utils";
+import editAnswer from "./editAnswer.vue";
 export default {
+  components: { editAnswer },
   data() {
     return {
+      loading: false,
+      exportLoading: false,
+      diaUp: false,
+      dialogVisible: false,
+      url: "/api_html/teaching/importSubjectiveScore",
       id: "",
+      title: "",
+      score: "",
       type: 1,
       paperModifyLog: {
-        realName: "张老师",
-        modifiedTime: "12-20",
+        realName: "",
+        modifiedTime: "",
       },
-      tableData: [
-        {
-          questionIndex: 1,
-          questionType: "单选题",
-          manfen: 100,
-          zuigao: 100,
-          zuidi: 20,
-          pingjun: 80,
-          defenlv: 90,
-          correctAnswer: "A",
-          x1: "A",
-          x2: "B",
-          weida: "",
-        },
-        {
-          questionIndex: 2,
-          questionType: "单选题",
-          manfen: 100,
-          zuigao: 99,
-          zuidi: 50,
-          pingjun: 90,
-          defenlv: 100,
-          correctAnswer: "B",
-          x1: "A",
-          x2: "B",
-          weida: "",
-        },
-      ],
-      tableData2: [
-        {
-          xuehao: 1,
-          xingming: "丁芳菲",
-          totalScore: 5,
-          defenlv: 50,
-          rank: 1,
-          defen1: 1,
-          defenlv1: 1,
-          defen2: 1,
-          defenlv2: 1,
-        },
-      ],
-      tableData3: [
-        {
-          xuehao: 1,
-          xingming: "丁芳菲",
-          totalScore: 5,
-          rank: 1,
-          keguan: 20,
-          zhuguan: 20,
-          score1: 1,
-          score2: 2,
-          score3: 3,
-          score4: 4,
-        },
-      ],
-      tableData4: [
-        {
-          xuehao: 1,
-          xingming: "丁芳菲",
-          banji: 'xx',
-          totalScore: 5,
-          daan1: 1,
-          daan2: 2,
-          daan3: 3,
-          daan4: 4,
-        },
-      ],
-      questionList: [{
-        title:'大题1',
-        subQuestions:[
-          {questionIndex:1, daan:1},
-          {questionIndex:2, daan:1},
-        ]
-      },{
-        title:'大题2',
-        subQuestions:[
-          {questionIndex:3, daan:2},
-          {questionIndex:4, daan:2},
-        ]
-      }],
+      tableData: [],
+      optionsList: [],
+      tableData2: [],
+      questionList: [],
+      page: 1,
+      size: 20,
+      total: 0,
     };
   },
   created() {
     this.id = this.$route.query.id;
-    // this._QueryData()
+    this.title = this.$route.query.title || "";
+    this.score = this.$route.query.score || "";
+    this._QueryData();
   },
   methods: {
+    setSubPro(type) {
+      let tit;
+      switch (type) {
+        case 2:
+          tit = "单选题";
+          break;
+        case 3:
+          tit = "多选题";
+          break;
+        case 4:
+          tit = "判断题";
+          break;
+        case 5:
+          tit = "主观题";
+          break;
+      }
+      return tit;
+    },
+    edit() {
+      this.dialogVisible = true;
+    },
+    cancel() {
+      this.dialogVisible = false;
+    },
+    saveSuccess() {
+      this.dialogVisible = false;
+      this._QueryData();
+    },
+    changePage(page) {
+      this.page = page;
+      this.examQuestionReport();
+    },
+    async downExcel() {
+      let data = await this.$request.subjectiveScoreTemplate({
+        examId: this.id,
+      });
+      if (data && !data.code) {
+        let blob = new Blob([data], {
+          type: "application/vnd.ms-excel;charset=utf-8",
+        });
+        downloadFile(`主观题模版.xlsx`, blob);
+      } else {
+        this.$message.error(data.message);
+      }
+    },
     async _QueryData() {
-      let { data, info, status } = this.$request.quizDetail({
-        id: this.id,
+      this.examDetail();
+      this.examStudentReport();
+      this.examQuestionReport();
+    },
+    async examDetail() {
+      //详情
+      this.loading = true;
+      let { data, info, status } = await this.$request.examDetail({
+        examId: this.id,
       });
+      this.loading = false;
+      if (status === 0) {
+        if (data.paperModifyLog) {
+          this.paperModifyLog = { ...data.paperModifyLog };
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _ReScore() {
+      //重新记分
+      this.loading = true;
+      let { data, info, status } = await this.$request.reScore({
+        examId: this.id,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.$message.success(info);
+        this._QueryData()
+        this.paperModifyLog.modifiedTime=""
+        this.paperModifyLog.realName=""
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async examStudentReport() {
+      //成绩排名-小题分-作答明细
+      this.loading = true;
+      let { data, info, status } = await this.$request.examStudentReport({
+        examId: this.id,
+      });
+      this.loading = false;
+      if (status === 0) {
+        let optionsList = [];
+        this.tableData2 = 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["que" + items.id] = items.id;
+            params["score" + items.id] = items.score;
+            params["answer" + items.id] = items.answer;
+            params["isRight" + items.id] = items.isRight;
+            params["questionType" + items.id] = items.questionType;
+          });
+          return {
+            ...item,
+            ...params,
+          };
+        });
+        this.questionList = [...optionsList];
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async examQuestionReport() {
+      //试题分析
+      this.loading = true;
+      let { data, info, status } = await this.$request.examQuestionReport({
+        examId: this.id,
+        page: this.page,
+        size: this.size,
+      });
+      this.loading = false;
+      if (status === 0) {
+        let optionsList = [];
+        this.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[items.option] = items.count;
+          });
+          return {
+            ...item,
+            ...params,
+          };
+        });
+        this.optionsList = [...optionsList];
+        this.total = data.count;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //导出
+    async exportData() {
+      if ((this.exportLoading = true)) return;
+      this.exportLoading = true;
+      const { data, status, info } = await this.$request.exportData();
+      this.exportLoading = false;
+      if (data) {
+        downloadFile(this.title + "报表", data);
+      } else {
+        this.$message.error(info);
+      }
     },
   },
 };
 </script>
 
 <style lang="scss" scoped>
+.page-container {
+  position: relative;
+  &.active {
+    height: 100%;
+    overflow: hidden;
+  }
+  .edit-dia {
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    width: 100%;
+    height: calc(100vh - 70px);
+    background: #fff;
+    overflow-y: auto;
+    z-index: 10;
+  }
+}
+.error {
+  color: #f30;
+}
 .page-content {
   padding: 20px 20px 0;
 }
@@ -431,4 +597,10 @@ export default {
     }
   }
 }
+.down {
+  padding-top: 20px;
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/test/editAnswer.vue b/src/views/test/editAnswer.vue
new file mode 100644
index 0000000..d492278
--- /dev/null
+++ b/src/views/test/editAnswer.vue
@@ -0,0 +1,814 @@
+<template>
+  <div>
+    <div class="back">
+      <div class="back-l" @click="cancel">
+        <i class="fa fa-mail-reply-all"></i>
+        <p>修改答案</p>
+      </div>
+    </div>
+    <div class="form-box">
+      <div class="answer-title">
+        <p class="name">{{ title }}</p>
+        <p class="totals">卷面总分：{{ score }}分</p>
+      </div>
+      <div v-if="questionList && questionList.length">
+        <template v-if="questionList[0].subQuestions">
+          <div v-for="(question, index) in questionList" :key="index">
+            <p class="question-title">
+              <span>{{ setBigNum(index) }}、</span>
+              <span class="title-txt">{{ question.questionTitle }}</span>
+              <span>共 {{ question.score }} 分</span>
+            </p>
+            <ul class="questions-ul">
+              <li class="sub-questions">
+                <div class="qs-num">题号</div>
+                <div class="qs-type">题型</div>
+                <div class="qs-score">分数</div>
+                <div class="qs-partScore">漏选得分</div>
+                <div class="qs-options qs-options2">选项设置</div>
+              </li>
+              <li
+                v-for="(subQuestions, indexs) in question.subQuestions"
+                :key="indexs"
+              >
+                <p
+                  class="set-ans-btn"
+                  v-if="
+                    subQuestions.qusType &&
+                    subQuestions.subNum &&
+                    subQuestions.subNum > 4
+                  "
+                >
+                  <el-button type="primary" @click="setFormAns(indexs, index)"
+                    >批量设置答案</el-button
+                  >
+                </p>
+                <div v-else class="sub-questions">
+                  <div class="qs-num">{{ subQuestions.questionIndex }}</div>
+                  <div class="qs-type">
+                    {{ setSubPro(subQuestions.questionType) }}
+                  </div>
+                  <div class="qs-score">
+                    {{ subQuestions.score }}
+                  </div>
+                  <div class="qs-partScore">
+                    <p v-if="subQuestions.questionType != 3">--</p>
+                    <p v-else>{{ subQuestions.partScore }}</p>
+                  </div>
+                  <div class="qs-options qs-options2">
+                    <p v-if="subQuestions.questionType == 5">--</p>
+                    <p v-if="subQuestions.questionType == 4" class="answer-box">
+                      <span
+                        class="answer-s"
+                        :class="subQuestions.correctAnswer == 1 ? 'active' : ''"
+                        @click="subQuestions.correctAnswer = 1"
+                        >✓</span
+                      >
+                      <span
+                        class="answer-s"
+                        :class="subQuestions.correctAnswer == 2 ? 'active' : ''"
+                        @click="subQuestions.correctAnswer = 2"
+                        >✗</span
+                      >
+                    </p>
+                    <p v-if="subQuestions.questionType == 3" class="answer-box">
+                      <template
+                        v-for="option in subQuestions.answerOptions.split(',')"
+                      >
+                        <span
+                          v-if="option"
+                          class="answer-s"
+                          :class="
+                            subQuestions.correctAnswer.includes(option)
+                              ? 'active'
+                              : ''
+                          "
+                          :key="option"
+                          @click="changAnswer(subQuestions, option)"
+                          >{{ option }}</span
+                        >
+                      </template>
+                    </p>
+                    <p v-if="subQuestions.questionType == 2" class="answer-box">
+                      <template
+                        v-for="option in subQuestions.answerOptions.split(',')"
+                      >
+                        <span
+                          class="answer-s"
+                          v-if="option"
+                          :class="
+                            subQuestions.correctAnswer == option ? 'active' : ''
+                          "
+                          :key="option"
+                          @click="subQuestions.correctAnswer = option"
+                          >{{ option }}</span
+                        >
+                      </template>
+                    </p>
+                  </div>
+                </div>
+              </li>
+            </ul>
+          </div>
+        </template>
+        <ul class="questions-ul" v-else>
+          <li class="sub-questions">
+            <div class="qs-num">题号</div>
+            <div class="qs-type">题型</div>
+            <div class="qs-score">分数</div>
+            <div class="qs-partScore">漏选得分</div>
+            <div class="qs-options qs-options2">选项设置</div>
+          </li>
+          <li v-for="(subQuestions, indexs) in questionList" :key="indexs">
+            <p
+              class="set-ans-btn"
+              v-if="
+                subQuestions.qusType &&
+                subQuestions.subNum &&
+                subQuestions.subNum > 4
+              "
+            >
+              <el-button type="primary" @click="setFormAns(indexs, index)"
+                >批量设置答案</el-button
+              >
+            </p>
+            <div v-else class="sub-questions">
+              <div class="qs-num">{{ subQuestions.questionIndex }}</div>
+              <div class="qs-type">
+                {{ setSubPro(subQuestions.questionType) }}
+              </div>
+              <div class="qs-score">
+                {{ subQuestions.score }}
+              </div>
+              <div class="qs-partScore">
+                <p v-if="subQuestions.questionType != 3">--</p>
+                <p v-else>{{ subQuestions.partScore }}</p>
+              </div>
+              <div class="qs-options qs-options2">
+                <p v-if="subQuestions.questionType == 5">--</p>
+                <p v-if="subQuestions.questionType == 4" class="answer-box">
+                  <span
+                    class="answer-s"
+                    :class="subQuestions.correctAnswer == 1 ? 'active' : ''"
+                    @click="subQuestions.correctAnswer = 1"
+                    >✓</span
+                  >
+                  <span
+                    class="answer-s"
+                    :class="subQuestions.correctAnswer == 2 ? 'active' : ''"
+                    @click="subQuestions.correctAnswer = 2"
+                    >✗</span
+                  >
+                </p>
+                <p v-if="subQuestions.questionType == 3" class="answer-box">
+                  <template
+                    v-for="option in subQuestions.answerOptions.split(',')"
+                  >
+                    <span
+                      v-if="option"
+                      class="answer-s"
+                      :class="
+                        subQuestions.correctAnswer.includes(option)
+                          ? 'active'
+                          : ''
+                      "
+                      :key="option"
+                      @click="changAnswer(subQuestions, option)"
+                      >{{ option }}</span
+                    >
+                  </template>
+                </p>
+                <p v-if="subQuestions.questionType == 2" class="answer-box">
+                  <template
+                    v-for="option in subQuestions.answerOptions.split(',')"
+                  >
+                    <span
+                      class="answer-s"
+                      v-if="option"
+                      :class="
+                        subQuestions.correctAnswer == option ? 'active' : ''
+                      "
+                      :key="option"
+                      @click="subQuestions.correctAnswer = option"
+                      >{{ option }}</span
+                    >
+                  </template>
+                </p>
+              </div>
+            </div>
+          </li>
+        </ul>
+      </div>
+      <div class="btn-box">
+        <el-button type="danger" plain round @click="cancel"
+          >取消</el-button
+        >
+        <el-button type="primary" round @click="saveAnswer">保存</el-button>
+      </div>
+    </div>
+    <el-dialog
+      title="批量设置答案"
+      :visible.sync="diaSetAns"
+      width="400"
+      :modal-append-to-body="false"
+    >
+      <div class="qs-options">
+        <p class="dia-tips">
+          请点击选项按钮设置答案,多选题题目之间用“,”隔开，若添加5道题：“AC,AD,BD,AC,CD”
+        </p>
+        <p>{{ setSubPro(formAns.qusType) }}：</p>
+        <p class="ipt">
+          <el-input
+            v-model="formAns.answerList"
+            @keydown.native="keydownAnswer($event)"
+          ></el-input>
+        </p>
+        <p class="answer-box">
+          <template v-if="formAns.qusType == 4">
+            <span
+              class="answer-s active"
+              @click="
+                formAns.answerList.length < formAns.subNum
+                  ? (formAns.answerList += '✓')
+                  : ''
+              "
+              >✓</span
+            >
+            <span
+              class="answer-s active"
+              @click="
+                formAns.answerList.length < formAns.subNum
+                  ? (formAns.answerList += '✗')
+                  : ''
+              "
+              >✗</span
+            >
+          </template>
+          <template v-if="formAns.qusType == 3">
+            <span
+              class="answer-s active"
+              v-for="option in formAns.answerOptions.split(',')"
+              :key="option"
+              @click="setMultiple(formAns, option)"
+              >{{ option }}</span
+            >
+            <span
+              class="answer-s active"
+              @click="
+                formAns.answerList.split(',').length < formAns.subNum
+                  ? (formAns.answerList += ',')
+                  : ''
+              "
+              >,</span
+            >
+          </template>
+          <template v-if="formAns.qusType == 2" class="answer-box">
+            <span
+              class="answer-s active"
+              v-for="option in formAns.answerOptions.split(',')"
+              :key="option"
+              @click="
+                formAns.answerList.length < formAns.subNum
+                  ? (formAns.answerList += option)
+                  : ''
+              "
+              >{{ option }}</span
+            >
+          </template>
+          <span
+            class="answer-s delButton"
+            @click="formAns.answerList = formAns.answerList.slice(0, -1)"
+            >x</span
+          >
+        </p>
+      </div>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="saveFormAns">确 定</el-button>
+        <el-button @click="diaSetAns = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { deepClone, checkAnswer } from "utils";
+export default {
+  props: {
+    id: "",
+    title: "",
+    score: "",
+  },
+  watch: {
+    id: {
+      handler: function (val) {
+        if (val) {
+          this.edit();
+        }
+      },
+      immediate: true,
+    },
+  },
+  data() {
+    return {
+      diaSetAns: false,
+      form: {},
+      questionList: [],
+      formAns: {
+        listIndex: 0, //大题位置
+        endIndex: 0, //相同题目最后一位题目的questionIndex
+        qusType: "", //题目类型
+        subNum: 0, //数量
+        answerOptions: [], //答案选项
+        answerList: "", //答案列表-字符串
+      },
+    };
+  },
+  created() {
+    // this.edit();
+  },
+  methods: {
+    cancel() {
+      this.$emit("cancel");
+    },
+    setSubPro(type) {
+      let tit;
+      switch (type) {
+        case 2:
+          tit = "单选题";
+          break;
+        case 3:
+          tit = "多选题";
+          break;
+        case 4:
+          tit = "判断题";
+          break;
+        case 5:
+          tit = "主观题";
+          break;
+      }
+      return tit;
+    },
+    setBigNum(num) {
+      let txt = "";
+      let bigNum = [
+        "一",
+        "二",
+        "三",
+        "四",
+        "五",
+        "六",
+        "七",
+        "八",
+        "九",
+        "十",
+        "十一",
+        "十二",
+        "十三",
+        "十四",
+        "十五",
+        "十六",
+        "十七",
+        "十八",
+        "十九",
+        "二十",
+      ];
+      txt = bigNum[num];
+
+      return txt;
+    },
+    keydownAnswer(event) {
+      //快速答案设置禁止输入
+      if (
+        event.key == "Meta" ||
+        event.key == "CapsLock" ||
+        event.key == "Shift" ||
+        event.key == "Enter" ||
+        event.key == "Alt" ||
+        event.key == "Backspace" ||
+        event.key == "Delete" ||
+        event.key == "ArrowUp" ||
+        event.key == "ArrowDown" ||
+        event.key == "ArrowLeft" ||
+        event.key == "v" ||
+        event.key == "V" ||
+        event.key == "ArrowRight"
+      ) {
+        return;
+      } else {
+        event.returnValue = "";
+      }
+    },
+    setAnswer(type, ans) {
+      let txt = "";
+      if (type == 2) {
+        txt = ans;
+      } else if (type == 3) {
+        txt = ans + ",";
+      } else if (type == 4) {
+        txt = ans == 1 ? "✓" : "✗";
+      }
+      return txt;
+    },
+    setMultiple(obj, answer) {
+      //多选答案设置
+      obj.answerList += answer;
+      let str = obj.answerList;
+      let str2 = checkAnswer(
+        str,
+        3,
+        obj.answerOptions.split(",").length,
+        obj.answerList.length
+      );
+      obj.answerList = str2;
+    },
+    changAnswer(sub, option) {
+      //设置多选答案
+      let str = new RegExp(option, "g");
+      if (sub.correctAnswer?.includes(option)) {
+        sub.correctAnswer = sub.correctAnswer.replace(str, "");
+      } else {
+        let arrs = (sub.correctAnswer && sub.correctAnswer.split("")) || [];
+        arrs.push(option);
+        sub.correctAnswer = arrs.sort().join("");
+      }
+    },
+    setFormAns(indexs, index) {
+      //初始化要修改的答案
+      if (this.questionList[0].subQuestions) {
+        this.formAns = { ...this.questionList[index].subQuestions[indexs] };
+        this.formAns.listIndex = index;
+      } else {
+        this.formAns = { ...this.questionList[indexs] };
+        this.formAns.listIndex = indexs;
+      }
+      this.diaSetAns = true;
+    },
+    saveFormAns() {
+      //批量修改答案
+      let EndIndex;
+      let subNum = this.formAns.subNum - 1;
+      if (this.questionList[this.formAns.listIndex].subQuestions) {
+        this.questionList[this.formAns.listIndex].subQuestions.some(
+          (item, index) => {
+            if (this.formAns.endIndex == item.questionIndex) {
+              EndIndex = index;
+              return;
+            }
+          }
+        );
+      } else {
+        this.questionList.some((item, index) => {
+          if (this.formAns.endIndex == item.questionIndex) {
+            EndIndex = index;
+            return;
+          }
+        });
+      }
+
+      for (let i = 0; i <= subNum; i++) {
+        let correctAnswer = "";
+        if (this.formAns.qusType == 2) {
+          correctAnswer = this.formAns.answerList[subNum - i];
+        } else if (this.formAns.qusType == 3) {
+          correctAnswer = this.formAns.answerList.split(",")[subNum - i];
+
+          console.log(this.formAns.answerList.split(",")[subNum - i]);
+        } else if (this.formAns.qusType == 4) {
+          correctAnswer = this.formAns.answerList[subNum - i] == "✓" ? 1 : 2;
+        }
+        if (this.questionList[0].subQuestions) {
+          this.questionList[this.formAns.listIndex].subQuestions[
+            EndIndex - i
+          ].correctAnswer = correctAnswer;
+        } else {
+          this.questionList[EndIndex - i].correctAnswer = correctAnswer;
+        }
+      }
+      this.diaSetAns = false;
+    },
+    async edit() {
+      //修改答案
+      const { data, status, info } = await this.$request.examQuestionList({
+        examId: this.id,
+      });
+      if (status == 0) {
+        this.questionList = deepClone(data?.list || []);
+      } else {
+        this.$message.error(info);
+      }
+      if (!!this.questionList[0].subQuestions) {
+        this.questionList?.map((item) => {
+          let types = [{}];
+          let addndex = 0;
+          item.subQuestions.map((sub, index) => {
+            if (!!sub.questionType) {
+              if (sub.questionType == types[addndex].qusType) {
+                //同类型批量答案+1
+                types[addndex].subNum += 1;
+                if (
+                  types[addndex].answerOptions.length < sub.answerOptions.length
+                ) {
+                  types[addndex].answerOptions = sub.answerOptions;
+                }
+                types[addndex].answerList += this.setAnswer(
+                  sub.questionType,
+                  sub.correctAnswer
+                );
+                if (index == item.subQuestions.length - 1) {
+                  //循环最后类型数量大于等于5，保存批量答案
+                  if (types[addndex].subNum && types[addndex].subNum >= 5) {
+                    types[addndex].endIndex = sub.questionIndex;
+                    types[addndex].index = index;
+                  }
+                }
+              } else {
+                if (types[addndex].subNum && types[addndex].subNum >= 5) {
+                  //不同类型时如果原有类型数量大于等于5，保存批量答案
+                  types[addndex].endIndex =
+                    item.subQuestions[index - 1].questionIndex;
+                  types[addndex].index = index;
+                  addndex += 1;
+                  types[addndex] = {};
+                }
+                //不同类型初始化批量答案
+                types[addndex].qusType = sub.questionType;
+                types[addndex].subNum = 1;
+                types[addndex].answerOptions = sub.answerOptions;
+                types[addndex].answerList = this.setAnswer(
+                  sub.questionType,
+                  sub.correctAnswer
+                );
+              }
+            }
+          });
+          for (let i = 0; i < types.length; i++) {
+            if (types[i].qusType == 3) {
+              types[i].answerList = types[i].answerList.slice(0, -1);
+            }
+            if (types[i].subNum >= 5) {
+              item.subQuestions.splice(
+                types[i].index + i + 1,
+                0,
+                deepClone(types[i])
+              );
+            }
+          }
+        });
+      } else {
+        let types = [{}];
+        let addndex = 0;
+        this.questionList?.map((sub, index) => {
+          if (!!sub.questionType) {
+            if (sub.questionType == types[addndex].qusType) {
+              //同类型批量答案+1
+              types[addndex].subNum += 1;
+              if (
+                types[addndex].answerOptions.length < sub.answerOptions.length
+              ) {
+                types[addndex].answerOptions = sub.answerOptions;
+              }
+              types[addndex].answerList += this.setAnswer(
+                sub.questionType,
+                sub.correctAnswer
+              );
+              if (index == this.questionList.length - 1) {
+                //循环最后类型数量大于等于5，保存批量答案
+                if (types[addndex].subNum && types[addndex].subNum >= 5) {
+                  types[addndex].endIndex = sub.questionIndex;
+                  types[addndex].index = index;
+                }
+              }
+            } else {
+              if (types[addndex].subNum && types[addndex].subNum >= 5) {
+                //不同类型时如果原有类型数量大于等于5，保存批量答案
+                types[addndex].endIndex =
+                  this.questionList[index - 1].questionIndex;
+                types[addndex].index = index;
+                addndex += 1;
+                types[addndex] = {};
+              }
+              //不同类型初始化批量答案
+              types[addndex].qusType = sub.questionType;
+              types[addndex].subNum = 1;
+              types[addndex].answerOptions = sub.answerOptions;
+              types[addndex].answerList = this.setAnswer(
+                sub.questionType,
+                sub.correctAnswer
+              );
+            }
+          }
+        });
+        for (let i = 0; i < types.length; i++) {
+          if (types[i].qusType == 3) {
+            types[i].answerList = types[i].answerList.slice(0, -1);
+          }
+          if (types[i].subNum >= 5) {
+            item.subQuestions.splice(
+              types[i].index + i + 1,
+              0,
+              deepClone(types[i])
+            );
+          }
+        }
+      }
+
+      this.dialogVisible = true;
+    },
+    async saveAnswer() {
+      //保存答案
+      for (let i = 0; i < this.questionList.length; i++) {
+        if (this.questionList[0].subQuestions) {
+          for (let j = 0; j < this.questionList[i].subQuestions.length; j++) {
+            if (this.questionList[i].subQuestions[j].qusType) {
+              this.questionList[i].subQuestions.splice(j, 1);
+            }
+          }
+        } else {
+          if (this.questionList[i].qusType) {
+            this.questionList.splice(i, 1);
+            i--
+          }
+        }
+      }
+      const { data, status, message } = await this.$request.setExamAnswer({
+        examId: this.id,
+        questionList: [...this.questionList],
+      });
+      if (status == 0) {
+        this.$emit("saveSuccess");
+      } else {
+        this.$message.error(message);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.back {
+  width: 100%;
+  height: 56px;
+  border-bottom: 1px solid #e2e2e2;
+  display: flex;
+  align-items: center;
+  padding: 0 20px;
+  box-sizing: border-box;
+  .back-l {
+    display: flex;
+    align-items: center;
+    cursor: pointer;
+    flex-shrink: 0;
+    font-size: 18px;
+    font-weight: 500;
+  }
+  .fa-mail-reply-all {
+    font-size: 28px;
+    color: #b3b3b3;
+    margin-right: 12px;
+  }
+}
+.form-box {
+  padding: 20px;
+}
+.answer-title {
+  text-align: center;
+  font-size: 20px;
+  color: #333;
+  font-weight: 700;
+  padding-bottom: 20px;
+  .totals {
+    font-size: 16px;
+    color: #888;
+    font-weight: normal;
+  }
+}
+.question-title {
+  line-height: 40px;
+  .ipt {
+    width: 300px;
+    margin: 0 16px 0 10px;
+    :deep(.el-input__inner) {
+      border-radius: 20px;
+      border-color: #667ffd;
+      background: rgba($color: #667ffd, $alpha: 0.05);
+    }
+  }
+  .delete {
+    margin-right: 8px;
+  }
+  .title-txt {
+    margin-right: 20px;
+    font-size: 16px;
+    font-weight: 700;
+  }
+}
+.questions-ul {
+  border-left: 1px solid #e2e2e2;
+  border-top: 1px solid #e2e2e2;
+  margin: 12px 0;
+}
+.sub-questions {
+  width: 100%;
+  display: flex;
+  border-bottom: 1px solid #e2e2e2;
+  & > div {
+    min-height: 40px;
+    padding: 5px;
+    flex-shrink: 0;
+    border-right: 1px solid #e2e2e2;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+  .qs-num {
+    width: 80px;
+  }
+  .qs-type {
+    width: 160px;
+  }
+  .qs-score,
+  .qs-partScore {
+    width: 160px;
+  }
+  .qs-options {
+    flex: 1;
+  }
+  .qs-set {
+    width: 80px;
+  }
+  .qs-options2 {
+    text-align: left;
+    justify-content: flex-start;
+    padding-left: 20px;
+    .answer-s {
+      cursor: pointer;
+    }
+  }
+  :deep(.el-select) {
+    .el-input__inner {
+      border-radius: 20px;
+      border-color: #667ffd;
+      width: 150px;
+      height: 32px;
+      line-height: 32px;
+      background: rgba($color: #667ffd, $alpha: 0.05);
+    }
+    .el-input__icon {
+      line-height: 32px;
+    }
+  }
+}
+.set-ans-btn {
+  width: 100%;
+  padding: 10px 0 10px 630px;
+  box-sizing: border-box;
+  border-bottom: 1px solid #e2e2e2;
+}
+.fa-exchange {
+  color: #667ffd;
+  cursor: pointer;
+  font-size: 16px;
+  margin-left: 10px;
+}
+.dia-btn {
+  border-radius: 20px;
+  margin: 0 20px;
+  padding: 10px 20px;
+}
+.dia-tips {
+  padding-bottom: 10px;
+}
+.answer-s {
+  width: 32px;
+  height: 28px;
+  cursor: pointer;
+  user-select: none;
+}
+.set-questions {
+  display: flex;
+  margin-bottom: 12px;
+  width: 100%;
+  .qs-num {
+    flex-shrink: 0;
+    margin-right: 10px;
+  }
+}
+.qs-options {
+  flex: 1;
+  .ipt {
+    margin-bottom: 5px;
+  }
+  .delButton {
+    border-color: #ff6868;
+    background: #ff6868 url("../../assets/images/arrow.png") no-repeat center;
+    background-size: 19px;
+    cursor: pointer;
+    color: transparent;
+  }
+  .ac {
+    border-color: #ff6868;
+    background: #ff6868;
+    color: #fff;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/test/index.vue b/src/views/test/index.vue
index 6fed0dd..3036fbc 100644
--- a/src/views/test/index.vue
+++ b/src/views/test/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="page-container">
+  <div class="page-container" :class="dialogVisible ? 'active' : ''">
     <back-box>
       <template slot="title">
         <span>即时测-数据报表</span>
@@ -25,7 +25,7 @@
           v-if="role == 'ROLE_BANZHUREN'"
           class="sel"
           multiple
-          v-model="query.subjectId"
+          v-model="query.subjectNames"
           placeholder="选择科目"
           @change="_QueryData"
         >
@@ -40,7 +40,7 @@
         <el-select
           v-else
           class="sel"
-          v-model="query.subjectId"
+          v-model="query.subjectNames"
           placeholder="选择科目"
           @change="_QueryData"
         >
@@ -89,87 +89,86 @@
       </div>
     </div>
     <div class="table-box">
-      <el-radio-group v-model="tabIndex" style="margin-bottom: 20px">
+      <el-radio-group
+        v-model="tabIndex"
+        @change="changeTab"
+        style="margin-bottom: 20px"
+      >
         <el-radio-button :label="1">单卷测练报表</el-radio-button>
         <el-radio-button :label="2">阶段测练报表</el-radio-button>
       </el-radio-group>
-      <div v-if="tabIndex == 1">
-        <el-table
-          :data="tableData"
-          border
-          style="width: 100%"
-          :default-sort="{ prop: '', order: 'descending' }"
-        >
+      <div v-if="tabIndex == 1" v-loading="loading">
+        <el-table :data="tableData" border style="width: 100%">
           <el-table-column
             prop="title"
             label="试卷名称"
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="totalScore"
+            prop="examPaperScore"
             label="卷面分"
             align="center"
             width="100"
           ></el-table-column>
           <el-table-column
-            prop="ceyan"
+            prop="answeredNum"
             label="测验人数"
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="shijian"
+            prop="examStartTime"
             label="测验时间"
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="pingjun"
+            prop="avgScore"
             label="班平均分"
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="zuigao"
+            prop="highestScore"
             label="班最高分"
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="zuidi"
+            prop="lowestScore"
             label="班最低分"
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="youxiu"
+            prop="excellenRate"
             label="优秀数（率）"
             sortable
             align="center"
             ><template slot-scope="scoped"
-              >{{ scoped.row.youxiu }}%</template
+              >{{ scoped.row.excellenRate }}%</template
             ></el-table-column
           >
           <el-table-column
-            prop="lianghao"
+            prop="goodRate"
             label="良好数（率）"
             sortable
             align="center"
             ><template slot-scope="scoped"
-              >{{ scoped.row.lianghao }}%</template
+              >{{ scoped.row.goodRate }}%</template
             ></el-table-column
           >
           <el-table-column
-            prop="jige"
+            prop="passRate"
             label="及格数（率）"
             sortable
             align="center"
             ><template slot-scope="scoped"
-              >{{ scoped.row.jige }}%</template
+              >{{ scoped.row.passRate }}%</template
             ></el-table-column
           >
           <el-table-column
-            prop="bujige"
+            prop="failedRate"
             label="不及格数（率）"
             sortable
             align="center"
             ><template slot-scope="scoped"
-              >{{ scoped.row.bujige }}%</template
+              >{{ scoped.row.failedRate }}%</template
             ></el-table-column
           >
           <el-table-column label="操作" align="center">
@@ -195,38 +194,33 @@
             </template>
           </el-table-column>
         </el-table>
+        <div class="pagination-box">
+          <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>
       </div>
-      <div v-if="tabIndex == 2">
-        <el-table
-          :data="tableStage"
-          border
-          style="width: 100%"
-          :default-sort="{ prop: '', order: 'descending' }"
-        >
+      <div v-if="tabIndex == 2" v-loading="loading">
+        <el-table :data="tableData" border style="width: 100%">
           <el-table-column
-            prop="xuehao"
+            prop="studentCode"
             label="学号"
             align="center"
             fixed
           ></el-table-column>
           <el-table-column
-            prop="xingming"
+            prop="studentName"
             label="姓名"
             fixed
             align="center"
           ></el-table-column>
-          <el-table-column label="阶段汇总" align="center">
-            <el-table-column
-              prop="totalScore"
-              label="总分"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="rank"
-              label="排名"
-              align="center"
-            ></el-table-column>
-          </el-table-column>
           <el-table-column
             align="center"
             v-for="(item, index) in answerList"
@@ -234,12 +228,12 @@
             :label="item.title"
           >
             <el-table-column
-              :prop="item.title + 'totalScore'"
-              label="成绩"
+              :prop="'score' + index"
+              label="总分/成绩"
               align="center"
             ></el-table-column>
             <el-table-column
-              :prop="item.title + 'rank'"
+              :prop="'classRank' + index"
               label="班名"
               align="center"
             ></el-table-column>
@@ -253,227 +247,37 @@
       </p>
     </div>
     <div class="edit-dia" v-show="dialogVisible" height="100%">
-      <div class="back">
-        <div class="back-l" @click="dialogVisible = false">
-          <i class="fa fa-mail-reply-all"></i>
-          <p>修改答案</p>
-        </div>
-      </div>
-      <div class="form-box">
-        <div class="answer-title">
-          <p class="name">{{ form.title }}</p>
-          <p class="totals">卷面总分：{{ form.score }}分</p>
-        </div>
-        <div v-if="questionList && questionList.length">
-          <div v-for="(question, index) in questionList" :key="index">
-            <p class="question-title">
-              <span>{{ setBigNum(index) }}、</span>
-              <span class="title-txt">{{ question.questionTitle }}</span>
-              <span>共 {{ question.score }} 分</span>
-            </p>
-            <ul class="questions-ul">
-              <li class="sub-questions">
-                <div class="qs-num">题号</div>
-                <div class="qs-type">题型</div>
-                <div class="qs-score">分数</div>
-                <div class="qs-partScore">漏选得分</div>
-                <div class="qs-options qs-options2">选项设置</div>
-              </li>
-              <li
-                v-for="(subQuestions, indexs) in question.subQuestions"
-                :key="indexs"
-              >
-                <p
-                  class="set-ans-btn"
-                  v-if="
-                    subQuestions.qusType &&
-                    subQuestions.subNum &&
-                    subQuestions.subNum > 4
-                  "
-                >
-                  <el-button type="primary" @click="setFormAns(index, indexs)"
-                    >批量设置答案</el-button
-                  >
-                </p>
-                <div v-else class="sub-questions">
-                  <div class="qs-num">{{ subQuestions.questionIndex }}</div>
-                  <div class="qs-type">
-                    {{ setSubPro(subQuestions.questionType) }}
-                  </div>
-                  <div class="qs-score">
-                    {{ subQuestions.score }}
-                  </div>
-                  <div class="qs-partScore">
-                    <p v-if="subQuestions.questionType != 3">--</p>
-                    <p v-else>{{ subQuestions.partScore }}</p>
-                  </div>
-                  <div class="qs-options qs-options2">
-                    <p v-if="subQuestions.questionType == 5">--</p>
-                    <p v-if="subQuestions.questionType == 4" class="answer-box">
-                      <span
-                        class="answer-s"
-                        :class="subQuestions.correctAnswer == 1 ? 'active' : ''"
-                        @click="subQuestions.correctAnswer = 1"
-                        >✓</span
-                      >
-                      <span
-                        class="answer-s"
-                        :class="subQuestions.correctAnswer == 2 ? 'active' : ''"
-                        @click="subQuestions.correctAnswer = 2"
-                        >✗</span
-                      >
-                    </p>
-                    <p v-if="subQuestions.questionType == 3" class="answer-box">
-                      <template
-                        v-for="option in subQuestions.answerOptions.split(',')"
-                      >
-                        <span
-                          v-if="option"
-                          class="answer-s"
-                          :class="
-                            subQuestions.correctAnswer.includes(option)
-                              ? 'active'
-                              : ''
-                          "
-                          :key="option"
-                          @click="changAnswer(subQuestions, option)"
-                          >{{ option }}</span
-                        >
-                      </template>
-                    </p>
-                    <p v-if="subQuestions.questionType == 2" class="answer-box">
-                      <template
-                        v-for="option in subQuestions.answerOptions.split(',')"
-                      >
-                        <span
-                          class="answer-s"
-                          v-if="option"
-                          :class="
-                            subQuestions.correctAnswer == option ? 'active' : ''
-                          "
-                          :key="option"
-                          @click="subQuestions.correctAnswer = option"
-                          >{{ option }}</span
-                        >
-                      </template>
-                    </p>
-                  </div>
-                </div>
-              </li>
-            </ul>
-          </div>
-        </div>
-        <div class="btn-box">
-          <el-button type="danger" plain round @click="dialogVisible = false"
-            >取消</el-button
-          >
-          <el-button type="primary" round @click="saveAnswer">保存</el-button>
-        </div>
-      </div>
+      <editAnswer
+        :id="form.id"
+        :title="form.title"
+        :score="form.examPaperScore"
+        @cancel="cancel"
+        @saveSuccess="saveSuccess"
+      />
     </div>
-    <el-dialog title="批量设置答案" :visible.sync="diaSetAns" width="400">
-      <div class="qs-options">
-        <p class="dia-tips">
-          请点击选项按钮设置答案,多选题题目之间用“,”隔开，若添加5道题：“AC,AD,BD,AC,CD”
-        </p>
-        <p>{{ setSubPro(formAns.qusType) }}：</p>
-        <p class="ipt">
-          <el-input
-            v-model="formAns.answerList"
-            @keydown.native="keydownAnswer($event)"
-          ></el-input>
-        </p>
-        <p class="answer-box">
-          <template v-if="formAns.qusType == 4">
-            <span
-              class="answer-s active"
-              @click="
-                formAns.answerList.length < formAns.subNum
-                  ? (formAns.answerList += '✓')
-                  : ''
-              "
-              >✓</span
-            >
-            <span
-              class="answer-s active"
-              @click="
-                formAns.answerList.length < formAns.subNum
-                  ? (formAns.answerList += '✗')
-                  : ''
-              "
-              >✗</span
-            >
-          </template>
-          <template v-if="formAns.qusType == 3">
-            <span
-              class="answer-s active"
-              v-for="option in formAns.answerOptions"
-              :key="option"
-              @click="setMultiple(formAns, option)"
-              >{{ option }}</span
-            >
-            <span
-              class="answer-s active"
-              @click="
-                formAns.answerList.split(',').length < formAns.subNum
-                  ? (formAns.answerList += ',')
-                  : ''
-              "
-              >,</span
-            >
-          </template>
-          <template v-if="formAns.qusType == 2" class="answer-box">
-            <span
-              class="answer-s active"
-              v-for="option in formAns.answerOptions"
-              :key="option"
-              @click="
-                formAns.answerList.length < formAns.subNum
-                  ? (formAns.answerList += option)
-                  : ''
-              "
-              >{{ option }}</span
-            >
-          </template>
-          <span
-            class="answer-s delButton"
-            @click="formAns.answerList = formAns.answerList.slice(0, -1)"
-            >x</span
-          >
-        </p>
-      </div>
-      <div class="dialog-footer" slot="footer">
-        <el-button @click="saveFormAns">确 定</el-button>
-        <el-button @click="diaSetAns = false">取 消</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import { formatDate, deepClone, checkAnswer } from "utils";
+import { formatDate } from "utils";
+import editAnswer from "./editAnswer.vue";
 export default {
+  components: { editAnswer },
   data() {
     return {
       role: "",
       loading: false,
       dialogVisible: false,
-      diaSetAns: false,
-      form: {},
-      questionList: [],
-      formAns: {
-        listIndex: 0, //大题位置
-        endIndex: 0, //相同题目最后一位题目的questionIndex
-        qusType: "", //题目类型
-        subNum: 0, //数量
-        answerOptions: [], //答案选项
-        answerList: "", //答案列表-字符串
+      form: {
+        id: "",
+        title: "",
+        examPaperScore: "",
       },
       date: "", //今天-昨天-本周
       query: {
         //搜索条件
         classId: "",
-        subjectId: "",
+        subjectNames: "",
         startDay: "",
         endDay: "",
         day: "",
@@ -481,207 +285,11 @@ export default {
       classList: [], //班级
       subjectList: [], //科目
       tabIndex: 1, //选项卡
-      tableData: [
-        {
-          title: "试卷一",
-          totalScore: 10,
-          ceyan: "40/50",
-          shijian: "2022-11-9 21:30至22:30",
-          pingjun: 60,
-          zuigao: 90,
-          zuidi: 50,
-          youxiu: 50,
-          lianghao: 40,
-          jige: 30,
-          bujige: 20,
-          questionList: [
-            {
-              questionTitle: "f",
-              score: 1,
-              subQuestions: [
-                {
-                  questionIndex: 1,
-                  questionType: 2,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 4,
-                  answerOptions: "A, B, C, D",
-                  correctAnswer: "B",
-                },
-                {
-                  questionIndex: 2,
-                  questionType: 2,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 4,
-                  answerOptions: "A, B, C, D,E,F",
-                  correctAnswer: "A",
-                },
-                {
-                  questionIndex: 3,
-                  questionType: 2,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 4,
-                  answerOptions: "A, B, C, D,E,F",
-                  correctAnswer: "A",
-                },
-                {
-                  questionIndex: 4,
-                  questionType: 2,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 4,
-                  answerOptions: "A, B, C, D,E,F",
-                  correctAnswer: "A",
-                },
-                {
-                  questionIndex: 5,
-                  questionType: 2,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 4,
-                  answerOptions: "A, B, C, D,E,F",
-                  correctAnswer: "A",
-                },
-                {
-                  questionIndex: 6,
-                  questionType: 3,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 4,
-                  answerOptions: "A, B, C, D,E,F",
-                  correctAnswer: "AB",
-                },
-                {
-                  questionIndex: 7,
-                  questionType: 4,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 0,
-                  answerOptions: [],
-                  correctAnswer: "1",
-                },
-                {
-                  questionIndex: 8,
-                  questionType: 3,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 4,
-                  answerOptions: "A, B, C, D,E,F",
-                  correctAnswer: "AB",
-                },
-                {
-                  questionIndex: 9,
-                  questionType: 3,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 4,
-                  answerOptions: "A, B, C, D,E,F",
-                  correctAnswer: "AB",
-                },
-                {
-                  questionIndex: 10,
-                  questionType: 3,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 4,
-                  answerOptions: "A, B, C, D,E,F",
-                  correctAnswer: "AB",
-                },
-                {
-                  questionIndex: 11,
-                  questionType: 3,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 4,
-                  answerOptions: "A, B, C, D,E,F",
-                  correctAnswer: "AB",
-                },
-                {
-                  questionIndex: 12,
-                  questionType: 3,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 4,
-                  answerOptions: "A, B, C, D,E,F",
-                  correctAnswer: "AB",
-                },
-                {
-                  questionIndex: 13,
-                  questionType: 4,
-                  score: 1,
-                  partScore: 0,
-                  selectNum: 0,
-                  answerOptions: [],
-                  correctAnswer: "1",
-                },
-              ],
-            },
-          ],
-        },
-        {
-          title: "试卷二",
-          totalScore: 20,
-          ceyan: "30/50",
-          shijian: "2022-11-9 21:30至22:30",
-          pingjun: 80,
-          zuigao: 92,
-          zuidi: 53,
-          youxiu: 45,
-          lianghao: 56,
-          jige: 20,
-          bujige: 30,
-        },
-      ],
-      tableStage: [
-        {
-          xuehao: 1,
-          xingming: "丁芳菲",
-          totalScore: 5,
-          rank: 1,
-          周测卷20221130totalScore: 10,
-          周测卷20221130rank: 0,
-          周测卷20221131totalScore: 11,
-          周测卷20221131rank: 1,
-          周测卷20221132totalScore: 12,
-          周测卷20221132rank: 2,
-          周测卷20221132totalScore: 13,
-          周测卷20221132rank: 3,
-        },
-        {
-          xuehao: 2,
-          xingming: "丁芳",
-          totalScore: 4,
-          rank: 2,
-          周测卷20221130totalScore: 20,
-          周测卷20221130rank: 3,
-          周测卷20221131totalScore: 21,
-          周测卷20221131rank: 4,
-          周测卷20221132totalScore: 22,
-          周测卷20221132rank: 5,
-          周测卷20221132totalScore: 22,
-          周测卷20221132rank: 5,
-        },
-      ],
-      answerList: [
-        //设置多卷内容供tableStage表格数据用
-        {
-          title: "周测卷20221130",
-          totalScore: 6,
-          rank: 2,
-        },
-        {
-          title: "周测卷20221131",
-          totalScore: 7,
-          rank: 3,
-        },
-        {
-          title: "周测卷20221132",
-          totalScore: 8,
-          rank: 4,
-        },
-      ],
+      tableData: [],
+      answerList: [], //设置多卷内容供tableStage表格数据用
+      page: 1,
+      size: 20,
+      total: 0,
     };
   },
   async created() {
@@ -690,7 +298,7 @@ export default {
     )?.role;
     await this._QueryClassList();
     await this._QuerySubjectList();
-    // await this.setDate(1);
+    await this.setDate(1);
     let startDay = this.query?.startDay;
     if (!startDay) {
       this.query.startDay = new Date();
@@ -704,54 +312,17 @@ export default {
         path: "/testAnalysis",
         query: {
           id: obj.id,
+          title: obj.title,
+          score: obj.examPaperScore,
         },
       });
     },
-    setSubPro(type) {
-      let tit;
-      switch (type) {
-        case 2:
-          tit = "单选题";
-          break;
-        case 3:
-          tit = "多选题";
-          break;
-        case 4:
-          tit = "判断题";
-          break;
-        case 5:
-          tit = "主观题";
-          break;
-      }
-      return tit;
+    cancel() {
+      this.dialogVisible = false;
     },
-    setBigNum(num) {
-      let txt = "";
-      let bigNum = [
-        "一",
-        "二",
-        "三",
-        "四",
-        "五",
-        "六",
-        "七",
-        "八",
-        "九",
-        "十",
-        "十一",
-        "十二",
-        "十三",
-        "十四",
-        "十五",
-        "十六",
-        "十七",
-        "十八",
-        "十九",
-        "二十",
-      ];
-      txt = bigNum[num];
-
-      return txt;
+    saveSuccess() {
+      this.dialogVisible = false;
+      this._QueryData();
     },
     setDate(index) {
       const that = this;
@@ -783,7 +354,7 @@ export default {
           that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
           break;
         case 4:
-          if (aMonth > 1 && aMonth < 4) {
+          if (aMonth > 0 && aMonth < 4) {
             aMonth = "01";
           } else if (aMonth > 3 && aMonth < 7) {
             aMonth = "04";
@@ -821,175 +392,29 @@ export default {
         }
       }
     },
-    keydownAnswer(event) {
-      //快速答案设置禁止输入
-      if (
-        event.key == "Meta" ||
-        event.key == "CapsLock" ||
-        event.key == "Shift" ||
-        event.key == "Enter" ||
-        event.key == "Alt" ||
-        event.key == "Backspace" ||
-        event.key == "Delete" ||
-        event.key == "ArrowUp" ||
-        event.key == "ArrowDown" ||
-        event.key == "ArrowLeft" ||
-        event.key == "v" ||
-        event.key == "V" ||
-        event.key == "ArrowRight"
-      ) {
-        return;
-      } else {
-        event.returnValue = "";
-      }
-    },
-    setAnswer(type, ans) {
-      let txt = "";
-      if (type == 2) {
-        txt = ans;
-      } else if (type == 3) {
-        txt = ans + ",";
-      } else if (type == 4) {
-        txt = ans == 1 ? "✓" : "✗";
-      }
-      return txt;
-    },
-    setMultiple(obj, answer) {
-      //多选答案设置
-      obj.answerList += answer;
-      let str = obj.answerList;
-      let str2 = checkAnswer(
-        str,
-        3,
-        obj.answerOptions.split(",").length,
-        obj.answerList.length
-      );
-      obj.answerList = str2;
+    changePage(page) {
+      this.page = page;
+      this._QueryData();
     },
     edit(item) {
-      //修改答案
-      this.form = deepClone(item);
-      this.questionList = deepClone(item?.questionList || []);
-      this.questionList?.map((item) => {
-        let types = [{}];
-        let addndex = 0;
-        item.subQuestions.map((sub, index) => {
-          if (!!sub.questionType) {
-            if (sub.questionType == types[addndex].qusType) {
-              //同类型批量答案+1
-              types[addndex].subNum += 1;
-              if (
-                types[addndex].answerOptions.length < sub.answerOptions.length
-              ) {
-                types[addndex].answerOptions = sub.answerOptions;
-              }
-              types[addndex].answerList += this.setAnswer(
-                sub.questionType,
-                sub.correctAnswer
-              );
-              if (index == item.subQuestions.length - 1) {
-                //循环最后类型数量大于等于5，保存批量答案
-                if (types[addndex].subNum && types[addndex].subNum >= 5) {
-                  types[addndex].endIndex = sub.questionIndex;
-                  types[addndex].index = index;
-                }
-              }
-            } else {
-              if (types[addndex].subNum && types[addndex].subNum >= 5) {
-                //不同类型时如果原有类型数量大于等于5，保存批量答案
-                types[addndex].endIndex =
-                  item.subQuestions[index - 1].questionIndex;
-                types[addndex].index = index;
-                addndex += 1;
-                types[addndex] = {};
-              }
-              //不同类型初始化批量答案
-              types[addndex].qusType = sub.questionType;
-              types[addndex].subNum = 1;
-              types[addndex].answerOptions = sub.answerOptions;
-              types[addndex].answerList = this.setAnswer(
-                sub.questionType,
-                sub.correctAnswer
-              );
-            }
-          }
-        });
-        for (let i = 0; i < types.length; i++) {
-          if (types[i].qusType == 3) {
-            types[i].answerList = types[i].answerList.slice(0, -1);
-          }
-          if (types[i].subNum >= 5) {
-            item.subQuestions.splice(
-              types[i].index + i,
-              0,
-              deepClone(types[i])
-            );
-          }
-        }
-      });
+      this.form = { ...item };
       this.dialogVisible = true;
     },
-    setFormAns(index, indexs) {
-      //初始化要修改的答案
-      this.formAns = { ...this.questionList[index].subQuestions[indexs] };
-      this.formAns.listIndex = index;
-      this.diaSetAns = true;
-    },
-    saveFormAns() {
-      //批量修改答案
-      let EndIndex;
-      let subNum = this.formAns.subNum - 1;
-      this.questionList[this.formAns.listIndex].subQuestions.some(
-        (item, index) => {
-          if (this.formAns.endIndex == item.questionIndex) {
-            EndIndex = index;
-            return;
-          }
-        }
-      );
-      for (let i = 0; i <= subNum; i++) {
-        let correctAnswer = "";
-        if (this.formAns.qusType == 2) {
-          correctAnswer = this.formAns.answerList[subNum - i];
-        } else if (this.formAns.qusType == 3) {
-          correctAnswer = this.formAns.answerList.split(",")[subNum - i];
-
-          console.log(this.formAns.answerList.split(",")[subNum - i]);
-        } else if (this.formAns.qusType == 4) {
-          correctAnswer = this.formAns.answerList[subNum - i] == "✓" ? 1 : 2;
-        }
-        this.questionList[this.formAns.listIndex].subQuestions[
-          EndIndex - i
-        ].correctAnswer = correctAnswer;
-      }
-      this.diaSetAns = false;
-    },
-    async saveAnswer() {
-      //保存答案
-      for (let i = 0; i < this.questionList.length; i++) {
-        for (let j = 0; j < this.questionList[i].subQuestions.length; j++) {
-          if (this.questionList[i].subQuestions[j].qusType) {
-            this.questionList[i].subQuestions.splice(j, 1);
-          }
-        }
-      }
-      const { data, status, message } = await this.$request.modifyPaper({
-        paperId: this.form.id,
-        questionList: [...this.questionList],
-      });
-      if (status == 0) {
-        this._QueryData();
-      } else {
-        this.$message.error(message);
-      }
+    changeTab() {
+      this.page = 1;
+      this._QueryData();
     },
-
     async changClazz() {
+      this.page = 1;
       await this._QuerySubjectList();
-      await this.setDate(1);
+      await this._QueryData();
     },
     async _QueryClassList() {
-      const { data, status, info } = await this.$request.fetchClassList();
+      const fetchClassList =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTClassList
+          : this.$request.tClassList;
+      const { data, status, info } = await fetchClassList();
       if (status === 0) {
         this.classList = data.list.map((item) => {
           return {
@@ -1003,7 +428,12 @@ export default {
       }
     },
     async _QuerySubjectList() {
-      const { data, status, info } = await this.$request.fetchSubjectList({
+      const fetchSubjectList =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTSubjectList
+          : this.$request.tSubjectList;
+
+      const { data, status, info } = await fetchSubjectList({
         classId: this.query.classId,
       });
       if (status === 0) {
@@ -1016,31 +446,135 @@ export default {
           }) || [];
         if (this.role == "ROLE_BANZHUREN") {
           this.subjectList.unshift({
-            value: "",
+            value: "全部",
             label: "全部",
           });
-          this.query.subjectId = [this.subjectList[0]?.value];
+          this.query.subjectNames.push(this.subjectList[0]?.value);
         } else {
-          this.query.subjectId = this.subjectList[0]?.value;
+          this.query.subjectNames = this.subjectList[0]?.value;
         }
       } else {
         this.$message.error(info);
       }
     },
     async _QueryData() {
+      this.tableData = [];
+      if (this.tabIndex == 1) {
+        this.examReportList();
+      } else {
+        this.phaseExamReport();
+      }
+    },
+    //单卷测练
+    async examReportList() {
       this.loading = true;
-      //多课时对比
       let query = {};
       for (let key in this.query) {
         if (this.query[key] != "") {
           query[key] = this.query[key];
         }
       }
-      const { data, status, info } = await this.$request.fetchQuizList({
+      if (this.role != "ROLE_BANZHUREN") {
+        query.subjectNames = [query.subjectNames];
+      } else {
+        if (
+          query["subjectNames"].length == 1 &&
+          query["subjectNames"][0] == "全部"
+        ) {
+          query["subjectNames"] = this.subjectList.map((item) => {
+            return item.value;
+          });
+          query["subjectNames"].shift();
+        }
+      }
+      const { data, status, info } = await this.$request.examReportList({
         ...query,
+        page: this.page,
+        size: this.size,
       });
       this.loading = false;
       if (status === 0) {
+        this.tableData = (data?.list && [...data?.list]) || [];
+        this.total = data.count;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //多卷测练
+    async phaseExamReport() {
+      this.loading = true;
+      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"].length == 1 &&
+          query["subjectNames"][0] == "全部"
+        ) {
+          query["subjectNames"] = this.subjectList.map((item) => {
+            return item.value;
+          });
+          query["subjectNames"].shift();
+        }
+      }
+      const phaseExamReport =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTPhaseExamReport
+          : this.$request.phaseExamReport;
+      const { data, status, info } = await phaseExamReport({
+        ...query,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.total = data.count;
+        let dataIdsList = [],
+          dataList = [];
+        data?.list.map((item) => {
+          item.examList.map((items) => {
+            if (this.role == "ROLE_JITUAN") {
+              // if (!dataIdsList.includes(items.grade)) {
+              //   dataIdsList.push(items.grade);
+              //   dataList.push(items);
+              // }
+            } else {
+              if (!dataIdsList.includes(items.title)) {
+                dataIdsList.push(items.title);
+                dataList.push(items);
+              }
+            }
+          });
+        });
+        console.log(dataList);
+        this.tableData = data?.list.map((item) => {
+          let params = {};
+          dataIdsList.map((ids, index) => {
+            params["score" + index] = "--";
+            params["classRank" + index] = "--";
+            item.examList.map((items) => {
+              if (this.role == "ROLE_JITUAN") {
+                if (items.title == ids) {
+                }
+              } else {
+                if (items.title == ids) {
+                  params["score" + index] = items.score;
+                  params["classRank" + index] = items.classRank;
+                }
+              }
+            });
+          });
+          return {
+            ...item,
+            ...params,
+          };
+        });
+        this.answerList = dataList;
       } else {
         this.$message.error(info);
       }
@@ -1049,7 +583,24 @@ export default {
 };
 </script>
 
+<style>
+div::-webkit-scrollbar {
+  width: 3px;
+  height: 10px;
+}
+div::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background-color: #ccc;
+}
+</style>
 <style lang="scss" scoped>
+.page-container {
+  position: relative;
+  &.active {
+    height: 100%;
+    overflow: hidden;
+  }
+}
 .table-box {
   margin: 0 20px;
   padding: 16px;
@@ -1062,60 +613,9 @@ export default {
     padding-left: 2px;
   }
 }
-
-.fa-exchange {
-  color: #667ffd;
-  cursor: pointer;
-  font-size: 16px;
-  margin-left: 10px;
-}
-.dia-btn {
-  border-radius: 20px;
-  margin: 0 20px;
-  padding: 10px 20px;
-}
-.dia-tips {
-  padding-bottom: 10px;
-}
-.answer-s {
-  width: 32px;
-  height: 28px;
-  cursor: pointer;
-  user-select: none;
-}
-.set-questions {
-  display: flex;
-  margin-bottom: 12px;
-  width: 100%;
-  .qs-num {
-    flex-shrink: 0;
-    margin-right: 10px;
-  }
-}
-.qs-options {
-  flex: 1;
-  .ipt {
-    margin-bottom: 5px;
-  }
-  .delButton {
-    border-color: #ff6868;
-    background: #ff6868 url("../../assets/images/arrow.png") no-repeat center;
-    background-size: 19px;
-    cursor: pointer;
-    color: transparent;
-  }
-  .ac {
-    border-color: #ff6868;
-    background: #ff6868;
-    color: #fff;
-  }
-}
 .down {
   padding-top: 16px;
 }
-.page-container {
-  position: relative;
-}
 .edit-dia {
   position: absolute;
   left: 0;
@@ -1123,128 +623,9 @@ export default {
   right: 0;
   bottom: 0;
   width: 100%;
-  height: calc(100vh - 80px);
+  height: calc(100vh - 70px);
   background: #fff;
   overflow-y: auto;
   z-index: 10;
-  .back {
-    width: 100%;
-    height: 56px;
-    border-bottom: 1px solid #e2e2e2;
-    display: flex;
-    align-items: center;
-    padding: 0 20px;
-    box-sizing: border-box;
-    .back-l {
-      display: flex;
-      align-items: center;
-      cursor: pointer;
-      flex-shrink: 0;
-      font-size: 18px;
-      font-weight: 500;
-    }
-    .fa-mail-reply-all {
-      font-size: 28px;
-      color: #b3b3b3;
-      margin-right: 12px;
-    }
-  }
-  .form-box {
-    padding: 20px;
-  }
-  .answer-title {
-    text-align: center;
-    font-size: 20px;
-    color: #333;
-    font-weight: 700;
-    padding-bottom: 20px;
-    .totals {
-      font-size: 16px;
-      color: #888;
-      font-weight: normal;
-    }
-  }
-  .question-title {
-    line-height: 40px;
-    .ipt {
-      width: 300px;
-      margin: 0 16px 0 10px;
-      :deep(.el-input__inner) {
-        border-radius: 20px;
-        border-color: #667ffd;
-        background: rgba($color: #667ffd, $alpha: 0.05);
-      }
-    }
-    .delete {
-      margin-right: 8px;
-    }
-    .title-txt {
-      margin-right: 20px;
-      font-size: 16px;
-      font-weight: 700;
-    }
-  }
-  .questions-ul {
-    border-left: 1px solid #e2e2e2;
-    border-top: 1px solid #e2e2e2;
-    margin: 12px 0;
-  }
-  .sub-questions {
-    width: 100%;
-    display: flex;
-    border-bottom: 1px solid #e2e2e2;
-    & > div {
-      min-height: 40px;
-      padding: 5px;
-      flex-shrink: 0;
-      border-right: 1px solid #e2e2e2;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-    }
-    .qs-num {
-      width: 80px;
-    }
-    .qs-type {
-      width: 160px;
-    }
-    .qs-score,
-    .qs-partScore {
-      width: 160px;
-    }
-    .qs-options {
-      flex: 1;
-    }
-    .qs-set {
-      width: 80px;
-    }
-    .qs-options2 {
-      text-align: left;
-      justify-content: flex-start;
-      padding-left: 20px;
-      .answer-s {
-        cursor: pointer;
-      }
-    }
-    :deep(.el-select) {
-      .el-input__inner {
-        border-radius: 20px;
-        border-color: #667ffd;
-        width: 150px;
-        height: 32px;
-        line-height: 32px;
-        background: rgba($color: #667ffd, $alpha: 0.05);
-      }
-      .el-input__icon {
-        line-height: 32px;
-      }
-    }
-  }
-  .set-ans-btn {
-    width: 100%;
-    padding: 10px 0 10px 630px;
-    box-sizing: border-box;
-    border-bottom: 1px solid #e2e2e2;
-  }
 }
 </style>
\ No newline at end of file
--
libgit2 0.21.4