diff --git a/src/components/charts/lineChart.vue b/src/components/charts/lineChart.vue
index fa23aef..551b985 100644
--- a/src/components/charts/lineChart.vue
+++ b/src/components/charts/lineChart.vue
@@ -9,6 +9,7 @@ export default {
     id: String,
     params: Array,
     xAxis: Array,
+    colors: Array
   },
   watch: {
     params: {
@@ -25,7 +26,7 @@ export default {
       chart: null,
     };
   },
-  created() {},
+  created() { },
   mounted() {
     this.initData();
   },
@@ -33,7 +34,7 @@ export default {
     setOption() {
       const that = this;
       const options = {
-        color: this.colors || ["#4472c4", "#ed7d32", "#a5a5a5"],
+        color: this.colors || ["#9772ff", "#79cd91", "#72b8ff"],
         backgroundColor: "#fff",
         tooltip: {
           trigger: "item",
@@ -41,8 +42,10 @@ export default {
         },
         legend: {
           show: true,
-          bottom: 0,
-          itemHeight: 2,
+          top: 0,
+          right: 20,
+          itemHeight: 15,
+          icon: "circle"
         },
         xAxis: {
           type: "category",
@@ -52,7 +55,7 @@ export default {
             show: false,
           },
           axisLabel: {
-            color: "#666",
+            color: "#333",
           },
         },
         yAxis: {
@@ -63,13 +66,16 @@ export default {
           },
           axisLabel: {
             color: "#666",
+            formatter: function (name) {
+              return name + "%"
+            },
           },
         },
         grid: {
-          top:28,
-          left: "10%",
-          right: "10%",
-          bottom: 30,
+          top: 36,
+          left: 20,
+          right: 20,
+          bottom: 20,
           containLabel: true,
         },
         series: that.params.map((item) => {
@@ -77,9 +83,9 @@ export default {
             name: item.name,
             type: "line",
             symbol: "circle",
-            symbolSize: "8",
+            symbolSize: "6",
             lineStyle: {
-              width: 3,
+              width: 1,
             },
             data: item.value,
           };
diff --git a/src/components/charts/radarChart.vue b/src/components/charts/radarChart.vue
index 188169d..334e07c 100644
--- a/src/components/charts/radarChart.vue
+++ b/src/components/charts/radarChart.vue
@@ -24,45 +24,62 @@ export default {
       chart: null,
     };
   },
-  created() {},
+  created() { },
   mounted() {
     this.initData();
   },
   methods: {
     setOption() {
+      let that = this
       const option = {
-        color: this.colors || ["#4472c4", "#ed7d32", "#a5a5a5"],
+        color: that.colors || ["#4472c4", "#ed7d32", "#a5a5a5"],
         backgroundColor: "#fff",
         tooltip: {
           trigger: "item",
           confine: true,
+          formatter: function (param) {
+            let marker = param.marker
+            let oHtml = `<p>${marker}${param.name}</p>`
+            param.value.map((item, index) => {
+              oHtml += `<p>${that.params.indicator[index].name}：${item}</p>`
+            })
+            return oHtml
+          }
         },
         legend: {
-          show:true,
-          bottom:0,
-          itemHeight:2
+          show: true,
+          top: 0,
+          right: 20,
+          itemHeight: 15,
+          icon: "circle"
         },
+
         radar: {
-          indicator: [...this.params.indicator],
+          indicator: [...that.params.indicator],
           splitNumber: 5,
-          center:['50%', '48%'],
-          radius:"70%",
+          center: ['50%', '48%'],
+          radius: "80%",
           shape: "polygon",
-          nameGap:10,
-          axisLine:{
-            show:false
+          nameGap: 6,
+          axisLine: {
+            show: false
           },
-          splitLine:{
+          splitLine: {
             lineStyle: {
               width: 0.5,
-              color:'#e2e2e2'
+              color: '#e2e2e2'
             },
           },
-          splitArea:{
-            areaStyle:{
-              color:['rgba(250,250,250,0)','rgba(200,200,200,0)']
+          splitArea: {
+            areaStyle: {
+              color: ['rgba(250,250,250,0)', 'rgba(200,200,200,0)']
             }
-          }
+          },
+          // axisLabel: {
+          //   show: false,
+          //   hideOverlap: true,
+          //   formatter: '{value}%'
+          // },
         },
         series: [
           {
@@ -74,7 +91,7 @@ export default {
             areaStyle: {
               color: "transparent",
             },
-            data: this.params.num,
+            data: that.params.seriesData,
           },
         ],
       };
diff --git a/src/mock/index.js b/src/mock/index.js
index e57ade8..0dd0bf0 100644
--- a/src/mock/index.js
+++ b/src/mock/index.js
@@ -35,7 +35,7 @@ Mock.mock(
             "answerOptions": "A,B,C,D",
             "correctAnswer|1": ["A", "B", "C", "D"],
             "screenshot": "./1.html",
-            "knowledge":"数与式#有理数#正数和负数,数与式#有理数#有理数"
+            "knowledge": "数与式#有理数#正数和负数,数与式#有理数#有理数"
           },
           {
             "questionType": 2,
@@ -45,7 +45,7 @@ Mock.mock(
             "answerOptions": "A,B,C,D",
             "correctAnswer|1": ["A", "B", "C", "D"],
             "screenshot": "./1.html",
-            "knowledge":"数与式#有理数#正数和负数"
+            "knowledge": "数与式#有理数#正数和负数"
           },
           {
             "questionType": 2,
@@ -208,4 +208,503 @@ Mock.mock(
     ]
   }
 }
+)
+
+Mock.mock(
+  "/api_html/teaching/examReportList", {
+  info: "success",
+  status: 0,
+  data: {
+    "list|2": [
+      {
+        "id": "@id",
+        subjectName: '语文',
+        className: '2班',
+        classId: "3215",
+        "title": "@cTitle",
+        "score|80-100": 85,
+        "answeredNum|45-50": 48,
+        classPersonNum: 50,
+        "examStartTime": '@date',
+        answerNum: 0,
+        recordStatus: 2,
+        classList: [{
+          classId: "@id",
+          className: "@cname",
+        }, {
+          classId: "@id",
+          className: "@cname",
+        }]
+      },
+      {
+        "id": "@id",
+        subjectName: '数学',
+        className: '2班',
+        classId: "3215",
+        "title": "@cTitle",
+        "score|80-100": 85,
+        "answeredNum|45-50": 48,
+        classPersonNum: 50,
+        "examStartTime": '@date',
+        answerNum: 0,
+        recordStatus: 2,
+        classList: [{
+          classId: "@id",
+          className: "@cname",
+        }, {
+          classId: "@id",
+          className: "@cname",
+        }]
+      },
+      {
+        "id": "@id",
+        subjectName: '英语',
+        className: '2班',
+        classId: "3215",
+        "title": "@cTitle",
+        "score|80-100": 85,
+        "answeredNum|45-50": 48,
+        classPersonNum: 50,
+        "examStartTime": '@date',
+        answerNum: 0,
+        recordStatus: 2,
+        classList: [{
+          classId: "@id",
+          className: "@cname",
+        }, {
+          classId: "@id",
+          className: "@cname",
+        }]
+      }
+    ]
+  }
+}
+)
+Mock.mock(
+  "/api_html/teaching/phaseExamReport", {
+  info: "success",
+  status: 0,
+  data: {
+    "list|5": [
+      {
+        "studentId": "@id",
+        "studentName": '@cname',
+        "studentCode": '@id',
+        "shortNumber": "@id",
+        "title": "@cTitle",
+        "examList": [
+          {
+            "title": "结石分气在织织",
+            "score": 80,
+            "classRank|+1": 1,
+            "participationRate|+1": 80,
+            "correctRate|+1": 82,
+            "answerCorrectRate|+1": 85,
+          },
+          {
+            "title": "第业适声",
+            "score": 81,
+            "classRank|+1": 1,
+            "participationRate|+1": 81,
+            "correctRate|+1": 88,
+            "answerCorrectRate|+1": 90,
+          },
+          {
+            "title": "把住六",
+            "score": 82,
+            "classRank|+1": 1,
+            "participationRate|+1": 82,
+            "correctRate|+1": 91,
+            "answerCorrectRate|+1": 95,
+          },
+          {
+            "title": "取严酸百列县",
+            "score": 83,
+            "classRank|+1": 1,
+            "participationRate|+1": 85,
+            "correctRate|+1": 90,
+            "answerCorrectRate|+1": 93,
+          },
+          {
+            "title": "三原上光",
+            "score": 84,
+            "classRank|+1": 1,
+            "participationRate|+1": 83,
+            "correctRate|+1": 93,
+            "answerCorrectRate|+1": 96,
+          }
+        ]
+      }
+    ]
+  }
+}
+)
+Mock.mock(
+  "/api_html/teaching/examMultiClassReport", {
+  info: "success",
+  status: 0,
+  data: {
+    "classes": [],
+    "students": [],
+  }
+}
+)
+Mock.mock(
+  "/api_html/teaching/listStudentsAndQuestions", {
+  info: "success",
+  status: 0,
+  data: {
+    "students": [{
+      "studentId": "@id",
+      "studentName": "@cname",
+      "questionList": [
+        {
+          "examQuestionId|+1": 0,
+          "questionId|+1": 1,
+          "questionTitle": "@cname",
+          "questionType|1-4": 1,
+          "score|1-2": 1,
+          "subQuestions": [
+            {
+              id: 1,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 2,
+              "questionType": 2,
+              "score": 2,
+            },
+            {
+              id: 3,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 4,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 5,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 6,
+              "questionType": 3,
+              "score": 1,
+            },
+          ]
+        },
+        {
+          "examQuestionId|+1": 0,
+          "questionId|+1": 1,
+          "questionTitle": "@cname",
+          "questionType|1-4": 1,
+          "score|1-2": 1,
+          "subQuestions": [
+            {
+              id: 7,
+              "questionType": 2,
+              "score": 2,
+            },
+            {
+              id: 8,
+              "questionType": 2,
+              "score": 3,
+            },
+            {
+              id: 9,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 10,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 11,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 12,
+              "questionType": 3,
+              "score": 1,
+            },
+            {
+              id: 13,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 14,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 15,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 16,
+              "questionType": 2,
+              "score": 1,
+            }
+          ]
+        },
+      ]
+    }, {
+      "studentId": "@id",
+      "studentName": "@cname",
+      "questionList": [
+        {
+          "examQuestionId|+1": 0,
+          "questionId|+1": 1,
+          "questionTitle": "@cname",
+          "questionType|1-4": 1,
+          "score|1-2": 1,
+          "subQuestions": [
+            {
+              id: 1,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 2,
+              "questionType": 2,
+              "score": 2,
+            },
+            {
+              id: 3,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 4,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 5,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 6,
+              "questionType": 3,
+              "score": 1,
+            },
+          ]
+        },
+        {
+          "examQuestionId|+1": 0,
+          "questionId|+1": 1,
+          "questionTitle": "@cname",
+          "questionType|1-4": 1,
+          "score|1-2": 1,
+          "subQuestions": [
+            {
+              id: 7,
+              "questionType": 2,
+              "score": 2,
+            },
+            {
+              id: 8,
+              "questionType": 2,
+              "score": 3,
+            },
+            {
+              id: 9,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 10,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 11,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 12,
+              "questionType": 3,
+              "score": 1,
+            },
+            {
+              id: 13,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 14,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 15,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 16,
+              "questionType": 2,
+              "score": 1,
+            }
+          ]
+        },
+      ]
+    }, {
+      "studentId": "@id",
+      "studentName": "@cname",
+      "questionList": [
+        {
+          "examQuestionId|+1": 0,
+          "questionId|+1": 1,
+          "questionTitle": "@cname",
+          "questionType|1-4": 1,
+          "score|1-2": 1,
+          "subQuestions": [
+            {
+              id: 1,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 2,
+              "questionType": 2,
+              "score": 2,
+            },
+            {
+              id: 3,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 4,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 5,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 6,
+              "questionType": 3,
+              "score": 1,
+            },
+          ]
+        },
+        {
+          "examQuestionId|+1": 0,
+          "questionId|+1": 1,
+          "questionTitle": "@cname",
+          "questionType|1-4": 1,
+          "score|1-2": 1,
+          "subQuestions": [
+            {
+              id: 7,
+              "questionType": 2,
+              "score": 2,
+            },
+            {
+              id: 8,
+              "questionType": 2,
+              "score": 3,
+            },
+            {
+              id: 9,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 10,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 11,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 12,
+              "questionType": 3,
+              "score": 1,
+            },
+            {
+              id: 13,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 14,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 15,
+              "questionType": 2,
+              "score": 1,
+            },
+            {
+              id: 16,
+              "questionType": 2,
+              "score": 1,
+            }
+          ]
+        },
+      ]
+    }],
+  }
+}
+)
+Mock.mock(
+  "/api_html/class/manager/phaseExamReport", {
+  info: "success",
+  status: 0,
+  data: {
+    "list": [{
+      "studentId": "@id",
+      "studentName": "@cname",
+      "dataList": [
+        {
+          "subjectName": "数学",
+          "examCount": '5',
+          "participationCount": '5',
+          "classRank": '1',
+          "score": '100',
+          "participationRate":'88',
+          "correctRate":'90',
+        },
+        {
+          "subjectName": "英语",
+          "examCount": '5',
+          "participationCount": '5',
+          "classRank": '2',
+          "score": '100',
+          "participationRate":'70',
+          "correctRate":'76',
+        },
+        {
+          "subjectName": "语文",
+          "examCount": '5',
+          "participationCount": '5',
+          "classRank": '2',
+          "score": '100',
+          "participationRate":'99',
+          "correctRate":'100',
+        },
+      ]
+    }],
+  }
+}
 )
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index 0d7ff47..51ed0fb 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -22,6 +22,7 @@ const AskList = () => import("@/views/basic/ask/list")
 const AskAnalysis = () => import("@/views/basic/ask/analysis")
 const AskArchiving = () => import("@/views/basic/ask/archiving")
 const Test = () => import("@/views/basic/test/index")
+const TestList = () => import("@/views/basic/test/list")
 const TestAnalysis = () => import("@/views/basic/test/analysis")
 const TestArchiving = () => import("@/views/basic/test/archiving")
 const DataSync = () => import("@/views/basic/dataSync/index")
@@ -214,9 +215,6 @@ let addrouters = [
         iconCls: "fa fa-bar-chart", // 图标样式class
         name: "随堂问报表",
         component: Ask,
-        meta: {
-          keepAlive: true,
-        },
         children: []
 
       },
@@ -260,18 +258,23 @@ let addrouters = [
         iconCls: "fa fa-pie-chart", // 图标样式class
         name: "",
         component: Test,
-        meta: {
-          keepAlive: true,
-        },
         children: []
       },
       {
-        path: "/testAnalysis",
-        iconCls: "", // 图标样式class
-        name: "即时测报表分析",
-        component: TestAnalysis,
-        parent: "test",
-        children: []
+        path: "/testList",
+        name: "",
+        component: TestList,
+
+        children: [
+          {
+            path: "/testAnalysis",
+            iconCls: "", // 图标样式class
+            name: "即时测报表分析",
+            component: TestAnalysis,
+            parent: "test",
+            children: []
+          },
+        ]
       },
       {
         path: "/testArchiving",
diff --git a/src/views/basic/ask/index.vue b/src/views/basic/ask/index.vue
index 4824c0b..78c54dd 100644
--- a/src/views/basic/ask/index.vue
+++ b/src/views/basic/ask/index.vue
@@ -97,8 +97,8 @@ export default {
 
   methods: {
     handleCheckAllChange(val) {
+      this.isIndeterminate = false;
       this.query.subjectNames = val ? this.subjectList : [];
-      this.allSubject = false;
     },
     handleChecked(value) {
       console.log(value)
diff --git a/src/views/basic/test/analysis.vue b/src/views/basic/test/analysis.vue
index 2a2021c..809db77 100644
--- a/src/views/basic/test/analysis.vue
+++ b/src/views/basic/test/analysis.vue
@@ -2,1013 +2,85 @@
   <div ref="main" class="page-container">
     <back-box>
       <template slot="title">
-        <span>单卷分析</span>
+        <span>{{ type == 1 ? '单卷测练报表' : type == 2 ? subject + "汇总报表" : type == 3 ? "多科汇总报表" :
+          `多班_${subjectName}_${title}_测练成绩对比分析` }}</span>
       </template>
     </back-box>
-    <div class="tips" v-if="paperModifyLog.modifiedTime && !status">
-      <p class="tips-p">
-        <i class="fa fa-bell-o"></i>
-        {{
-          `${paperModifyLog.modifiedTime} ${paperModifyLog.realName}`
-        }}修改了答案，是否重新记分？
-      </p>
-      <div class="btn-box">
-        <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">
-      <div class="content-header">
-        <div class="tab-box">
-          <span
-            v-for="(item, index) in tabList"
-            :key="item"
-            class="tab-item"
-            :class="type == index ? 'active' : ''"
-            @click="setType(index)"
-            >{{ item }}</span
-          >
-        </div>
-        <el-button
-          v-if="!status"
-          class="setMinScore"
-          @click="diaMinScore = true"
-          round
-          size="small"
-          >设置低分值</el-button
-        >
-      </div>
-      <div id="print-content" class="table-box" v-loading="loading">
-        <el-table
-          :max-height="tableMaxHeight"
-          v-show="type == 0"
-          :data="tableData"
-          border
-          style="width: 100%"
-        >
-          <el-table-column
-            prop="questionIndex"
-            label="题号"
-            align="center"
-            fixed
-            width="60"
-          ></el-table-column>
-          <el-table-column
-            prop="questionType"
-            label="题型"
-            align="center"
-            fixed
-            width="100"
-            ><template slot-scope="scope">{{
-              setSubPro(scope.row.questionType)
-            }}</template></el-table-column
-          >
-          <el-table-column
-            prop="score"
-            width="100"
-            label="满分值"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            width="110"
-            prop="highestScore"
-            label="班最高分"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            width="110"
-            prop="lowestScore"
-            label="班最低分"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            width="110"
-            prop="avgScore"
-            label="班平均分"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="classScoringRate"
-            width="120"
-            sortable
-            label="班级得分率"
-            align="center"
-            ><template slot-scope="scoped"
-              >{{ scoped.row.classScoringRate }}%</template
-            ></el-table-column
-          >
-          <el-table-column prop="correctAnswer" label="答案" align="center"
-            ><template slot-scope="scoped">{{
-              scoped.row.correctAnswer == 1
-                ? "✓"
-                : scoped.row.correctAnswer == 2
-                ? "✗"
-                : scoped.row.correctAnswer
-            }}</template>
-          </el-table-column>
-          <el-table-column
-            v-for="(item, index) in optionsList"
-            :key="index"
-            :label="item.title"
-            :prop="'count' + index"
-            align="center"
-            width="120"
-            ><template slot-scope="scope"
-              ><p class="persent">
-                {{
-                  scope.row.questionType == "5"
-                    ? ""
-                    : scope.row["option" + index]
-                    ? `${scope.row["option" + index]}(${
-                        scope.row["persent" + index]
-                      })`
-                    : ""
-                }}
-              </p></template
-            >
-          </el-table-column>
-        </el-table>
-        <div id="print-table">
-          <table class="hide">
-            <thead>
-              <tr>
-                <th>题号</th>
-                <th>题型</th>
-                <th>满分值</th>
-                <th>班最高分</th>
-                <th>班最低分</th>
-                <th>班平均分</th>
-                <th>班级得分率</th>
-                <th>答案</th>
-                <th>选项1</th>
-                <th>选项2</th>
-                <th>选项3</th>
-                <th>选项4</th>
-                <th>未答</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr v-for="(tr, index) in tableData">
-                <td width="60">{{ index + 1 }}</td>
-                <td width="100">{{ setSubPro(tr.questionType) }}</td>
-                <td width="100">{{ tr.sortable }}</td>
-                <td width="110">{{ tr.highestScore }}</td>
-                <td width="110">{{ tr.lowestScore }}</td>
-                <td width="110">{{ tr.avgScore }}</td>
-                <td width="120">{{ tr.classScoringRate }}%</td>
-                <td>
-                  {{
-                    tr.correctAnswer == 1
-                      ? "✓"
-                      : tr.correctAnswer == 2
-                      ? "✗"
-                      : tr.correctAnswer
-                  }}
-                </td>
-                <td
-                  v-for="(item, index) in optionsList"
-                  :key="index"
-                  width="120"
-                >
-                  <p class="persent">
-                    {{
-                      tr.questionType == "5"
-                        ? ""
-                        : tr["option" + index]
-                        ? `${tr["option" + index]}(${tr["persent" + index]})`
-                        : ""
-                    }}
-                  </p>
-                </td>
-              </tr>
-            </tbody>
-          </table>
-          <div class="hui-box" v-show="type == 0">
-            <span class="s-txt">汇总</span>
-            <ul class="hui-ul">
-              <li class="hui-li">
-                <span class="hui-s s1">主观题</span>
-                <span class="hui-s s1">{{ examReport.subjectiveScore }}</span>
-                <span class="hui-s s2">{{
-                  examReport.subjectiveHighestScore
-                }}</span>
-                <span class="hui-s s2">{{
-                  examReport.subjectiveLowestScore
-                }}</span>
-                <span class="hui-s s2">{{
-                  examReport.subjectiveAvgScore
-                }}</span>
-                <span class="hui-s s3"
-                  >{{ examReport.subjectiveClassScoringRate }}%</span
-                >
-              </li>
-              <li class="hui-li">
-                <span class="hui-s s1">客观题</span>
-                <span class="hui-s s1">{{ examReport.objectiveScore }}</span>
-                <span class="hui-s s2">{{
-                  examReport.objectiveHighestScore
-                }}</span>
-                <span class="hui-s s2">{{
-                  examReport.objectiveLowestScore
-                }}</span>
-                <span class="hui-s s2">{{ examReport.objectiveAvgScore }}</span>
-                <span class="hui-s s3"
-                  >{{ examReport.objectiveClassScoringRate }}%</span
-                >
-              </li>
-              <li class="hui-li">
-                <span class="hui-s s1">整卷</span>
-                <span class="hui-s s1">{{ examReport.examPaperScore }}</span>
-                <span class="hui-s s2">{{ examReport.highestScore }}</span>
-                <span class="hui-s s2">{{ examReport.lowestScore }}</span>
-                <span class="hui-s s2">{{ examReport.avgScore }}</span>
-                <span class="hui-s s3">{{ examReport.classScoringRate }}%</span>
-              </li>
-            </ul>
-          </div>
-        </div>
-        <el-table
-          v-show="type == 1"
-          :max-height="tableMaxHeight"
-          :data="tableData2"
-          border
-          style="width: 100%"
-          :default-sort="{ prop: 'dadui', order: 'descending' }"
-        >
-          <el-table-column
-            prop="studentCode"
-            label="学号"
-            align="center"
-            fixed
-          ></el-table-column>
-          <el-table-column
-            prop="studentName"
-            label="姓名"
-            fixed
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="examScore"
-            label="总分"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="scoringRate"
-            label="得分率"
-            sortable
-            align="center"
-            ><template slot-scope="scope"
-              >{{ scope.row.scoringRate }}%</template
-            ></el-table-column
-          >
-          <el-table-column
-            prop="classRank"
-            label="班名"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column label="客观题" align="center">
-            <el-table-column
-              prop="objectiveExamScore"
-              label="得分"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="objectiveScoringRate"
-              label="得分率"
-              align="center"
-              ><template slot-scope="scope"
-                >{{ scope.row.objectiveScoringRate }}%</template
-              ></el-table-column
-            >
-          </el-table-column>
-          <el-table-column label="主观题" align="center">
-            <el-table-column
-              prop="subjectiveExamScore"
-              label="得分"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="subjectiveScoringRate"
-              label="得分率"
-              align="center"
-              ><template slot-scope="scope"
-                >{{ scope.row.subjectiveScoringRate }}%</template
-              ></el-table-column
-            >
-          </el-table-column>
-        </el-table>
-        <el-table
-          v-show="type == 2"
-          :max-height="tableMaxHeight"
-          :data="tableData2"
-          border
-          style="width: 100%"
-          :default-sort="{ prop: '', order: 'descending' }"
-        >
-          <el-table-column
-            prop="studentCode"
-            label="学号"
-            fixed
-            align="center"
-            width="120"
-          ></el-table-column>
-          <el-table-column
-            prop="studentName"
-            label="姓名"
-            fixed
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="examScore"
-            label="总分"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column label="分数组成" align="center">
-            <el-table-column
-              prop="objectiveExamScore"
-              label="客观题分"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="subjectiveExamScore"
-              label="主观题分"
-              align="center"
-            ></el-table-column>
-          </el-table-column>
-          <el-table-column
-            align="center"
-            v-for="(item, index) in questionList"
-            :key="index"
-            :label="'Q' + item.id"
-            :prop="'score' + item.id"
-          >
-          </el-table-column>
-        </el-table>
-        <el-table
-          :max-height="tableMaxHeight"
-          v-show="type == 3"
-          :data="tableData2"
-          border
-          style="width: 100%"
-          :default-sort="{ prop: '', order: 'descending' }"
-        >
-          <el-table-column
-            prop="studentCode"
-            label="学号"
-            fixed
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="studentName"
-            label="姓名"
-            fixed
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="className"
-            label="班级"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="examScore"
-            label="总分"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            v-for="(item, index) in questionList"
-            :key="index"
-            :label="'Q' + item.id"
-          >
-            <template slot-scope="scope">
-              <span v-if="tableData[index]?.questionType == 5">*</span>
-              <span
-                v-else-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'"
-                >-</span
-              >
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <div class="down">
-        <div>
-          <el-button
-            @click="exportData"
-            type="primary"
-            plain
-            round
-            icon="fa fa-cloud-download"
-            >导出报表</el-button
-          >
-          <el-button
-            v-if="!this.$store.getters.code"
-            @click="print"
-            type="primary"
-            plain
-            round
-            icon="el-icon-printer"
-            >打印</el-button
-          >
-        </div>
-        <div v-if="!status">
-          <el-button
-            v-if="examReport.subjectiveScore != 0"
-            @click="diaUp = true"
-            type="primary"
-            round
-            v-loading="exportLoading"
-            >导入主观题分数</el-button
-          >
-          <template v-if="role == 'ROLE_JIAOSHI'">
-            <el-button
-              @click="edit"
-              type="primary"
-              v-if="examReport.subjectiveScore != examReport.examPaperScore"
-              round
-              >查看题目</el-button
-            ></template
-          >
-        </div>
-      </div>
-      <el-dialog
-        :close-on-click-modal="false"
-        title="导入主观题分数"
-        :visible.sync="diaUp"
-        width="600"
-      >
-        <upload :url="url" :examId="id" @upSuccess="upSuccess">
-          <template slot="down">
-            <p class="down-txt">
-              第一步：下载模板并编辑完成学生分数
-              <el-link type="danger" @click="downExcel">模板下载</el-link> 。
-            </p>
-            <p class="down-txt">第二步：上传完成编辑的模板文件并导入。</p>
-          </template>
-        </upload>
-        <div class="dialog-footer" slot="footer">
-          <el-button @click="diaUp = false">取 消</el-button>
-        </div>
-      </el-dialog>
-      <el-dialog
-        :close-on-click-modal="false"
-        title="低分区间设置"
-        :visible.sync="diaMinScore"
-        width="480px"
-        @closed="closeDiaMinScore"
-      >
-        <el-form>
-          <el-form-item label="低分设置模式:">
-            <el-select v-model="lowRange.type" @change="changeScore">
-              <el-option label="按分数设置" :value="0"></el-option>
-              <el-option label="按已考人数比例" :value="1"></el-option>
-              <el-option label="按分数比例设置(按题目)" :value="2"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="低分区间:">
-            <el-input
-              class="score-ipt"
-              type="number"
-              v-model="lowRange.range[0]"
-              :min="0"
-              :max="100"
-              @input="lowRange.range[1] > 100 ? (lowRange.range[1] = 100) : ''"
-              @keydown.native="keydownRange($event)"
-            ></el-input
-            >{{ lowRange.type != 0 ? "%" : "分" }}(含)
-            <el-input
-              class="score-ipt"
-              type="number"
-              v-model="lowRange.range[1]"
-              :min="0"
-              :max="100"
-              @input="lowRange.range[1] > 100 ? (lowRange.range[1] = 100) : ''"
-              @keydown.native="keydownRange($event)"
-            ></el-input
-            >{{ lowRange.type != 0 ? "%" : "分" }}(含)
-          </el-form-item>
-        </el-form>
-
-        <div
-          class="dialog-footer"
-          slot="footer"
-          align="center"
-          v-loading="loadingTange"
-        >
-          <el-button type="danger" @click="_SavelowRange">保存</el-button>
-          <el-button @click="diaMinScore = false">取 消</el-button>
-        </div>
-      </el-dialog>
-    </div>
+    <Test v-if="type == 1" :role="role" :id="id" :classId="classId" :subjectName="subjectName" :title="title" />
+    <MultipleTest v-else-if="type == 2" :role="role" :ids="ids" :classId="classId" :subjectName="subjectName" />
+    <MultipleSubTest v-else-if="type == 3" :role="role" :ids="ids" :classId="classId" :subjectName="subjectName" />
+    <Contrast v-else-if="type == 4" :role="role" :ids="ids" :subjectName="subjectName" :title="title" />
   </div>
 </template>
 
 <script>
-import { downloadFile, tablePrint } from "@/utils";
+import Test from "./components/test.vue"
+import MultipleTest from "./components/multipleTest.vue"
+import MultipleSubTest from "./components/multipleSubTest.vue"
+import Contrast from "./components/contrast.vue"
 export default {
+  components: {
+    Test,
+    MultipleTest,
+    MultipleSubTest,
+    Contrast
+  },
   data() {
     return {
       role: "",
-      status: 0,// 1:已归档试卷
-      tableMaxHeight: 600,
-      loading: false,
-      exportLoading: false,
-      diaUp: false,
-      url: "/api_html/teaching/importSubjectiveScore",
       id: "",
-      classId: "",
-      subjectName: "",
-      title: "",
-      score: "",
-      tabList: ["试题分析", "成绩排名", "小题分报表", "作答明细表"],
+      ids: [],
       type: 0,
-      paperModifyLog: { //修改信息
-        realName: "",
-        modifiedTime: "",
-      },
-      examReport: {
-        subjectiveScore: 0,
-        subjectiveHighestScore: "",
-        subjectiveLowestScore: "",
-        subjectiveAvgScore: "",
-        subjectiveClassScoringRate: "",
-        objectiveScore: "",
-        objectiveHighestScore: "",
-        objectiveLowestScore: "",
-        objectiveAvgScore: "",
-        objectiveClassScoringRate: "",
-        examPaperScore: "",
-        highestScore: "",
-        lowestScore: "",
-        avgScore: "",
-        classScoringRate: "",
-      },
-      tableData: [],
-      optionsList: [],
-      tableData2: [],
-      questionList: [],
-      page: 1,
-      size: 20,
-      total: 0,
-      // 设置低分值
-      loadingTange: false,
-      diaMinScore: false,
-      lowRange: {
-        type: 0,
-        range: [60, 0],
-      },
-      defaultLowRange: {
-        type: 0,
-        range: [],
-      },
+      classId: "",
+      subjectName: '',
+      title: ''
     };
   },
   created() {
     this.role =
       this.$store.getters.info.showRole ||
       this.$store.getters.info.permissions[0].role;
-    this.id = this.$route.query.id;
-    this.status = this.$route.query.status ? this.$route.query.status : 0;
-    this.title = this.$route.query.title || "";
+    this.id = this.$route.query.id || "";
+    this.ids = this.$route.query.ids && this.$route.query.ids.split() || "";
+    this.type = this.$route.query.type
     this.classId = this.$route.query.classId || "";
-    this.subjectName = this.$route.query.subjectName || "";
-    this._QueryData();
+    this.subjectName = this.$route.query.subjectName || ""
+    this.title = this.$route.query.title || ""
   },
   methods: {
-    print() {
-      if (this.type == 0) {
-        tablePrint("print-table", this.title + this.tabList[this.type], true);
-      } else {
-        tablePrint("print-content", this.title + this.tabList[this.type]);
-      }
-    },
-    upSuccess(res) {
-      //导入成功
-      this.$message.success("导入成功");
-      this.diaUp = false;
-      this._QueryData();
-    },
-    setType(type) {
-      console.log(this.$refs.main.offsetHeight - 50);
-      this.tableMaxHeight = this.$refs.main.offsetHeight;
-      this.type = type;
-    },
-    setSubPro(type) {
-      let tit;
-      switch (type) {
-        case 2:
-          tit = "单选题";
-          break;
-        case 3:
-          tit = "多选题";
-          break;
-        case 4:
-          tit = "判断题";
-          break;
-        case 5:
-          tit = "主观题";
-          break;
-      }
-      return tit;
-    },
-    edit() {
-      this.$router.push({
-        path: "/examinationPaperEdit",
-        query: {
-          paperId: this.id,
-          title: this.title,
-          type: 2,
-        },
-      });
-    },
-    changePage(page) {
-      this.page = page;
-      this.examQuestionReport();
-    },
-    // 切换低分设置类型设置默认分值
-    changeScore() {
-      this.lowRange.range = [...this.defaultLowRange.range];
-    },
-    // 禁止输入负数
-    keydownRange(event) {
-      if (event.key == "-" || event.key == "e") {
-        event.returnValue = "";
-      }
-    },
-    // 关闭低分设置
-    closeDiaMinScore() {
-      this.lowRange.type = this.defaultLowRange.type;
-      this.lowRange.range = [...this.defaultLowRange.range];
-    },
-    // 保存低分设置
-    async _SavelowRange() {
-      if(this.lowRange.range[0].trim() == "" || this.lowRange.range[1].trim() == ""){
-        this.$message.warning("请补全低分设置！");
-        return 
-      }
-      this.loadingTange = true;
-      let { data, status, info } = await this.$request.setLowRange({
-        classId: this.classId,
-        subjectName: this.subjectName,
-        ...this.lowRange,
-      });
-      this.loadingTange = false;
-      if (status === 0) {
-        this.$message.success(info);
-        this.diaMinScore = false;
-        this.examDetail();
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QueryData() {
-      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 };
-        }
-        this.examReport = { ...data?.examReport };
-        this.defaultLowRange = data.lowRange || {
-          type: 1,
-          range: [60, 0],
-        };
-        this.lowRange.type = this.defaultLowRange.type;
-        this.lowRange.range = [...this.defaultLowRange.range];
-      } 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];
-          }
-          detail.map((items, index) => {
-            params["que" + items.id] = items.id;
-            params["score" + items.id] = String(items.score).includes(".")
-              ? Number(items.score)
-              : items.score;
-            params["answer" + items.id] =
-              items.answer == 1 ? "✓" : items.answer == 2 ? "✗" : items.answer;
-            params["isRight" + items.id] = items.isRight;
-            params["questionType" + items.id] = items.questionType;
-          });
-          return {
-            ...item,
-            ...params,
-          };
-        });
-        console.log();
-        this.questionList = optionsList.sort((a, b) => {
-          return a.id - b.id;
-        });
-      } 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,
-        size: 9999,
-      });
-      this.loading = false;
-      if (status === 0) {
-        let optionsList = [{}, {}, {}, {}, {}];
-        let tableData = data?.list.map((item) => {
-          let params = {};
-          const detail = JSON.parse(item.detail);
-          let lastOPtion = detail?.find((item) => {
-            return item.option == "未答";
-          });
-          let defaultArr = detail?.filter((item) => {
-            return item.option != "未答";
-          });
 
-          optionsList.map((items, index) => {
-            if (index != 4) {
-              params["count" + index] =
-                defaultArr[index]?.option != "未答"
-                  ? defaultArr[index]?.count
-                  : "";
-              params["persent" + index] =
-                defaultArr[index]?.option != "未答"
-                  ? defaultArr[index]?.persent
-                  : "";
-              params["option" + index] =
-                defaultArr[index]?.option != "未答"
-                  ? defaultArr[index]?.option == 1
-                    ? "✓"
-                    : defaultArr[index]?.option == 2
-                    ? "✗"
-                    : defaultArr[index]?.option
-                  : "";
-              items["title"] = "选项" + (index + 1);
-            } else {
-              items["title"] = "未答";
-              params["count" + index] = lastOPtion.count;
-              params["persent" + index] = lastOPtion.persent;
-              params["option" + index] = "?";
-            }
-          });
-          return {
-            ...item,
-            ...params,
-          };
-        });
-        this.tableData = tableData.sort((a, b) => {
-          return a.questionIndex - b.questionIndex;
-        });
-        this.optionsList = [...optionsList];
-        this.total = data.count;
-        this.setType(0);
-      } else {
-        this.$message.error(info);
-      }
-    },
-    //导出
-    async exportData() {
-      if (this.exportLoading == true) return;
-      this.exportLoading = true;
-      const data = await this.$request.exportExamReport({
-        examId: this.id,
-      });
-      this.exportLoading = false;
-      if (data) {
-        let blob = new Blob([data], {
-          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-        });
-        downloadFile(
-          this.status
-            ? "即时测-已归档单卷测练报表.xlsx"
-            : "即时测-单卷测练报表.xlsx",
-          blob
-        );
-      } else {
-        this.$message.error("下载失败");
-      }
-    },
-    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.info);
-      }
-    },
-  },
+  }
 };
 </script>
-<style>
-div::-webkit-scrollbar {
-  width: 3px;
-  height: 10px;
-}
-div::-webkit-scrollbar-thumb {
-  border-radius: 10px;
-  background-color: #ccc;
-}
-</style>
 <style lang="scss" scoped>
-.hide {
-  display: none;
-}
 .page-container {
   position: relative;
   height: 100%;
+
   .table-box {
     min-height: 100%;
   }
+
   &.active {
     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;
-  }
-}
-.persent {
-  white-space: nowrap;
+
+
 }
+
 .error {
   color: #f30;
 }
+
 .page-content {
   padding: 20px 20px 0;
 }
-.tips {
-  height: 48px;
-  box-sizing: border-box;
-  line-height: 48px;
-  padding: 0 16px;
-  border: 1px solid #fac7cc;
-  border-radius: 5px;
-  background-color: #ffebec;
-  font-size: 14px;
-  color: #fd9795;
-  margin: 10px 20px 0 20px;
-  display: flex;
-  &-p {
-    flex: 1;
-  }
-  .fa-bell-o {
-    font-size: 18px;
-    margin-right: 5px;
-  }
-}
-.tab-box {
-  width: 800px;
-  margin: 0 auto 12px;
-  background: #f8f8f8;
-  border-radius: 20px;
-  display: flex;
-  user-select: none;
-  .tab-item {
-    flex: 1;
-    height: 40px;
-    line-height: 40px;
-    text-align: center;
-    font-size: 16px;
-    color: #666;
-    font-weight: 500;
-    background: transparent;
-    border-radius: 20px;
-    cursor: pointer;
-    &.active {
-      background: #667ffd;
-      color: #fff;
-    }
-  }
-}
+
+
 .down {
   padding-top: 20px;
   width: 100%;
   display: flex;
   justify-content: space-between;
 }
-.hui-box {
-  display: flex;
-  text-align: center;
-  .s-txt {
-    width: 61px;
-    line-height: 144px;
-    background: #e2e2e2;
-    font-size: 16px;
-    color: #fff;
-    font-weight: 700;
-  }
-  .hui-ul {
-    border-top: 1px solid #e2e2e2;
-  }
-  .hui-li {
-    display: flex;
-    .hui-s {
-      height: 48px;
-      line-height: 48px;
-      border-right: 1px solid #e2e2e2;
-      border-bottom: 1px solid #e2e2e2;
-      box-sizing: border-box;
-    }
-    .s1 {
-      width: 100px;
-    }
-    .s2 {
-      width: 110px;
-    }
-    .s3 {
-      width: 120px;
-    }
-  }
-}
-
-// 设置低分值
-.content-header {
-  width: 100%;
-  position: relative;
-  .setMinScore {
-    position: absolute;
-    bottom: 0;
-    right: 0px;
-  }
-}
-.score-ipt {
-  width: 80px;
-  margin: 0 5px;
-}
 </style>
\ No newline at end of file
diff --git a/src/views/basic/test/components/test.vue b/src/views/basic/test/components/test.vue
index 756a349..8291d54 100644
--- a/src/views/basic/test/components/test.vue
+++ b/src/views/basic/test/components/test.vue
@@ -308,7 +308,11 @@ export default {
         range: [],
       },
       //答题录分
-      diaScoreSet: false
+      diaScoreSet: false,
+
+      exportType: 1,
+      exportStudent: [],
+      multipleSelection: [],
     };
   },
   created() {
@@ -563,8 +567,29 @@ export default {
     async exportData() {
       if (this.exportLoading == true) return;
       this.exportLoading = true;
-      const data = await this.$request.exportExamReport({
+      let studentIds = []
+      if (length) {
+        studentIds = this.exportStudent.slice(0, 10).map(item => {
+          return item.studentId
+        })
+      } else {
+        studentIds = this.multipleSelection.map(item => {
+          return item.studentId
+        })
+      }
+      let query = {};
+      if (studentIds.length == this.exportStudent.length) {
+        query.studentIds = []
+      } else if (studentIds.length > 0) {
+        query.studentIds = studentIds
+      }
+      const exportExamReport = this.role == "ROLE_PERSONAL" ?
+        this.$request.pExportExamReport
+        : this.$request.exportExamReport;
+
+      const data = await exportExamReport({
         examId: this.id,
+        ...query
       });
       this.exportLoading = false;
       if (data) {
diff --git a/src/views/basic/test/contrast.vue b/src/views/basic/test/contrast.vue
deleted file mode 100644
index cfe1429..0000000
--- a/src/views/basic/test/contrast.vue
+++ /dev/null
@@ -1,596 +0,0 @@
-<template>
-  <div ref="main" class="page-container">
-    <back-box>
-      <template slot="title">
-        <span>多班_{{ subjectNames }}_{{ title }}_测练成绩对比分析</span>
-      </template>
-    </back-box>
-    <div class="page-content">
-      <div class="content-header">
-        <div class="tab-box">
-          <span
-            v-for="(item, index) in tabList"
-            :key="item"
-            class="tab-item"
-            :class="type == index ? 'active' : ''"
-            @click="setType(index)"
-            >{{ item }}</span
-          >
-        </div>
-        <el-button class="setMinScore" @click="openDia" round size="small"
-          >对比成绩等级设置</el-button
-        >
-      </div>
-      <div id="print-content" class="table-box" v-loading="loading">
-        <el-table
-          :max-height="tableMaxHeight"
-          v-show="type == 0"
-          :data="tableData"
-          border
-          style="width: 100%"
-        >
-          <el-table-column
-            type="index"
-            label="序号"
-            fixed
-            align="center"
-            width="60"
-          ></el-table-column>
-          <el-table-column
-            prop="className"
-            label="班级"
-            align="center"
-            fixed
-          ></el-table-column>
-          <el-table-column label="测验人数/班级人数" align="center" width="84">
-            <template slot-scope="scope">
-              <p v-for="(item, index) in scope.row.count.split('/')">
-                {{ item }}{{ index == 0 ? "/" : "" }}
-              </p>
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop="percent"
-            label="参与度"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="avg"
-            label="班平均分"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="max"
-            label="班最高分"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="min"
-            label="班最低分"
-            sortable
-            align="center"
-          ></el-table-column>
-
-          <el-table-column
-            v-for="(item, index) in defaultLevels.levels"
-            :label="item[0] + '数(率)'"
-            align="center"
-            ><template slot-scope="scoped">
-              <p class="p1">{{ scoped.row.levels[index].people }}</p>
-              <p class="p1">({{ scoped.row.levels[index].percent }})</p>
-            </template></el-table-column
-          >
-        </el-table>
-        <el-table
-          v-show="type == 1"
-          :max-height="tableMaxHeight"
-          :data="tableData2"
-          border
-          style="width: 100%"
-        >
-          <el-table-column
-            prop="rank"
-            label="排名"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="name"
-            label="姓名"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="className"
-            label="班级"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="score"
-            label="总分"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="levelName"
-            label="成绩等级"
-            align="center"
-          ></el-table-column>
-        </el-table>
-      </div>
-      <div class="down">
-        <div>
-          <el-button
-            v-loading="exportLoading"
-            @click="exportData"
-            type="primary"
-            plain
-            round
-            icon="fa fa-cloud-download"
-            >导出报表</el-button
-          >
-          <el-button
-            v-if="!this.$store.getters.code"
-            @click="print"
-            type="primary"
-            plain
-            round
-            icon="el-icon-printer"
-            >打印</el-button
-          >
-        </div>
-      </div>
-
-      <el-dialog
-        :close-on-click-modal="false"
-        title="等级设置"
-        :visible.sync="diaLogBox"
-        width="800px"
-        @closed="closeDia"
-      >
-        <el-form class="use-form">
-          <el-form-item class="use-form-item-box">
-            <el-form-item label="等级名称：" class="use-form-item">
-              <el-select
-                size="small"
-                v-model="fromData.type"
-                @change="changeType"
-              >
-                <el-option label="优良合格不合格" :value="0"></el-option>
-                <el-option label="ABCD" :value="1"></el-option>
-                <el-option label="自定义" :value="2"></el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="等级设置模式：" class="use-form-item">
-              <el-select size="small" v-model="fromData.levelType">
-                <el-option label="按分数比例" :value="0"></el-option>
-                <el-option label="按已考人数比例" :value="1"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-form-item>
-          <el-form-item>
-            <div class="dia-tab-box">
-              <p class="dia-tab-tit">
-                <span class="item1">编号</span>
-                <span class="item2"><i>*</i>等级名称</span>
-                <span class="item3"><i>*</i>等级最高</span>
-                <span class="item3"><i>*</i>等级最低</span>
-                <span class="item"></span>
-              </p>
-              <div
-                class="dia-tab-item"
-                v-for="(item, index) in fromData.levels"
-              >
-                <span class="item1">{{ index + 1 }}</span>
-                <p class="item2">
-                  <el-input
-                    class="score-ipt"
-                    v-model="item[0]"
-                    :maxlength="12"
-                    @keydown.native="keydownRange($event)"
-                  ></el-input>
-                </p>
-                <p class="item3">
-                  <el-input
-                    class="score-ipt"
-                    type="number"
-                    v-model="item[1]"
-                    :min="item[2]"
-                    :max="index == 0 ? 100 : fromData.levels[index - 1][2]"
-                    @keydown.native="keydownRange($event)"
-                  ></el-input>
-                  %
-                  <template v-if="fromData.levelType == 0">
-                    ({{ index != 0 ? "不含" : ""
-                    }}{{
-                      Number(((item[1] / 100) * examPaperScore).toFixed(1))
-                    }}分)
-                  </template>
-                  <template v-else>{{ index != 0 ? "不含" : "" }}</template>
-                </p>
-                <p>~</p>
-                <p class="item3">
-                  <el-input
-                    class="score-ipt"
-                    type="number"
-                    v-model="item[2]"
-                    :min="0"
-                    :max="item[1]"
-                    @keydown.native="keydownRange($event)"
-                  ></el-input>
-                  %
-                  <template v-if="fromData.levelType == 0">
-                    ({{
-                      Number(((item[2] / 100) * examPaperScore).toFixed(1))
-                    }}分)
-                  </template>
-                </p>
-                <p class="item">
-                  <el-link
-                    type="danger"
-                    :underline="false"
-                    @click="fromData.levels.splice(index, 1)"
-                    >删除</el-link
-                  >
-                </p>
-              </div>
-              <div class="add">
-                <p @click="fromData.levels.push(['', '', ''])">
-                  <el-button
-                    size="mini"
-                    icon="el-icon-plus"
-                    circle
-                    type="primary"
-                  ></el-button
-                  >添加一行
-                </p>
-              </div>
-            </div>
-          </el-form-item>
-        </el-form>
-
-        <div class="dialog-footer" slot="footer" align="center">
-          <el-button type="danger" @click="savefrom">保存</el-button>
-          <el-button @click="diaLogBox = false">取 消</el-button>
-        </div>
-      </el-dialog>
-    </div>
-  </div>
-</template>
-
-<script>
-import { downloadFile, tablePrint } from "@/utils";
-export default {
-  data() {
-    return {
-      ids: "",
-      title: "",
-      subjectNames: "",
-      tabList: ["班级对比情况", "学生成绩排名"],
-      type: 0,
-      loading: false,
-      exportLoading: false,
-      diaLogBox: false,
-      fromData: {
-        type: 0,
-        levelType: 0,
-        levels: [
-          ["优秀", 100, 90],
-          ["良好", 89.9, 70],
-          ["合格", 69.9, 60],
-          ["不合格", 59.9, 0],
-        ],
-      },
-      defaultLevels: {
-        levelType: 0,
-        levels: [],
-      },
-      tableMaxHeight: 600,
-      tableData: [],
-      tableData2: [],
-      examPaperScore: 100, //卷面最高分
-    };
-  },
-  async created() {
-    this.ids = this.$route.query.ids;
-    await this._QueryData();
-    await this._QueryDefaultLevels();
-  },
-  destroyed() {
-    sessionStorage.setItem("levelFromData", "");
-  },
-  methods: {
-    // 禁止输入负数
-    keydownRange(event) {
-      if (event.key == "-" || event.key == "e") {
-        event.returnValue = "";
-      }
-    },
-    print() {
-      tablePrint(
-        "print-content",
-        `多班_${this.subjectNames}_${this.title}_测练成绩对比分析`
-      );
-    },
-    setType(type) {
-      console.log(this.$refs.main.offsetHeight - 50);
-      this.tableMaxHeight = this.$refs.main.offsetHeight;
-      this.type = type;
-    },
-    openDia() {
-      this.diaLogBox = true;
-    },
-    closeDia() {
-      let levelFromData = sessionStorage.getItem("levelFromData");
-      if (levelFromData) {
-        levelFromData = JSON.parse(levelFromData);
-        this.fromData.type = levelFromData.type;
-        this.fromData.levelType = levelFromData.levelType;
-        this.fromData.levels = [...levelFromData.levels];
-      } else {
-        this.fromData.type = 0;
-        this.fromData.levelType = this.defaultLevels.levelType;
-        this.fromData.levels = [...this.defaultLevels.levels];
-      }
-    },
-    changeType(val) {
-      if (val == this.defaultLevels.type) {
-        this.fromData.levels = [...this.defaultLevels.levels];
-      } else {
-        this.fromData.levels = this.fromData.levels.splice(0, 4);
-        if (val == 0) {
-          this.fromData.levels = this.fromData.levels.map((item, index) => {
-            let arrTxt = ["优秀", "良好", "合格", "不合格"];
-            return [arrTxt[index], item[1], item[2]];
-          });
-        } else if (val == 1) {
-          this.fromData.levels = this.fromData.levels.map((item, index) => {
-            let arrTxt = ["A", "B", "C", "D"];
-            return [arrTxt[index], item[1], item[2]];
-          });
-        } else {
-          this.fromData.levels = this.fromData.levels.map((item, index) => {
-            return ["", item[1], item[2]];
-          });
-        }
-      }
-    },
-    savefrom() {
-      for (let i = 0; i < this.fromData.levels.length; i++) {
-        if (this.fromData.levels[i].includes("")) {
-          this.$message.warning("请补全编号" + (i + 1) + "设置信息！");
-          return;
-        }
-      }
-      if (this.fromData.levels.length == 0) {
-        this.$message.warning("请添加等级设置！");
-        return;
-      }
-      let nums = [];
-      let ERR_OK = false;
-      this.fromData.levels.map((item) => {
-        nums.push(Number(item[1]));
-        nums.push(Number(item[2]));
-      });
-      for (let i = 0; i < nums.length; i++) {
-        if (nums[i + 1] && nums[i + 1] > nums[i]) {
-          ERR_OK = true;
-          this.$message.warning("高等级比例不能低于低等级比例！请检查");
-          break;
-        }
-      }
-      if (ERR_OK) return;
-      this.tableData = [];
-      this.tableData2 = [];
-      this.defaultLevels.type = this.fromData.type;
-      this.defaultLevels.levelType = this.fromData.levelType;
-      this.defaultLevels.levels = [...this.fromData.levels];
-      sessionStorage.setItem("levelFromData", JSON.stringify(this.fromData));
-      this.diaLogBox = false;
-      this._QueryData({
-        levelType: this.fromData.levelType,
-        levels: this.fromData.levels,
-      });
-    },
-
-    async _QueryDefaultLevels() {
-      const { data, info, status } = await this.$request.defaultLevels();
-      if (status === 0) {
-        this.defaultLevels = { ...data } || {
-          levelType: 0,
-          levels: [
-            ["优秀", 100, 90],
-            ["良好", 89.9, 70],
-            ["合格", 69.9, 60],
-            ["不合格", 59.9, 0],
-          ],
-        };
-        this.defaultLevels.type = 0
-        this.fromData.levelType = this.defaultLevels.levelType;
-        this.fromData.levels = [...this.defaultLevels.levels];
-        sessionStorage.setItem(
-          "levelFromData",
-          JSON.stringify(this.defaultLevels)
-        );
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async _QueryData(params) {
-      let query = {};
-      if (params) {
-        let paramObj = JSON.parse(JSON.stringify(params))
-        if (paramObj.levelType == 0) {
-          paramObj.levels = paramObj.levels.map((item) => {
-            item[1] = ((item[1] / 100) * this.examPaperScore).toFixed(1);
-            item[2] = ((item[2] / 100) * this.examPaperScore).toFixed(1);
-            return item;
-          });
-        }
-        query = { ...paramObj };
-      }
-      const { data, info, status } = await this.$request.examMultiClassReport({
-        examIds: this.ids,
-        ...query,
-      });
-      if (status === 0) {
-        this.title = data.title;
-        this.examPaperScore = data.examPaperScore || 100;
-        this.subjectNames = data.subjectName;
-        this.tableData = data.classes || [];
-        this.tableData2 =
-          data.students.map((item) => {
-            item.score = Number(item.score);
-            return item;
-          }) || [];
-      } else {
-        this.$message.error(info);
-      }
-    },
-
-    //导出
-    async exportData() {
-      if (this.exportLoading == true) return;
-      this.exportLoading = true;
-      let params = { ...this.fromData };
-      if (params.levelType == 0) {
-        params.levels = params.levels.map((item) => {
-          console.log(item);
-          item[1] = ((item[1] / 100) * this.examPaperScore).toFixed(1);
-          item[2] = ((item[2] / 100) * this.examPaperScore).toFixed(1);
-          return item;
-        });
-      }
-      const data = await this.$request.exportExamMultiReport({
-        examIds: this.ids,
-        levels: params.levels,
-        levelType: params.levelType,
-      });
-      this.exportLoading = false;
-      if (data) {
-        let blob = new Blob([data], {
-          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-        });
-        downloadFile(
-          `多班_${this.subjectNames}_${this.title}_测练成绩对比分析`,
-          blob
-        );
-      } else {
-        this.$message.error("下载失败");
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.page-container {
-  position: relative;
-  height: 100%;
-  .table-box {
-    min-height: 100%;
-  }
-  &.active {
-    overflow: hidden;
-  }
-  .content-header {
-    width: 100%;
-    position: relative;
-    .setMinScore {
-      position: absolute;
-      bottom: 0;
-      right: 0;
-    }
-  }
-  .page-content {
-    padding: 20px 20px 0;
-  }
-}
-.tab-box {
-  width: 400px;
-  margin: 0 auto 12px;
-  background: #f8f8f8;
-  border-radius: 20px;
-  display: flex;
-  user-select: none;
-  .tab-item {
-    flex: 1;
-    height: 40px;
-    line-height: 40px;
-    text-align: center;
-    font-size: 16px;
-    color: #666;
-    font-weight: 500;
-    background: transparent;
-    border-radius: 20px;
-    cursor: pointer;
-    &.active {
-      background: #667ffd;
-      color: #fff;
-    }
-  }
-}
-.down {
-  padding-top: 20px;
-  width: 100%;
-  display: flex;
-  justify-content: space-between;
-}
-.use-form {
-  padding: 0 12px;
-  .use-form-item-box {
-    :deep(.el-form-item__content) {
-      display: flex;
-    }
-    .use-form-item {
-      width: 40%;
-      margin-right: 20px;
-    }
-  }
-}
-.dia-tab-box {
-  .dia-tab-tit,
-  .dia-tab-item {
-    margin-bottom: 10px;
-    i {
-      color: #f30;
-      padding-right: 5px;
-    }
-    display: flex;
-    .item {
-      width: 40px;
-    }
-    .item1 {
-      padding-left: 10px;
-      width: 10%;
-    }
-    .item2 {
-      width: 18%;
-    }
-    .item3 {
-      padding-left: 12px;
-      flex: 1;
-    }
-    .score-ipt {
-      width: 100px;
-    }
-  }
-  .dia-tab-tit {
-    background: rgba(243, 243, 243, 1);
-  }
-  .add {
-    display: flex;
-    justify-content: center;
-    margin: 0 auto;
-    p {
-      cursor: pointer;
-    }
-    .el-button {
-      margin-right: 6px;
-    }
-  }
-}
-.p1 {
-  line-height: 18px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/basic/test/index.vue b/src/views/basic/test/index.vue
index 658a85c..588b00a 100644
--- a/src/views/basic/test/index.vue
+++ b/src/views/basic/test/index.vue
@@ -1,547 +1,89 @@
 <template>
-  <div ref="main" class="page-container">
-    <back-box>
-      <template slot="title">
-        <span>即时测-数据报表</span>
-      </template>
-      <template slot="btns">
-        <el-tooltip
-          v-if="!code && gdClass"
-          effect="dark"
-          content="已归档试卷"
-          placement="bottom"
-        >
-          <el-button
-            type="primary"
-            icon="fa fa-archive"
-            size="mini"
-            plain
-            circle
-            @click="toArchiving"
-          ></el-button>
-        </el-tooltip>
-      </template>
-    </back-box>
-    <div class="answer-header">
-      <div class="sel-box">
-        <el-select
-          class="sel"
-          v-model="query.classId"
-          placeholder="选择班级"
-          @change="changeclass"
-        >
-          <el-option
-            v-for="item in classList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-        <el-select
-          v-if="role == 'ROLE_BANZHUREN'"
-          class="sel"
-          multiple
-          v-model="query.subjectNames"
-          placeholder="选择科目"
-          @change="changeSub"
-        >
-          <el-option
-            v-for="item in subjectList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-        <el-select
-          v-else
-          class="sel"
-          v-model="query.subjectNames"
-          placeholder="选择科目"
-        >
-          <el-option
-            v-for="item in subjectList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-        <div class="d1">
-          <el-date-picker
-            v-model="query.startDay"
-            type="date"
-            @change="handleChangeTimeStart"
-            placeholder="选择日期时间"
-            value-format="yyyy-MM-dd"
-          >
-          </el-date-picker>
-          ~
-          <el-date-picker
-            v-model="query.endDay"
-            type="date"
-            placeholder="选择日期时间"
-            @change="handleChangeTimeEnd"
-            value-format="yyyy-MM-dd"
-          >
-          </el-date-picker>
+  <div class="main" ref="main">
+    <div class="sel-dia">
+      <p class="tit">
+        <span>报表数据配置</span>
+        <i class="el-icon-close" @click="goHome"></i>
+      </p>
+      <div class="select-box">
+        <div class="sel-item sel-item2">
+          <span class="sel-label">班级：</span>
+          <div class="sel-d">
+            <p class="p-all">
+              <el-checkbox :indeterminate="isIndeterminateClass" v-model="allClass"
+                @change="handleCheckAllChangeClass">全选</el-checkbox>
+            </p>
+            <p class="sel-p">
+              <el-checkbox-group v-model="query.classId" @change="changeclass">
+                <el-checkbox v-for="item in classList" :label="item.value" :key="item.value">{{ item.label
+                }}</el-checkbox>
+              </el-checkbox-group>
+            </p>
+          </div>
         </div>
-        <p class="p1">
-          <span @click="setDate(1)" :class="[date == 1 ? 'active' : '', 's1']"
-            >今天</span
-          >
-          <span @click="setDate(2)" :class="[date == 2 ? 'active' : '', 's1']"
-            >本周</span
-          >
-          <span @click="setDate(3)" :class="[date == 3 ? 'active' : '', 's1']"
-            >本月</span
-          >
-          <span @click="setDate(4)" :class="[date == 4 ? 'active' : '', 's1']"
-            >本季度</span
-          >
-        </p>
-        <el-button type="primary" round @click="_QueryData()">筛选</el-button>
-      </div>
-    </div>
-    <div class="table-box">
-      <el-radio-group
-        v-model="tabIndex"
-        @change="changeTab"
-        style="margin-bottom: 20px"
-      >
-        <template v-for="(item, index) in tabList">
-          <el-radio-button
-            v-if="index == 0 || query.startDay != query.endDay"
-            :key="index"
-            :label="index + 1"
-            >{{ item }}</el-radio-button
-          >
-        </template>
-      </el-radio-group>
-      <div v-show="tabIndex == 1" v-loading="loading">
-        <el-table :data="tableData" border style="width: 100%">
-          <el-table-column
-            prop="title"
-            label="试卷名称"
-            fixed
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="examPaperScore"
-            label="卷面分"
-            align="center"
-            width="68"
-          ></el-table-column>
-          <el-table-column prop="answeredNum" label="测验人数" align="center"
-            ><template slot-scope="scoped">{{
-              `${scoped.row.answeredNum}/${scoped.row.classPersonNum}`
-            }}</template></el-table-column
-          >
-          <el-table-column
-            prop="examStartTime"
-            label="测验时间"
-            width="100"
-            align="center"
-          ></el-table-column>
-          <el-table-column prop="avgScore" label="班平均分" align="center"
-            ><template slot-scope="scoped">{{
-              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                scoped.row.answerNum == 0) &&
-              scoped.row.recordStatus == 0
-                ? "-"
-                : scoped.row.avgScore
-            }}</template></el-table-column
-          >
-          <el-table-column prop="highestScore" label="班最高分" align="center"
-            ><template slot-scope="scoped">{{
-              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                scoped.row.answerNum == 0) &&
-              scoped.row.recordStatus == 0
-                ? "-"
-                : scoped.row.highestScore
-            }}</template></el-table-column
-          >
-          <el-table-column prop="lowestScore" label="班最低分" align="center"
-            ><template slot-scope="scoped">{{
-              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                scoped.row.answerNum == 0) &&
-              scoped.row.recordStatus == 0
-                ? "-"
-                : scoped.row.lowestScore
-            }}</template></el-table-column
-          >
-          <el-table-column
-            prop="excellenRate"
-            label="优秀数(率)"
-            sortable
-            align="center"
-            width="110"
-            class-name="p0"
-            ><template slot-scope="scoped">
-              <p
-                v-if="
-                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                    scoped.row.answerNum == 0) &&
-                  scoped.row.arecordStatus == 0
-                "
-              >
-                "-"
-              </p>
-              <template v-else>
-                <p>{{ scoped.row.excellenNum }}</p>
-                <p v-if="scoped.row.excellenNum">
-                  {{ `（${scoped.row.excellenRate}%）` }}
-                </p>
-              </template>
-            </template></el-table-column
-          >
-          <el-table-column
-            prop="goodRate"
-            label="良好数(率)"
-            sortable
-            align="center"
-            width="110"
-            class-name="p0"
-            ><template slot-scope="scoped">
-              <p
-                v-if="
-                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                    scoped.row.answerNum == 0) &&
-                  scoped.row.arecordStatus == 0
-                "
-              >
-                "-"
-              </p>
-              <template v-else>
-                <p>{{ scoped.row.goodNum }}</p>
-                <p v-if="scoped.row.goodNum">
-                  {{ `（${scoped.row.goodRate}%）` }}
-                </p>
-              </template>
-            </template></el-table-column
-          >
-          <el-table-column
-            prop="passRate"
-            label="及格数(率)"
-            sortable
-            align="center"
-            width="110"
-            class-name="p0"
-            ><template slot-scope="scoped">
-              <p
-                v-if="
-                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                    scoped.row.answerNum == 0) &&
-                  scoped.row.arecordStatus == 0
-                "
-              >
-                "-"
-              </p>
-              <template v-else>
-                <p>{{ scoped.row.passNum }}</p>
-                <p v-if="scoped.row.passNum">
-                  {{ `（${scoped.row.passRate}%）` }}
-                </p>
-              </template>
-            </template></el-table-column
-          >
-          <el-table-column
-            prop="failedRate"
-            label="不及格数(率)"
-            sortable
-            align="center"
-            width="130"
-            class-name="p0"
-            ><template slot-scope="scoped">
-              <p
-                v-if="
-                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                    scoped.row.answerNum == 0) &&
-                  scoped.row.arecordStatus == 0
-                "
-              >
-                "-"
-              </p>
-              <template v-else>
-                <p>{{ scoped.row.failedNum }}</p>
-                <p v-if="scoped.row.failedNum">
-                  {{ `（${scoped.row.failedRate}%）` }}
-                </p>
-              </template>
-            </template></el-table-column
-          >
-          <el-table-column label="操作" align="center">
-            <template slot-scope="scoped">
-              <el-tooltip
-                v-if="
-                  scoped.row.answerNum != 0 ||
-                  (scoped.row.recordStatus != 0 &&
-                    scoped.row.subjectiveScore == scoped.row.examPaperScore)
-                "
-                effect="dark"
-                content="详情"
-                placement="top"
-              >
-                <el-button
-                  type="primary"
-                  circle
-                  size="mini"
-                  icon="fa fa-arrow-right"
-                  @click="linkTo(scoped.row)"
-                ></el-button>
-              </el-tooltip>
-              <template
-                v-if="
-                  scoped.row.answerNum == 0 &&
-                  scoped.row.subjectiveScore != scoped.row.examPaperScore
-                "
-              >
-                <el-tooltip
-                  v-if="role == 'ROLE_JIAOSHI'"
-                  effect="dark"
-                  content="设置答案"
-                  placement="top"
-                >
-                  <el-button
-                    type="primary"
-                    circle
-                    size="mini"
-                    icon="fa fa-file-text"
-                    @click="edit(scoped.row)"
-                  ></el-button>
-                </el-tooltip>
-                <template v-else>未设置答案</template>
-              </template>
-              <el-tooltip
-                v-if="
-                  scoped.row.subjectiveScore == scoped.row.examPaperScore &&
-                  scoped.row.recordStatus == 0
-                "
-                effect="dark"
-                content="导入主观题"
-                placement="top"
-              >
-                <el-button
-                  type="primary"
-                  circle
-                  size="mini"
-                  icon="fa fa-cloud"
-                  @click="uploadSJ(scoped.row)"
-                ></el-button>
-              </el-tooltip>
-            </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 class="sel-item sel-item2">
+          <span class="sel-label">科目：</span>
+          <div class="sel-d">
+            <p class="p-all">
+              <el-checkbox :indeterminate="isIndeterminateSub" v-model="allSubject"
+                @change="handleCheckAllChangeSub">全选</el-checkbox>
+            </p>
+            <p class="sel-p">
+              <el-checkbox-group v-model="query.subjectNames" @change="CheckedSub">
+                <el-checkbox v-for="item in subjectList" :label="item" :key="item">{{ item
+                }}</el-checkbox>
+              </el-checkbox-group>
+            </p>
+          </div>
         </div>
-      </div>
-      <div v-show="tabIndex == 2" v-loading="loading">
-        <el-empty
-          :image-size="100"
-          v-if="!tableData.length && loading == false"
-          description="没有更多数据"
-        ></el-empty>
-        <template v-if="tableData.length && loading == false">
-          <div id="print-content">
-            <el-table
-              :max-height="tableMaxHeight"
-              v-if="role == 'ROLE_JIAOSHI'"
-              :data="tableData"
-              border
-              style="width: 100%"
-            >
-              <el-table-column
-                prop="studentCode"
-                label="学号"
-                align="center"
-                fixed
-              ></el-table-column>
-              <el-table-column
-                prop="studentName"
-                label="姓名"
-                fixed
-                align="center"
-              >
-                <template slot-scope="scoped"
-                  ><span class="click-b" @click="toPortrait(scoped.row)">
-                    {{ scoped.row.studentName }}
-                  </span></template
-                ></el-table-column
-              >
-              <el-table-column
-                align="center"
-                v-for="(item, index) in answerList"
-                :key="index"
-                :label="item.title"
-              >
-                <el-table-column
-                  :prop="'score' + index"
-                  :label="index == 0 ? '总分' : '成绩'"
-                  align="center"
-                  :class-name="index % 2 == 0 ? 'bg' : ''"
-                ></el-table-column>
-                <el-table-column
-                  :prop="'classRank' + index"
-                  label="班名"
-                  align="center"
-                  :class-name="index % 2 == 0 ? 'bg' : ''"
-                ></el-table-column>
-              </el-table-column>
-            </el-table>
-            <el-table
-              v-else
-              :data="tableData"
-              :max-height="tableMaxHeight"
-              border
-              style="width: 100%"
-            >
-              <el-table-column
-                prop="studentCode"
-                label="学号"
-                align="center"
-                fixed
-              ></el-table-column>
-
-              <el-table-column
-                prop="studentName"
-                label="姓名"
-                fixed
-                align="center"
-              >
-                <template slot-scope="scoped"
-                  ><span class="click-b" @click="toPortrait(scoped.row)">
-                    {{ scoped.row.studentName }}
-                  </span></template
-                >
-              </el-table-column>
-              <el-table-column
-                align="center"
-                v-for="(item, index) in answerList"
-                :key="index"
-                :label="item"
-              >
-                <el-table-column
-                  :prop="'examCount' + item"
-                  label="测练数"
-                  align="center"
-                  :class-name="index % 2 == 0 ? 'bg' : ''"
-                ></el-table-column>
-                <el-table-column
-                  :prop="'participationCount' + item"
-                  label="参与数"
-                  align="center"
-                  :class-name="index % 2 == 0 ? 'bg' : ''"
-                ></el-table-column>
-                <el-table-column
-                  :prop="'score' + item"
-                  label="总分"
-                  align="center"
-                  :class-name="index % 2 == 0 ? 'bg' : ''"
-                ></el-table-column>
-                <el-table-column
-                  :prop="'classRank' + item"
-                  label="班名"
-                  align="center"
-                  :class-name="index % 2 == 0 ? 'bg' : ''"
-                ></el-table-column>
-              </el-table-column>
-            </el-table>
+        <div class="sel-item">
+          <span class="sel-label">日期：</span>
+          <div class="d1">
+            <el-date-picker v-model="query.startDay" type="date" @change="handleChangeTimeStart" placeholder="选择日期时间"
+              value-format="yyyy-MM-dd">
+            </el-date-picker>
+            ~
+            <el-date-picker v-model="query.endDay" type="date" placeholder="选择日期时间" @change="handleChangeTimeEnd"
+              value-format="yyyy-MM-dd">
+            </el-date-picker>
           </div>
-        </template>
-      </div>
-      <p class="down" v-if="tabIndex == 2 && tableData.length">
-        <el-button
-          type="primary"
-          plain
-          round
-          icon="fa fa-cloud-download"
-          @click="downExl"
-          >导出报表</el-button
-        >
-        <el-button
-          v-if="!this.$store.getters.code"
-          @click="print"
-          type="primary"
-          plain
-          round
-          icon="el-icon-printer"
-          >打印</el-button
-        >
-      </p>
-    </div>
-    <el-dialog :close-on-click-modal="false" title="导入主观题分数" :visible.sync="diaUp" width="600">
-      <upload
-        :url="url"
-        :examId="examId"
-        @upSuccess="upSuccess"
-        fileName="主观题分数"
-        v-loading="loadingDown"
-      >
-        <template slot="down">
-          <p class="down-txt">
-            第一步：下载模板并编辑完成学生分数
-            <el-link type="danger" @click="downExcel">模板下载</el-link> 。
+          <p class="p1">
+            <span @click="setDate(1)" :class="[date == 1 ? 'active' : '', 's1']">本周</span>
+            <span @click="setDate(2)" :class="[date == 2 ? 'active' : '', 's1']">本月</span>
+            <span @click="setDate(3)" :class="[date == 3 ? 'active' : '', 's1']">本季度</span>
           </p>
-          <p class="down-txt">第二步：上传完成编辑的模板文件并导入。</p>
-        </template>
-      </upload>
-      <div class="dialog-footer" slot="footer">
-        <el-button @click="diaUp = false">取 消</el-button>
+        </div>
+      </div>
+      <div class="foot-box">
+        <el-button type="primary" round @click="goList">确定</el-button>
+        <el-button type="danger" round @click="goHome">取消</el-button>
       </div>
-    </el-dialog>
+    </div>
   </div>
 </template>
 
 <script>
-import { formatDate, downloadFile, tablePrint } from "utils";
-import BusEvent from "@/utils/busEvent";
+import { formatDate } from "utils";
 export default {
   data() {
     return {
       code: "",
-      gdClass: 0, //已归档班级数量
-      exportLoading: false,
-      tableMaxHeight: 300,
       role: "",
-      loading: false,
-      diaUp: false,
-      loadingDown: false,
-      url: "/api_html/teaching/importSubjectiveScore",
-      examId: "",
-      form: {
-        id: "",
-        title: "",
-        examPaperScore: "",
-      },
       date: "", //今天-昨天-本周
       query: {
         //搜索条件
-        classId: "",
-        subjectNames: "",
+        classId: [],
+        subjectNames: [],
         startDay: "",
         endDay: "",
-        day: "",
       },
-      tabList: ["单卷测练报表", "阶段测练报表"],
       classList: [], //班级
       subjectList: [], //科目
-      tabIndex: 1, //选项卡
-      tableData: [],
-      answerList: [], //设置多卷内容供tableStage表格数据用
-      page: 1,
-      size: 20,
-      total: 0,
+
+      isIndeterminateClass: true,//全选样式
+      allClass: false,//全选状态
+      isIndeterminateSub: true,//全选样式
+      allSubject: false,//全选状态
     };
   },
   async created() {
@@ -549,7 +91,7 @@ export default {
     this.role =
       this.$store.getters.info.showRole ||
       this.$store.getters.info.permissions[0].role;
-    this._QueryClassList2();
+    this.query.subjectNames = [];
     await this._QueryClassList();
     if (!this.query.classId) {
       return;
@@ -562,115 +104,37 @@ export default {
       this.query.endDay = new Date();
     }
   },
-  activated() {
-    const that = this;
-    BusEvent.$on("keepAlive", async function () {
-      // if (that.$route.path == "/test") {
-      that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
-      that._QueryClassList2();
-      await that._QueryClassList();
-      if (!that.query.classId) {
-        return;
-      }
-      await that._QuerySubjectList();
-      await that.setDate(1);
-      let startDay = that.query?.startDay;
-      if (!startDay) {
-        that.query.startDay = new Date();
-        that.query.endDay = new Date();
-      }
-      // }
-    });
-  },
+
   methods: {
-    print() {
-      tablePrint("print-content", "即时测-" + this.tabList[this.tabIndex - 1]);
+    handleCheckAllChangeClass(val) {
+      this.isIndeterminateClass = false
+      this.query.classId = val ? this.classList.map(item => item.value) : [];
     },
-    changeSub(val) {
-      //科目改变触发事件
-      let sub;
-      if (val && val.length) {
-        let leng = val.length - 1;
-        sub = val[leng];
-      }
-      console.log(val);
-      this.query.subjectNames = val.filter((item) => {
-        return sub != "全部" ? item != "全部" : item == "全部";
-      });
+    changeclass(value) {
+      console.log(value)
+      let checkedCount = value.length;
+      this.allClass = checkedCount === this.classList.length;
+      this.isIndeterminateClass = checkedCount > 0 && checkedCount < this.classList.length;
     },
-    toArchiving() {
-      this.$router.push({
-        path: "/testArchiving",
-      });
+    handleCheckAllChangeSub(val) {
+      this.isIndeterminate = false
+      this.query.subjectNames = val ? this.subjectList : [];
     },
-    linkTo(obj) {
-      //去详情
-      this.$router.push({
-        path: "/testAnalysis",
-        query: {
-          id: obj.id,
-          title: obj.title,
-          score: obj.examPaperScore,
-        },
-      });
-    },
-    toPortrait(obj) {
-      //暂时不上线
-      return;
-      if (this.$store.getters.code) {
-        return;
-      }
-      let subjectNames = [];
-      subjectNames =
-        this.role == "ROLE_BANZHUREN"
-          ? [...this.query["subjectNames"]]
-          : [this.query["subjectNames"]];
-      if (
-        this.query["subjectNames"] &&
-        this.query["subjectNames"]?.length == 1 &&
-        this.query["subjectNames"][0] == "全部"
-      ) {
-        subjectNames = this.subjectList.map((item) => {
-          return item.value;
-        });
-        subjectNames?.shift();
-      }
-      //去学生画像
-      this.$router.push({
-        path: "/portraitDetail",
-        query: {
-          id: obj.studentId,
-          classId: this.query.classId,
-          subjectNames: subjectNames.join(","),
-          studentName: obj.studentName,
-          studentCode: obj.studentCode,
-          startDay: this.query.startDay,
-          endDay: this.query.endDay,
-          date: this.date,
-        },
-      });
-    },
-    uploadSJ(obj) {
-      //导入开关
-      this.examId = obj.id;
-      this.diaUp = true;
+    CheckedSub(value) {
+      console.log(value)
+      let checkedCount = value.length;
+      this.allSubject = checkedCount === this.subjectList.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.subjectList.length;
     },
     setDate(index) {
       const that = this;
       this.date = index == this.date ? "" : index;
       let aYear = new Date().getFullYear();
       let aMonth = new Date().getMonth() + 1;
-      that.query.day = "";
       that.query.startDay = "";
       that.query.endDay = "";
       switch (index) {
         case 1:
-          that.query.day = formatDate(new Date(), "yyyy-MM-dd");
-          that.query.startDay = that.query.day;
-          that.query.endDay = that.query.day;
-          that.tabIndex = 1;
-          break;
-        case 2:
           let day = new Date().getDay();
           if (day == 0) {
             //中国式星期天是一周的最后一天
@@ -681,12 +145,12 @@ export default {
           that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
           that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
           break;
-        case 3:
+        case 2:
           aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
           that.query.startDay = `${aYear}-${aMonth}-01`;
           that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
           break;
-        case 4:
+        case 3:
           if (aMonth > 0 && aMonth < 4) {
             aMonth = "1";
           } else if (aMonth > 3 && aMonth < 7) {
@@ -703,10 +167,8 @@ export default {
           break;
       }
       this.page = 1;
-      this._QueryData();
     },
     handleChangeTimeStart(val) {
-      this.query.day = "";
       this.date = "";
       if (this.query.endDay) {
         if (new Date(val).getTime() > new Date(this.query.endDay).getTime()) {
@@ -716,67 +178,21 @@ export default {
       }
     },
     handleChangeTimeEnd(val) {
-      this.query.day = "";
       this.date = "";
-      if (this.query.startDay) {
+      if (this.query.startDay && val) {
         if (new Date(val).getTime() < new Date(this.query.startDay).getTime()) {
           this.$message.error("任务结束时间不能任务开始时间前面，请重新设置");
           this.query.endDay = "";
         }
       }
     },
-    changePage(page) {
-      this.page = page;
-      this._QueryData();
-    },
-    edit(item) {
-      this.$router.push({
-        path: "/examinationPaperEdit",
-        query: {
-          paperId: item.id,
-          title: item.title,
-          type: 2,
-        },
-      });
-    },
-    changeTab() {
-      this.tableMaxHeight = this.$refs.main.offsetHeight;
-      this.page = 1;
-      this._QueryData();
-    },
-    upSuccess(res) {
-      //导入成功
-      this.$message.success("导入成功");
-      this.diaUp = false;
-      this._QueryData();
-    },
-    async changeclass() {
-      await this._QuerySubjectList();
-      this.page = 1;
-      this._QueryData();
-    },
-    async changClazz() {
-      this.page = 1;
-      await this._QuerySubjectList();
-      await this._QueryData();
-    },
-    async _QueryClassList2() {
-      const fetchClassList =
-        this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTClassList
-          : this.$request.tClassList;
-      const { data, status, info } = await fetchClassList({ status: 1 });
-      if (status === 0) {
-        this.gdClass = data?.list?.length || 0;
-      } else {
-        this.$message.error(info);
-      }
-    },
     async _QueryClassList() {
       const fetchClassList =
         this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTClassList
-          : this.$request.tClassList;
+          ? this.$request.cTClassList :
+          this.role == "ROLE_PERSONAL"
+            ? this.$request.pClassList
+            : this.$request.tClassList;
       const { data, status, info } = await fetchClassList();
       if (status === 0) {
         this.classList = data.list.map((item) => {
@@ -785,7 +201,7 @@ export default {
             label: item.className,
           };
         });
-        this.query.classId = this.classList[0]?.value;
+        this.classList.length ? this.query.classId.push(this.classList[0].value) : "";
       } else {
         this.$message.error(info);
       }
@@ -793,275 +209,191 @@ export default {
     async _QuerySubjectList() {
       const fetchSubjectList =
         this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTSubjectList
-          : this.$request.tSubjectList;
+          ? this.$request.cTSubjectList :
+          this.role == "ROLE_PERSONAL"
+            ? this.$request.pSubjectList
+            : this.$request.tSubjectList;
 
+      const classIds = this.classList.map(item => item.value) || []
       const { data, status, info } = await fetchSubjectList({
-        classId: this.query.classId,
+        classIds: classIds,
       });
       if (status === 0) {
-        this.subjectList =
-          data.subjectNames?.map((item) => {
-            return {
-              value: item,
-              label: item,
-            };
-          }) || [];
-        if (this.role == "ROLE_BANZHUREN") {
-          this.subjectList.unshift({
-            value: "全部",
-            label: "全部",
-          });
-          this.query.subjectNames.push(this.subjectList[0]?.value);
-        } else {
-          this.query.subjectNames = this.subjectList[0]?.value;
-        }
+        this.subjectList = data.subjectNames || [];
+        // if (this.role == "ROLE_BANZHUREN") {
+        //   this.query.subjectNames = this.subjectList
+        // } else {
+        this.subjectList.length ? this.query.subjectNames.push(this.subjectList[0]) : "";
+        // }
       } else {
         this.$message.error(info);
       }
     },
-    async _QueryData() {
-      if (!this.query.classId) {
-        return;
-      }
-      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];
-        }
-      }
-      if (this.role != "ROLE_BANZHUREN") {
-        query.subjectNames = [query.subjectNames];
-      } else {
-        if (
-          query["subjectNames"] &&
-          query["subjectNames"].length == 1 &&
-          query["subjectNames"][0] == "全部"
-        ) {
-          query["subjectNames"] = this.subjectList.map((item) => {
-            return item.value;
-          });
-          query["subjectNames"].shift();
-        }
-        if (!query["subjectNames"]) {
-          this.$message.warning("请选择科目");
-          return;
-        }
-      }
-      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 || 0;
-      } 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"] &&
-          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;
-        if (this.role == "ROLE_BANZHUREN") {
-          let subjectName = [];
-          this.tableData = data?.list.map((item) => {
-            let params = {};
-            item.dataList.map((items, index) => {
-              if (!subjectName.includes(items.subjectName)) {
-                subjectName.push(items.subjectName);
-              }
-              params["examCount" + items.subjectName] = items.examCount;
-              params["participationCount" + items.subjectName] =
-                items.participationCount;
-              params["score" + items.subjectName] = items.score;
-              params["classRank" + items.subjectName] = items.classRank;
-            });
-            return {
-              ...item,
-              ...params,
-            };
-          });
-          this.answerList = [...subjectName];
-        } else {
-          let dataIdsList = [],
-            dataList = [];
-          data?.list.map((item) => {
-            item.examList.map((items) => {
-              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 (items.title == ids) {
-                  params["score" + index] = items.score;
-                  params["classRank" + index] = items.classRank;
-                }
-              });
-            });
-            return {
-              ...item,
-              ...params,
-            };
-          });
-          this.answerList = dataList;
-        }
-      } else {
-        this.$message.error(info);
-      }
+
+    //回主页
+    goHome() {
+      this.$router.push({
+        path: '/index'
+      })
     },
-    async downExl() {
-      //报表到处
-      if (this.exportLoading == true) return;
-      let query = {};
-      for (let key in this.query) {
-        if (this.query[key] != "") {
-          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
-            query["subjectName"] = this.query[key];
-          } else {
-            query[key] = this.query[key];
-          }
-        }
-      }
-      if (this.role == "ROLE_BANZHUREN") {
-        if (
-          query["subjectNames"] &&
-          query["subjectNames"].length == 1 &&
-          query["subjectNames"][0] == "全部"
-        ) {
-          query["subjectNames"] = this.subjectList.map((item) => {
-            return item.value;
-          });
-          query["subjectNames"].shift();
-        }
-        if (!query["subjectNames"]) {
-          this.$message.warning("请选择科目");
-          return;
+    //去列表
+    goList() {
+      this.$router.push({
+        path: '/testList',
+        query: {
+          params: JSON.stringify(this.query)
         }
-      }
-      const exportPhaseExamReport =
-        this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTExportPhaseExamReport
-          : this.$request.exportPhaseExamReport;
-      this.exportLoading = true;
-      const data = await exportPhaseExamReport({ ...query });
-      this.exportLoading = false;
-      if (data && !data.code) {
-        let blob = new Blob([data], {
-          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-        });
-        downloadFile("即时测-阶段测练报表.xlsx", blob);
-      } else {
-        this.$message.error(data.info);
-      }
-    },
-    async downExcel() {
-      //模板下载
-      this.loadingDown = true;
-      let data = await this.$request.subjectiveScoreTemplate({
-        examId: this.examId,
-      });
-      this.loadingDown = false;
-      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.info);
-      }
-    },
+      })
+    }
   },
 };
 </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;
+.main {
   height: 100%;
-  &.active {
-    overflow: hidden;
-  }
+  background: rgba($color: #000000, $alpha: .3);
+  display: flex;
+  justify-content: center;
 }
-.table-box {
-  margin: 0 20px;
-  padding: 16px;
-  background: #f8f8f8;
-  border-radius: 5px;
-  :deep(.fa-arrow-right) {
-    padding-left: 2px;
+
+.sel-dia {
+  margin-top: 100px;
+  width: 750px;
+  background: #fff;
+  border-radius: 10px;
+  overflow: hidden;
+  height: 460px;
+  display: flex;
+  flex-direction: column;
+
+  .tit {
+    text-align: center;
+    position: relative;
+    padding: 20px 0 12px;
+    font-size: 18px;
+    font-weight: 500;
+    flex-shrink: 0;
+
+    .el-icon-close {
+      position: absolute;
+      top: 0;
+      right: 0;
+      width: 30px;
+      height: 30px;
+      text-align: center;
+      line-height: 28px;
+      background: #e2e2e2;
+      border-radius: 0 0 0 24px;
+      box-sizing: border-box;
+      padding-left: 6px;
+      font-size: 18px;
+      cursor: pointer;
+
+      &:hover {
+        color: #f30;
+      }
+    }
   }
-  :deep(.fa-file-text) {
-    padding-left: 2px;
+
+  .select-box {
+    flex: 1;
+    overflow-y: auto;
+    padding: 0 30px;
+
+    .sel-item {
+      display: flex;
+      align-items: center;
+      margin-bottom: 12px;
+
+      .sel-label {
+        width: 60px;
+        margin-right: 10px;
+        flex-shrink: 0;
+        font-size: 15px;
+        font-weight: 500;
+      }
+
+      :deep(.el-input__inner) {
+        height: 36px;
+        line-height: 36px;
+        border-radius: 18px;
+      }
+
+      :deep(.el-input__suffix) {
+        .el-input__icon {
+          line-height: 36px;
+        }
+      }
+
+      :deep(.el-input__inner) {
+        height: 36px;
+        line-height: 36px;
+        border-radius: 18px;
+
+        .el-input__icon {
+          line-height: 36px;
+        }
+      }
+
+      .el-date-editor.el-input,
+      .el-date-editor.el-input__inner {
+        width: 160px;
+        height: 36px;
+        line-height: 36px;
+
+        :deep(.el-input__icon) {
+          line-height: 36px;
+        }
+      }
+    }
+
+    .sel-item2 {
+      align-items: flex-start;
+      line-height: 20px;
+      padding-top: 10px;
+
+      .p-all {
+        padding-bottom: 6px;
+      }
+    }
+
+    .p1 {
+      .s1 {
+        margin-left: 20px;
+        cursor: pointer;
+        color: #7f7f7f;
+
+        &:hover {
+          color: #409eff;
+        }
+
+        &.active {
+          color: #667ffd;
+        }
+      }
+    }
+  }
+
+  .foot-box {
+    flex-shrink: 0;
+    padding: 12px 0 20px;
+    display: flex;
+    justify-content: center;
+
+    .el-button {
+      margin: 0 30px;
+    }
   }
-}
-.down {
-  padding-top: 16px;
-}
-.click-b {
-  cursor: pointer;
-  color: #409eff;
-  text-decoration: underline;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/basic/test/list.vue b/src/views/basic/test/list.vue
new file mode 100644
index 0000000..0e9654a
--- /dev/null
+++ b/src/views/basic/test/list.vue
@@ -0,0 +1,348 @@
+<template>
+  <div ref="main" class="page-container">
+    <back-box v-show="!isDetail">
+      <template slot="title">
+        <span>即时测-数据报表</span>
+      </template>
+      <template slot="btns">
+        <el-tooltip v-if="!code && gdClass" effect="dark" content="已归档试卷" placement="bottom">
+          <el-button type="primary" icon="fa fa-archive" size="mini" plain circle @click="toArchiving"></el-button>
+        </el-tooltip>
+      </template>
+    </back-box>
+    <div v-show="!isDetail" class="table-box" v-loading="loading">
+      <div v-if="!isMultipleClass">
+        <p class="btn-box">
+          <el-button type="primary" round @click="linkToDetail2">查看汇总报表</el-button>
+        </p>
+        <el-table :data="tableData" :max-height="tableMaxHeight" border style="width: 100%"
+          @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="40"></el-table-column>
+          <el-table-column prop="subjectName" label="科目" align="center"></el-table-column>
+          <el-table-column prop="className" label="班级" align="center"></el-table-column>
+          <el-table-column prop="title" label="试卷名称" align="center"></el-table-column>
+          <el-table-column prop="score" label="卷面分" align="center"></el-table-column>
+          <el-table-column label="测验人数/班级人数" align="center">
+            <template slot-scope="scoped">{{ `${scoped.row.answeredNum}/${scoped.row.classPersonNum}` }}</template>
+          </el-table-column>
+          <el-table-column prop="examStartTime" label="测验开始时间" align="center"></el-table-column>
+          <el-table-column label="操作" align="center">
+            <template slot-scope="scoped">
+              <el-tooltip v-if="scoped.row.answerNum != 0 || scoped.row.recordStatus != 0
+                " effect="dark" content="详情" placement="top">
+                <el-button type="primary" circle size="mini" icon="fa fa-arrow-right"
+                  @click="linkTo(scoped.row)"></el-button>
+              </el-tooltip>
+              <template v-if="scoped.row.answerNum == 0">
+                <el-tooltip v-if="role != 'ROLE_BANZHUREN'" effect="dark" content="设置答案" placement="top">
+                  <el-button type="primary" circle size="mini" icon="fa fa-file-text"
+                    @click="edit(scoped.row)"></el-button>
+                </el-tooltip>
+                <template v-else>未设置答案</template>
+              </template>
+              <!-- <el-tooltip v-else effect="dark" content="答卷录分" placement="top">
+                <el-button type="primary" circle size="mini" @click="openScoreSet(scoped.row)">分</el-button>
+              </el-tooltip> -->
+              <el-tooltip effect="dark" content="答卷录分" placement="top">
+                <el-button type="primary" circle size="mini" @click="openScoreSet(scoped.row)">分</el-button>
+              </el-tooltip>
+            </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>
+        <ScoreSet v-show="diaScoreSet" :role="role" :id="examId" :title="examTitlt" :examScore="examScore"
+          @closeScoreSet="closeScoreSet" />
+      </div>
+      <div v-else>
+        <el-table :data="tableData" :max-height="tableMaxHeight" border style="width: 100%">
+          <el-table-column prop="subjectName" label="科目" align="center"></el-table-column>
+          <el-table-column prop="classList" label="班级" align="center">
+            <template slot-scope="scoped"><span v-for="(item, index) in scoped.row.classList">{{
+              `${index == 0 ? '' : '/'}` + item.className
+            }}</span></template>
+          </el-table-column>
+          <el-table-column prop="title" label="试卷名称" align="center"></el-table-column>
+          <el-table-column prop="score" label="卷面分" align="center"></el-table-column>
+          <el-table-column label="操作" align="center">
+            <template slot-scope="scoped">
+              <el-button type="primary" circle size="mini" icon="el-icon-arrow-right"
+                @click="linkContrast(scoped.row)"></el-button>
+            </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>
+    <router-view v-show="isDetail"></router-view>
+  </div>
+</template>
+
+<script>
+import ScoreSet from "./components/scoreSet.vue"
+export default {
+  components: {
+    ScoreSet
+  },
+  data() {
+    return {
+      code: "",
+      gdClass: 0, //已归档班级数量
+      tableMaxHeight: null,
+      role: "",
+      loading: false,
+      diaScoreSet: false,
+      examId: "",//当前操作试卷
+      examTitlt: "",//当前操作试卷名称
+      examScore: 0,//当前操作试卷卷面总分
+      query: {
+        //搜索条件
+        classId: [],
+        subjectNames: [],
+        startDay: "",
+        endDay: "",
+      },
+      multipleSelection: [],
+      tableData: [],
+      page: 1,
+      size: 20,
+      total: 0,
+      isMultipleClass: false,
+    };
+  },
+  computed: {
+    isDetail: function () {
+      let bol = (this.$route.name == "即时测报表分析") ? true : false
+      return bol
+    }
+  },
+  async created() {
+    this.code = localStorage.getItem("csCode") || "";
+
+    this.init()
+  },
+  mounted() {
+    this.tableMaxHeight = this.$refs.main.offsetHeight;
+  },
+  watch: {
+    "$route.query.params": function (nVal) {
+      let isFromTestDetail = sessionStorage.getItem("isFromTestDetail");
+      if (!isFromTestDetail && nVal) {
+        this.init()
+      }
+    }
+  },
+  methods: {
+    //初始化
+    init() {
+      const queryData = this.$route.query.params
+      queryData ? this.query = { ...this.query, ...JSON.parse(queryData) } : ''
+      console.log(this.query)
+      if (this.query.classId.length > 1) {
+        this.isMultipleClass = true
+      }
+      this.role =
+        this.$store.getters.info.showRole ||
+        this.$store.getters.info.permissions[0].role;
+      if (this.role != "ROLE_PERSONAL") {
+        this._QueryGdClass()
+      }
+      this.page = 1
+      this.total = 0
+      this.tableData = []
+      this._QueryData()
+    },
+    //归档列表
+    toArchiving() {
+      this.$router.push({
+        path: "/testArchiving",
+      });
+    },
+    //跳转单卷分析
+    linkTo(obj) {
+      //去详情
+      this.$router.push({
+        path: "/testAnalysis",
+        query: {
+          id: obj.id,
+          title: obj.title,
+          score: obj.examPaperScore || 0,
+          type: 1,
+          subject: obj.subjectName
+        },
+      });
+    },
+    //汇总跳转-多卷
+    linkToDetail2() {
+      if (this.multipleSelection.length == 0) {
+        this.$message.warning("请选择试卷！")
+        return
+      };
+      let subjectArr = []
+      const ids = this.multipleSelection.map(item => {
+        subjectArr.push(item.subjectName)
+        return item.id
+      })
+      subjectArr = [...new Set(subjectArr)]
+      console.log(subjectArr)
+      if (ids.length == 1) {
+        this.$router.push({
+          path: "/testAnalysis",
+          query: {
+            id: ids[0],
+            title: this.multipleSelection[0].title,
+            score: this.multipleSelection[0].examPaperScore || 0,
+            type: 1,
+            subjectName: subjectArr.join()
+          },
+        });
+      } else {
+        //去详情
+        this.$router.push({
+          path: "/testAnalysis",
+          query: {
+            ids: ids.join(),
+            classId: this.query.classId[0],
+            type: subjectArr.length == 1 ? 2 : 3,
+            subjectName: subjectArr.join()
+          },
+        });
+      }
+    },
+    // 多班对比
+    linkContrast(obj) {
+      this.$router.push({
+        path: "/testAnalysis",
+        query: {
+          ids: obj.classList.map(item => item.classId).join(),
+          subjectName: obj.subjectName,
+          title: obj.title,
+          type: 4
+        },
+      });
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    //打开答卷录分
+    openScoreSet(obj) {
+      this.examId = obj.id;
+      this.examTitlt = obj.title;
+      this.examScore = obj.examScore;
+      this.diaScoreSet = true;
+    },
+    //关闭设置分数
+    closeScoreSet() {
+      this.diaScoreSet = false
+    },
+    //修改答案
+    edit(item) {
+      this.$router.push({
+        path: "/examinationPaperEdit",
+        query: {
+          paperId: item.id,
+          title: item.title,
+          type: 2,
+        },
+      });
+    },
+
+    async _QueryGdClass() {
+      const fetchClassList =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTClassList
+          : this.$request.tClassList;
+      const { data, status, info } = await fetchClassList({ status: 1 });
+      if (status === 0) {
+        this.gdClass = data?.list?.length || 0;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    changePage(page) {
+      this.page = page;
+      this._QueryData();
+    },
+    async _QueryData() {
+      this.loading = true;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          query[key] = this.query[key];
+        }
+      }
+      const examReportList = this.role == "ROLE_PERSONAL" ?
+        this.$request.pExamReportList : this.$request.examReportList
+      const { data, status, info } = await examReportList({
+        ...query,
+        page: this.page,
+        size: this.size,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.tableData = (data?.list && [...data?.list]) || [];
+        this.total = data?.count || 0;
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
+</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;
+  height: 100%;
+
+  &.active {
+    overflow: hidden;
+  }
+}
+
+.table-box {
+  margin: 20px;
+  border-radius: 5px;
+
+  :deep(.fa-arrow-right) {
+    padding-left: 2px;
+  }
+
+  :deep(.fa-file-text) {
+    padding-left: 2px;
+  }
+}
+
+.down {
+  padding-top: 16px;
+}
+
+.click-b {
+  cursor: pointer;
+  color: #409eff;
+  text-decoration: underline;
+}
+
+.btn-box {
+  text-align: right;
+  padding: 0 12px 16px;
+}
+</style>
\ No newline at end of file