diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js
index 5418797..dc34abe 100644
--- a/src/api/apis/apis.js
+++ b/src/api/apis/apis.js
@@ -1622,4 +1622,12 @@ export default {
       data
     });
   },
+  // 删除随堂问报表
+  deletePaperReport(data) {
+    return service({
+      url: setUpUrls.deletePaperReport,
+      method: "POST",
+      data
+    });
+  },
 };
diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js
index be7bfa2..3df0c00 100644
--- a/src/api/urls/apis.js
+++ b/src/api/urls/apis.js
@@ -424,4 +424,6 @@ export default {
    paperShareCount: "/api_html/common/paper/paperShareCount",
    //教师/个人版导入备题组卷Word文档
    paperWordUpload: "/api_html/common/paper/upload",
+   //删除随堂问报表
+   deletePaperReport: "/api_html/teaching/deletePaperReport",
 }
diff --git a/src/router/index.js b/src/router/index.js
index be5c38b..c7e773c 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,4 +1,3 @@
-import en from "../i18n/lang/en"
 import Vue from "vue"
 import Router from "vue-router"
 import Login from "@/views/login/index"
@@ -19,6 +18,7 @@ const PortraitDetail = () => import("@/views/portrait/detail")
 
 
 const Ask = () => import("@/views/basic/ask/index")
+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")
@@ -37,18 +37,20 @@ const SetUpSchool = () => import("@/views/basic/setUp/school")
 const SetUpTeacher = () => import("@/views/basic/setUp/teacher")
 const SetUpStudent = () => import("@/views/basic/setUp/student")
 const ArchivedClazz = () => import("@/views/basic/setUp/archivedClazz")
+const UserInfo = () => import("@/views/basic/userInfo/index")
 
 // 个人版
-const PersonalAsk = () => import("@/views/personal/ask/index")
-const PersonalAskAnalysis = () => import("@/views/personal/ask/analysis")
-const PersonalArchiving = () => import("@/views/personal/ask/archiving")
-const PersonalTest = () => import("@/views/personal/test/index")
-const PersonalTestAnalysis = () => import("@/views/personal/test/analysis")
-const PersonalTestArchiving = () => import("@/views/personal/test/archiving")
-const PersonalDataSync = () => import("@/views/personal/dataSync/index")
-const PersonalSetUpStudent = () => import("@/views/personal/setUp/student")
-const PersonalDown = () => import("@/views/personal/down/index")
-const PersonalUserInfo = () => import("@/views/personal/userInfo/index")
+// const PersonalAsk = () => import("@/views/personal/ask/index")
+// const PersonalAskAnalysis = () => import("@/views/personal/ask/analysis")
+// const PersonalArchiving = () => import("@/views/personal/ask/archiving")
+// const PersonalTest = () => import("@/views/personal/test/index")
+// const PersonalTestAnalysis = () => import("@/views/personal/test/analysis")
+// const PersonalTestArchiving = () => import("@/views/personal/test/archiving")
+// const PersonalDataSync = () => import("@/views/personal/dataSync/index")
+// const PersonalSetUpStudent = () => import("@/views/personal/setUp/student")
+// const PersonalDown = () => import("@/views/personal/down/index")
+// const PersonalUserInfo = () => import("@/views/personal/userInfo/index")
+
 
 // 超级管理员
 const AdminDevice = () => import("@/views/admin/device/index")
@@ -127,7 +129,7 @@ let defaultRouter = [
         path: "/userInfo",
         iconCls: "fa fa-user", // 图标样式class
         name: "个人信息",
-        component: PersonalUserInfo,
+        component: UserInfo,
         children: []
       }
     ]
@@ -209,7 +211,6 @@ let addrouters = [
       {
         path: "/ask",
         iconCls: "fa fa-bar-chart", // 图标样式class
-        name: "ask",
         name: "随堂问报表",
         component: Ask,
         meta: {
@@ -219,12 +220,21 @@ let addrouters = [
 
       },
       {
-        path: "/askAnalysis",
-        iconCls: "", // 图标样式class
-        name: "随堂问报表分析",
-        component: AskAnalysis,
-        parent: "ask",
-        children: []
+        path: "/askList",
+        iconCls: "fa fa-bar-chart", // 图标样式class
+        name: "随堂问报表",
+        component: AskList,
+        children: [
+          {
+            path: "/askAnalysis",
+            iconCls: "", // 图标样式class
+            name: "随堂问报表分析",
+            component: AskAnalysis,
+            parent: "askList",
+            children: []
+          },
+
+        ],
       },
       {
         path: "/askArchiving",
@@ -489,21 +499,21 @@ let addrouters = [
 let csAddrouters = [
   {
     path: "/examinationPaper",
-    iconCls: "fa fa-file-text", 
+    iconCls: "fa fa-file-text",
     name: "备题组卷",
     component: Layout,
     alone: true,
     children: [
       {
         path: "/examinationPaper",
-        iconCls: "fa fa-file-text", 
+        iconCls: "fa fa-file-text",
         name: "examinationPaper",
         component: ExaminationPaper,
         children: []
       },
       {
         path: "/examinationPaperAdd",
-        iconCls: "", 
+        iconCls: "",
         name: "examinationPaperAdd",
         component: ExaminationPaperAdd,
         parent: "examinationPaper",
@@ -511,7 +521,7 @@ let csAddrouters = [
       },
       {
         path: "/examinationPaperEdit",
-        iconCls: "", 
+        iconCls: "",
         name: "修改答题卡",
         component: ExaminationPaperEdit,
         parent: "examinationPaper",
@@ -519,7 +529,7 @@ let csAddrouters = [
       },
       {
         path: "/examinationPaperRecycle",
-        iconCls: "", 
+        iconCls: "",
         name: "回收站答题卡",
         component: ExaminationPaperRecycle,
         parent: "examinationPaper",
@@ -527,7 +537,7 @@ let csAddrouters = [
       },
       {
         path: "/examinationPaperArchiving",
-        iconCls: "", 
+        iconCls: "",
         name: "已归档答题卡",
         component: ExaminationPaperArchiving,
         parent: "examinationPaper",
@@ -538,14 +548,14 @@ let csAddrouters = [
   },
   {
     path: "/ask",
-    iconCls: "fa fa-bar-chart", 
+    iconCls: "fa fa-bar-chart",
     name: "随堂问报表",
     component: Layout,
     alone: true,
     children: [
       {
         path: "/ask",
-        iconCls: "fa fa-bar-chart", 
+        iconCls: "fa fa-bar-chart",
         name: "ask",
         name: "随堂问报表",
         component: Ask,
@@ -557,7 +567,7 @@ let csAddrouters = [
       },
       {
         path: "/askAnalysis",
-        iconCls: "", 
+        iconCls: "",
         name: "随堂问报表分析",
         component: AskAnalysis,
         parent: "ask",
@@ -567,14 +577,14 @@ let csAddrouters = [
   },
   {
     path: "/test",
-    iconCls: "fa fa-pie-chart", 
+    iconCls: "fa fa-pie-chart",
     name: "即时测报表",
     component: Layout,
     alone: true,
     children: [
       {
         path: "/test",
-        iconCls: "fa fa-pie-chart", 
+        iconCls: "fa fa-pie-chart",
         name: "",
         component: Test,
         meta: {
@@ -584,7 +594,7 @@ let csAddrouters = [
       },
       {
         path: "/testAnalysis",
-        iconCls: "", 
+        iconCls: "",
         name: "即时测报表分析",
         component: TestAnalysis,
         parent: "test",
@@ -595,7 +605,7 @@ let csAddrouters = [
   },
   {
     path: "/setUpConglomerate",
-    iconCls: "fa fa-building", 
+    iconCls: "fa fa-building",
     name: "学校管理",
     component: Layout,
     alone: true,
@@ -611,7 +621,7 @@ let csAddrouters = [
   },
   {
     path: "/setUpAccount",
-    iconCls: "fa fa-id-card-o", 
+    iconCls: "fa fa-id-card-o",
     name: "账号管理",
     component: Layout,
     alone: true,
@@ -656,14 +666,14 @@ let csAddrouters = [
   },
   {
     path: "/card",
-    iconCls: "fa fa-id-card", 
+    iconCls: "fa fa-id-card",
     name: "发卡记录",
     component: Layout,
     alone: true,
     children: [
       {
         path: "/card",
-        iconCls: "fa fa-id-card", 
+        iconCls: "fa fa-id-card",
         name: "",
         component: Card,
         children: []
@@ -672,14 +682,14 @@ let csAddrouters = [
   },
   {
     path: "/device",
-    iconCls: "fa fa-dashboard", 
+    iconCls: "fa fa-dashboard",
     name: "设备状态",
     component: Layout,
     alone: true,
     children: [
       {
         path: "/device",
-        iconCls: "fa fa-dashboard", 
+        iconCls: "fa fa-dashboard",
         name: "",
         component: Device,
         meta: {
@@ -689,7 +699,7 @@ let csAddrouters = [
       },
       {
         path: "/deviceLog",
-        iconCls: "fa fa-list-alt", 
+        iconCls: "fa fa-list-alt",
         name: "",
         component: DeviceLog,
         parent: "device",
@@ -699,14 +709,14 @@ let csAddrouters = [
   },
   {
     path: "/analysis",
-    iconCls: "fa fa-area-chart", 
+    iconCls: "fa fa-area-chart",
     name: "使用分析",
     component: Layout,
     alone: true,
     children: [
       {
         path: "/analysis",
-        iconCls: "fa fa-area-chart", 
+        iconCls: "fa fa-area-chart",
         name: "",
         component: Analysis,
         children: []
@@ -715,21 +725,21 @@ let csAddrouters = [
   },
   {
     path: "/down",
-    iconCls: "fa fa-download", 
+    iconCls: "fa fa-download",
     name: "软件下载",
     component: Layout,
     alone: true,
     children: [
       {
         path: "/down",
-        iconCls: "fa fa-download", 
+        iconCls: "fa fa-download",
         name: "发卡软件",
         component: Down,
         children: []
       },
       {
         path: "/downClient",
-        iconCls: "", 
+        iconCls: "",
         name: "授课端软件",
         component: DownClient,
         parent: "down",
@@ -739,14 +749,14 @@ let csAddrouters = [
   },
   {
     path: "/dataSync",
-    iconCls: "fa fa-random", 
+    iconCls: "fa fa-random",
     name: "数据同步",
     component: Layout,
     alone: true,
     children: [
       {
         path: "/dataSync",
-        iconCls: "fa fa-random", 
+        iconCls: "fa fa-random",
         name: "",
         component: DataSync,
         children: []
@@ -768,28 +778,28 @@ const addroutersPersonal = [
         path: "/setUpStudent",
         iconCls: "a fa-mortar-board",
         name: '',
-        component: PersonalSetUpStudent,
+        component: SetUpStudent,
         children: []
       },
     ]
   },
   {
     path: "/examinationPaper",
-    iconCls: "fa fa-file-text", 
+    iconCls: "fa fa-file-text",
     name: "备题组卷",
     component: Layout,
     alone: true,
     children: [
       {
         path: "/examinationPaper",
-        iconCls: "fa fa-file-text", 
+        iconCls: "fa fa-file-text",
         name: "examinationPaper",
         component: ExaminationPaper,
         children: []
       },
       {
         path: "/examinationPaperAdd",
-        iconCls: "", 
+        iconCls: "",
         name: "examinationPaperAdd",
         component: ExaminationPaperAdd,
         parent: "examinationPaper",
@@ -797,7 +807,7 @@ const addroutersPersonal = [
       },
       {
         path: "/examinationPaperAddAsk",
-        iconCls: "", 
+        iconCls: "",
         name: "examinationPaperAddAsk",
         component: ExaminationPaperAddAsk,
         parent: "examinationPaper",
@@ -805,7 +815,7 @@ const addroutersPersonal = [
       },
       {
         path: "/examinationPaperEdit",
-        iconCls: "", 
+        iconCls: "",
         name: "修改答题卡",
         component: ExaminationPaperEdit,
         parent: "examinationPaper",
@@ -813,7 +823,7 @@ const addroutersPersonal = [
       },
       {
         path: "/examinationPaperRecycle",
-        iconCls: "", 
+        iconCls: "",
         name: "回收站答题卡",
         component: ExaminationPaperRecycle,
         parent: "examinationPaper",
@@ -821,7 +831,7 @@ const addroutersPersonal = [
       },
       {
         path: "/examinationPaperArchiving",
-        iconCls: "", 
+        iconCls: "",
         name: "已归档答题卡",
         component: ExaminationPaperArchiving,
         parent: "examinationPaper",
@@ -832,54 +842,66 @@ const addroutersPersonal = [
   },
   {
     path: "/ask",
-    iconCls: "fa fa-bar-chart", 
+    iconCls: "fa fa-bar-chart",
     name: "随堂问报表",
     component: Layout,
     alone: true,
     children: [
       {
         path: "/ask",
-        iconCls: "fa fa-bar-chart", 
+        iconCls: "fa fa-bar-chart",
         name: "ask",
         name: "随堂问报表",
-        component: PersonalAsk,
+        component: Ask,
         meta: {
-          keepAlive: true,
+          keepAlive: false,
         },
         children: []
 
       },
       {
-        path: "/askAnalysis",
-        iconCls: "", 
-        name: "随堂问报表分析",
-        component: PersonalAskAnalysis,
-        parent: "ask",
-        children: []
+        path: "/askList",
+        iconCls: "fa fa-bar-chart", // 图标样式class
+        name: "ask",
+        name: "随堂问报表",
+        component: AskList,
+        meta: {
+          keepAlive: true,
+        },
+        children: [
+          {
+            path: "/askAnalysis",
+            iconCls: "",
+            name: "随堂问报表分析",
+            component: AskAnalysis,
+            parent: "ask",
+            children: []
+          },
+          {
+            path: "/askArchiving",
+            iconCls: "",
+            name: "随堂问已归档报表分析",
+            component: AskArchiving,
+            parent: "ask",
+            hidden: true,
+            children: []
+          }
+        ]
       },
-      {
-        path: "/askArchiving",
-        iconCls: "", 
-        name: "随堂已归档问报表分析",
-        component: PersonalArchiving,
-        parent: "ask",
-        hidden: true,
-        children: []
-      }
     ]
   },
   {
     path: "/test",
-    iconCls: "fa fa-pie-chart", 
+    iconCls: "fa fa-pie-chart",
     name: "即时测报表",
     component: Layout,
     alone: true,
     children: [
       {
         path: "/test",
-        iconCls: "fa fa-pie-chart", 
+        iconCls: "fa fa-pie-chart",
         name: "",
-        component: PersonalTest,
+        component: Test,
         meta: {
           keepAlive: true,
         },
@@ -887,17 +909,17 @@ const addroutersPersonal = [
       },
       {
         path: "/testAnalysis",
-        iconCls: "", 
+        iconCls: "",
         name: "即时测报表分析",
-        component: PersonalTestAnalysis,
+        component: TestAnalysis,
         parent: "test",
         children: []
       },
       {
         path: "/testArchiving",
-        iconCls: "", 
-        name: "即时已归档测报表分析",
-        component: PersonalTestArchiving,
+        iconCls: "",
+        name: "即时测已归档报表分析",
+        component: TestArchiving,
         parent: "test",
         hidden: true,
         children: []
@@ -907,14 +929,14 @@ const addroutersPersonal = [
   },
   {
     path: "/portrait",
-    iconCls: "fa fa-users", 
+    iconCls: "fa fa-users",
     name: "学生画像",
     component: Layout,
     alone: true,
     children: [
       {
         path: "/portrait",
-        iconCls: "fa fa-users", 
+        iconCls: "fa fa-users",
         name: "",
         component: Portrait,
         meta: {
@@ -924,7 +946,7 @@ const addroutersPersonal = [
       },
       {
         path: "/portraitDetail",
-        iconCls: "", 
+        iconCls: "",
         name: "授课端软件",
         component: PortraitDetail,
         parent: "down",
@@ -934,32 +956,32 @@ const addroutersPersonal = [
   },
   {
     path: "/dataSync",
-    iconCls: "fa fa-random", 
+    iconCls: "fa fa-random",
     name: "数据同步",
     component: Layout,
     alone: true,
     children: [
       {
         path: "/dataSync",
-        iconCls: "fa fa-random", 
+        iconCls: "fa fa-random",
         name: "",
-        component: PersonalDataSync,
+        component: DataSync,
         children: []
       }
     ]
   },
   {
     path: "/down",
-    iconCls: "fa fa-download", 
+    iconCls: "fa fa-download",
     name: "软件下载",
     component: Layout,
     alone: true,
     children: [
       {
         path: "/down",
-        iconCls: "fa fa-download", 
+        iconCls: "fa fa-download",
         name: "发卡软件",
-        component: PersonalDown,
+        component: Down,
         children: []
       }
     ]
@@ -970,7 +992,7 @@ const addroutersPersonal = [
 const addRoutersAdmin = [
   {
     path: "/account",
-    iconCls: "fa fa-id-card-o", 
+    iconCls: "fa fa-id-card-o",
     name: "账号管理",
     component: Layout,
     alone: true,
@@ -986,14 +1008,14 @@ const addRoutersAdmin = [
   },
   {
     path: "/device",
-    iconCls: "fa fa-dashboard", 
+    iconCls: "fa fa-dashboard",
     name: "设备状态",
     component: Layout,
     alone: true,
     children: [
       {
         path: "/device",
-        iconCls: "fa fa-dashboard", 
+        iconCls: "fa fa-dashboard",
         name: "",
         component: AdminDevice,
         meta: {
@@ -1003,7 +1025,7 @@ const addRoutersAdmin = [
       },
       {
         path: "/deviceLog",
-        iconCls: "fa fa-list-alt", 
+        iconCls: "fa fa-list-alt",
         name: "",
         component: AdminDeviceLog,
         parent: "device",
diff --git a/src/router/permission.js b/src/router/permission.js
index 9ffa8b1..a40d390 100644
--- a/src/router/permission.js
+++ b/src/router/permission.js
@@ -5,6 +5,17 @@ import store from "../store";
 //  获取角色信息，根据用户权限动态加载路由
 router.beforeEach((to, from, next) => {
   NProgress.start();
+  let fromRouteName = from.name
+  if (fromRouteName == '随堂问报表分析') {
+    sessionStorage.setItem('isFromAskDetail', 1)
+  } else {
+    sessionStorage.setItem('isFromAskDetail', "")
+  }
+  if (fromRouteName == '即时测报表分析') {
+    sessionStorage.setItem('isFromTestDetail', 1)
+  } else {
+    sessionStorage.setItem('isFromTestDetail', "")
+  }
   if (to.path === "/login") {
     next();
   } else {
diff --git a/src/views/basic/ask/analysis.vue b/src/views/basic/ask/analysis.vue
index a83b49f..a743ec9 100644
--- a/src/views/basic/ask/analysis.vue
+++ b/src/views/basic/ask/analysis.vue
@@ -7,351 +7,116 @@
     </back-box>
     <div class="page-content">
       <div class="tab-box">
-        <span
-          class="tab-item"
-          v-for="(item, index) in tabList"
-          :key="index"
-          :class="type == index + 1 ? 'active' : ''"
-          @click="setType(index + 1)"
-          >{{ item }}</span
-        >
+        <span class="tab-item" v-for="(item, index) in tabList" :key="index" :class="type == item.value ? 'active' : ''"
+          @click="setType(item.value)">{{ item.name }}</span>
       </div>
       <div v-loading="loading">
         <div id="print-content">
-          <ul class="info" v-if="type == 1">
-            <li class="info-item">科目：{{ detail.subjectName }}</li>
-            <li class="info-item">课时：{{ detail.title }}</li>
-            <li class="info-item">上课时间：{{ detail.startTime }}</li>
-            <li class="info-item">下课时间：{{ detail.endTime }}</li>
-            <li class="info-item">签到人数：{{ detail.answeredNum }}</li>
-            <li class="info-item">题目总数：{{ detail.questionNum }}</li>
-            <li class="info-item">答题总数：{{ detail.totalAnswersNum }}</li>
-            <li class="info-item">课时时长：{{ detail.duration }}分钟</li>
-            <li class="info-item">
-              总参与度：：{{ detail.participationRate }}%
-            </li>
-            <li class="info-item">
-              班级总正确率：{{ detail.classCorrectRate }}%
-            </li>
-            <li class="info-item">
-              已答总正确率：{{ detail.answerCorrectRate }}%
-            </li>
-            <li class="info-item">
-              反馈时长：{{ setDuration(detail.consumingDuration) }}
-            </li>
-          </ul>
-          <el-table
-            v-if="type == 1"
-            :data="tableData"
-            border
-            style="width: 100%"
-          >
-            <el-table-column prop="questionIndex" label="题号" align="center"
-              ><template slot-scope="scoped"
-                >Q{{ scoped.row.questionIndex }}</template
-              ></el-table-column
-            >
-            <el-table-column prop="questionType" label="题型" align="center">
-              <template slot-scope="scoped">{{
-                setSubPro(scoped.row.questionType)
-              }}</template>
-            </el-table-column>
-            <el-table-column
-              prop="answeredNum"
-              label="答题人数"
-              sortable
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="correctAnswerNum"
-              label="答对人数"
-              sortable
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="participationRate"
-              label="班级参与度"
-              sortable
-              align="center"
-              ><template slot-scope="scoped"
-                >{{ scoped.row.participationRate }}%</template
-              ></el-table-column
-            >
-            <el-table-column
-              prop="classCorrectRate"
-              label="班级正确率"
-              sortable
-              align="center"
-              ><template slot-scope="scoped"
-                >{{ scoped.row.classCorrectRate }}%</template
-              ></el-table-column
-            >
-            <el-table-column
-              prop="answerCorrectRate"
-              label="已答正确率"
-              sortable
-              align="center"
-              ><template slot-scope="scoped"
-                >{{ scoped.row.answerCorrectRate }}%</template
-              ></el-table-column
-            >
-            <el-table-column
-              prop="correctAnswer"
-              label="正确答案"
-              align="center"
-            >
-              <template slot-scope="scoped">{{
-                scoped.row.correctAnswer == 1
-                  ? "✓"
-                  : scoped.row.correctAnswer == 2
-                  ? "✗"
-                  : scoped.row.correctAnswer
-              }}</template></el-table-column
-            >
-            <el-table-column prop="fallible" label="干扰答案" align="center"
-              ><template slot-scope="scoped">{{
-                scoped.row.fallible == 1
-                  ? "✓"
-                  : scoped.row.fallible == 2
-                  ? "✗"
-                  : scoped.row.fallible
-              }}</template></el-table-column
-            >
-            <!-- <el-table-column prop="screenshot" label="题干" align="center">
-            <template slot-scope="scoped">
-              <el-image
-                v-if="scoped.row.screenshot"
-                style="width: 60px; height: 40px"
-                :src="scoped.row.screenshot"
-                :preview-src-list="[scoped.row.screenshot]"
-              >
-              </el-image><span v-else>暂无</span></template
-          ></el-table-column> -->
-          </el-table>
-          <el-table
-            v-if="type == 2"
-            :data="tableData"
-            border
-            style="width: 100%"
-          >
-            <el-table-column
-              prop="studentCode"
-              label="学号"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="studentName"
-              label="姓名"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="answerTimes"
-              label="答题次数"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="consumingDuration"
-              label="答题耗时"
-              align="center"
-              ><template slot-scope="scoped">{{
-                setDuration(scoped.row.consumingDuration)
-              }}</template></el-table-column
-            >
-            <el-table-column
-              prop="correctAnswerTimes"
-              label="答对次数"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="participationRate"
-              label="参与度"
-              sortable
-              align="center"
-              ><template slot-scope="scoped"
-                >{{ scoped.row.participationRate }}%</template
-              ></el-table-column
-            >
-            <el-table-column
-              prop="correctRate"
-              label="正确率"
-              sortable
-              align="center"
-              ><template slot-scope="scoped"
-                >{{ scoped.row.correctRate }}%</template
-              ></el-table-column
-            >
-            <el-table-column
-              prop="answerCorrectRate"
-              label="已答正确率"
-              sortable
-              align="center"
-              ><template slot-scope="scoped"
-                >{{ scoped.row.answerCorrectRate }}%</template
-              ></el-table-column
-            >
-            <el-table-column
-              v-for="(item, index) in optionsList"
-              :key="index"
-              :label="'Q' + (index + 1)"
-              align="center"
-              ><template slot-scope="scoped">
-                <span :class="scoped.row['isRight' + index] ? '' : 'red'">{{
-                  scoped.row["answer" + index]
-                }}</span>
-              </template>
-            </el-table-column>
-          </el-table>
-          <el-table
-            v-if="type == 3"
-            :data="tableData"
-            border
-            style="width: 100%"
-          >
-            <el-table-column
-              prop="studentCode"
-              label="学号"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="studentName"
-              label="姓名"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="rushAnswerTimes"
-              label="抢答成功次数"
-              sortable
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="rushAnswerCorrectTimes"
-              label="答对次数"
-              sortable
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="checkAnswerTimes"
-              label="抽答次数"
-              sortable
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="checkAnswerCorrectTimes"
-              label="抽答答对次数"
-              sortable
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="interactionsNum"
-              label="参与得分"
-              sortable
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="interactionsCorrectNum"
-              label="对错得分"
-              sortable
-              align="center"
-            ></el-table-column>
-          </el-table>
-          <el-table
-            v-if="type == 4"
-            :data="tableData"
-            border
-            style="width: 100%"
-          >
-            <el-table-column
-              prop="studentName"
-              label="姓名"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="checkInTime"
-              label="签到时间"
-              sortable
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="makeUpTime"
-              label="补签时间"
-              sortable
-              align="center"
-            ></el-table-column>
-          </el-table>
+
+          <!-- 学生答题情况 -->
+          <Detail v-if="type == 1" :types="types" :detail="detail" />
+          <!-- 学生答题情况 -->
+          <Example v-if="type == 1" :types="types" :tableData="tableData" />
+          <!-- 学生问答 -->
+          <AnswerQustion v-if="type == 2" :types="types" :tableData="tableData" />
+          <!-- 学生互动表现 -->
+          <Interact v-if="type == 3" :types="types" :tableData="tableData" />
+          <!-- 签到明细 -->
+          <Report v-if="type == 4" :tableData="tableData" />
         </div>
         <div class="pagination-box" v-show="type == 1">
-          <el-pagination
-            small=""
-            layout="total,prev, pager, next"
-            :hide-on-single-page="true"
-            :total="total"
-            @current-change="changePage"
-            :current-page="page"
-            :page-size="size"
-          >
+          <el-pagination small="" layout="total,prev, pager, next" :hide-on-single-page="true" :total="total"
+            @current-change="changePage" :current-page="page" :page-size="size">
           </el-pagination>
         </div>
         <p class="down">
-          <el-button
-            @click="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
-          >
-          <!-- <el-button @click="edit" type="primary" round>修改答案</el-button> -->
+          <el-button @click="openDown" type="primary" plain round icon="fa fa-cloud-download">导出报表</el-button>
+          <el-button v-if="!this.$store.getters.code" @click="print" type="primary" plain round
+            icon="el-icon-printer">打印</el-button>
         </p>
       </div>
+      <el-dialog :close-on-click-modal="false" :visible.sync="diaDown" width="360px">
+        <div v-show="exportType == 1">
+          <div class="down-item">
+            <p class="tit">是否将学生表现折线图一起导出</p>
+            <el-radio-group v-model="downType" @change="changeDownType">
+              <el-radio :label="1">不导出</el-radio>
+              <el-radio :label="2">导出</el-radio>
+            </el-radio-group>
+          </div>
+          <div class="down-item">
+            <p class="tit">选择要导出的学生</p>
+            <el-radio-group v-model="exportType">
+              <el-radio :label="1">导出全部</el-radio>
+              <el-radio :label="2">导出制定学生</el-radio>
+            </el-radio-group>
+          </div>
+        </div>
+        <ul v-show="exportType == 2">
+          <li v-for="item in exportStudent"></li>
+        </ul>
+        <div class="dialog-footer" slot="footer">
+          <el-button size="small" type="primary" round @click="exportData">确 定</el-button>
+          <el-button size="small" type="danger" round @click="cancel">取 消</el-button>
+        </div>
+      </el-dialog>
     </div>
-
-    <set-answer
-      :diaVisible="dialogVisible"
-      :questionList="form.questionList"
-      :paperId="form.id"
-      @saveSuccess="handleSuccess"
-      @cancel="cancel"
-    />
   </div>
 </template>
 
 <script>
 import { downloadFile, tablePrint } from "@/utils";
+import Detail from "./components/detail.vue"
+import Example from "./components/example.vue"
+import AnswerQustion from "./components/answerQustion.vue"
+import Interact from "./components/interact.vue"
+import Report from "./components/report.vue"
 export default {
+  components: {
+    Detail, Example, AnswerQustion, Interact, Report
+  },
   data() {
     return {
-      dialogVisible: false,
+      role: "",
       loading: false,
-      id: "",
+      id: [],
       type: 1,
-      form: {
-        id: "",
-        questionList: [],
-      },
-      tabList: ["答题表现", "学生问答表现", "学生互动表现", "签到明细"],
+      tabList: [],
       detail: {},
       tableData: [],
-      optionsList: [],
       page: 1,
       size: 20,
       total: 0,
       status: 0,
+      diaDown: false,
+      downType: 1,
+      exportType: 1,
+      exportStudent: []
     };
   },
   created() {
-    this.id = this.$route.query.id;
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
+    this.types = Number(this.$route.query.types)
+    if (this.types == 1) {
+      this.tabList = [{ name: "答题表现", value: 1 },
+      { name: "学生问答表现", value: 2 },
+      { name: "学生互动表现", value: 3 },
+      { name: "签到明细", value: 4 },]
+    } else if (this.types == 2) {
+      this.tabList = [{ name: "答题表现", value: 1 },
+      { name: "学生问答表现", value: 2 },
+      { name: "学生互动表现", value: 3 }]
+    } else if (this.types == 3) {
+      this.tabList = [
+        { name: "学生问答表现", value: 2 },
+        { name: "学生互动表现", value: 3 }]
+    }
+    this.id = JSON.parse(this.$route.query.id)
     this.status = this.$route.query.status ? this.$route.query.status : 0;
     this._QueryData();
-    this.periodDetail();
+    this.types != 3 ? this.periodDetail() : '';
   },
   methods: {
     print() {
@@ -364,6 +129,7 @@ export default {
       this.type = type;
       this.page = 1;
       this._QueryData();
+      this._QueryDataQuestionRank()
     },
     setDuration(times) {
       let m = parseInt(times / 1000 / 60);
@@ -383,55 +149,16 @@ export default {
       }
       return aTime;
     },
-    setSubPro(type) {
-      let tit;
-      switch (type) {
-        case 2:
-          tit = "单选题";
-          break;
-        case 3:
-          tit = "多选题";
-          break;
-        case 4:
-          tit = "判断题";
-          break;
-        case 5:
-          tit = "主观题";
-          break;
-        default:
-          tit = "其他";
-      }
-      return tit;
-    },
-    cancel() {
-      this.dialogVisible = false;
-    },
-    handleSuccess() {
-      this.dialogVisible = false;
-      this._QueryData();
-    },
-    async edit() {
-      if (this.editLoading) return;
-      this.editLoading = true;
-      const { data, status, info } = await this.$request.periodQuestionList({
-        periodId: this.id,
-      });
-      this.editLoading = false;
-      if (status === 0) {
-        this.form.id = this.id;
-        this.form.questionList = (data.list && [...data.list]) || [];
-        this.dialogVisible = true;
-      } else {
-        this.$message.error(info);
-      }
-    },
     changePage(page) {
       this.page = page;
       this._QueryData();
     },
     async periodDetail() {
-      let { data, info, status } = await this.$request.periodDetail({
-        periodId: this.id,
+      const periodDetail = this.role == "ROLE_PERSONAL" ?
+        this.$request.pPeriodDetail :
+        this.$request.periodDetail;
+      let { data, info, status } = await periodDetail({
+        periodId: this.id[0],
       });
       if (status == 0) {
         this.detail = { ...data };
@@ -446,50 +173,57 @@ export default {
       }
     },
     async _QueryData() {
-      const queryData =
-        this.type == 1
-          ? this.$request.periodQuestionReport
-          : this.$request.periodStudentReport;
+      let queryData;
       let query = {};
-      if (this.type == 2) {
-        query.type = 1;
-      } else if (this.type == 3) {
-        query.type = 2;
-      } else if (this.type == 4) {
-        query.type = 3;
+      if (this.role == "ROLE_PERSONAL") {
+        if (this.types == 1) {
+          query.page = this.page
+          query.size = this.size
+          queryData = this.type == 1
+            ? this.$request.pPeriodQuestionReport
+            : this.$request.pPeriodStudentReport
+        }
+        else if (this.types == 2) {
+          queryData = this.type == 1
+            ? this.$request.pPeriodQuestionReport
+            : this.type == 2 ? this.$request.phaseAnswerReport : this.$request.phaseInteractiveReport;
+        } else if (this.types == 3) {
+          this.type == 1
+            ? this.$request.pPeriodQuestionReport
+            : this.type == 2 ? this.$request.pPhaseAnswerReport : this.$request.pPhaseInteractiveReport;
+        }
+      } else {
+        if (this.types == 1) {
+          query.page = this.page
+          query.size = this.size
+          queryData = this.type == 1
+            ? this.$request.periodQuestionReport
+            : this.$request.periodStudentReport
+        } else if (this.types == 2) {
+          queryData = this.type == 1
+            ? this.$request.periodQuestionReport
+            : this.type == 2 ? this.$request.phaseAnswerReport : this.$request.phaseInteractiveReport;
+        } else if (this.types == 3) {
+          queryData = this.type == 1
+            ? this.$request.periodQuestionReport
+            : this.type == 2 ? this.$request.cTPhaseAnswerReport : this.$request.cTPhaseInteractiveReport;
+        }
+      }
+
+
+      if (this.types == 1) {
+        query.type = this.type
       }
       this.loading = true;
       let { data, info, status } = await queryData({
-        periodId: this.id,
-        page: this.page,
-        size: this.size,
+        // periodId: this.id,
+        periodId: this.id[0],
         ...query,
       });
       this.loading = false;
       if (status === 0) {
         if (this.type == 2) {
-          let optionsList = [];
-          this.tableData = data?.list.map((item) => {
-            let params = {};
-            const detail = JSON.parse(item.detail);
-            if (detail.length > optionsList.length) {
-              optionsList = [...detail];
-            }
-            detail.map((items, index) => {
-              params["isRight" + index] = items.isRight;
-              params["answer" + index] =
-                items.answer == 1
-                  ? "✓"
-                  : items.answer == 2
-                  ? "✗"
-                  : items.answer;
-            });
-            return {
-              ...item,
-              ...params,
-            };
-          });
-          this.optionsList = [...optionsList];
+          this.tableData = data?.list || []
         } else {
           this.tableData = data?.list.sort((a, b) => {
             return a.questionIndex - b.questionIndex;
@@ -500,19 +234,89 @@ export default {
         this.$message.error(info);
       }
     },
+    async _QueryDataQuestionRank() {
+      let queryData;
+      if (this.role == "ROLE_PERSONAL") {
+        if (this.types == 1) {
+          queryData = this.type == 1
+            ? this.$request.pPeriodQuestionReport
+            : this.$request.pPeriodStudentReport
+        }
+        else if (this.types == 2) {
+          queryData = this.type == 1
+            ? this.$request.pPeriodQuestionReport
+            : this.type == 2 ? this.$request.phaseAnswerReport : this.$request.phaseInteractiveReport;
+        } else if (this.types == 3) {
+          this.type == 1
+            ? this.$request.pPeriodQuestionReport
+            : this.type == 2 ? this.$request.pPhaseAnswerReport : this.$request.pPhaseInteractiveReport;
+        }
+      } else {
+        if (this.types == 1) {
+          queryData = this.type == 1
+            ? this.$request.periodQuestionReport
+            : this.$request.periodStudentReport
+        } else if (this.types == 2) {
+          queryData = this.type == 1
+            ? this.$request.periodQuestionReport
+            : this.type == 2 ? this.$request.phaseAnswerReport : this.$request.phaseInteractiveReport;
+        } else if (this.types == 3) {
+          queryData = this.type == 1
+            ? this.$request.periodQuestionReport
+            : this.type == 2 ? this.$request.cTPhaseAnswerReport : this.$request.cTPhaseInteractiveReport;
+        }
+      }
+
+      let query = {};
+      if (this.types == 1) {
+        query.type = this.type
+      }
+      this.loading = true;
+      let { data, info, status } = await queryData({
+        // periodId: this.id,
+        periodId: this.id[0],
+        onlyRate: true,
+        ...query,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.exportStudent = [...data?.list] || []
+      } else {
+        this.$message.error(info);
+      }
+    },
+
+
+    openDown() {
+      this.diaDown = true;
+      this.downType = 1
+    },
+    cancel() {
+      if (this.exportType == 2) {
+        this.exportType = 1
+      } else {
+        this.diaDown = false;
+      }
+    },
+    changeDownType() {
+      this.exportType = 1
+    },
+
     //导出
     async exportData() {
       if (this.exportLoading == true) return;
       this.exportLoading = true;
+      let studentIds = []
       const data = await this.$request.exportPeriodReport({
-        periodId: this.id,
+        // periodId: this.id,
+        periodId: this.id[0],
       });
       this.exportLoading = false;
       if (data) {
         let blob = new Blob([data], {
           type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
         });
-        downloadFile(this.status?"随堂问-已归档单课时报表.xlsx":"随堂问-单课时报表.xlsx", blob);
+        downloadFile(this.status ? "随堂问-已归档单课时报表.xlsx" : "随堂问-单课时报表.xlsx", blob);
       } else {
         this.$message.error("下载失败");
       }
@@ -525,6 +329,7 @@ div::-webkit-scrollbar {
   width: 3px;
   height: 10px;
 }
+
 div::-webkit-scrollbar-thumb {
   border-radius: 10px;
   background-color: #ccc;
@@ -537,18 +342,22 @@ div::-webkit-scrollbar-thumb {
   display: flex;
   justify-content: space-between;
 }
+
 .red {
   color: #f30;
 }
+
 .page-content {
   padding: 20px 20px 0;
 }
+
 .tab-box {
   width: 800px;
   margin: 0 auto 12px;
   background: #f8f8f8;
   border-radius: 20px;
   display: flex;
+
   .tab-item {
     flex: 1;
     height: 40px;
@@ -560,28 +369,27 @@ div::-webkit-scrollbar-thumb {
     background: transparent;
     border-radius: 20px;
     cursor: pointer;
+
     &.active {
       background: #667ffd;
       color: #fff;
     }
   }
 }
-.info {
-  display: flex;
-  flex-wrap: wrap;
-  border-left: 1px solid #e2e2e2;
-  border-top: 1px solid #e2e2e2;
-  margin-bottom: 12px;
-  .info-item {
-    width: 25%;
-    height: 50px;
-    box-sizing: border-box;
-    flex-shrink: 0;
-    background: #f8f8f8;
-    border-right: 1px solid #e2e2e2;
-    border-bottom: 1px solid #e2e2e2;
-    line-height: 50px;
-    text-align: center;
+
+.el-dialog {
+  .down-item {
+    font-size: 15px;
+    margin-bottom: 10px;
+
+    .tit {
+      line-height: 18px;
+      padding: 10px 0;
+    }
   }
 }
+
+.dialog-footer {
+  text-align: center;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/basic/ask/components/answerQustion.vue b/src/views/basic/ask/components/answerQustion.vue
new file mode 100644
index 0000000..1bfd795
--- /dev/null
+++ b/src/views/basic/ask/components/answerQustion.vue
@@ -0,0 +1,174 @@
+<template>
+  <el-table :data="resultData" border style="width: 100%">
+    <el-table-column prop="studentCode" label="学号" align="center"></el-table-column>
+    <el-table-column prop="studentName" label="姓名" align="center"></el-table-column>
+    <template v-if="types == 1">
+      <el-table-column prop="answerTimes" label="答题次数" align="center"></el-table-column>
+      <el-table-column prop="consumingDuration" label="答题耗时" align="center"><template slot-scope="scoped">{{
+        setDuration(scoped.row.consumingDuration)
+      }}</template></el-table-column>
+      <el-table-column prop="correctAnswerTimes" label="答对次数" align="center"></el-table-column>
+      <el-table-column prop="participationRate" label="参与度" sortable align="center"><template slot-scope="scoped">{{
+        scoped.row.participationRate }}%</template></el-table-column>
+      <el-table-column prop="correctRate" label="正确率" sortable align="center"><template slot-scope="scoped">{{
+        scoped.row.correctRate }}%</template></el-table-column>
+      <el-table-column prop="answerCorrectRate" label="已答正确率" sortable align="center"><template slot-scope="scoped">{{
+        scoped.row.answerCorrectRate }}%</template></el-table-column>
+      <el-table-column v-for="(item, index) in optionsList" :key="index" :label="'Q' + (index + 1)"
+        align="center"><template slot-scope="scoped">
+          <span :class="scoped.row['isRight' + index] ? '' : 'red'">{{
+            scoped.row["answer" + index]
+          }}</span>
+        </template>
+      </el-table-column>
+    </template>
+    <template v-if="types == 2">
+      <el-table-column prop="answerTimes" label="累计答题次数" align="center"></el-table-column>
+      <el-table-column prop="correctAnswerTimes" label="累计答对次数" align="center"></el-table-column>
+      <el-table-column prop="participationRate" label="总参与度" align="center"><template slot-scope="scoped">{{
+        scoped.row.participationRate }}%</template></el-table-column>
+
+      <el-table-column prop="participationRateRank" label="总参与度班名" align="center"></el-table-column>
+      <el-table-column prop="correctRate" label="总正确率" align="center"><template slot-scope="scoped">{{
+        scoped.row.correctRate }}%</template></el-table-column>
+      <el-table-column prop="correctRateRank" label="总正确率班名" sortable align="center"></el-table-column>
+      <el-table-column prop="answerCorrectRate" label="已答正确率" align="center"><template slot-scope="scoped">{{
+        scoped.row.answerCorrectRate }}%</template></el-table-column>
+      <el-table-column label="查看折线图" align="center">
+        <template slot-scope="scoped"><el-button icon="el-icon-right" type="primary" circle></el-button></template>
+      </el-table-column>
+    </template>
+    <template v-if="types == 3">
+      <el-table-column v-for="(item, index) in phaseOption" :key="index" :label="item" align="center">
+        <el-table-column align="center" :label="index == 0 ? '总课时数' : '课时数'" :prop="'periodCount' + item">
+        </el-table-column>
+        <el-table-column align="center" :label="index == 0 ? '总出题数' : '出题数'" :prop="'questionNum' + item">
+        </el-table-column>
+        <el-table-column align="center" :label="index == 0 ? '总参与度' : '参与度'" :prop="'participationRate' + item"><template
+            slot-scope="scoped">{{ scoped.row["participationRate" + item] }}%</template>
+        </el-table-column>
+        <el-table-column align="center" :label="index == 0 ? '总正确率' : '正确率'" :prop="'correctRate' + item"><template
+            slot-scope="scoped">{{ scoped.row["correctRate" + item] }}%</template>
+        </el-table-column>
+      </el-table-column>
+    </template>
+  </el-table>
+</template>
+<script>
+export default {
+  props: {
+    tableData: Array,
+    types: Number,
+  },
+  data() {
+    return {
+      optionsList: [],
+      phaseOption: [], //问答补充数据
+    };
+  },
+  computed: {
+    resultData: function () {
+      let resultData = []
+      if (this.tableData.length) {
+        let optionsList = [];
+        let subjectName = [];
+        let rank = {}
+        resultData = this.tableData.map((item) => {
+          let params = {};
+
+          if (this.types == 1) {
+            const detail = JSON.parse(item.detail);
+            if (detail.length > optionsList.length) {
+              optionsList = [...detail];
+            }
+            detail.map((items, index) => {
+              params["isRight" + index] = items.isRight;
+              params["answer" + index] =
+                items.answer == 1
+                  ? "✓"
+                  : items.answer == 2
+                    ? "✗"
+                    : items.answer;
+            });
+          } else if (this.types == 3) {
+            item.dataList.map((items, index) => {
+              if (!subjectName.includes(items.subjectName)) {
+                subjectName.push(items.subjectName);
+              }
+              params["answerCorrectRate" + items.subjectName] =
+                items.answerCorrectRate;
+              params["correctRate" + items.subjectName] = items.correctRate;
+              params["participationRate" + items.subjectName] =
+                items.participationRate;
+              params["periodCount" + items.subjectName] = items.periodCount;
+              params["questionNum" + items.subjectName] = items.questionNum;
+            });
+          }
+          if (this.types != 3) {
+            let participationRateArr = []
+            let correctRateArr = []
+            this.tableData.map(item => {
+              participationRateArr.push(item.participationRate)
+              correctRateArr.push(item.correctRate)
+            })
+            participationRateArr = [...new Set(participationRateArr)]
+            participationRateArr = participationRateArr.sort((a, b) => {
+              return b - a
+            })
+            correctRateArr = [...new Set(correctRateArr)]
+            correctRateArr = correctRateArr.sort((a, b) => {
+              return b - a
+            })
+            let participationRateRank = participationRateArr.findIndex(value => {
+              return item.participationRate == value
+            })
+            let correctRateRank = correctRateArr.findIndex(value => {
+              return item.correctRate == value
+            })
+            rank = {
+              participationRateRank: participationRateRank + 1,
+              correctRateRank: correctRateRank + 1
+            }
+          }
+          return {
+            ...item,
+            ...params,
+            ...rank
+          };
+        });
+        this.phaseOption = [...subjectName];
+        this.optionsList = [...optionsList];
+      } else {
+        resultData = []
+        this.optionsList = []
+      }
+      return resultData
+    }
+  },
+  methods: {
+    setDuration(times) {
+      let m = parseInt(times / 1000 / 60);
+      let s = parseInt((times / 1000) % 60);
+      let ms = times;
+      let aTime;
+      if (times == 0) {
+        aTime = `0`;
+      } else {
+        if (m == 0 && s == 0) {
+          aTime = `${ms}毫秒`;
+        } else if (m == 0 && s != 0) {
+          aTime = `${s}秒`;
+        } else if (m != 0 && s != 0) {
+          aTime = `${m}分${s}秒`;
+        }
+      }
+      return aTime;
+    },
+  }
+};
+</script>
+<style>
+.red {
+  color: #f30;
+}
+</style>
diff --git a/src/views/basic/ask/components/detail.vue b/src/views/basic/ask/components/detail.vue
new file mode 100644
index 0000000..66869e3
--- /dev/null
+++ b/src/views/basic/ask/components/detail.vue
@@ -0,0 +1,93 @@
+<template>
+  <ul class="info" v-if="types == 1">
+    <li class="info-item">科目：{{ detail.subjectName }}</li>
+    <li class="info-item">课时：{{ detail.title }}</li>
+    <li class="info-item">上课时间：{{ detail.startTime }}</li>
+    <li class="info-item">下课时间：{{ detail.endTime }}</li>
+    <li class="info-item">签到人数：{{ detail.answeredNum }}</li>
+    <li class="info-item">题目总数：{{ detail.questionNum }}</li>
+    <li class="info-item">答题总数：{{ detail.totalAnswersNum }}</li>
+    <li class="info-item">课时时长：{{ detail.duration }}分钟</li>
+    <li class="info-item">
+      总参与度：：{{ detail.participationRate }}%
+    </li>
+    <li class="info-item">
+      班级总正确率：{{ detail.classCorrectRate }}%
+    </li>
+    <li class="info-item">
+      已答总正确率：{{ detail.answerCorrectRate }}%
+    </li>
+    <li class="info-item">
+      反馈时长：{{ setDuration(detail.consumingDuration) }}
+    </li>
+  </ul>
+  <ul class="info" v-else-if="types == 2">
+    <li class="info-item">科目：{{ detail.subjectName }}</li>
+    <li class="info-item">课时总数：{{ detail.title }}</li>
+    <li class="info-item">课时时长：{{ detail.duration }}分钟</li>
+    <li class="info-item">
+      反馈时长：{{ setDuration(detail.consumingDuration) }}
+    </li>
+    <li class="info-item">题目总数：{{ detail.questionNum }}</li>
+    <li class="info-item">答题总数：{{ detail.totalAnswersNum }}</li>
+    <li class="info-item">
+      班级总正确率：{{ detail.classCorrectRate }}%
+    </li>
+    <li class="info-item">
+      已答总正确率：{{ detail.answerCorrectRate }}%
+    </li>
+    <li class="info-item">
+      总参与度：：{{ detail.participationRate }}%
+    </li>
+
+  </ul>
+</template>
+<script>
+export default {
+  props: {
+    types: Number,
+    detail: Object,
+  },
+  methods: {
+    setDuration(times) {
+      let m = parseInt(times / 1000 / 60);
+      let s = parseInt((times / 1000) % 60);
+      let ms = times;
+      let aTime;
+      if (times == 0) {
+        aTime = `0`;
+      } else {
+        if (m == 0 && s == 0) {
+          aTime = `${ms}毫秒`;
+        } else if (m == 0 && s != 0) {
+          aTime = `${s}秒`;
+        } else if (m != 0 && s != 0) {
+          aTime = `${m}分${s}秒`;
+        }
+      }
+      return aTime;
+    },
+  }
+}
+</script>
+<style lang="scss" scoped>
+.info {
+  display: flex;
+  flex-wrap: wrap;
+  border-left: 1px solid #e2e2e2;
+  border-top: 1px solid #e2e2e2;
+  margin-bottom: 12px;
+
+  .info-item {
+    width: 25%;
+    height: 50px;
+    box-sizing: border-box;
+    flex-shrink: 0;
+    background: #f8f8f8;
+    border-right: 1px solid #e2e2e2;
+    border-bottom: 1px solid #e2e2e2;
+    line-height: 50px;
+    text-align: center;
+  }
+}
+</style>
diff --git a/src/views/basic/ask/components/example.vue b/src/views/basic/ask/components/example.vue
new file mode 100644
index 0000000..ca15c65
--- /dev/null
+++ b/src/views/basic/ask/components/example.vue
@@ -0,0 +1,68 @@
+<template>
+ 
+  <el-table :data="tableData" border style="width: 100%">
+    <el-table-column prop="questionIndex" label="题号" align="center"><template slot-scope="scoped">Q{{
+      scoped.row.questionIndex }}</template></el-table-column>
+    <el-table-column prop="questionType" label="题型" align="center">
+      <template slot-scope="scoped">{{
+        setSubPro(scoped.row.questionType)
+      }}</template>
+    </el-table-column>
+    <el-table-column prop="answeredNum" label="答题人数" sortable align="center"></el-table-column>
+    <el-table-column prop="correctAnswerNum" label="答对人数" sortable align="center"></el-table-column>
+    <el-table-column prop="participationRate" label="班级参与度" sortable align="center"><template slot-scope="scoped">{{
+      scoped.row.participationRate }}%</template></el-table-column>
+    <el-table-column prop="classCorrectRate" label="班级正确率" sortable align="center"><template slot-scope="scoped">{{
+      scoped.row.classCorrectRate }}%</template></el-table-column>
+    <el-table-column prop="answerCorrectRate" label="已答正确率" sortable align="center"><template slot-scope="scoped">{{
+      scoped.row.answerCorrectRate }}%</template></el-table-column>
+    <el-table-column prop="correctAnswer" label="正确答案" align="center">
+      <template slot-scope="scoped">{{
+        scoped.row.correctAnswer == 1
+        ? "✓"
+        : scoped.row.correctAnswer == 2
+          ? "✗"
+          : scoped.row.correctAnswer
+      }}</template></el-table-column>
+    <el-table-column prop="fallible" label="干扰答案" align="center"><template slot-scope="scoped">{{
+      scoped.row.fallible == 1
+      ? "✓"
+      : scoped.row.fallible == 2
+        ? "✗"
+        : scoped.row.fallible
+    }}</template></el-table-column>
+  </el-table>
+</template>
+<script>
+export default {
+  props: {
+    tableData: Array,
+  },
+  data() {
+    return {};
+  },
+  created() { },
+  methods: {
+    setSubPro(type) {
+      let tit;
+      switch (type) {
+        case 2:
+          tit = "单选题";
+          break;
+        case 3:
+          tit = "多选题";
+          break;
+        case 4:
+          tit = "判断题";
+          break;
+        case 5:
+          tit = "主观题";
+          break;
+        default:
+          tit = "其他";
+      }
+      return tit;
+    },
+  }
+};
+</script>
diff --git a/src/views/basic/ask/components/interact.vue b/src/views/basic/ask/components/interact.vue
new file mode 100644
index 0000000..09ba7d9
--- /dev/null
+++ b/src/views/basic/ask/components/interact.vue
@@ -0,0 +1,70 @@
+<template>
+  <el-table :data="resultData" border style="width: 100%">
+    <el-table-column prop="studentCode" label="学号" align="center"></el-table-column>
+    <el-table-column prop="studentName" label="姓名" align="center"></el-table-column>
+    <template v-if="types != 3">
+      <el-table-column prop="rushAnswerTimes" label="抢答成功次数" sortable align="center"></el-table-column>
+      <el-table-column prop="rushAnswerCorrectTimes" label="答对次数" sortable align="center"></el-table-column>
+      <el-table-column prop="checkAnswerTimes" label="抽答次数" sortable align="center"></el-table-column>
+      <el-table-column prop="checkAnswerCorrectTimes" label="抽答答对次数" sortable align="center"></el-table-column>
+      <el-table-column prop="interactionsNum" label="参与得分" sortable align="center"></el-table-column>
+      <el-table-column prop="interactionsCorrectNum" label="对错得分" sortable align="center"></el-table-column>
+    </template>
+    <template v-else>
+      <el-table-column v-for="(item, index) in phaseInter" :key="index" :label="item" align="center">
+        <el-table-column align="center" v-if="index == 0" label="参与分" sortable :prop="'interactionsNum' + item">
+        </el-table-column>
+        <el-table-column v-else align="center" label="互动数" :prop="'interactionsNum' + item">
+        </el-table-column>
+        <el-table-column v-if="index == 0" align="center" label="对错分" sortable :prop="'interactionsCorrectNum' + item">
+        </el-table-column>
+        <el-table-column v-else align="center" label="参与数" :prop="'interactionsCorrectNum' + item">
+        </el-table-column>
+      </el-table-column>
+    </template>
+  </el-table>
+</template>
+<script>
+export default {
+  props: {
+    tableData: Array,
+    types: Number,
+  },
+  data() {
+    return {
+      phaseInter: [], //互动补充数据
+    }
+  },
+  computed: {
+    resultData: function () {
+      let resultData = []
+      if (this.tableData.length) {
+        if (this.types == "3") {
+          let subjectName = [];
+          resultData = data?.list.map((item) => {
+            let params = {};
+            item.dataList.map((items, index) => {
+              if (!subjectName.includes(items.subjectName)) {
+                subjectName.push(items.subjectName);
+              }
+              params["interactionsNum" + items.subjectName] =
+                items.interactionsNum;
+              params["interactionsCorrectNum" + items.subjectName] =
+                items.interactionsCorrectNum;
+            });
+            return {
+              ...item,
+              ...params,
+            };
+          });
+          this.phaseInter = [...subjectName];
+        }
+      } else {
+        resultData = []
+        this.optionsList = []
+      }
+      return resultData
+    }
+  },
+};
+</script>
diff --git a/src/views/basic/ask/components/report.vue b/src/views/basic/ask/components/report.vue
new file mode 100644
index 0000000..0766059
--- /dev/null
+++ b/src/views/basic/ask/components/report.vue
@@ -0,0 +1,14 @@
+<template>
+  <el-table :data="tableData" border style="width: 100%">
+    <el-table-column prop="studentName" label="姓名" align="center"></el-table-column>
+    <el-table-column prop="checkInTime" label="签到时间" sortable align="center"></el-table-column>
+    <el-table-column prop="makeUpTime" label="补签时间" sortable align="center"></el-table-column>
+  </el-table>
+</template>
+<script>
+export default {
+  props: {
+    tableData: Array,
+  }
+};
+</script>
diff --git a/src/views/basic/ask/index.vue b/src/views/basic/ask/index.vue
index 24876fa..d9d483b 100644
--- a/src/views/basic/ask/index.vue
+++ b/src/views/basic/ask/index.vue
@@ -1,536 +1,79 @@
 <template>
   <div class="main" ref="main">
-    <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' || role == 'ROLE_PERSONAL'"
-          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="sel-dia">
+      <p class="tit">
+        <span>报表数据配置</span>
+        <i class="el-icon-close" @click="goHome"></i>
+      </p>
+      <div class="select-box">
+        <div class="sel-item">
+          <span class="sel-label">班级：</span>
+          <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>
         </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="tabChange"
-        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 class="table-cont" v-loading="loading">
-        <div id="print-content">
-          <div v-show="tabIndex == 1">
-            <el-table
-              :data="tableData"
-              border
-              style="width: 100%"
-              @sort-change="sortChange"
-            >
-              <el-table-column
-                prop="title"
-                label="课时"
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="questionNum"
-                label="题目总数"
-                align="center"
-                width="100"
-              ></el-table-column>
-              <el-table-column
-                prop="startTime"
-                label="上课时间"
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="participationRate"
-                label="参与度"
-                sortable="custom"
-                align="center"
-              >
-                <template slot-scope="scoped"
-                  >{{ scoped.row.participationRate }}%</template
-                ></el-table-column
-              >
-              <el-table-column
-                prop="answerCorrectRate"
-                label="已答总正确率"
-                sortable="custom"
-                align="center"
-              >
-                <template slot-scope="scoped"
-                  >{{ scoped.row.answerCorrectRate }}%</template
-                >
-              </el-table-column>
-              <el-table-column
-                prop="classCorrectRate"
-                label="班级总正确率"
-                sortable="custom"
-                align="center"
-                ><template slot-scope="scoped"
-                  >{{ scoped.row.classCorrectRate }}%</template
-                ></el-table-column
-              >
-              <el-table-column label="操作" align="center">
-                <template slot-scope="scoped">
-                  <template v-if="scoped.row.answerNum == 0">
-                    <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-else
-                    effect="dark"
-                    content="详情"
-                    placement="top"
-                  >
-                    <el-button
-                      type="primary"
-                      circle
-                      size="mini"
-                      icon="fa fa-arrow-right"
-                      @click="linkTo(scoped.row)"
-                    ></el-button>
-                  </el-tooltip>
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-          <div v-show="tabIndex == 2">
-            <el-table
-              id="print-content2"
-              v-if="role == 'ROLE_JIAOSHI'"
-              :max-height="tableMaxHeight"
-              :data="tableData"
-              border
-              style="width: 100%"
-            >
-              <el-table-column
-                prop="studentCode"
-                label="学号"
-                fixed
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="studentName"
-                label="姓名"
-                fixed
-                align="center"
-                width="100"
-              ></el-table-column>
-              <el-table-column
-                prop="answerTimes"
-                label="累计答题次数"
-                sortable
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="correctAnswerTimes"
-                label="累计答对次数"
-                sortable
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="participationRate"
-                label="总参与度"
-                sortable
-                align="center"
-              >
-                <template slot-scope="scoped"
-                  >{{ scoped.row.participationRate }}%</template
-                ></el-table-column
-              >
-              <el-table-column
-                prop="correctRate"
-                label="总正确率"
-                sortable
-                align="center"
-              >
-                <template slot-scope="scoped"
-                  >{{ scoped.row.correctRate }}%</template
-                ></el-table-column
-              >
-              <el-table-column
-                prop="answerCorrectRate"
-                label="已答总正确率"
-                sortable
-                align="center"
-              >
-                <template slot-scope="scoped"
-                  >{{ scoped.row.answerCorrectRate }}%</template
-                >
-              </el-table-column>
-              <el-table-column
-                prop="classRank"
-                label="总正确率班排名"
-                sortable
-                align="center"
-              ></el-table-column>
-            </el-table>
-            <el-table
-              id="print-content2"
-              :max-height="tableMaxHeight"
-              v-else
-              :data="tableData"
-              border
-              style="width: 100%"
-            >
-              <el-table-column
-                prop="studentCode"
-                label="学号"
-                align="center"
-                fixed
-              ></el-table-column>
-              <el-table-column
-                prop="studentName"
-                label="姓名"
-                align="center"
-                fixed
-                width="100"
-              ></el-table-column>
-              <el-table-column
-                v-for="(item, index) in phaseOption"
-                :key="index"
-                :label="item"
-                align="center"
-              >
-                <el-table-column
-                  align="center"
-                  :label="index == 0 ? '总课时数' : '课时数'"
-                  :prop="'periodCount' + item"
-                >
-                </el-table-column>
-                <el-table-column
-                  align="center"
-                  :label="index == 0 ? '总出题数' : '出题数'"
-                  :prop="'questionNum' + item"
-                >
-                </el-table-column>
-                <el-table-column
-                  align="center"
-                  :label="index == 0 ? '总参与度' : '参与度'"
-                  :prop="'participationRate' + item"
-                  ><template slot-scope="scoped"
-                    >{{ scoped.row["participationRate" + item] }}%</template
-                  >
-                </el-table-column>
-                <el-table-column
-                  align="center"
-                  :label="index == 0 ? '总正确率' : '正确率'"
-                  :prop="'correctRate' + item"
-                  ><template slot-scope="scoped"
-                    >{{ scoped.row["correctRate" + item] }}%</template
-                  >
-                </el-table-column>
-              </el-table-column>
-            </el-table>
-          </div>
-          <div v-show="tabIndex == 3">
-            <el-table
-              id="print-content3"
-              v-if="role == 'ROLE_JIAOSHI'"
-              :max-height="tableMaxHeight"
-              :data="tableData"
-              border
-              style="width: 100%"
-            >
-              <el-table-column
-                prop="studentCode"
-                label="学号"
-                fixed
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="studentName"
-                label="姓名"
-                fixed
-                align="center"
-                width="100"
-              ></el-table-column>
-              <el-table-column
-                prop="rushAnswerTimes"
-                label="抢答成功次数"
-                sortable
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="rushAnswerCorrectTimes"
-                label="抢答答对次数"
-                sortable
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="checkAnswerTimes"
-                label="抽答次数"
-                sortable
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="checkAnswerCorrectTimes"
-                label="抽答答对次数"
-                sortable
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="interactionsNum"
-                label="参与得分"
-                sortable
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="interactionsCorrectNum"
-                label="对错得分"
-                sortable
-                align="center"
-              ></el-table-column>
-            </el-table>
-            <el-table
-              id="print-content3"
-              v-else
-              :max-height="tableMaxHeight"
-              :data="tableData"
-              border
-              style="width: 100%"
-            >
-              <el-table-column
-                prop="studentCode"
-                label="学号"
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                prop="studentName"
-                label="姓名"
-                align="center"
-                width="100"
-              ></el-table-column>
-              <el-table-column
-                v-for="(item, index) in phaseInter"
-                :key="index"
-                :label="item"
-                align="center"
-              >
-                <el-table-column
-                  align="center"
-                  v-if="index == 0"
-                  label="参与分"
-                  sortable
-                  :prop="'interactionsNum' + item"
-                >
-                </el-table-column>
-                <el-table-column
-                  v-else
-                  align="center"
-                  label="互动数"
-                  :prop="'interactionsNum' + item"
-                >
-                </el-table-column>
-                <el-table-column
-                  v-if="index == 0"
-                  align="center"
-                  label="对错分"
-                  sortable
-                  :prop="'interactionsCorrectNum' + item"
-                >
-                </el-table-column>
-                <el-table-column
-                  v-else
-                  align="center"
-                  label="参与数"
-                  :prop="'interactionsCorrectNum' + item"
-                >
-                </el-table-column>
-              </el-table-column>
-            </el-table>
+        <div class="sel-item sel-item2">
+          <span class="sel-label">科目：</span>
+          <div class="sel-d">
+            <p class="p-all">
+              <el-checkbox :indeterminate="isIndeterminate" v-model="allSubject"
+                @change="handleCheckAllChange">全选</el-checkbox>
+            </p>
+            <p class="sel-p">
+              <el-checkbox-group v-model="query.subjectNames" @change="handleChecked">
+                <el-checkbox v-for="item in subjectList" :label="item" :key="item">{{ item
+                }}</el-checkbox>
+              </el-checkbox-group>
+            </p>
           </div>
         </div>
-        <div class="pagination-box" v-show="tabIndex == 1">
-          <el-pagination
-            small=""
-            layout="total,prev, pager, next"
-            :hide-on-single-page="true"
-            :total="total"
-            @current-change="changePage"
-            :current-page="page"
-            :page-size="size"
-          >
-          </el-pagination>
+        <div 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>
+          <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>
         </div>
-        <p
-          class="down"
-          v-if="(tabIndex == 3 || tabIndex == 2) && tableData.length"
-        >
-          <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
-          >
-        </p>
+      </div>
+      <div class="foot-box">
+        <el-button type="primary" round @click="goList">确定</el-button>
+        <el-button type="danger" round @click="goHome">取消</el-button>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-import { formatDate, downloadFile, tablePrint } from "utils";
-import BusEvent from "@/utils/busEvent";
+import { formatDate } from "utils";
 export default {
   data() {
     return {
-      gdClass: 0, //已归档班级数量
-      tableMaxHeight: 300,
       code: "",
       role: "",
-      loading: false,
       date: "", //今天-昨天-本周
       query: {
         //搜索条件
         classId: "",
-        subjectNames: "",
+        subjectNames: [],
         startDay: "",
         endDay: "",
-        day: "",
-      },
-      tabList: ["单课时报表", "阶段问答报表", "阶段互动报表"],
-      custom: {
-        //单课时排序
-        orderField: null,
-        orderType: null,
       },
       classList: [], //班级
       subjectList: [], //科目
-      tabIndex: 1, //选项卡
-      tableData: [],
-      phaseOption: [], //问答补充数据
-      phaseInter: [], //互动补充数据
-      page: 1,
-      size: 20,
-      total: 0,
+
+      isIndeterminate: true,//全选样式
+      allSubject: false,//全选状态
     };
   },
   async created() {
@@ -538,8 +81,7 @@ export default {
     this.role =
       this.$store.getters.info.showRole ||
       this.$store.getters.info.permissions[0].role;
-    this.query.subjectNames = this.role == "ROLE_BANZHUREN" ? [] : "";
-    this._QueryClassList2();
+    this.query.subjectNames = [];
     await this._QueryClassList();
     if (!this.query.classId) {
       return;
@@ -552,69 +94,27 @@ export default {
       this.query.endDay = new Date();
     }
   },
-  activated() {
-    const that = this;
-    BusEvent.$on("keepAlive", async function () {
-      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: {
-    toArchiving() {
-      this.$router.push({
-        path: "/askArchiving",
-      });
-    },
-    print() {
-      tablePrint("print-content", "随堂问-" + this.tabList[this.tabIndex - 1]);
-    },
-    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 == "全部";
-      });
+    handleCheckAllChange(val) {
+      this.checkedCities = val ? this.subjectList : [];
+      this.allSubject = false;
     },
-    linkTo(obj) {
-      //去详情
-      this.$router.push({
-        path: "/askAnalysis",
-        query: {
-          id: obj.id,
-        },
-      });
+    handleChecked(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) {
             //中国式星期天是一周的最后一天
@@ -625,12 +125,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) {
@@ -647,10 +147,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()) {
@@ -660,73 +158,28 @@ 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 = "";
         }
       }
     },
-    async edit(item) {
-      this.$router.push({
-        path: "/examinationPaperEdit",
-        query: {
-          paperId: item.id,
-          title: item.title,
-          type: 3,
-        },
-      });
-    },
-    tabChange() {
-      this.tableMaxHeight = this.$refs.main.offsetHeight;
-      this.page = 1;
-      this.tableData = [];
-      this._QueryData();
-    },
-    sortChange(obj) {
-      this.custom.orderField =
-        obj.prop == "participationRate"
-          ? 1
-          : obj.prop == "answerCorrectRate"
-          ? 2
-          : 3;
-      this.custom.orderType = obj.order == "ascending" ? 0 : 1;
-      this.page = 1;
-      this._QueryData();
-    },
-    changePage(page) {
-      this.page = page;
-      this._QueryData();
-    },
+
     async changeclass() {
+      this.allSubject = false
+      this.query.subjectNames = []
       await this._QuerySubjectList();
-      this.page = 1;
-      this._QueryData();
-    },
-    async changClazz() {
-      await this._QuerySubjectList();
-      // await this.setDate(1);
-      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) => {
@@ -743,292 +196,41 @@ 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 { data, status, info } = await fetchSubjectList({
         classId: this.query.classId,
       });
       if (status === 0) {
-        this.subjectList =
-          data.subjectNames?.map((item) => {
-            return {
-              value: item,
-              label: item,
-            };
-          }) || [];
+        this.subjectList = data.subjectNames || [];
         if (this.role == "ROLE_BANZHUREN") {
-          this.subjectList.unshift({
-            value: "全部",
-            label: "全部",
-          });
-          this.query.subjectNames.push(this.subjectList[0]?.value);
+          this.query.subjectNames = this.subjectList
         } else {
-          this.query.subjectNames = this.subjectList[0]?.value;
+          this.subjectList.length ? this.query.subjectNames.push(this.subjectList[0]) : "";
         }
       } else {
         this.$message.error(info);
       }
     },
-    async _QueryData() {
-      if (!this.query.classId) {
-        return;
-      }
-      if (this.tabIndex == 1) {
-        this.periodReportList();
-      } else if (this.tabIndex == 2) {
-        this.phaseAnswerReport();
-      } else if (this.tabIndex == 3) {
-        this.phaseInteractiveReport();
-      }
-    },
-    //分页查询课时报表列表
-    async periodReportList() {
-      this.loading = true;
-      let query = {};
-      for (let key in this.query) {
-        if (this.query[key] != "") {
-          query[key] = this.query[key];
-        }
-      }
-      if (this.custom.orderField !== null) {
-        query = { ...query, ...this.custom };
-      }
-      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.periodReportList({
-        ...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 phaseAnswerReport() {
-      this.loading = true;
-      let query = {};
-      for (let key in this.query) {
-        if (this.query[key] != "") {
-          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
-            query["subjectName"] = this.query[key];
-          } else {
-            query[key] = this.query[key];
-          }
-        }
-      }
-      if (this.role == "ROLE_BANZHUREN") {
-        if (
-          query["subjectNames"] &&
-          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 phaseAnswerReport =
-        this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTPhaseAnswerReport
-          : this.$request.phaseAnswerReport;
 
-      const { data, status, info } = await phaseAnswerReport({
-        ...query,
-      });
-      this.loading = false;
-      if (status === 0) {
-        if (this.role == "ROLE_BANZHUREN") {
-          let subjectName = [];
-          let tableData = data?.list.map((item) => {
-            let params = {};
-            item.dataList.map((items, index) => {
-              if (!subjectName.includes(items.subjectName)) {
-                subjectName.push(items.subjectName);
-              }
-              params["answerCorrectRate" + items.subjectName] =
-                items.answerCorrectRate;
-              params["correctRate" + items.subjectName] = items.correctRate;
-              params["participationRate" + items.subjectName] =
-                items.participationRate;
-              params["periodCount" + items.subjectName] = items.periodCount;
-              params["questionNum" + items.subjectName] = items.questionNum;
-            });
-            return {
-              ...item,
-              ...params,
-            };
-          });
-          this.phaseOption = [...subjectName];
-          this.tableData = tableData.sort((a, b) => {
-            return a.studentCode - b.studentCode;
-          });
-        } else {
-          this.tableData =
-            (data?.list &&
-              [...data?.list].sort((a, b) => {
-                return a.studentCode - b.studentCode;
-              })) ||
-            [];
-        }
-        this.total = data.count;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    //查询阶段互动报表
-    async phaseInteractiveReport() {
-      this.loading = true;
-      let query = {};
-      for (let key in this.query) {
-        if (this.query[key] != "") {
-          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
-            query["subjectName"] = this.query[key];
-          } else {
-            query[key] = this.query[key];
-          }
-        }
-      }
-      if (this.role == "ROLE_BANZHUREN") {
-        if (
-          query["subjectNames"] &&
-          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 phaseInteractiveReport =
-        this.role == "ROLE_BANZHUREN"
-          ? this.$request.cTPhaseInteractiveReport
-          : this.$request.phaseInteractiveReport;
-
-      const { data, status, info } = await phaseInteractiveReport({
-        ...query,
-      });
-      this.loading = false;
-      if (status === 0) {
-        if (this.role == "ROLE_BANZHUREN") {
-          let subjectName = [];
-          let tableData = data?.list.map((item) => {
-            let params = {};
-            item.dataList.map((items, index) => {
-              if (!subjectName.includes(items.subjectName)) {
-                subjectName.push(items.subjectName);
-              }
-              params["interactionsNum" + items.subjectName] =
-                items.interactionsNum;
-              params["interactionsCorrectNum" + items.subjectName] =
-                items.interactionsCorrectNum;
-            });
-            return {
-              ...item,
-              ...params,
-            };
-          });
-          this.phaseInter = [...subjectName];
-          this.tableData = tableData.sort((a, b) => {
-            return a.studentCode - b.studentCode;
-          });
-        } else {
-          this.tableData =
-            (data?.list &&
-              [...data?.list].sort((a, b) => {
-                return a.studentCode - b.studentCode;
-              })) ||
-            [];
-        }
-        this.total = data.count;
-      } else {
-        this.$message.error(info);
-      }
+    //回主页
+    goHome() {
+      this.$router.push({
+        path: '/index'
+      })
     },
-    //导出
-    async exportData() {
-      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: '/askList',
+        query: {
+          params: JSON.stringify(this.query)
         }
-      }
-      this.exportLoading = true;
-      let exportData;
-      if (this.role == "ROLE_BANZHUREN") {
-        exportData =
-          this.tabIndex == 2
-            ? this.$request.cTExportPhaseAnswerReport
-            : this.$request.cTExportPhaseInteractiveReport;
-      } else {
-        exportData =
-          this.tabIndex == 2
-            ? this.$request.exportPhaseAnswerReport
-            : this.$request.exportPhaseInteractiveReport;
-      }
-      const data = await exportData({ ...query });
-      this.exportLoading = false;
-      if (data) {
-        let blob = new Blob([data], {
-          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-        });
-        downloadFile("随堂问-阶段报表.xlsx", blob);
-      } else {
-        this.$message.error("下载失败");
-      }
-    },
+      })
+    }
   },
 };
 </script>
@@ -1037,6 +239,7 @@ div::-webkit-scrollbar {
   width: 3px;
   height: 10px;
 }
+
 div::-webkit-scrollbar-thumb {
   border-radius: 10px;
   background-color: #ccc;
@@ -1045,75 +248,138 @@ div::-webkit-scrollbar-thumb {
 <style lang="scss" scoped>
 .main {
   height: 100%;
-}
-.table-box {
-  margin: 0 20px;
-  padding: 16px;
-  background: #f8f8f8;
-  border-radius: 5px;
-  .table-cont {
-    min-height: 300px;
-  }
-  :deep(.fa-arrow-right) {
-    padding-left: 2px;
-  }
-  :deep(.fa-file-text) {
-    padding-left: 2px;
-  }
+  background: rgba($color: #000000, $alpha: .3);
+  display: flex;
+  justify-content: center;
 }
 
-.fa-exchange {
-  color: #667ffd;
-  cursor: pointer;
-  font-size: 16px;
-  margin-left: 10px;
-}
-.dia-btn {
-  border-radius: 20px;
-  margin: 0 20px;
-  padding: 10px 20px;
-}
-.dia-tips {
-  padding-bottom: 10px;
-}
-.dia-question-box {
-  padding: 16px 16px 1px;
-  background: #f8f8f8;
+.sel-dia {
+  margin-top: 100px;
+  width: 750px;
+  background: #fff;
   border-radius: 10px;
-
-  .answer-s {
-    width: 36px;
-    height: 28px;
-    cursor: pointer;
-  }
-}
-.set-questions {
+  overflow: hidden;
+  height: 460px;
   display: flex;
-  margin-bottom: 12px;
-  width: 100%;
-  .qs-num {
+  flex-direction: column;
+
+  .tit {
+    text-align: center;
+    position: relative;
+    padding: 20px 0 12px;
+    font-size: 18px;
+    font-weight: 500;
     flex-shrink: 0;
-    margin-right: 10px;
+
+    .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;
+      }
+    }
   }
-  .qs-options {
+
+  .select-box {
     flex: 1;
-    .ipt {
-      margin-bottom: 5px;
+    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;
+        }
+      }
     }
   }
-  .delButton {
-    border-color: #ff6868;
-    background: #ff6868 url("../../../assets/images/arrow.png") no-repeat center;
-    background-size: 19px;
-    color: transparent;
-  }
-  .ac {
-    border-color: #ff6868;
-    background: #ff6868;
-    color: #fff;
+
+  .foot-box {
+    flex-shrink: 0;
+    padding: 12px 0 20px;
+    display: flex;
+    justify-content: center;
+
+    .el-button {
+      margin: 0 30px;
+    }
   }
 }
-.down {
-  padding-top: 16px;
-}
 </style>
\ No newline at end of file
diff --git a/src/views/basic/ask/list.vue b/src/views/basic/ask/list.vue
index e69de29..7674135 100644
--- a/src/views/basic/ask/list.vue
+++ b/src/views/basic/ask/list.vue
@@ -0,0 +1,290 @@
+<template>
+  <div class="main" ref="main">
+    <back-box v-show="!isDetail">
+      <template slot="title">
+        <span>随堂问-数据报表</span>
+      </template>
+      <template slot="btns">
+        <el-tooltip v-if="this.role != 'ROLE_PERSONAL' && !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">
+      <div class="table-cont" v-loading="loading">
+        <p class="btn-box">
+          <el-button type="primary" round @click="linkToDetail2">查看汇总报表</el-button>
+        </p>
+        <div id="print-content">
+          <el-table :data="tableData" border :show-header="total > 0" style="width: 100%"
+            @selection-change="handleSelectionChange">
+            <el-table-column type="selection" width="40"></el-table-column>
+            <el-table-column prop="subject" label="科目" align="center" width="80"></el-table-column>
+            <el-table-column prop="title" label="课时名称" align="center"></el-table-column>
+            <el-table-column prop="participationRate" label="总参与度" align="center"> <template slot-scope="scoped">{{
+              scoped.row.participationRate }}%</template></el-table-column>
+            <el-table-column prop="answerCorrectRate" label="已答总正确率" align="center"><template slot-scope="scoped">{{
+              scoped.row.answerCorrectRate }}%</template>
+            </el-table-column>
+            <el-table-column prop="classCorrectRate" label="班级总正确率" align="center"><template slot-scope="scoped">{{
+              scoped.row.classCorrectRate }}%</template></el-table-column>
+            <el-table-column prop="questionNum" label="题目总数" align="center"></el-table-column>
+            <el-table-column prop="startTime" label="上课时间" align="center"></el-table-column>
+            <el-table-column label="操作" align="center" width="100">
+              <template slot-scope="scoped">
+                <template v-if="scoped.row.answerNum == 0">
+                  <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-else effect="dark" content="详情" placement="top">
+                  <el-button type="primary" circle size="mini" icon="fa fa-arrow-right"
+                    @click="linkToDetail(scoped.row, 1)"></el-button>
+                </el-tooltip>
+                <el-tooltip effect="dark" content="删除" placement="top">
+                  <el-button type="primary" circle size="mini" icon="el-icon-delete"
+                    @click="remove(scoped.row)"></el-button>
+                </el-tooltip>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <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 { downloadFile } from "utils";
+export default {
+  data() {
+    return {
+      gdClass: 0, //已归档班级数量
+      code: "",
+      role: "",
+      loading: false,
+      query: {
+        //搜索条件
+        classId: "",
+        subjectNames: [],
+        startDay: "",
+        endDay: "",
+      },
+      tableData: [],
+      multipleSelection: [],
+      page: 1,
+      size: 20,
+      total: 0,
+    };
+  },
+  computed: {
+    isDetail: function () {
+      let bol = (this.$route.name == "随堂问报表分析") ? true : false
+      return bol
+    }
+  },
+  async created() {
+    this.code = localStorage.getItem("csCode") || "";
+    const queryData = this.$route.query.params
+    queryData ? this.query = { ...this.query, ...JSON.parse(queryData) } : ''
+    this.init()
+  },
+  watch: {
+    "$route.query.params": function (nVal) {
+      let isFromAskDetail = sessionStorage.getItem("isFromAskDetail");
+      if (!isFromAskDetail && nVal) {
+        this.init()
+      }
+    }
+  },
+  methods: {
+    //初始化
+    init() {
+      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: "/askArchiving",
+      });
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    //去详情
+    linkToDetail(obj, types) {
+      this.$router.push({
+        path: "/askAnalysis",
+        query: {
+          id: JSON.stringify([obj.id]),
+          types: types,
+        },
+      });
+    },
+    //去详情
+    linkToDetail2() {
+      let subjectArr = []
+      const ids = this.multipleSelection.map(item => {
+        subjectArr.push(item.subject)
+        return item.id
+      })
+      subjectArr = [...new Set(subjectArr)]
+      this.$router.push({
+        path: "/askAnalysis",
+        query: {
+          id: JSON.stringify(ids),
+          types: subjectArr.length == 1 ? 2 : 3,
+        },
+      });
+    },
+    //删除
+    remove(obj) {
+      const { data, status, info } = this.$request.deletePaperReport({
+        id: obj.id,
+      });
+      if (status === 0) {
+        this.$message.success(info);
+        this._QueryData();
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //修改答案
+    async edit(item) {
+      this.$router.push({
+        path: "/examinationPaperEdit",
+        query: {
+          paperId: item.id,
+          title: item.title,
+          type: 3,
+        },
+      });
+    },
+    changePage(page) {
+      this.page = page;
+      this._QueryData();
+    },
+    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);
+      }
+    },
+    //分页查询课时报表列表
+    async _QueryData() {
+      this.loading = true;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "" || this.query[key].length != 0) {
+          query[key] = this.query[key];
+        }
+      }
+      const periodReportList = this.role == "ROLE_PERSONAL" ?
+        this.$request.pPhaseInteractiveReport :
+        this.$request.periodReportList;
+      const { data, status, info } = await periodReportList({
+        ...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 exportData() {
+      if (this.exportLoading == true) return;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "" || this.query[key].length != 0) {
+          query[key] = this.query[key];
+        }
+      }
+      this.exportLoading = true;
+      let exportData = this.role == "ROLE_BANZHUREN" ?
+        this.$request.cTExportPhaseInteractiveReport :
+        this.role == "ROLE_PERSONAL" ?
+          this.$request.pExportPhaseReport :
+          this.$request.exportPhaseInteractiveReport;
+      const data = await exportData({ ...query });
+      this.exportLoading = false;
+      if (data) {
+        let blob = new Blob([data], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        downloadFile("随堂问-数据报表.xlsx", blob);
+      } else {
+        this.$message.error("下载失败");
+      }
+    },
+  },
+};
+</script>
+<style>
+div::-webkit-scrollbar {
+  width: 3px;
+  height: 10px;
+}
+
+div::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background-color: #ccc;
+}
+</style>
+<style lang="scss" scoped>
+.main {
+  height: 100%;
+}
+
+.table-box {
+  padding: 16px;
+  border-radius: 5px;
+
+  .table-cont {
+    min-height: 300px;
+  }
+
+  :deep(.fa-arrow-right) {
+    padding-left: 2px;
+  }
+
+  :deep(.fa-file-text) {
+    padding-left: 2px;
+  }
+}
+
+.btn-box {
+  text-align: right;
+  padding: 0 12px 16px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/basic/down/index.vue b/src/views/basic/down/index.vue
index 3b64cef..3fa7928 100644
--- a/src/views/basic/down/index.vue
+++ b/src/views/basic/down/index.vue
@@ -5,7 +5,19 @@
         <span>软件下载</span>
       </template>
     </back-box>
-    <div class="page-content">
+
+    <div v-if="role == 'ROLE_PERSONAL'" class="down-box" v-loading="loading">
+      <img class="logo" src="" alt="" />
+      <div class="txt">
+        <p class="p1">
+          {{ `${info.appName || ""} ${info.versionName || ""}` }}
+        </p>
+        <p class="p2">文件大小：{{ `${info.fileSize}` }}M</p>
+        <p class="p2">最近更新：{{ info.modifiedTime }}</p>
+      </div>
+      <el-button type="primary" @click="downCard">立即下载</el-button>
+    </div>
+    <div v-else class="page-content">
       <div class="down-item">
         <p class="txt">
           K12公私立学校、高等院校、教育培训机构的课堂互动教学、即时课堂测验。
@@ -36,12 +48,23 @@ export default {
       role: "",
       loading: false,
       loadingNet: false,
+      info: {
+        id: "",
+        appName: "",
+        appImage: "",
+        versionName: "",
+        fileSize: "",
+        modifiedTime: "",
+      },
     };
   },
   created() {
     this.role =
       this.$store.getters.info.showRole ||
       this.$store.getters.info.permissions[0].role;
+    if (this.role == 'ROLE_PERSONAL') {
+      this.latestVersion();
+    }
   },
   methods: {
     links() {
@@ -49,10 +72,31 @@ export default {
         path: "/downClient",
       });
     },
+    async latestVersion() {
+      const { data, status, info } = await this.$request.pLatestVersion();
+      if (status == 0) {
+        this.info = { ...data };
+        this.info.fileSize =
+          (this.info.fileSize &&
+            (this.info.fileSize / 1024 / 1024).toFixed(2)) ||
+          "--";
+      } else {
+        this.$message.error(info);
+      }
+    },
     async downCard() {
       if (this.loading == true) return;
       this.loading = true;
-      const { data, status, info } = await this.$request.latestClickersApp();
+      let latestClickersApp;
+      let query = {}
+      if (this.role == 'ROLE_PERSONAL') {
+        latestClickersApp = this.$request.pGetAppDownloadUrl
+        query.versionId = this.info.id
+      } else {
+        latestClickersApp = this.$request.latestClickersApp
+      }
+
+      const { data, status, info } = await latestClickersApp({ ...query });
       this.loading = false;
       if (status == 0) {
         const a = document.createElement("a");
@@ -89,10 +133,12 @@ export default {
 .content-box {
   width: 100%;
 }
+
 .page-content {
   display: flex;
   padding-top: 50px;
   margin-left: 160px;
+
   .down-item {
     width: 200px;
     padding: 50px 20px;
@@ -104,6 +150,7 @@ export default {
     align-items: center;
     background: #f8f8f8;
     box-shadow: 2px 2px 5px #ccc;
+
     .txt {
       font-size: 16px;
       color: #7f7f7f;
diff --git a/src/views/basic/setUp/clazz.vue b/src/views/basic/setUp/clazz.vue
index 71ed7b4..e340bae 100644
--- a/src/views/basic/setUp/clazz.vue
+++ b/src/views/basic/setUp/clazz.vue
@@ -315,6 +315,7 @@ export default {
       });
       this.diaUp = false;
       this._QueryData();
+      this._QuerySubject();
     },
     setClass(obj, gradeName) {
       this.formClass.studentCount = obj.studentCount;
diff --git a/src/views/basic/userInfo/index.vue b/src/views/basic/userInfo/index.vue
new file mode 100644
index 0000000..ff3de4d
--- /dev/null
+++ b/src/views/basic/userInfo/index.vue
@@ -0,0 +1,326 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>个人信息</span>
+      </template>
+    </back-box>
+    <div class="page-content">
+      <div class="content-box">
+        <i class="el-icon-edit" @click="diaSchool = true"></i>
+        <i class="el-icon-key" @click="diaPass = true"></i>
+        <ul class="school-info">
+          <li class="school-item">
+            <span class="s1">学校名称：</span>
+            <span class="s2">{{ Info.tenantName || "--" }}</span>
+          </li>
+          <li class="school-item">
+            <span class="s1">教师姓名：</span>
+            <span class="s2">{{ Info.contactPerson || "--" }}</span>
+          </li>
+          <li class="school-item">
+            <span class="s1">手机号码：</span>
+            <span class="s2">{{ Info.contactPhone || "--" }}</span>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <el-dialog :close-on-click-modal="false" title="修改个人信息" :visible.sync="diaSchool" width="400">
+      <el-form
+        ref="formSchool"
+        class="form-box"
+        :model="formSchool"
+        :rules="rulesSchool"
+        label-width="160px"
+      >
+        <el-form-item label="学校名称：" prop="tenantName"
+          ><el-col :span="10"
+            ><el-input
+              maxlength="30"
+              v-model="formSchool.tenantName"
+              placeholder="请输入教师姓名"
+            ></el-input></el-col
+        ></el-form-item>
+        <el-form-item label="教师姓名：" prop="contactPerson"
+          ><el-col :span="10"
+            ><el-input
+              maxlength="30"
+              v-model="formSchool.contactPerson"
+              placeholder="请输入教师姓名"
+            ></el-input></el-col
+        ></el-form-item>
+        <el-form-item label="手机号码：" prop="contactPhone"
+          ><el-col :span="10"
+            ><el-input
+              v-model="formSchool.contactPhone"
+              type="number"
+              oninput="if(value.length > 11) value = value.slice(0,11)"
+              placeholder="请输入教师姓名手机号码"
+            ></el-input></el-col
+        ></el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="editSchool">确 定</el-button>
+        <el-button @click="diaSchool = false">取 消</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog :close-on-click-modal="false" title="修改密码" :visible.sync="diaPass" width="400">
+      <el-form
+        ref="formPass"
+        class="form-box"
+        :model="password"
+        :rules="rulesPassword"
+        label-width="160px"
+      >
+        <el-form-item label="旧密码：" prop="oldPassword"
+          ><el-col :span="10"
+            ><el-input
+              maxlength="30"
+              v-model="password.oldPassword"
+              placeholder="请输入密码"
+              show-password
+            ></el-input></el-col
+        ></el-form-item>
+        <el-form-item label="新密码：" prop="password"
+          ><el-col :span="10"
+            ><el-input
+              maxlength="30"
+              v-model="password.password"
+              placeholder="请输入新密码"
+              show-password
+            ></el-input></el-col
+        ></el-form-item>
+        <el-form-item label="确认密码：" prop="resetPassword"
+          ><el-col :span="10"
+            ><el-input
+              maxlength="30"
+              v-model="password.resetPassword"
+              placeholder="请输入新密码"
+              show-password
+            ></el-input></el-col
+        ></el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="editPass">确 定</el-button>
+        <el-button @click="diaPass = false">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { downloadFile, encryptLoginPassword } from "@/utils";
+export default {
+  data() {
+    return {
+      loading: false,
+      diaSchool: false,
+      diaPass: false,
+      Info: {
+        tenantName: "",
+        contactPerson: "",
+        contactPhone: "",
+        sections: "",
+      },
+      password: {
+        oldPassword: "",
+        password: "",
+        resetPassword: "",
+      },
+      rulesPassword: {
+        oldPassword: [
+          { required: true, message: "请输入旧密码", trigger: "blur" },
+        ],
+        password: [
+          { required: true, message: "请输入新密码", trigger: "blur" },
+        ],
+        resetPassword: [
+          { required: true, message: "请输入新密码", trigger: "blur" },
+        ],
+      },
+      tableData: [],
+      formSchool: {
+        tenantName: "",
+        contactPerson: "",
+        contactPhone: "",
+      },
+      rulesSchool: {},
+    };
+  },
+  created() {
+    this._QueryData();
+  },
+  methods: {
+    editSchool() {
+      if (this.loading) {
+        return;
+      }
+      this.$refs.formSchool.validate(async (valid) => {
+        if (valid) {
+          this.loading = true;
+          let form = { ...this.formSchool };
+          const { data, status, info } = await this.$request.modifyInfo({
+            ...form,
+          });
+          this.loading = false;
+          if (status === 0) {
+            this.$message.success("修改成功~");
+            this.diaSchool = false;
+            this._QueryData();
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.error("数据有误，请检查！");
+        }
+      });
+    },
+    editPass() {
+      if (this.loading) {
+        return;
+      }
+      this.$refs.formPass.validate(async (valid) => {
+        if (valid) {
+          if (this.password.password != this.password.resetPassword) {
+            this.$message.warning("两次输入密码不一致请检查！");
+            return;
+          }
+          this.loading = true;
+          const { data, status, info } = await this.$request.modifyInfo({
+            oldPassword: encryptLoginPassword(this.password.oldPassword),
+            password: encryptLoginPassword(this.password.password),
+          });
+          this.loading = false;
+          if (status === 0) {
+            this.$message.success("密码修改成功~");
+            this.diaPass = false;
+            const res = await this.$request.logout();
+            this.$store.commit("setToken", "");
+            this.$store.commit("setInfo", {});
+            this.$store.commit("setRouters", []);
+            this.$store.commit("resetTabnavBox");
+            this.$router.push({
+              path: "/login",
+            });
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          this.$message.error("数据有误，请检查！");
+        }
+      });
+    },
+    async _QueryData() {
+      this.loading = true;
+      const { data, status, info } = await this.$request.getInfo();
+      this.loading = false;
+      console.log(status);
+      if (status === 0) {
+        this.Info = { ...data };
+        for (let key in this.formSchool) {
+          this.formSchool[key] = data[key] || "";
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async downExcel() {
+      let data = await this.$request.downDevice({
+        id: 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 lang="scss" scoped>
+.page-content {
+  padding: 20px;
+  .content-box {
+    background: #f8f8f8;
+    border-radius: 16px;
+    position: relative;
+    .el-icon-edit {
+      position: absolute;
+      top: 12px;
+      right: 40px;
+      padding: 5px;
+      font-size: 18px;
+      cursor: pointer;
+      &:hover {
+        color: #36f;
+      }
+    }
+    .el-icon-key {
+      position: absolute;
+      top: 12px;
+      right: 12px;
+      padding: 5px;
+      font-size: 18px;
+      cursor: pointer;
+      &:hover {
+        color: #36f;
+      }
+    }
+  }
+  .school-info {
+    display: flex;
+    flex-wrap: wrap;
+    padding: 16px 0;
+    border-bottom: 0.5px solid #f2f2f2;
+    .school-item {
+      width: 50%;
+      line-height: 48px;
+      padding-left: 100px;
+      display: flex;
+      box-sizing: border-box;
+      .s1 {
+        width: 160px;
+        font-size: 15px;
+        color: #888;
+      }
+      .s2 {
+        flex: 1;
+      }
+    }
+  }
+}
+.form-box {
+  margin: 0 20px;
+  .subject-box {
+    height: 90px;
+    overflow: hidden;
+    position: relative;
+    &.active {
+      height: auto;
+      overflow: auto;
+    }
+    .showAll {
+      position: absolute;
+      bottom: 0;
+      right: 10px;
+      font-size: 12px;
+      color: #7f7f7f;
+      cursor: pointer;
+      padding: 2px;
+      &:hover {
+        color: #667ffd;
+      }
+    }
+  }
+}
+.el-icon-plus {
+  cursor: pointer;
+  &:hover {
+    color: #667ffd;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/examinationPaper/edit.vue b/src/views/examinationPaper/edit.vue
index 8d8572f..24e58b9 100644
--- a/src/views/examinationPaper/edit.vue
+++ b/src/views/examinationPaper/edit.vue
@@ -377,8 +377,8 @@ export default {
     knowledgeData: function () {
       let jsons = []
       if (this.form.sectionName && this.form.subjectName) {
-        let sectionName = this.form.sectionName
-        let subjectName = this.form.subjectName
+        let sectionName = this.form.sectionName || null
+        let subjectName = this.form.subjectName || null
         if (sectionName && Object.keys(this.knowledgeList).includes(sectionName)) {
           if (Object.keys(this.knowledgeList[sectionName]).includes(subjectName)) {
             jsons = this.knowledgeList[sectionName][subjectName]