diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js
index be2452f..30f8138 100644
--- a/src/api/apis/apis.js
+++ b/src/api/apis/apis.js
@@ -567,6 +567,15 @@ export default {
       data,
     });
   },
+  //  导出设备列表
+  exportDevice(data) {
+    return service({
+      url: setUpUrls.exportDevice,
+      method: "POST",
+      data,
+      responseType: 'arraybuffer',
+    });
+  },
   //  查询设备详情
   deviceDetail(data) {
     return service({
@@ -704,6 +713,38 @@ export default {
       responseType: 'arraybuffer',
     });
   },
+  //  班级归档
+  classArchiving(data) {
+    return service({
+      url: setUpUrls.classArchiving,
+      method: "POST",
+      data,
+    });
+  },
+  //  查询学校已归档班级列表
+  archivingClassList(data) {
+    return service({
+      url: setUpUrls.archivingClassList,
+      method: "POST",
+      data,
+    });
+  },
+  //  学生换班
+  studentChangeClass(data) {
+    return service({
+      url: setUpUrls.studentChangeClass,
+      method: "POST",
+      data,
+    });
+  },
+  //  升级年级
+  upgradeGrade(data) {
+    return service({
+      url: setUpUrls.upgradeGrade,
+      method: "POST",
+      data,
+    });
+  },
 
   /**
    * 集团管理员-学校管理
diff --git a/src/api/axios.js b/src/api/axios.js
index 6177210..fe62731 100644
--- a/src/api/axios.js
+++ b/src/api/axios.js
@@ -67,7 +67,6 @@ service.interceptors.response.use(
 
     if (status === 403 || status === 401) {
       if (data.status === 999) {
-        console.log(data.data)
         if (data.data) {
           window.location.href = data.data;
         } else {
diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js
index a8eb3ef..fea6104 100644
--- a/src/api/urls/apis.js
+++ b/src/api/urls/apis.js
@@ -140,6 +140,8 @@ export default {
   keyboardReport: "/api_html/school/manager/keyboardReport",
   //  分页查询设备列表
   deviceList: "/api_html/school/manager/deviceList",
+  //  导出设备列表
+  exportDevice: "/api_html/school/manager/exportDevice",
   //  查询设备详情
   deviceDetail: "/api_html/school/manager/deviceDetail",
   //  分页查询设备日志列表
@@ -174,6 +176,15 @@ export default {
   latestClickersApp: "/api_html/school/manager/latestClickersApp",
   // 发卡导出
   exportClickersLog: "/api_html/school/manager/exportClickersLog",
+  /*v1.3*/
+  // 班级归档
+  classArchiving: "/api_html/school/manager/classArchiving",
+  // 查询学校已归档班级列表
+  archivingClassList: "/api_html/school/manager/archivingClassList",
+  // 学生换班
+  studentChangeClass: "/api_html/school/manager/studentChangeClass",
+  // 升级年级
+  upgradeGrade: "/api_html/school/manager/upgradeGrade",
 
 
   // 查询区域列表
diff --git a/src/components/charts/pieChart.vue b/src/components/charts/pieChart.vue
index 8fa82e3..7cd5b47 100644
--- a/src/components/charts/pieChart.vue
+++ b/src/components/charts/pieChart.vue
@@ -64,7 +64,6 @@ export default {
           label: {
             normal: {
               formatter(v) {
-                console.log(v)
                 let rate = v.data.rate*100
                 return v.name + rate.toFixed(2) + "%";
               },
diff --git a/src/components/setAnswer.vue b/src/components/setAnswer.vue
index 36171ff..9e370aa 100644
--- a/src/components/setAnswer.vue
+++ b/src/components/setAnswer.vue
@@ -446,7 +446,6 @@ export default {
           i--;
         }
       }
-      console.log(questionList);
       const { data, status, message } = await this.$request.setPeriodAnswer({
         periodId: this.paperId,
         questionList: questionList,
diff --git a/src/router/index.js b/src/router/index.js
index 264dd31..c301590 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -12,18 +12,24 @@ const ExaminationPaper = () => import("@/views/examinationPaper/index")
 const ExaminationPaperAdd = () => import("@/views/examinationPaper/add")
 const ExaminationPaperEdit = () => import("@/views/examinationPaper/edit")
 const ExaminationPaperRecycle = () => import("@/views/examinationPaper/recycle")
+const ExaminationPaperArchiving = () => import("@/views/examinationPaper/archiving")
 const Portrait = () => import("@/views/portrait/index")
 const PortraitDetail = () => import("@/views/portrait/detail")
 const CSExaminationPaper = () => import("@/views/examinationPaper/index")
-const CSExaminationPaperAdd = () => import("@/views/standard/examinationPaper/add")
-const CSExaminationPaperEdit = () => import("@/views/standard/examinationPaper/edit")
-const CSExaminationPaperRecycle = () => import("@/views/standard/examinationPaper/recycle")
+// const CSExaminationPaperAdd = () => import("@/views/standard/examinationPaper/add")
+// const CSExaminationPaperEdit = () => import("@/views/standard/examinationPaper/edit")
+// const CSExaminationPaperRecycle = () => import("@/views/standard/examinationPaper/recycle")
+const CSExaminationPaperAdd = () => import("@/views/examinationPaper/add")
+const CSExaminationPaperEdit = () => import("@/views/examinationPaper/edit")
+const CSExaminationPaperRecycle = () => import("@/views/examinationPaper/recycle")
 
 
 const Ask = () => import("@/views/standard/ask/index")
 const AskAnalysis = () => import("@/views/standard/ask/analysis")
+const AskArchiving = () => import("@/views/standard/ask/archiving")
 const Test = () => import("@/views/standard/test/index")
 const TestAnalysis = () => import("@/views/standard/test/analysis")
+const TestArchiving = () => import("@/views/standard/test/archiving")
 const DataSync = () => import("@/views/standard/dataSync/index")
 const Card = () => import("@/views/standard/card/index")
 const Analysis = () => import("@/views/standard/analysis/index")
@@ -34,13 +40,16 @@ const DownClient = () => import("@/views/standard/down/client")
 const SetUpAccount = () => import("@/views/standard/setUp/account")
 const SetUpConglomerate = () => import("@/views/standard/setUp/conglomerate")
 const SetUpSchool = () => import("@/views/standard/setUp/school")
-const SetUpStudent = () => import("@/views/standard/setUp/student")
 const SetUpTeacher = () => import("@/views/standard/setUp/teacher")
+const SetUpStudent = () => import("@/views/standard/setUp/student")
+const ArchivedClazz = () => import("@/views/standard/setUp/archivedClazz")
 
 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")
@@ -115,7 +124,7 @@ let defaultRouter = [
   }
 ]
 
-let addrouters = [  
+let addrouters = [
   {
     path: "/examinationPaper",
     iconCls: "fa fa-file-text", // 图标样式class
@@ -149,11 +158,20 @@ let addrouters = [
       {
         path: "/examinationPaperRecycle",
         iconCls: "", // 图标样式class
-        name: "已归档答题卡",
+        name: "回收站答题卡",
         component: ExaminationPaperRecycle,
         parent: "examinationPaper",
         children: []
       },
+      {
+        path: "/examinationPaperArchiving",
+        iconCls: "", // 图标样式class
+        name: "已归档答题卡",
+        component: ExaminationPaperArchiving,
+        parent: "examinationPaper",
+        hidden: true,
+        children: []
+      },
     ]
   },
   {
@@ -182,6 +200,15 @@ let addrouters = [
         component: AskAnalysis,
         parent: "ask",
         children: []
+      },
+      {
+        path: "/askArchiving",
+        iconCls: "", // 图标样式class
+        name: "随堂问已归档报表分析",
+        component: AskArchiving,
+        parent: "ask",
+        hidden: true,
+        children: []
       }
     ]
   },
@@ -209,6 +236,15 @@ let addrouters = [
         component: TestAnalysis,
         parent: "test",
         children: []
+      },
+      {
+        path: "/testArchiving",
+        iconCls: "", // 图标样式class
+        name: "即时测已归档报表分析",
+        component: TestArchiving,
+        parent: "test",
+        hidden: true,
+        children: []
       }
 
     ]
@@ -272,6 +308,14 @@ let addrouters = [
         component: SetUpStudent,
         children: []
       },
+      {
+        path: "/archivedClazz",
+        iconCls: "fa fa-list-ul",
+        name: '已归档班级',
+        component: ArchivedClazz,
+        hidden: true,
+        children: []
+      },
     ]
   },
   {
@@ -401,7 +445,7 @@ let addrouters = [
   //   ]
   // },
 ]
-let csAddrouters = [  
+let csAddrouters = [
   {
     path: "/examinationPaper",
     iconCls: "fa fa-file-text", // 图标样式class
@@ -435,11 +479,20 @@ let csAddrouters = [
       {
         path: "/examinationPaperRecycle",
         iconCls: "", // 图标样式class
-        name: "已归档答题卡",
+        name: "回收站答题卡",
         component: CSExaminationPaperRecycle,
         parent: "examinationPaper",
         children: []
       },
+      {
+        path: "/examinationPaperArchiving",
+        iconCls: "", // 图标样式class
+        name: "已归档答题卡",
+        component: ExaminationPaperArchiving,
+        parent: "examinationPaper",
+        hidden: true,
+        children: []
+      },
     ]
   },
   {
@@ -711,11 +764,20 @@ const addroutersPersonal = [
       {
         path: "/examinationPaperRecycle",
         iconCls: "", // 图标样式class
-        name: "已归档答题卡",
+        name: "回收站答题卡",
         component: ExaminationPaperRecycle,
         parent: "examinationPaper",
         children: []
       },
+      {
+        path: "/examinationPaperArchiving",
+        iconCls: "", // 图标样式class
+        name: "已归档答题卡",
+        component: ExaminationPaperArchiving,
+        parent: "examinationPaper",
+        hidden: true,
+        children: []
+      },
     ]
   },
   {
@@ -744,6 +806,15 @@ const addroutersPersonal = [
         component: PersonalAskAnalysis,
         parent: "ask",
         children: []
+      },
+      {
+        path: "/askArchiving",
+        iconCls: "", // 图标样式class
+        name: "随堂已归档问报表分析",
+        component: PersonalArchiving,
+        parent: "ask",
+        hidden:true,
+        children: []
       }
     ]
   },
@@ -771,6 +842,15 @@ const addroutersPersonal = [
         component: PersonalTestAnalysis,
         parent: "test",
         children: []
+      },
+      {
+        path: "/testArchiving",
+        iconCls: "", // 图标样式class
+        name: "即时已归档测报表分析",
+        component: PersonalTestArchiving,
+        parent: "test",
+        hidden:true,
+        children: []
       }
 
     ]
@@ -901,4 +981,4 @@ const addRoutersAdmin = [
 export default new Router({
   routes: defaultRouter
 })
-export { defaultRouter, addrouters,addroutersPersonal,addRoutersAdmin ,csAddrouters}
+export { defaultRouter, addrouters, addroutersPersonal, addRoutersAdmin, csAddrouters }
diff --git a/src/router/permission.js b/src/router/permission.js
index a3d6618..eebe527 100644
--- a/src/router/permission.js
+++ b/src/router/permission.js
@@ -9,6 +9,9 @@ router.beforeEach((to, from, next) => {
     next();
   } else {
     if (store.getters.token) {
+      if (to.path == '/device' && from.path == '/deviceLog') {
+        to.query.back = true
+      }
       next();
     } else {
       if (store.getters.info && store.getters.addRouters) {
@@ -17,7 +20,6 @@ router.beforeEach((to, from, next) => {
         let authorityRouterObj = userInfo.permissions.filter((item) => {
           return item.roleName == userInfo.showRoleName;
         });
-        console.log([...authorityRouterObj[0]?.authorityRouter])
         store.commit("setRouters", [...authorityRouterObj[0]?.authorityRouter]);
         store.commit("setInfo", { ...userInfo });
         store.getters.addRouters.forEach((res) => {
diff --git a/src/utils/index.js b/src/utils/index.js
index 6b86f02..bffaba2 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -453,7 +453,6 @@ export function checkAnswer(
   s = filtterChar(s, questionType == 3 && questionCount > 1, optionCount);
   if (questionType == 2) {
     //单选
-    console.log(s.length + " " + questionCount);
     if (s.length > questionCount) {
       s = s.substring(0, questionCount);
     }
@@ -679,7 +678,6 @@ export function formatClass(data) {
       }
     }
   });
-  console.log(sectionNameArr);
   return sectionNameArr;
 }
 export function formatGradeClass(data) {
@@ -748,44 +746,52 @@ export function formatGradeNameClass(data) {
   return gradeNameArr;
 }
 
-export function tablePrint(id) {
+export function tablePrint(id, title) {
   let divs = document.getElementById(id);
   let awin = window.open("", "_blank");
   awin.document.getElementsByTagName(
     "head"
   )[0].innerHTML = `<style> @media print {@page {size:A4 landscape;margin:10mm}
     body{margin:5mm;font-size:8px;}}
+    body{-webkit-print-color-adjust: exact;}
+    .tit{text-align:center;font-size:20px;color:#333;line-height:24px;font-weight:700;padding:10px 0;margin:0;}
     .table-box,.el-table,.el-table__body-wrapper,.el-table--border{max-height:99999999px!important;height:auto;width:auto!important}
     .el-table{width:100%}
     .el-table,.el-table__body-wrapper{max-height:auto}
     .el-table .el-table__cell{padding:12px 0}
-    .el-table thead tr:first-child th.el-table__cell{border-top: 1px solid #EBEEF5;}
-    .el-table thead tr:first-child th.el-table__cell:first-child{border-left: 1px solid #EBEEF5;}
-    .el-table tbody tr td.el-table__cell:first-child{border-left: 1px solid #EBEEF5;}
-    .el-table td.el-table__cell{border-bottom: 1px solid #EBEEF5;}
-    .el-table--border .el-table__cell{border-right: 1px solid #EBEEF5;}
-    .el-table--border th.el-table__cell, .el-table__fixed-right-patch{border-bottom: 1px solid #EBEEF5;}
+    .el-table thead tr:first-child th.el-table__cell{border-top: 1px solid #ccc;background:#ccc}
+    .el-table thead tr:first-child th.el-table__cell:first-child{border-left: 1px solid #ccc;}
+    .el-table tbody tr td.el-table__cell:first-child{border-left: 1px solid #ccc;}
+    .el-table td.el-table__cell{border-bottom: 1px solid #ccc;}
+    .el-table--border .el-table__cell{border-right: 1px solid #ccc;}
+    .el-table--border th.el-table__cell, .el-table__fixed-right-patch{border-bottom: 1px solid #ccc;}
     .el-table .el-table__cell.gutter{border:none!important;}
     .el-table__fixed{display:none!important}
     .el-table .el-table__cell.is-center{text-align:center!important}
     .el-table .el-table__cell.is-hidden>*{visibility: inherit;}
     ul,li{margin:0;padding:0;list-style:none}
     .hui-box{display: flex;text-align: center;}
-    .hui-box .s-txt{width: 60px;line-height: 144px;background: #e2e2e2;font-size: 16px;color: #fff;font-weight: 700;border:1px solid #e2e2e2;box-sizing:border-box}
-    .hui-ul{border-top: 1px solid #e2e2e2;}
+    .hui-box .s-txt{width: 60px;line-height: 144px;background: #ccc;font-size: 16px;color: #fff;font-weight: 700;border:1px solid #ccc;box-sizing:border-box}
+    .hui-ul{border-top: 1px solid #ccc;}
     .hui-li{display: flex;}
-    .hui-s{height: 48px;line-height: 48px;border-right: 1px solid #e2e2e2;border-bottom: 1px solid #e2e2e2;box-sizing: border-box;}
+    .hui-s{height: 48px;line-height: 48px;border-right: 1px solid #ccc;border-bottom: 1px solid #ccc;box-sizing: border-box;}
     .hui-s.s1{width: 100px;}
     .hui-s.s2{ width: 110px;}
     .hui-s.s3{width: 120px;}
-    .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;}
+    .info { display: flex;flex-wrap: wrap;border-left: 1px solid #ccc;border-top: 1px solid #ccc;margin-bottom: 12px;}
+    .info-item {width: 25%;height: 50px;box-sizing: border-box;flex-shrink: 0;background: #f8f8f8;border-right: 1px solid #ccc;border-bottom: 1px solid #ccc;line-height: 50px;text-align: center;}
     </style>`;
   let aDom = divs.cloneNode(true);
   let aTbody = aDom
     .getElementsByClassName("el-table__body")[0]
     .getElementsByTagName("tbody")[0];
   aDom.getElementsByClassName("el-table__header")[0].append(aTbody);
+  if (title) {
+    let pTit = awin.document.createElement('p')
+    pTit.className = "tit"
+    pTit.innerHTML = title
+    awin.document.body.append(pTit)
+  }
   awin.document.body.append(aDom);
   awin.print();
   awin.close()
diff --git a/src/views/admin/account/index.vue b/src/views/admin/account/index.vue
index 9185317..a1ac1b7 100644
--- a/src/views/admin/account/index.vue
+++ b/src/views/admin/account/index.vue
@@ -178,16 +178,6 @@
             </el-input>
           </el-col>
         </el-form-item>
-        <!-- <el-form-item label="密码：" prop="password">
-          <el-col :span="12">
-            <el-input
-              placeholder="请输入密码"
-              v-model.trim="formCount.password"
-              maxlength="18"
-            >
-            </el-input>
-          </el-col>
-        </el-form-item> -->
         <el-form-item label="联系人姓名：" prop="contactPerson">
           <el-col :span="12">
             <el-input
@@ -219,6 +209,13 @@
             </el-input>
           </el-col>
         </el-form-item>
+        <el-form-item label="使用模式：" v-if="formCount.versionType == 1">
+          <el-radio-group v-model="formCount.usageMode">
+            <el-radio :label="0">班级专用</el-radio>
+            <el-radio :label="1">多班复用</el-radio>
+            <el-radio :label="2">用户配置 </el-radio>
+          </el-radio-group>
+        </el-form-item>
       </el-form>
       <div class="dialog-footer" slot="footer">
         <el-button @click="saveCount">确 定</el-button>
@@ -327,6 +324,8 @@ export default {
         tenantName: "",
         contactPerson: "",
         contactPhone: "",
+        versionType:"",
+        usageMode:""
       },
       ruleCount: {
         loginName: [{ required: true, message: "请输入账号", trigger: "blur" }],
@@ -374,7 +373,7 @@ export default {
       this.formAddCount.usageMode = "";
       this.diaAdd = true;
     },
-    versionTypeChange(){
+    versionTypeChange() {
       this.formAddCount.usageMode = "";
     },
     saveAddCount() {
@@ -405,10 +404,11 @@ export default {
       this.formCount.tenantName = obj.tenantName;
       this.formCount.contactPerson = obj.realName;
       this.formCount.contactPhone = obj.phone;
+      this.formCount.versionType = obj.versionType;
+      this.formCount.usageMode = obj.usageMode;
       this.diaCount = true;
     },
     handleDropdownClick(value, item) {
-      console.log(item);
       //更多
       if (value == 2) {
         this.$confirm("确定要删除这条账号信息吗？", "提示", {
@@ -452,7 +452,6 @@ export default {
     },
     async updateUser(obj, type) {
       let query = {};
-      console.log(query);
       if (type == 1) {
         query.available = obj.available == 0 ? 1 : 0;
       }
diff --git a/src/views/examinationPaper/archiving.vue b/src/views/examinationPaper/archiving.vue
new file mode 100644
index 0000000..679b9a1
--- /dev/null
+++ b/src/views/examinationPaper/archiving.vue
@@ -0,0 +1,407 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>已归档答题卡</span>
+      </template>
+    </back-box>
+    <div class="answer-header">
+      <div class="sel-box">
+        <el-select
+          class="sel"
+          v-model="query.classId"
+          placeholder="选择班级"
+          @change="changClazz"
+        >
+          <el-option
+            v-for="item in classList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <el-select
+          class="sel"
+          v-model="query.subjectName"
+          placeholder="选择科目"
+          @change="_QueryData()"
+        >
+          <el-option
+            v-for="item in subjectList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <el-select
+          class="sel"
+          v-model="query.tagId"
+          placeholder="选择类型"
+          @change="_QueryData()"
+        >
+          <el-option
+            v-for="item in typeList"
+            :key="item.label"
+            :label="item.label"
+            :value="item.value"
+            >{{ item.label }}
+          </el-option>
+        </el-select>
+        <el-input
+          placeholder="试卷名称"
+          v-model="query.title"
+          class="input-with-select"
+          @keyup.enter.native="_QueryData(true)"
+        >
+          <el-button
+            slot="append"
+            icon="el-icon-search"
+            @click="_QueryData(true)"
+          ></el-button>
+        </el-input>
+      </div>
+    </div>
+    <ul class="content" v-if="tableData && tableData.length">
+      <li class="item" v-for="item in tableData" :key="item.id">
+        <div class="pic-box">
+          <p class="i-box"><i class="fa fa-map-o"></i></p>
+          <p class="ids">{{ item.id }}</p>
+        </div>
+        <div class="info">
+          <p class="title">
+            {{ item.title }}
+            <span class="label" v-if="!!item.tag">{{ item.tag }}</span>
+          </p>
+          <p class="num">
+            总题数：{{ item.questionNum }}
+            <em class="s-line">|</em>
+            预计时长：{{ item.examsDuration }}
+          </p>
+          <p class="person">
+            {{ item.realName }}<em class="s-line">|</em
+            ><span class="date">{{ item.modifiedTime }}</span>
+          </p>
+        </div>
+        <div class="btn-box">
+          <el-tooltip effect="dark" content="复制" placement="bottom">
+            <el-button
+              class="edit"
+              type="info"
+              size="mini"
+              circle
+              icon="fa fa-archive-copy"
+              @click="toAdd(item)"
+            ></el-button>
+          </el-tooltip>
+        </div>
+      </li>
+    </ul>
+    <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>
+    <el-empty
+      v-if="!loading && tableData.length == 0"
+      content="没有更多数据"
+      :image-size="100"
+    ></el-empty>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "examinationPaperArchiving",
+  data() {
+    return {
+      code: "",
+      role: "",
+      loading: false,
+      query: {
+        classId: "",
+        subjectName: "",
+        tagId: "",
+        title: "",
+      },
+      classList: [],
+      subjectList: [],
+      typeList: [],
+      tableData: null,
+      total: 0,
+      page: 1,
+      size: 20,
+    };
+  },
+  async created() {
+    this.code = localStorage.getItem("csCode") || "";
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
+    await this._QueryClassList();
+    if (!this.query.classId) {
+      return;
+    }
+    await this._QuerySubjectList();
+    this._QueryData();
+    this._QueryTypeList();
+  },
+  methods: {
+    toAdd(item) {
+      this.$router.push({
+        path: "/examinationPaperAdd",
+        query: {
+          type: 2,
+          paperId: item.id,
+        },
+      });
+    },
+    changePage(page) {
+      this.page = page;
+      this._QueryData(this.query.title);
+    },
+    //切换班级
+    async changClazz() {
+      await this._QuerySubjectList();
+      this._QueryData(false);
+    },
+    // 查找答题卡类型
+    async _QueryTypeList() {
+      if (!this.query.classId) return;
+      let fetchTypeNames =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pPaperTagList
+          : this.$request.fetchTypeNames;
+
+      const { data, status, info } = await fetchTypeNames({
+        classId: this.query.classId,
+        type: 0,
+      });
+      if (status === 0) {
+        this.typeList =
+          data.list.map((item) => {
+            return {
+              value: item.tagId,
+              label: item.tag,
+            };
+          }) || [];
+        this.typeList.unshift({
+          value: "",
+          label: "请选择标签",
+        });
+      } else {
+        this.$message.error(info);
+      }
+    },
+    // 查找班级
+    async _QueryClassList() {
+      this.loading = true;
+      let fetchClassList =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pClassList
+          : this.$request.fetchClassList;
+
+      const { data, status, info } = await fetchClassList({ status: 1 });
+      if (status === 0) {
+        if (!!data.list) {
+          this.classList =
+            data.list?.map((item) => {
+              return {
+                value: this.role == "ROLE_PERSONAL" ? item.id : item.classId,
+                label: item.className,
+              };
+            }) || [];
+          this.query.classId = this.classList[0]?.value;
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    // 查找科目
+    async _QuerySubjectList() {
+      if (!this.query.classId) return;
+      let fetchSubjectList =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pSubjectList
+          : this.$request.fetchSubjectList;
+
+      const { data, status, info } = await fetchSubjectList({
+        classId: this.query.classId,
+        status: 1,
+      });
+      if (status === 0) {
+        this.subjectList =
+          data.subjectNames?.map((item) => {
+            return {
+              value: item,
+              label: item,
+            };
+          }) || [];
+        this.query.subjectName = this.subjectList[0]?.value;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryData(type) {
+      if (!this.query.classId) return;
+      this.loading = true;
+      //获取答题卡列表
+      let query = {};
+      if (!type) {
+        this.query.title = "";
+        query = { ...this.query };
+      } else {
+        query = { title: this.query.title };
+        this.query.tagId = "";
+        // this.query.subjectName = "";
+      }
+      query.classId = this.query.classId;
+      query.subjectName = this.query.subjectName;
+      for (let key in query) {
+        if (!query[key]) {
+          query[key] = null;
+        }
+      }
+      if (!query.classId) {
+        this.total = 0;
+        this.tableData = [];
+        this.loading = false;
+        return;
+      }
+      this.loading = true;
+      let fetchPaperList =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pPaperList
+          : this.$request.fetchPaperList;
+
+      const { data, status, info } = await fetchPaperList({
+        ...query,
+        status: 1,
+        page: this.page,
+        size: this.size,
+        status: 3,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.total = data.total;
+        this.tableData = (data.list && [...data.list]) || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.content {
+  margin: 0 20px;
+  background: #f8f8f8;
+  padding: 12px;
+  border-radius: 20px;
+  .item {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    overflow: hidden;
+    box-sizing: border-box;
+    padding: 12px;
+    border-radius: 20px;
+    background: #fff;
+    margin-bottom: 12px;
+    &:last-of-type {
+      margin-bottom: 0;
+    }
+    .pic-box {
+      width: 80px;
+      height: 80px;
+      border-radius: 10px;
+      margin-right: 10px;
+      flex-shrink: 0;
+      background: #d7d7d7;
+      text-align: center;
+      color: #fff;
+      font-weight: 500;
+      .i-box {
+        padding-top: 10px;
+        font-size: 32px;
+        margin-bottom: 3px;
+      }
+    }
+    .info {
+      min-height: 80px;
+      flex: 1;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      .s-line {
+        padding: 0 5px;
+        color: #e2e2e2;
+      }
+      .title {
+        font-size: 16px;
+        color: #222;
+        font-weight: 500;
+        .label {
+          display: inline-block;
+          font-size: 12px;
+          color: #2e9afe;
+          line-height: 16px;
+          padding: 0 10px;
+          border: 1px solid #2e9afe;
+          border-radius: 10px;
+          transform: translateY(-2px);
+        }
+      }
+      .person {
+        color: #666;
+      }
+    }
+    .clazz {
+      font-size: 14px;
+      font-weight: 500;
+      position: relative;
+      position: relative;
+      &.active {
+        color: #667ffd;
+      }
+      .el-icon-success {
+        position: absolute;
+        right: 0;
+        top: -5px;
+        color: #667ffd;
+      }
+      &:last-of-type {
+        .el-icon-success {
+          right: -18px;
+        }
+      }
+    }
+    .btn-box {
+      flex-shrink: 0;
+      .edit {
+        margin-right: 12px;
+      }
+    }
+  }
+}
+.answer-header {
+  .sel-box {
+    .sel {
+      min-width: 160px;
+    }
+    :deep(.el-cascader__tags) {
+      flex-wrap: nowrap;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/examinationPaper/edit.vue b/src/views/examinationPaper/edit.vue
index 4a18186..83ac7cb 100644
--- a/src/views/examinationPaper/edit.vue
+++ b/src/views/examinationPaper/edit.vue
@@ -551,7 +551,6 @@ export default {
       this.dialogStem = true;
     },
     openTag(obj, type, index, indexs) {
-      console.log(obj);
       //难度，知识点
       this.stem = { ...this.stem, obj };
       this.stem.type = type;
@@ -1073,7 +1072,6 @@ export default {
             }
           }
         }
-        console.log(this.questionList);
       } else {
         this.$message.error(info);
       }
@@ -1095,7 +1093,7 @@ export default {
     position: fixed;
     right: 40px;
     bottom: 20px;
-    padding: 10px 0 20px;
+    padding: 10px 0 5px;
     background: #fff;
     text-align: right;
     margin-left: 140px;
diff --git a/src/views/examinationPaper/index.vue b/src/views/examinationPaper/index.vue
index 12e2f8c..e076ae1 100644
--- a/src/views/examinationPaper/index.vue
+++ b/src/views/examinationPaper/index.vue
@@ -5,6 +5,21 @@
         <span>备题组卷</span>
       </template>
       <template slot="btns">
+        <el-tooltip
+          v-if="!code"
+          effect="dark"
+          content="已归档试卷"
+          placement="bottom"
+        >
+          <el-button
+            type="primary"
+            icon="fa fa-archive"
+            size="mini"
+            plain
+            circle
+            @click="toArchiving"
+          ></el-button>
+        </el-tooltip>
         <el-button
           type="primary"
           size="mini"
@@ -199,6 +214,7 @@ export default {
   name: "examinationPaper",
   data() {
     return {
+      code: "",
       loading: false,
       userName: "",
       dialogVisible: false,
@@ -228,11 +244,15 @@ export default {
     };
   },
   async created() {
+    this.code = localStorage.getItem("csCode") || "";
     this.role =
       this.$store.getters.info.showRole ||
       this.$store.getters.info.permissions[0].role;
     this.userName = this.$store.getters.info.name || "";
     await this._QueryClassList();
+    if (!this.query.classId) {
+      return;
+    }
     await this._QuerySubjectList();
     this._QueryData();
     this._QueryTypeList();
@@ -243,6 +263,11 @@ export default {
         window.location.reload();
       }, 500);
     },
+    toArchiving() {
+      this.$router.push({
+        path: "/examinationPaperArchiving",
+      });
+    },
     toAdd(query) {
       let routerItem = {
         path: "/examinationPaperAdd",
@@ -358,7 +383,6 @@ export default {
           : this.$request.fetchClassList;
 
       const { data, status, info } = await fetchClassList();
-      console.log(status);
       if (status === 0) {
         if (!!data.list) {
           this.classList =
diff --git a/src/views/examinationPaper/recycle.vue b/src/views/examinationPaper/recycle.vue
index 47f09bb..b2f7f42 100644
--- a/src/views/examinationPaper/recycle.vue
+++ b/src/views/examinationPaper/recycle.vue
@@ -292,7 +292,6 @@ export default {
           ? this.$request.pClassList
           : this.$request.fetchClassList;
       const { data, status, info } = await fetchClassList();
-      console.log(status);
       if (status === 0) {
         if (!!data.list) {
           this.classList =
diff --git a/src/views/personal/ask/analysis.vue b/src/views/personal/ask/analysis.vue
index b082b24..e9888c9 100644
--- a/src/views/personal/ask/analysis.vue
+++ b/src/views/personal/ask/analysis.vue
@@ -9,27 +9,11 @@
       <div class="tab-box">
         <span
           class="tab-item"
-          :class="type == 1 ? 'active' : ''"
-          @click="setType(1)"
-          >答题表现</span
-        >
-        <span
-          class="tab-item"
-          :class="type == 2 ? 'active' : ''"
-          @click="setType(2)"
-          >学生问答表现</span
-        >
-        <span
-          class="tab-item"
-          :class="type == 3 ? 'active' : ''"
-          @click="setType(3)"
-          >学生互动表现</span
-        >
-        <span
-          class="tab-item"
-          :class="type == 4 ? 'active' : ''"
-          @click="setType(4)"
-          >签到明细</span
+          v-for="(item, index) in tabList"
+          :key="index"
+          :class="type == index + 1 ? 'active' : ''"
+          @click="setType(index + 1)"
+          >{{ item }}</span
         >
       </div>
       <div v-loading="loading">
@@ -366,23 +350,29 @@ export default {
         id: "",
         questionList: [],
       },
+      tabList: ["答题表现", "学生问答表现", "学生互动表现", "签到明细"],
       detail: {},
       tableData: [],
       optionsList: [],
       page: 1,
       size: 20,
       total: 0,
+      status: 0,
     };
   },
   created() {
     this.id = this.$route.query.id;
+    this.status = this.$route.query.status ? this.$route.query.status : 0;
     this.title = this.$route.query.title;
     this._QueryData();
     this.periodDetail();
   },
   methods: {
     print() {
-      tablePrint("print-content");
+      tablePrint(
+        "print-content",
+        this.detail.title + "_" + this.tabList[this.type - 1]
+      );
     },
     setType(type) {
       this.type = type;
@@ -524,7 +514,7 @@ export default {
         let blob = new Blob([data], {
           type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
         });
-        downloadFile("随堂问-单课时报表.xlsx", blob);
+        downloadFile(this.status?"随堂问-已归档单课时报表.xlsx":"随堂问-单课时报表.xlsx", blob);
       } else {
         this.$message.error("下载失败");
       }
diff --git a/src/views/personal/ask/archiving.vue b/src/views/personal/ask/archiving.vue
new file mode 100644
index 0000000..584f4f1
--- /dev/null
+++ b/src/views/personal/ask/archiving.vue
@@ -0,0 +1,838 @@
+<template>
+  <div class="main" ref="main">
+    <back-box>
+      <template slot="title">
+        <span>问答-已归档数据报表</span>
+      </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
+          class="sel"
+          multiple
+          collapse-tags
+          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>
+        <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
+          >
+          <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">
+                  <el-tooltip 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"
+              :max-height="tableMaxHeight"
+              :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"
+              :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>
+        </div>
+        <div class="pagination-box" v-show="tabIndex == 1">
+          <el-pagination
+            small=""
+            layout="total,prev, pager, next"
+            :hide-on-single-page="true"
+            :total="total"
+            @current-change="changePage"
+            :current-page="page"
+            :page-size="size"
+          >
+          </el-pagination>
+        </div>
+        <p
+          class="down"
+          v-if="(tabIndex == 3 || tabIndex == 2) && tableData.length"
+        >
+          <el-button
+            @click="exportData"
+            type="primary"
+            plain
+            round
+            icon="fa fa-cloud-download"
+            >导出报表</el-button
+          >
+          <el-button
+            @click="print"
+            type="primary"
+            plain
+            round
+            icon="el-icon-printer"
+            >打印</el-button
+          >
+        </p>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatDate, tablePrint, downloadFile } from "utils";
+import BusEvent from "@/utils/busEvent";
+export default {
+  data() {
+    return {
+      tableMaxHeight: 300,
+      loading: false,
+      form: { questionList: [] },
+      date: "", //今天-昨天-本周
+      query: {
+        //搜索条件
+        classId: "",
+        subjectNames: [],
+        startDay: "",
+        endDay: "",
+        day: "",
+      },
+      tabList: ["单课时报表", "阶段问答报表", "阶段互动报表"],
+      custom: {
+        //单课时排序
+        orderField: null,
+        orderType: null,
+      },
+      classList: [], //班级
+      subjectList: [], //科目
+      tabIndex: 1, //选项卡
+      tableData: [],
+      phaseOption: [], //问答补充数据
+      phaseInter: [], //互动补充数据
+      page: 1,
+      size: 20,
+      total: 0,
+    };
+  },
+  async created() {
+    await this._QueryClassList();
+    if (!this.query.classId) {
+      return;
+    }
+    await this._QuerySubjectList();
+    await this.setDate(1);
+    let startDay = this.query?.startDay;
+    if (!startDay) {
+      this.query.startDay = new Date();
+      this.query.endDay = new Date();
+    }
+  },
+  activated() {
+    const that = this;
+    BusEvent.$on("keepAlive", async function () {
+        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];
+      }
+      this.query.subjectNames = val.filter((item) => {
+        return sub != "全部" ? item != "全部" : item == "全部";
+      });
+    },
+    linkTo(obj) {
+      //去详情
+      this.$router.push({
+        path: "/askAnalysis",
+        query: {
+          id: obj.id,
+          title: obj.title,
+          status: 1,
+        },
+      });
+    },
+    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) {
+            //中国式星期天是一周的最后一天
+            day = 7;
+          }
+          day--;
+          let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
+          that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 3:
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 4:
+          if (aMonth > 0 && aMonth < 4) {
+            aMonth = "1";
+          } else if (aMonth > 3 && aMonth < 7) {
+            aMonth = "4";
+          } else if (aMonth > 6 && aMonth < 10) {
+            aMonth = "7";
+          } else {
+            aMonth = "10";
+          }
+
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          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()) {
+          this.$message.error("任务结束时间不能任务开始时间前面，请重新设置");
+          this.query.startDay = "";
+        }
+      }
+    },
+    handleChangeTimeEnd(val) {
+      this.query.day = "";
+      this.date = "";
+      if (this.query.startDay) {
+        if (new Date(val).getTime() < new Date(this.query.startDay).getTime()) {
+          this.$message.error("任务结束时间不能任务开始时间前面，请重新设置");
+          this.query.endDay = "";
+        }
+      }
+    },
+    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() {
+      await this._QuerySubjectList();
+      this.page = 1;
+      this._QueryData();
+    },
+    async changClazz() {
+      await this._QuerySubjectList();
+      // await this.setDate(1);
+      this._QueryData();
+    },
+    async _QueryClassList() {
+      const { data, status, info } = await this.$request.pClassList({
+        status: 1,
+      });
+      if (status === 0) {
+        this.classList = data.list.map((item) => {
+          return {
+            value: item.id,
+            label: item.className,
+          };
+        });
+        this.query.classId = this.classList[0]?.value;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QuerySubjectList() {
+      if (!this.query.classId) return;
+      const { data, status, info } = await this.$request.pSubjectList({
+        classId: this.query.classId,
+        status: 1,
+      });
+      if (status === 0) {
+        this.query.subjectNames = [];
+        this.subjectList =
+          data.subjectNames?.map((item) => {
+            return {
+              value: item,
+              label: item,
+            };
+          }) || [];
+        this.subjectList.unshift({
+          value: "全部",
+          label: "全部",
+        });
+        this.query.subjectNames.push(this.subjectList[0]?.value);
+      } 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 (
+        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.pPeriodReportList({
+        ...query,
+        page: this.page,
+        size: this.size,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.tableData = (data?.list && [...data?.list]) || [];
+        this.total = data.count;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //查询阶段问答报表
+    async phaseAnswerReport() {
+      this.loading = true;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          query[key] = this.query[key];
+        }
+      }
+      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.pPhaseAnswerReport({
+        ...query,
+      });
+      this.loading = false;
+      if (status === 0) {
+        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;
+        });
+
+        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] != "") {
+          query[key] = this.query[key];
+        }
+      }
+
+      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.pPhaseInteractiveReport({
+          ...query,
+        });
+      this.loading = false;
+      if (status === 0) {
+        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;
+        });
+
+        this.total = data.count;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //导出
+    async exportData() {
+      if (this.exportLoading == true) return;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          query[key] = this.query[key];
+        }
+      }
+
+      if (
+        query["subjectNames"] &&
+        query["subjectNames"].length == 1 &&
+        query["subjectNames"][0] == "全部"
+      ) {
+        query["subjectNames"] = this.subjectList.map((item) => {
+          return item.value;
+        });
+        query["subjectNames"].shift();
+      }
+      if (!query["subjectNames"]) {
+        this.$message.warning("请选择科目");
+        return;
+      }
+      this.exportLoading = true;
+      const data = await this.$request.pExportPhaseReport({ ...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 {
+  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;
+  }
+}
+
+.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;
+  border-radius: 10px;
+
+  .answer-s {
+    width: 36px;
+    height: 28px;
+    cursor: pointer;
+  }
+}
+.set-questions {
+  display: flex;
+  margin-bottom: 12px;
+  width: 100%;
+  .qs-num {
+    flex-shrink: 0;
+    margin-right: 10px;
+  }
+  .qs-options {
+    flex: 1;
+    .ipt {
+      margin-bottom: 5px;
+    }
+  }
+  .delButton {
+    border-color: #ff6868;
+    background: #ff6868 url("../../../assets/images/arrow.png") no-repeat center;
+    background-size: 19px;
+    color: transparent;
+  }
+  .ac {
+    border-color: #ff6868;
+    background: #ff6868;
+    color: #fff;
+  }
+}
+.down {
+  padding-top: 16px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/personal/ask/index.vue b/src/views/personal/ask/index.vue
index 4d41b66..188b543 100644
--- a/src/views/personal/ask/index.vue
+++ b/src/views/personal/ask/index.vue
@@ -4,6 +4,23 @@
       <template slot="title">
         <span>问答-数据报表</span>
       </template>
+      <template slot="btns">
+        <el-tooltip
+          v-if="!code"
+          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">
@@ -79,13 +96,14 @@
         @change="tabChange"
         style="margin-bottom: 20px"
       >
-        <el-radio-button :label="1">单课时报表</el-radio-button>
-        <el-radio-button :label="2" v-if="query.startDay != query.endDay"
-          >阶段问答报表</el-radio-button
-        >
-        <el-radio-button :label="3" v-if="query.startDay != query.endDay"
-          >阶段互动报表</el-radio-button
-        >
+        <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">
@@ -348,6 +366,7 @@ export default {
         endDay: "",
         day: "",
       },
+      tabList: ["单课时报表", "阶段问答报表", "阶段互动报表"],
       custom: {
         //单课时排序
         orderField: null,
@@ -366,6 +385,9 @@ export default {
   },
   async created() {
     await this._QueryClassList();
+    if (!this.query.classId) {
+      return;
+    }
     await this._QuerySubjectList();
     await this.setDate(1);
     let startDay = this.query?.startDay;
@@ -377,19 +399,27 @@ export default {
   activated() {
     const that = this;
     BusEvent.$on("keepAlive", async function () {
-      await that._QueryClassList();
-      await that._QuerySubjectList();
-      await that.setDate(1);
-      let startDay = that.query?.startDay;
-      if (!startDay) {
-        that.query.startDay = new Date();
-        that.query.endDay = new Date();
-      }
+        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");
+      tablePrint("print-content", "随堂问-" + this.tabList[this.tabIndex - 1]);
     },
     changeSub(val) {
       let sub;
@@ -397,7 +427,6 @@ export default {
         let leng = val.length - 1;
         sub = val[leng];
       }
-      console.log(val);
       this.query.subjectNames = val.filter((item) => {
         return sub != "全部" ? item != "全部" : item == "全部";
       });
diff --git a/src/views/personal/card/index.vue b/src/views/personal/card/index.vue
index 2a09e0e..0f04602 100644
--- a/src/views/personal/card/index.vue
+++ b/src/views/personal/card/index.vue
@@ -144,7 +144,6 @@ export default {
     async _QueryGradeList() {
       this.loading = true;
       const { data, status, info } = await this.$request.gradeList();
-      console.log(status);
       if (status === 0) {
         if (!!data.list) {
           this.gradeList =
@@ -196,7 +195,6 @@ export default {
         size: 20,
       });
       this.loading = false;
-      console.log(status);
       if (status === 0) {
         this.tableData = data.list || [];
         this.total = data.count;
diff --git a/src/views/personal/test/analysis.vue b/src/views/personal/test/analysis.vue
index cd5ff1c..f8600eb 100644
--- a/src/views/personal/test/analysis.vue
+++ b/src/views/personal/test/analysis.vue
@@ -5,7 +5,7 @@
         <span>单卷分析</span>
       </template>
     </back-box>
-    <div class="tips" v-if="paperModifyLog.modifiedTime">
+    <div class="tips" v-if="paperModifyLog.modifiedTime || status">
       <p class="tips-p">
         <i class="fa fa-bell-o"></i>
         {{
@@ -29,28 +29,12 @@
     <div class="page-content">
       <div class="tab-box">
         <span
+          v-for="(item, index) in tabList"
+          :key="item"
           class="tab-item"
-          :class="type == 1 ? 'active' : ''"
-          @click="setType(1)"
-          >试题分析</span
-        >
-        <span
-          class="tab-item"
-          :class="type == 2 ? 'active' : ''"
-          @click="setType(2)"
-          >成绩排名</span
-        >
-        <span
-          class="tab-item"
-          :class="type == 3 ? 'active' : ''"
-          @click="setType(3)"
-          >小题分报表</span
-        >
-        <span
-          class="tab-item"
-          :class="type == 4 ? 'active' : ''"
-          @click="setType(4)"
-          >作答明细表</span
+          :class="type == index + 1 ? 'active' : ''"
+          @click="setType(index + 1)"
+          >{{ item }}</span
         >
       </div>
       <div id="print-content" class="table-box" v-loading="loading">
@@ -398,7 +382,7 @@
             >打印</el-button
           >
         </div>
-        <div>
+        <div v-if="!status">
           <el-button
             v-if="examReport.subjectiveScore != 0"
             @click="diaUp = true"
@@ -442,6 +426,7 @@ export default {
   data() {
     return {
       role: "",
+      status: 0,
       tableMaxHeight: 600,
       loading: false,
       exportLoading: false,
@@ -451,6 +436,7 @@ export default {
       title: "",
       score: "",
       type: 1,
+      tabList: ["试题分析", "成绩排名", "小题分报表", "作答明细表"],
       paperModifyLog: {
         realName: "",
         modifiedTime: "",
@@ -486,12 +472,13 @@ export default {
       this.$store.getters.info.showRole ||
       this.$store.getters.info.permissions[0].role;
     this.id = this.$route.query.id;
+    this.status = this.$route.query.status ? this.$route.query.status : 0;
     this.title = this.$route.query.title || "";
     this._QueryData();
   },
   methods: {
     print() {
-      tablePrint("print-content");
+      tablePrint("print-content", this.title + this.tabList[this.type - 1]);
     },
     upSuccess(res) {
       //导入成功
diff --git a/src/views/personal/test/archiving.vue b/src/views/personal/test/archiving.vue
new file mode 100644
index 0000000..ee1cf87
--- /dev/null
+++ b/src/views/personal/test/archiving.vue
@@ -0,0 +1,742 @@
+<template>
+  <div ref="main" class="page-container">
+    <back-box>
+      <template slot="title">
+        <span>即时测-已归档数据报表</span>
+      </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
+          class="sel"
+          multiple
+          v-model="query.subjectNames"
+          placeholder="选择科目"
+          collapse-tags
+          @change="changeSub"
+        >
+          <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>
+        <p class="p1">
+          <span @click="setDate(1)" :class="[date == 1 ? 'active' : '', 's1']"
+            >今天</span
+          >
+          <span @click="setDate(2)" :class="[date == 2 ? 'active' : '', 's1']"
+            >本周</span
+          >
+          <span @click="setDate(3)" :class="[date == 3 ? 'active' : '', 's1']"
+            >本月</span
+          >
+          <span @click="setDate(4)" :class="[date == 4 ? 'active' : '', 's1']"
+            >本季度</span
+          >
+        </p>
+        <el-button type="primary" round @click="_QueryData()">筛选</el-button>
+      </div>
+    </div>
+    <div class="table-box">
+      <el-radio-group
+        v-model="tabIndex"
+        @change="changeTab"
+        style="margin-bottom: 20px"
+      >
+        <template v-for="(item, index) in tabList">
+          <el-radio-button
+            v-if="index == 0 || query.startDay != query.endDay"
+            :key="index"
+            :label="index + 1"
+            >{{ item }}</el-radio-button
+          >
+        </template>
+      </el-radio-group>
+      <div v-show="tabIndex == 1" v-loading="loading">
+        <el-table :data="tableData" border style="width: 100%">
+          <el-table-column
+            prop="title"
+            label="试卷名称"
+            fixed
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="examPaperScore"
+            label="卷面分"
+            align="center"
+            width="100"
+          ></el-table-column>
+          <el-table-column prop="answeredNum" label="测验人数" align="center"
+            ><template slot-scope="scoped">{{
+              `${scoped.row.answeredNum}/${scoped.row.classPersonNum}`
+            }}</template></el-table-column
+          >
+          <el-table-column
+            prop="examStartTime"
+            label="测验时间"
+            width="100"
+            align="center"
+          ></el-table-column>
+          <el-table-column prop="avgScore" label="班平均分" align="center"
+            ><template slot-scope="scoped">{{
+              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                scoped.row.answerNum == 0) &&
+              scoped.row.recordStatus == 0
+                ? "-"
+                : scoped.row.avgScore
+            }}</template></el-table-column
+          >
+          <el-table-column prop="highestScore" label="班最高分" align="center"
+            ><template slot-scope="scoped">{{
+              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                scoped.row.answerNum == 0) &&
+              scoped.row.recordStatus == 0
+                ? "-"
+                : scoped.row.highestScore
+            }}</template></el-table-column
+          >
+          <el-table-column prop="lowestScore" label="班最低分" align="center"
+            ><template slot-scope="scoped">{{
+              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                scoped.row.answerNum == 0) &&
+              scoped.row.recordStatus == 0
+                ? "-"
+                : scoped.row.lowestScore
+            }}</template></el-table-column
+          >
+          <el-table-column
+            prop="excellenRate"
+            label="优秀数(率)"
+            sortable
+            align="center"
+            width="110"
+            class-name="p0"
+            ><template slot-scope="scoped">
+              <p
+                v-if="
+                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                    scoped.row.answerNum == 0) &&
+                  scoped.row.arecordStatus == 0
+                "
+              >
+                "-"
+              </p>
+              <template v-else>
+                <p>{{ scoped.row.excellenNum }}</p>
+                <p v-if="scoped.row.excellenNum">
+                  {{ `（${scoped.row.excellenRate}%）` }}
+                </p>
+              </template>
+            </template></el-table-column
+          >
+          <el-table-column
+            prop="goodRate"
+            label="良好数(率)"
+            sortable
+            align="center"
+            width="110"
+            class-name="p0"
+            ><template slot-scope="scoped">
+              <p
+                v-if="
+                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                    scoped.row.answerNum == 0) &&
+                  scoped.row.arecordStatus == 0
+                "
+              >
+                "-"
+              </p>
+              <template v-else>
+                <p>{{ scoped.row.goodNum }}</p>
+                <p v-if="scoped.row.goodNum">
+                  {{ `（${scoped.row.goodRate}%）` }}
+                </p>
+              </template>
+            </template></el-table-column
+          >
+          <el-table-column
+            prop="passRate"
+            label="及格数(率)"
+            sortable
+            align="center"
+            width="110"
+            class-name="p0"
+            ><template slot-scope="scoped">
+              <p
+                v-if="
+                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                    scoped.row.answerNum == 0) &&
+                  scoped.row.arecordStatus == 0
+                "
+              >
+                "-"
+              </p>
+              <template v-else>
+                <p>{{ scoped.row.passNum }}</p>
+                <p v-if="scoped.row.passNum">
+                  {{ `（${scoped.row.passRate}%）` }}
+                </p>
+              </template>
+            </template></el-table-column
+          >
+          <el-table-column
+            prop="failedRate"
+            label="不及格数(率)"
+            sortable
+            align="center"
+            width="130"
+            class-name="p0"
+            ><template slot-scope="scoped">
+              <p
+                v-if="
+                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                    scoped.row.answerNum == 0) &&
+                  scoped.row.arecordStatus == 0
+                "
+              >
+                "-"
+              </p>
+              <template v-else>
+                <p>{{ scoped.row.failedNum }}</p>
+                <p v-if="scoped.row.failedNum">
+                  {{ `（${scoped.row.failedRate}%）` }}
+                </p>
+              </template>
+            </template></el-table-column
+          >
+          <el-table-column label="操作" align="center">
+            <template slot-scope="scoped">
+              <el-tooltip 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 class="pagination-box">
+          <el-pagination
+            small=""
+            layout="total,prev, pager, next"
+            :hide-on-single-page="true"
+            :total="total"
+            @current-change="changePage"
+            :current-page="page"
+            :page-size="size"
+          >
+          </el-pagination>
+        </div>
+      </div>
+      <div v-show="tabIndex == 2" v-loading="loading">
+        <el-empty
+          :image-size="100"
+          v-if="!tableData.length && loading == false"
+          description="没有更多数据"
+        ></el-empty>
+        <template v-if="tableData.length && loading == false">
+          <el-table
+            id="print-content"
+            :data="tableData"
+            :max-height="tableMaxHeight"
+            border
+            style="width: 100%"
+          >
+            <el-table-column
+              prop="studentCode"
+              label="学号"
+              align="center"
+              fixed
+            ></el-table-column>
+            <el-table-column
+              prop="studentName"
+              label="姓名"
+              fixed
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              align="center"
+              v-for="(item, index) in answerList"
+              :key="index"
+              :label="item"
+            >
+              <el-table-column
+                :prop="'examCount' + item"
+                label="测练数"
+                align="center"
+                :class-name="index % 2 == 0 ? 'bg' : ''"
+              ></el-table-column>
+              <el-table-column
+                :prop="'participationCount' + item"
+                label="参与数"
+                align="center"
+                :class-name="index % 2 == 0 ? 'bg' : ''"
+              ></el-table-column>
+              <el-table-column
+                :prop="'score' + item"
+                label="总分"
+                align="center"
+                :class-name="index % 2 == 0 ? 'bg' : ''"
+              ></el-table-column>
+              <el-table-column
+                :prop="'classRank' + item"
+                label="班名"
+                align="center"
+                :class-name="index % 2 == 0 ? 'bg' : ''"
+              ></el-table-column>
+            </el-table-column>
+          </el-table>
+        </template>
+      </div>
+      <p class="down" v-if="tabIndex == 2 && tableData.length">
+        <el-button
+          type="primary"
+          plain
+          round
+          icon="fa fa-cloud-download"
+          @click="downExl"
+          >导出报表</el-button
+        >
+        <el-button
+          @click="print"
+          type="primary"
+          plain
+          round
+          icon="el-icon-printer"
+          >打印</el-button
+        >
+      </p>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatDate, downloadFile, tablePrint } from "utils";
+import BusEvent from "@/utils/busEvent";
+export default {
+  data() {
+    return {
+      exportLoading: false,
+      tableMaxHeight: 300,
+      loading: false,
+      date: "", //今天-昨天-本周
+      query: {
+        //搜索条件
+        classId: "",
+        subjectNames: [],
+        startDay: "",
+        endDay: "",
+        day: "",
+      },
+      tabList: ["单卷测练报表", "阶段测练报表"],
+      classList: [], //班级
+      subjectList: [], //科目
+      tabIndex: 1, //选项卡
+      tableData: [],
+      answerList: [], //设置多卷内容供tableStage表格数据用
+      page: 1,
+      size: 20,
+      total: 0,
+    };
+  },
+  async created() {
+    await this._QueryClassList();
+    if (!this.query.classId) {
+      return;
+    }
+    await this._QuerySubjectList();
+    await this.setDate(1);
+    let startDay = this.query?.startDay;
+    if (!startDay) {
+      this.query.startDay = new Date();
+      this.query.endDay = new Date();
+    }
+  },
+  activated() {
+    const that = this;
+    BusEvent.$on("keepAlive", async function () {
+        await that._QueryClassList();
+        if (!that.query.classId) {
+          return;
+        }
+        await that._QuerySubjectList();
+        await that.setDate(1);
+        let startDay = that.query?.startDay;
+        if (!startDay) {
+          that.query.startDay = new Date();
+          that.query.endDay = new Date();
+        }
+    });
+  },
+  methods: {
+    print() {
+      tablePrint("print-content", "即时测-" + this.tabList[this.tabIndex - 1]);
+    },
+    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 == "全部";
+      });
+    },
+    linkTo(obj) {
+      //去详情
+      this.$router.push({
+        path: "/testAnalysis",
+        query: {
+          id: obj.id,
+          title: obj.title,
+          score: obj.examPaperScore,
+          status: 1,
+        },
+      });
+    },
+    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) {
+            //中国式星期天是一周的最后一天
+            day = 7;
+          }
+          day--;
+          let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
+          that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 3:
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 4:
+          if (aMonth > 0 && aMonth < 4) {
+            aMonth = "1";
+          } else if (aMonth > 3 && aMonth < 7) {
+            aMonth = "4";
+          } else if (aMonth > 6 && aMonth < 10) {
+            aMonth = "7";
+          } else {
+            aMonth = "10";
+          }
+
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          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()) {
+          this.$message.error("任务结束时间不能任务开始时间前面，请重新设置");
+          this.query.startDay = "";
+        }
+      }
+    },
+    handleChangeTimeEnd(val) {
+      this.query.day = "";
+      this.date = "";
+      if (this.query.startDay) {
+        if (new Date(val).getTime() < new Date(this.query.startDay).getTime()) {
+          this.$message.error("任务结束时间不能任务开始时间前面，请重新设置");
+          this.query.endDay = "";
+        }
+      }
+    },
+    changePage(page) {
+      this.page = page;
+      this._QueryData();
+    },
+    changeTab() {
+      this.tableMaxHeight = this.$refs.main.offsetHeight;
+      this.page = 1;
+      this._QueryData();
+    },
+
+    async changeclass() {
+      await this._QuerySubjectList();
+      this.page = 1;
+      this._QueryData();
+    },
+
+    async changClazz() {
+      this.page = 1;
+      await this._QuerySubjectList();
+      await this._QueryData();
+    },
+    async _QueryClassList() {
+      const { data, status, info } = await this.$request.pClassList({
+        status: 1,
+      });
+      if (status === 0) {
+        this.classList = data.list.map((item) => {
+          return {
+            value: item.id,
+            label: item.className,
+          };
+        });
+        this.query.classId = this.classList[0]?.value;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QuerySubjectList() {
+      if (!this.query.classId) return;
+      const { data, status, info } = await this.$request.pSubjectList({
+        classId: this.query.classId,
+        status: 1,
+      });
+      if (status === 0) {
+        this.query.subjectNames = [];
+        this.subjectList =
+          data.subjectNames?.map((item) => {
+            return {
+              value: item,
+              label: item,
+            };
+          }) || [];
+        this.subjectList.unshift({
+          value: "全部",
+          label: "全部",
+        });
+        this.query.subjectNames.push(this.subjectList[0]?.value);
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryData() {
+      if (!this.query.classId) return;
+      this.tableData = [];
+      if (this.tabIndex == 1) {
+        this.examReportList();
+      } else {
+        this.phaseExamReport();
+      }
+    },
+    //单卷测练
+    async examReportList() {
+      this.loading = true;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          query[key] = this.query[key];
+        }
+      }
+
+      if (
+        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.pExamReportList({
+        ...query,
+        page: this.page,
+        size: this.size,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.tableData = (data?.list && [...data?.list]) || [];
+        this.total = data?.count || 0;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //多卷测练
+    async phaseExamReport() {
+      this.loading = true;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          query[key] = this.query[key];
+        }
+      }
+
+      if (
+        query["subjectNames"] &&
+        query["subjectNames"]?.length == 1 &&
+        query["subjectNames"][0] == "全部"
+      ) {
+        query["subjectNames"] = this.subjectList.map((item) => {
+          return item.value;
+        });
+        query["subjectNames"]?.shift();
+      }
+      // 测试
+      query["subjectName"] = "政治";
+      delete query["subjectNames"];
+      // end
+      const { data, status, info } = await this.$request.pPhaseExamReport({
+        ...query,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.total = data.count;
+        let subjectName = [];
+        this.tableData = data?.list.map((item) => {
+          let params = {};
+          item.dataList?.map((items, index) => {
+            if (!subjectName.includes(items.subjectName)) {
+              subjectName.push(items.subjectName);
+            }
+            params["examCount" + items.subjectName] = items.examCount;
+            params["participationCount" + items.subjectName] =
+              items.participationCount;
+            params["score" + items.subjectName] = items.score;
+            params["classRank" + items.subjectName] = items.classRank;
+          });
+          return {
+            ...item,
+            ...params,
+          };
+        });
+        this.answerList = [...subjectName];
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async downExl() {
+      if (this.exportLoading == true) return;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          query[key] = this.query[key];
+        }
+      }
+      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 = await this.$request.pExportPhaseExamReport({ ...query });
+      this.exportLoading = false;
+      if (data && !data.code) {
+        let blob = new Blob([data], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        downloadFile("即时测-已归档阶段测练报表.xlsx", blob);
+      } else {
+        this.$message.error(data.info);
+      }
+    },
+  },
+};
+</script>
+
+<style>
+div::-webkit-scrollbar {
+  width: 3px;
+  height: 10px;
+}
+div::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background-color: #ccc;
+}
+</style>
+<style lang="scss" scoped>
+.page-container {
+  position: relative;
+  height: 100%;
+  &.active {
+    overflow: hidden;
+  }
+}
+.table-box {
+  margin: 0 20px;
+  padding: 16px;
+  background: #f8f8f8;
+  border-radius: 5px;
+  :deep(.fa-arrow-right) {
+    padding-left: 2px;
+  }
+  :deep(.fa-file-text) {
+    padding-left: 2px;
+  }
+}
+.click-b {
+  cursor: pointer;
+  color: #409eff;
+  text-decoration: underline;
+}
+.down {
+  padding-top: 16px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/personal/test/index.vue b/src/views/personal/test/index.vue
index 07ca68d..8c08bb9 100644
--- a/src/views/personal/test/index.vue
+++ b/src/views/personal/test/index.vue
@@ -79,12 +79,14 @@
         @change="changeTab"
         style="margin-bottom: 20px"
       >
-        <el-radio-button :label="1">单卷测练报表</el-radio-button>
-        <el-radio-button
-          :label="2"
-          v-show="this.query.startDay != this.query.endDay"
-          >阶段测练报表</el-radio-button
-        >
+        <template v-for="(item, index) in tabList">
+          <el-radio-button
+            v-if="index == 0 || query.startDay != query.endDay"
+            :key="index"
+            :label="index + 1"
+            >{{ item }}</el-radio-button
+          >
+        </template>
       </el-radio-group>
       <div v-show="tabIndex == 1" v-loading="loading">
         <el-table :data="tableData" border style="width: 100%">
@@ -438,6 +440,7 @@ export default {
         endDay: "",
         day: "",
       },
+      tabList: ["单卷测练报表", "阶段测练报表"],
       classList: [], //班级
       subjectList: [], //科目
       tabIndex: 1, //选项卡
@@ -450,6 +453,9 @@ export default {
   },
   async created() {
     await this._QueryClassList();
+    if (!this.query.classId) {
+      return;
+    }
     await this._QuerySubjectList();
     await this.setDate(1);
     let startDay = this.query?.startDay;
@@ -461,19 +467,22 @@ export default {
   activated() {
     const that = this;
     BusEvent.$on("keepAlive", async function () {
-      await that._QueryClassList();
-      await that._QuerySubjectList();
-      await that.setDate(1);
-      let startDay = that.query?.startDay;
-      if (!startDay) {
-        that.query.startDay = new Date();
-        that.query.endDay = new Date();
-      }
+        await that._QueryClassList();
+        if (!that.query.classId) {
+          return;
+        }
+        await that._QuerySubjectList();
+        await that.setDate(1);
+        let startDay = that.query?.startDay;
+        if (!startDay) {
+          that.query.startDay = new Date();
+          that.query.endDay = new Date();
+        }
     });
   },
   methods: {
     print() {
-      tablePrint("print-content");
+      tablePrint("print-content", "即时测-" + this.tabList[this.tabIndex - 1]);
     },
     changeSub(val) {
       let sub;
@@ -622,9 +631,9 @@ export default {
       this.page = 1;
       this._QueryData();
     },
-     upSuccess(res) {
-      //导入成功  
-      this.$message.success("导入成功")
+    upSuccess(res) {
+      //导入成功
+      this.$message.success("导入成功");
       this.diaUp = false;
       this._QueryData();
     },
diff --git a/src/views/standard/ask/analysis.vue b/src/views/standard/ask/analysis.vue
index 69d7e4b..a83b49f 100644
--- a/src/views/standard/ask/analysis.vue
+++ b/src/views/standard/ask/analysis.vue
@@ -9,27 +9,11 @@
       <div class="tab-box">
         <span
           class="tab-item"
-          :class="type == 1 ? 'active' : ''"
-          @click="setType(1)"
-          >答题表现</span
-        >
-        <span
-          class="tab-item"
-          :class="type == 2 ? 'active' : ''"
-          @click="setType(2)"
-          >学生问答表现</span
-        >
-        <span
-          class="tab-item"
-          :class="type == 3 ? 'active' : ''"
-          @click="setType(3)"
-          >学生互动表现</span
-        >
-        <span
-          class="tab-item"
-          :class="type == 4 ? 'active' : ''"
-          @click="setType(4)"
-          >签到明细</span
+          v-for="(item, index) in tabList"
+          :key="index"
+          :class="type == index + 1 ? 'active' : ''"
+          @click="setType(index + 1)"
+          >{{ item }}</span
         >
       </div>
       <div v-loading="loading">
@@ -353,22 +337,28 @@ export default {
         id: "",
         questionList: [],
       },
+      tabList: ["答题表现", "学生问答表现", "学生互动表现", "签到明细"],
       detail: {},
       tableData: [],
       optionsList: [],
       page: 1,
       size: 20,
       total: 0,
+      status: 0,
     };
   },
   created() {
     this.id = this.$route.query.id;
+    this.status = this.$route.query.status ? this.$route.query.status : 0;
     this._QueryData();
     this.periodDetail();
   },
   methods: {
     print() {
-      tablePrint("print-content");
+      tablePrint(
+        "print-content",
+        this.detail.title + "_" + this.tabList[this.type - 1]
+      );
     },
     setType(type) {
       this.type = type;
@@ -522,7 +512,7 @@ export default {
         let blob = new Blob([data], {
           type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
         });
-        downloadFile("随堂问-单课时报表.xlsx", blob);
+        downloadFile(this.status?"随堂问-已归档单课时报表.xlsx":"随堂问-单课时报表.xlsx", blob);
       } else {
         this.$message.error("下载失败");
       }
diff --git a/src/views/standard/ask/archiving.vue b/src/views/standard/ask/archiving.vue
new file mode 100644
index 0000000..3eb9668
--- /dev/null
+++ b/src/views/standard/ask/archiving.vue
@@ -0,0 +1,1052 @@
+<template>
+  <div class="main" ref="main">
+    <back-box>
+      <template slot="title">
+        <span>问答-已归档数据报表</span>
+      </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>
+        <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">
+                  <el-tooltip 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>
+        </div>
+        <div class="pagination-box" v-show="tabIndex == 1">
+          <el-pagination
+            small=""
+            layout="total,prev, pager, next"
+            :hide-on-single-page="true"
+            :total="total"
+            @current-change="changePage"
+            :current-page="page"
+            :page-size="size"
+          >
+          </el-pagination>
+        </div>
+        <p
+          class="down"
+          v-if="(tabIndex == 3 || tabIndex == 2) && 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>
+  </div>
+</template>
+
+<script>
+import { formatDate, downloadFile, tablePrint } from "utils";
+import BusEvent from "@/utils/busEvent";
+export default {
+  data() {
+    return {
+      tableMaxHeight: 300,
+      code: "",
+      role: "",
+      loading: false,
+      date: "", //今天-昨天-本周
+      query: {
+        //搜索条件
+        classId: "",
+        subjectNames: "",
+        startDay: "",
+        endDay: "",
+        day: "",
+      },
+      tabList: ["单课时报表", "阶段问答报表", "阶段互动报表"],
+      custom: {
+        //单课时排序
+        orderField: null,
+        orderType: null,
+      },
+      classList: [], //班级
+      subjectList: [], //科目
+      tabIndex: 1, //选项卡
+      tableData: [],
+      phaseOption: [], //问答补充数据
+      phaseInter: [], //互动补充数据
+      page: 1,
+      size: 20,
+      total: 0,
+    };
+  },
+  async created() {
+    this.code = localStorage.getItem("csCode") || "";
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
+    this.query.subjectNames = this.role == "ROLE_BANZHUREN" ? [] : "";
+    await this._QueryClassList();
+    if (!this.query.classId) {
+      return;
+    }
+    await this._QuerySubjectList();
+    await this.setDate(1);
+    let startDay = this.query?.startDay;
+    if (!startDay) {
+      this.query.startDay = new Date();
+      this.query.endDay = new Date();
+    }
+  },
+  activated() {
+    const that = this;
+    BusEvent.$on("keepAlive", async function () {
+        that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
+        await that._QueryClassList();
+        if (!that.query.classId) {
+          return;
+        }
+        await that._QuerySubjectList();
+        await that.setDate(1);
+        let startDay = that.query?.startDay;
+        if (!startDay) {
+          that.query.startDay = new Date();
+          that.query.endDay = new Date();
+        }
+    });
+  },
+  methods: {
+    print() {
+      tablePrint(
+        "print-content",
+        "随堂问-已归档" + this.tabList[this.tabIndex - 1]
+      );
+    },
+    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 == "全部";
+      });
+    },
+    linkTo(obj) {
+      //去详情
+      this.$router.push({
+        path: "/askAnalysis",
+        query: {
+          id: obj.id,
+          status: 1,
+        },
+      });
+    },
+    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) {
+            //中国式星期天是一周的最后一天
+            day = 7;
+          }
+          day--;
+          let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
+          that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 3:
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 4:
+          if (aMonth > 0 && aMonth < 4) {
+            aMonth = "1";
+          } else if (aMonth > 3 && aMonth < 7) {
+            aMonth = "4";
+          } else if (aMonth > 6 && aMonth < 10) {
+            aMonth = "7";
+          } else {
+            aMonth = "10";
+          }
+
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          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()) {
+          this.$message.error("任务结束时间不能任务开始时间前面，请重新设置");
+          this.query.startDay = "";
+        }
+      }
+    },
+    handleChangeTimeEnd(val) {
+      this.query.day = "";
+      this.date = "";
+      if (this.query.startDay) {
+        if (new Date(val).getTime() < new Date(this.query.startDay).getTime()) {
+          this.$message.error("任务结束时间不能任务开始时间前面，请重新设置");
+          this.query.endDay = "";
+        }
+      }
+    },
+    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() {
+      await this._QuerySubjectList();
+      this.page = 1;
+      this._QueryData();
+    },
+    async changClazz() {
+      await this._QuerySubjectList();
+      // await this.setDate(1);
+      this._QueryData();
+    },
+    async _QueryClassList() {
+      const fetchClassList =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTClassList
+          : this.$request.tClassList;
+      const { data, status, info } = await fetchClassList({ status: 1 });
+      if (status === 0) {
+        this.classList = data.list.map((item) => {
+          return {
+            value: item.classId,
+            label: item.className,
+          };
+        });
+        this.query.classId = this.classList[0]?.value;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QuerySubjectList() {
+      const fetchSubjectList =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTSubjectList
+          : this.$request.tSubjectList;
+
+      const { data, status, info } = await fetchSubjectList({
+        classId: this.query.classId,
+        status: 1,
+      });
+      if (status === 0) {
+        this.subjectList =
+          data.subjectNames?.map((item) => {
+            return {
+              value: item,
+              label: item,
+            };
+          }) || [];
+        if (this.role == "ROLE_BANZHUREN") {
+          this.subjectList.unshift({
+            value: "全部",
+            label: "全部",
+          });
+          this.query.subjectNames.push(this.subjectList[0]?.value);
+        } else {
+          this.query.subjectNames = this.subjectList[0]?.value;
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryData() {
+      if (this.tabIndex == 1) {
+        this.periodReportList();
+      } else if (this.tabIndex == 2) {
+        this.phaseAnswerReport();
+      } else if (this.tabIndex == 3) {
+        this.phaseInteractiveReport();
+      }
+    },
+    //分页查询课时报表列表
+    async periodReportList() {
+      this.loading = true;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          query[key] = this.query[key];
+        }
+      }
+      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);
+      }
+    },
+    //导出
+    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;
+        }
+      }
+      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>
+<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 {
+  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;
+  }
+}
+
+.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;
+  border-radius: 10px;
+
+  .answer-s {
+    width: 36px;
+    height: 28px;
+    cursor: pointer;
+  }
+}
+.set-questions {
+  display: flex;
+  margin-bottom: 12px;
+  width: 100%;
+  .qs-num {
+    flex-shrink: 0;
+    margin-right: 10px;
+  }
+  .qs-options {
+    flex: 1;
+    .ipt {
+      margin-bottom: 5px;
+    }
+  }
+  .delButton {
+    border-color: #ff6868;
+    background: #ff6868 url("../../../assets/images/arrow.png") no-repeat center;
+    background-size: 19px;
+    color: transparent;
+  }
+  .ac {
+    border-color: #ff6868;
+    background: #ff6868;
+    color: #fff;
+  }
+}
+.down {
+  padding-top: 16px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/standard/ask/index.vue b/src/views/standard/ask/index.vue
index 3dcd3bc..72272c9 100644
--- a/src/views/standard/ask/index.vue
+++ b/src/views/standard/ask/index.vue
@@ -4,6 +4,23 @@
       <template slot="title">
         <span>问答-数据报表</span>
       </template>
+      <template slot="btns">
+        <el-tooltip
+          v-if="!code"
+          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">
@@ -93,16 +110,14 @@
         @change="tabChange"
         style="margin-bottom: 20px"
       >
-        <el-radio-button :label="1">单课时报表</el-radio-button>
-        <!-- <el-radio-button :label="2" v-if="this.role != 'ROLE_BANZHUREN'"
-          >阶段问答报表</el-radio-button
-        > -->
-        <el-radio-button :label="2" v-if="query.startDay != query.endDay"
-          >阶段问答报表</el-radio-button
-        >
-        <el-radio-button :label="3" v-if="query.startDay != query.endDay"
-          >阶段互动报表</el-radio-button
-        >
+        <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">
@@ -485,6 +500,7 @@ export default {
   data() {
     return {
       tableMaxHeight: 300,
+      code: "",
       role: "",
       loading: false,
       date: "", //今天-昨天-本周
@@ -496,6 +512,7 @@ export default {
         endDay: "",
         day: "",
       },
+      tabList: ["单课时报表", "阶段问答报表", "阶段互动报表"],
       custom: {
         //单课时排序
         orderField: null,
@@ -513,11 +530,15 @@ export default {
     };
   },
   async created() {
+    this.code = localStorage.getItem("csCode") || "";
     this.role =
       this.$store.getters.info.showRole ||
       this.$store.getters.info.permissions[0].role;
     this.query.subjectNames = this.role == "ROLE_BANZHUREN" ? [] : "";
     await this._QueryClassList();
+    if (!this.query.classId) {
+      return;
+    }
     await this._QuerySubjectList();
     await this.setDate(1);
     let startDay = this.query?.startDay;
@@ -529,20 +550,28 @@ export default {
   activated() {
     const that = this;
     BusEvent.$on("keepAlive", async function () {
-      that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
-      await that._QueryClassList();
-      await that._QuerySubjectList();
-      await that.setDate(1);
-      let startDay = that.query?.startDay;
-      if (!startDay) {
-        that.query.startDay = new Date();
-        that.query.endDay = new Date();
-      }
+        that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
+        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");
+      tablePrint("print-content", "随堂问-" + this.tabList[this.tabIndex - 1]);
     },
     changeSub(val) {
       let sub;
@@ -926,7 +955,6 @@ export default {
         this.$message.error(info);
       }
     },
-    setDownQuery() {},
     //导出
     async exportData() {
       if (this.exportLoading == true) return;
diff --git a/src/views/standard/card/index.vue b/src/views/standard/card/index.vue
index 4a826d5..9b9cc43 100644
--- a/src/views/standard/card/index.vue
+++ b/src/views/standard/card/index.vue
@@ -79,7 +79,7 @@
           ></el-table-column>
           <el-table-column align="center" label="年级">
             <template slot-scope="scope">
-              <span>{{ scope.row.classList[0].gradeName }}</span>
+              <span>{{ scope.row.classList[0]?.gradeName }}</span>
             </template>
           </el-table-column>
           <el-table-column align="center" label="班级">
diff --git a/src/views/standard/device/index.vue b/src/views/standard/device/index.vue
index 99c4a64..37bca11 100644
--- a/src/views/standard/device/index.vue
+++ b/src/views/standard/device/index.vue
@@ -112,6 +112,23 @@
                 align="center"
               ></el-table-column>
               <el-table-column
+                v-if="role == 'ROLE_JITUAN'"
+                prop="schoolName"
+                label="学校"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                v-if="role == 'ROLE_JITUAN'"
+                prop="gradeName"
+                label="年级"
+                align="center"
+                ><template slot-scope="scoped">
+                  <p v-for="(item, index) in scoped.row.classList" :key="index">
+                    {{ item.gradeName }}
+                  </p>
+                </template></el-table-column
+              >
+              <el-table-column
                 prop="roomName"
                 label="所在教室"
                 align="center"
@@ -248,6 +265,23 @@
                   </p></template
                 ></el-table-column
               >
+              <el-table-column
+                v-if="role == 'ROLE_JITUAN'"
+                prop="schoolName"
+                label="学校"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                v-if="role == 'ROLE_JITUAN'"
+                prop="gradeName"
+                label="年级"
+                align="center"
+                ><template slot-scope="scoped">
+                  <p v-for="(item, index) in scoped.row.classList" :key="index">
+                    {{ item.gradeName }}
+                  </p>
+                </template></el-table-column
+              >
               <el-table-column prop="class" label="关联班级" align="center">
                 <template slot-scope="scoped">
                   <p v-for="(item, index) in scoped.row.classList" :key="index">
@@ -333,6 +367,12 @@
                 </template></el-table-column
               >
               <el-table-column
+                v-if="role == 'ROLE_JITUAN'"
+                prop="schoolName"
+                label="学校"
+                align="center"
+              ></el-table-column>
+              <el-table-column
                 prop="lastUpdateTime"
                 label="最近更新"
                 align="center"
@@ -386,7 +426,7 @@
           >
           </el-pagination>
         </div>
-        <!-- <p class="down" v-if="tableData.length">
+        <p class="down" v-if="tableData.length">
           <el-button
             type="primary"
             plain
@@ -395,7 +435,7 @@
             @click="downExl"
             >导出报表</el-button
           >
-        </p> -->
+        </p>
       </div>
     </div>
     <el-dialog title="设备导入" :visible.sync="diaUp" width="400">
@@ -494,7 +534,6 @@ import scatterChart from "@/components/charts/scatterChart";
 import _ from "lodash";
 import { downloadFile, getBlob, formatGradeNameClass } from "@/utils";
 import api from "@/api/apis/apis";
-import BusEvent from "@/utils/busEvent";
 export default {
   components: { pieChart, scatterChart },
   watch: {
@@ -578,6 +617,7 @@ export default {
       selectionTabIds: [],
       page: 1,
       size: 20,
+      isBack: false,
     };
   },
   created() {
@@ -615,16 +655,16 @@ export default {
     if (this.role == "ROLE_XUEXIAO") {
       this._QueryDataSchool();
     }
-    this.stationReport();
     this._QueryGradeList();
-    this._QueryData();
     if (this.role == "ROLE_JITUAN") {
       this.showSchool();
     }
   },
   activated() {
     const that = this;
-    BusEvent.$on("keepAlive", async function () {
+    this.isBack = this.$route.query.back ? this.$route.query.back : false;
+    console.log(this.$route.query.back);
+    if (!this.isBack) {
       that.type = 1;
       that.page = 1;
       that.total = 0;
@@ -635,7 +675,7 @@ export default {
       that.query.type = "";
       that.stationReport();
       that._QueryData();
-    });
+    }
   },
   methods: {
     upSuccess(res) {
@@ -806,16 +846,14 @@ export default {
       }
     },
     async downExl() {
-      //报表到处
+      //报表导出
       if (this.exportLoading == true) return;
-      const exportPhaseExamReport =
-        this.type == 1
-          ? this.$request.cTExportPhaseExamReport
-          : this.type == 1
-          ? this.$request.exportPhaseExamReport
-          : this.$request.exportPhaseExamReport;
+      let query = this.setQuery();
       this.exportLoading = true;
-      const data = await exportPhaseExamReport({ ...this.query });
+      const data = await this.$request.exportDevice({
+        ...query,
+        deviceType: this.type,
+      });
       this.exportLoading = false;
       if (data && !data.code) {
         let blob = new Blob([data], {
@@ -1114,7 +1152,7 @@ export default {
   padding: 20px 0 12px;
 }
 .down {
-  padding:0 0 16px 20px;
+  padding: 0 0 16px 20px;
 }
 .content {
   background: #f8f8f8;
@@ -1157,7 +1195,7 @@ export default {
     }
   }
   .table-box {
-    padding: 20px;
+    padding: 20px 20px 0;
     .answer-header {
       padding: 0;
       margin-bottom: 12px;
diff --git a/src/views/standard/setUp/archivedClazz.vue b/src/views/standard/setUp/archivedClazz.vue
new file mode 100644
index 0000000..1540917
--- /dev/null
+++ b/src/views/standard/setUp/archivedClazz.vue
@@ -0,0 +1,90 @@
+<template>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>已归档班级</span>
+      </template>
+    </back-box>
+    <div class="page-content" v-loading="loading">
+      <el-table :data="tableData" border style="width: 100%">
+        <el-table-column
+          prop="gradeName"
+          label="年级"
+          fixed
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="className"
+          label="班级名称"
+          fixed
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="studentCount"
+          label="学生数量"
+          fixed
+          align="center"
+        ></el-table-column>
+        <el-table-column
+          prop="modifiedTime"
+          label="归档时间"
+          fixed
+          align="center"
+        ></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>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      role: "",
+      loading: false,
+      tableData: [],
+      total: 0,
+      page: 1,
+      size: 20,
+    };
+  },
+  async created() {
+    this._QueryData();
+  },
+  methods: {
+    changePage(page) {
+      this.page = page;
+      this._QueryData(this.query.title);
+    },
+    async _QueryData() {
+      this.loading = true;
+      const { data, status, info } = await this.$request.archivingClassList();
+      this.loading = false;
+      if (status === 0) {
+        this.total = data.total;
+        this.tableData = (data.list && [...data.list]) || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.page-content {
+  padding: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/standard/setUp/school.vue b/src/views/standard/setUp/school.vue
index d6ec731..cd7abc9 100644
--- a/src/views/standard/setUp/school.vue
+++ b/src/views/standard/setUp/school.vue
@@ -59,7 +59,12 @@
           </li>
         </ul>
         <div class="grade-box">
-          <p class="h-title">年级管理</p>
+          <p class="h-title">
+            年级管理
+            <span class="popconfirm-box" @click="diaUpgradeGrade = true">
+              年级升级<i class="fa fa-level-up"></i>
+            </span>
+          </p>
           <ul class="grade-info">
             <li
               class="grade-item"
@@ -205,6 +210,15 @@
         <el-button @click="diaSchool = false">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="班级升级" :visible.sync="diaUpgradeGrade" width="400">
+      <p>注意该操作会将所有年级升级，请谨慎操作！</p>
+      <div class="dialog-footer" slot="footer">
+        <el-button type="danger" @click="_UpgradeGrade()">确认升级</el-button>
+        <el-button type="primary" @click="diaUpgradeGrade = false"
+          >取 消</el-button
+        >
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -300,6 +314,7 @@ export default {
         { id: "7", name: "高补" },
       ],
       subjectList: [],
+      diaUpgradeGrade: false, //班级升级
     };
   },
   created() {
@@ -316,7 +331,7 @@ export default {
         showClose: true,
         message: `成功（${res.data.success}）`,
         type: "success",
-        duration:5000
+        duration: 5000,
       });
       this.diaUp = false;
       this._QueryDataSchool();
@@ -377,6 +392,19 @@ export default {
         }
       });
     },
+    async _UpgradeGrade() {
+      this.loading = true;
+      const { data, status, info } = await this.$request.upgradeGrade();
+      this.loading = false;
+      if (status === 0) {
+        this.$message.success("升级成功~");
+        this.diaUpgradeGrade = false;
+        this._QueryDataGrade();
+        this._QuerySubject();
+      } else {
+        this.$message.error(info);
+      }
+    },
     async editGrade() {
       //保存修改年级信息
       if (!this.formGrade.subjectNames.length) {
@@ -505,6 +533,23 @@ export default {
   }
   .grade-box {
     padding: 20px;
+    .h-title {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .popconfirm-box {
+        cursor: pointer;
+        font-size: 14px;
+        color: #999;
+        .fa-level-up{
+          font-size:16px;
+          padding-left:2px;
+        }
+        &:hover {
+          color: #f30;
+        }
+      }
+    }
     .grade-info {
       display: flex;
       flex-wrap: wrap;
diff --git a/src/views/standard/setUp/student.vue b/src/views/standard/setUp/student.vue
index dd8b462..405aacb 100644
--- a/src/views/standard/setUp/student.vue
+++ b/src/views/standard/setUp/student.vue
@@ -34,6 +34,12 @@
     </back-box>
 
     <div class="page-content">
+      <template v-if="!code && role !== 'ROLE_PERSONAL'">
+        <p class="tips" v-show="archivedTotal">
+          <span>另有{{ archivedTotal }}个班级已经归档,</span>
+          <router-link to="/archivedClazz">点击查看&gt;&gt;</router-link>
+        </p>
+      </template>
       <div class="stu-box">
         <div class="stu-list">
           <div class="h-title">
@@ -55,22 +61,31 @@
           <ul class="stu-ul">
             <li
               class="stu-item"
-              v-for="item in classList"
+              v-for="(item, index) in classList"
               :key="item.id"
               :class="query.classId == item.id ? 'active' : ''"
               @click="classDetail(item)"
             >
-              <i
-                v-if="!code"
-                class="el-icon-edit-outline"
-                @click.stop="setClass(item)"
-              ></i>
+              <template v-if="!code && role !== 'ROLE_PERSONAL'">
+                <div class="popconfirm-box">
+                  <el-popconfirm
+                    title="确定要将该班级归档吗？"
+                    @confirm="archivingClass(item, index)"
+                  >
+                    <i slot="reference" class="fa fa-file-archive-o"></i>
+                  </el-popconfirm>
+                </div>
+                <i
+                  class="el-icon-edit-outline"
+                  @click.stop="setClass(item)"
+                ></i>
+              </template>
               {{ item.className }}（{{ item.studentCount }}）
             </li>
           </ul>
         </div>
         <div class="stu-detail">
-          <div class="clazz-detail">
+          <div class="clazz-detail" v-if="clazzDetail.stationSn">
             <p>基站SN：{{ clazzDetail.stationSn }}</p>
             <p>配对码：{{ clazzDetail.pairingCode }}</p>
             <p>频点：{{ clazzDetail.frequency }}</p>
@@ -116,6 +131,7 @@
               >
                 <i class="el-icon-delete" slot="reference"></i>
               </el-popconfirm>
+              <i class="el-icon-user-solid" @click="openChangeClazz(item)"></i>
               <p class="name">{{ item.studentName }}</p>
               <p class="p1">答题器：{{ item.clickerSn || "--" }}</p>
               <p class="p1">长学号：{{ item.studentCode }}</p>
@@ -130,6 +146,52 @@
         </div>
       </div>
     </div>
+    <el-dialog title="学生调班" :visible.sync="diaChangeClass" width="400">
+      <el-form
+        class="form-box"
+        ref="formStuCla"
+        :model="formStuCla"
+        :rules="rulesStuCla"
+        label-width="160px"
+      >
+        <el-form-item label="学生姓名：">
+          <span>{{ formStuCla.studentName }}</span>
+        </el-form-item>
+        <el-form-item label="当前班级：">
+          <span>{{ formStuCla.className }}</span>
+        </el-form-item>
+        <el-form-item label="调到班级：">
+          <el-col :span="10">
+            <el-select
+              class="sel"
+              v-model="formStuCla.classId"
+              placeholder="选择年级"
+            >
+              <el-option
+                v-for="item in classList"
+                :key="item.id"
+                :label="item.className"
+                :value="item.id"
+              >
+              </el-option>
+            </el-select>
+          </el-col>
+        </el-form-item>
+        <el-form-item label="长学号：" prop="studentCode">
+          <el-col :span="10">
+            <el-input
+              maxlength="12"
+              placeholder="输入学生长学号"
+              v-model.trim="formStuCla.studentCode"
+            />
+          </el-col>
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="changeStu">确 定</el-button>
+        <el-button @click="diaChangeClass = false">取 消</el-button>
+      </div>
+    </el-dialog>
     <el-dialog title="添加学生" :visible.sync="diaStu" width="400">
       <el-form
         ref="formBox"
@@ -234,7 +296,7 @@
 </template>
 
 <script>
-import { downloadFile, getBlob } from "@/utils";
+import _ from "lodash";
 export default {
   data() {
     return {
@@ -244,6 +306,7 @@ export default {
       url: "/api_html/school/manager/importStudentClicker",
       diaStu: false,
       diaClass: false,
+      diaChangeClass: false,
       clazzDetail: { stationSn: "", pairingCode: "", frequency: "" },
       query: {
         gradeName: "",
@@ -277,6 +340,22 @@ export default {
           { required: true, message: "请输入班级名称", trigger: "blur" },
         ],
       },
+      formStuCla: {
+        studentName: "",
+        studentId: "",
+        oldClassId: "",
+        className: "",
+        classId: "",
+        studentCode: "",
+      },
+      rulesStuCla: {
+        className: [
+          { required: true, message: "请输入班级名称", trigger: "blur" },
+        ],
+        studentCode: [
+          { required: true, message: "请输入学生号", trigger: "blur" },
+        ],
+      },
       gradeName: "",
       gradeList: [],
       classList: [],
@@ -290,6 +369,7 @@ export default {
         teacherCourseList: [],
         teacherGradeList: [],
       },
+      archivedTotal: 0, //已归档班级
     };
   },
   async created() {
@@ -297,6 +377,7 @@ export default {
     this.role =
       this.$store.getters.info.showRole ||
       this.$store.getters.info.permissions[0].role;
+    this._QueryArchivedNum();
     await this._QueryDataGrade();
     await this._QueryClass();
     this._QueryData(3);
@@ -316,8 +397,10 @@ export default {
       this.clazzDetail.frequency = obj.frequency;
       this.query.classId = obj.id;
       this.formStu.className = obj.className;
+      this.formStuCla.className = obj.className;
       this._QueryData(3);
     },
+
     setClass(obj) {
       this.formClass.gradeName = obj.gradeName;
       this.formClass.classId = obj.id;
@@ -358,23 +441,7 @@ export default {
       this.diaUp = false;
       this._QueryData(3);
     },
-    async removeStu(obj, index) {
-      const { data, status, info } = await this.$request.delStudent({
-        studentId: obj.id,
-      });
-      if (status === 0) {
-        this.$message.success("删除成功");
-        this.studentList.splice(index, 1);
-        this._QueryClass();
-      } else {
-        this.$message.error(info);
-      }
-    },
-    async changeGrade(val) {
-      this.query.classId = "";
-      await this._QueryClass(val);
-      this._QueryData(3);
-    },
+    //添加学生
     addStu() {
       let query = {};
       for (let key in this.formStu) {
@@ -412,6 +479,81 @@ export default {
         }
       });
     },
+    //学生调班弹窗
+    openChangeClazz(obj) {
+      this.formStuCla.studentId = obj.id;
+      this.formStuCla.studentName = obj.studentName;
+      this.formStuCla.studentCode = obj.studentCode;
+      this.formStuCla.classId = this.query.classId;
+      this.formStuCla.oldClassId = this.query.classId;
+      this.diaChangeClass = true;
+    },
+    //学生调班
+    changeStu: _.throttle(
+      function () {
+        this.$refs.formStuCla.validate(async (valid) => {
+          if (valid) {
+            const { data, status, info } =
+              await this.$request.studentChangeClass({
+                studentId: this.formStuCla.studentId,
+                oldClassId: this.formStuCla.oldClassId,
+                classId: this.formStuCla.classId,
+                studentCode: this.formStuCla.studentCode,
+              });
+            if (status == 0) {
+              this.diaChangeClass = false;
+              this.$message.success(info);
+              this._QueryData();
+            } else {
+              this.$message.error(info);
+            }
+          } else {
+            this.$message.error("数据有误请检查！");
+          }
+        });
+      },
+      2000,
+      { leading: true, trailing: false }
+    ),
+    //班级归档
+    async archivingClass(obj, index) {
+      const { data, status, info } = await this.$request.classArchiving({
+        classId: obj.id,
+      });
+      if (status === 0) {
+        this.$message.success("归档成功");
+        this.classList.splice(index, 1);
+        this.setClass(this.classList[index]);
+        this.diaClass = false;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async removeStu(obj, index) {
+      const { data, status, info } = await this.$request.delStudent({
+        studentId: obj.id,
+      });
+      if (status === 0) {
+        this.$message.success("删除成功");
+        this.studentList.splice(index, 1);
+        this._QueryClass();
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async changeGrade(val) {
+      this.query.classId = "";
+      await this._QueryClass(val);
+      this._QueryData(3);
+    },
+    async _QueryArchivedNum() {
+      const { data, status, info } = await this.$request.archivingClassList();
+      if (status === 0) {
+        this.archivedTotal = data?.count || 0;
+      } else {
+        this.$message.error(info);
+      }
+    },
     async _QueryData(type) {
       let query = {};
       query.gradeName = this.query.gradeName;
@@ -464,6 +606,7 @@ export default {
         this.classList = [...data.list] || [];
         this.query.classId = this.classList[0]?.id;
         this.formStu.className = this.classList[0]?.className;
+        this.formStuCla.className = this.classList[0]?.className;
         this.clazzDetail.stationSn = this.classList[0]?.stationSn;
         this.clazzDetail.pairingCode = this.classList[0]?.pairingCode;
         this.clazzDetail.frequency = this.classList[0]?.frequency;
@@ -494,13 +637,20 @@ export default {
 .page-content {
   padding: 20px;
 }
+.tips {
+  display: flex;
+  line-height: 16px;
+  font-size: 14px;
+  color: #999;
+  margin-bottom: 10px;
+}
 .stu-box {
   display: flex;
   background: #f8f8f8;
   border-radius: 10px;
   overflow: hidden;
   .answer-header {
-    padding-top: 0;
+    padding-top: 10px;
   }
   .stu-list {
     max-height: 80vh;
@@ -519,18 +669,32 @@ export default {
       .el-icon-edit-outline {
         position: absolute;
         top: 8px;
-        right: 12px;
+        right: 4px;
         font-size: 20px;
         display: none;
         &:hover {
           color: #667ffd;
         }
       }
+      .popconfirm-box {
+        position: absolute;
+        top: 6px;
+        right: 31px;
+        font-size: 17px;
+        line-height: 24px;
+        display: none;
+        &:hover {
+          color: #667ffd;
+        }
+      }
       &:hover {
         background: #eee;
         .el-icon-edit-outline {
           display: block;
         }
+        .popconfirm-box {
+          display: block;
+        }
       }
       &.active {
         color: #667ffd;
@@ -565,6 +729,19 @@ export default {
         margin: 0 20px 20px 0;
         padding: 0 12px 5px;
         position: relative;
+        .el-icon-user-solid {
+          position: absolute;
+          top: 8px;
+          left: 8px;
+          font-size: 18px;
+          color: #666;
+          padding: 2px;
+          display: none;
+          cursor: pointer;
+          &:hover {
+            color: #667ffd;
+          }
+        }
         .el-icon-delete {
           position: absolute;
           top: 8px;
@@ -578,6 +755,9 @@ export default {
           }
         }
         &:hover {
+          .el-icon-user-solid {
+            display: block;
+          }
           .el-icon-delete {
             display: block;
           }
@@ -598,7 +778,7 @@ export default {
   }
   .clazz-detail {
     display: flex;
-    padding: 12px 12px 10px 20px;
+    padding: 12px 12px 0 20px;
     p {
       margin-right: 16px;
       color: #666;
diff --git a/src/views/standard/test/analysis.vue b/src/views/standard/test/analysis.vue
index e89b05a..c6f2457 100644
--- a/src/views/standard/test/analysis.vue
+++ b/src/views/standard/test/analysis.vue
@@ -5,7 +5,7 @@
         <span>单卷分析</span>
       </template>
     </back-box>
-    <div class="tips" v-if="paperModifyLog.modifiedTime">
+    <div class="tips" v-if="paperModifyLog.modifiedTime || status">
       <p class="tips-p">
         <i class="fa fa-bell-o"></i>
         {{
@@ -29,34 +29,18 @@
     <div class="page-content">
       <div class="tab-box">
         <span
+          v-for="(item, index) in tabList"
+          :key="item"
           class="tab-item"
-          :class="type == 1 ? 'active' : ''"
-          @click="setType(1)"
-          >试题分析</span
-        >
-        <span
-          class="tab-item"
-          :class="type == 2 ? 'active' : ''"
-          @click="setType(2)"
-          >成绩排名</span
-        >
-        <span
-          class="tab-item"
-          :class="type == 3 ? 'active' : ''"
-          @click="setType(3)"
-          >小题分报表</span
-        >
-        <span
-          class="tab-item"
-          :class="type == 4 ? 'active' : ''"
-          @click="setType(4)"
-          >作答明细表</span
+          :class="type == index ? 'active' : ''"
+          @click="setType(index)"
+          >{{ item }}</span
         >
       </div>
       <div id="print-content" class="table-box" v-loading="loading">
         <el-table
           :max-height="tableMaxHeight"
-          v-show="type == 1"
+          v-show="type == 0"
           :data="tableData"
           border
           style="width: 100%"
@@ -147,7 +131,7 @@
             >
           </el-table-column>
         </el-table>
-        <div class="hui-box" v-show="type == 1">
+        <div class="hui-box" v-show="type == 0">
           <span class="s-txt">汇总</span>
           <ul class="hui-ul">
             <li class="hui-li">
@@ -189,7 +173,7 @@
           </ul>
         </div>
         <el-table
-          v-show="type == 2"
+          v-show="type == 1"
           :max-height="tableMaxHeight"
           :data="tableData2"
           border
@@ -261,7 +245,7 @@
           </el-table-column>
         </el-table>
         <el-table
-          v-show="type == 3"
+          v-show="type == 2"
           :max-height="tableMaxHeight"
           :data="tableData2"
           border
@@ -309,7 +293,7 @@
         </el-table>
         <el-table
           :max-height="tableMaxHeight"
-          v-show="type == 4"
+          v-show="type == 3"
           :data="tableData2"
           border
           style="width: 100%"
@@ -381,7 +365,7 @@
             >打印</el-button
           >
         </div>
-        <div>
+        <div v-if="!status">
           <el-button
             v-if="examReport.subjectiveScore != 0"
             @click="diaUp = true"
@@ -425,6 +409,7 @@ export default {
   data() {
     return {
       role: "",
+      status: 0,
       tableMaxHeight: 600,
       loading: false,
       exportLoading: false,
@@ -433,7 +418,8 @@ export default {
       id: "",
       title: "",
       score: "",
-      type: 1,
+      tabList: ["试题分析", "成绩排名", "小题分报表", "作答明细表"],
+      type: 0,
       paperModifyLog: {
         realName: "",
         modifiedTime: "",
@@ -469,12 +455,13 @@ export default {
       this.$store.getters.info.showRole ||
       this.$store.getters.info.permissions[0].role;
     this.id = this.$route.query.id;
+    this.status = this.$route.query.status ? this.$route.query.status : 0;
     this.title = this.$route.query.title || "";
     this._QueryData();
   },
   methods: {
     print() {
-      tablePrint("print-content");
+      tablePrint("print-content", this.title + this.tabList[this.type]);
     },
     upSuccess(res) {
       //导入成功
@@ -653,7 +640,7 @@ export default {
         });
         this.optionsList = [...optionsList];
         this.total = data.count;
-        this.setType(1);
+        this.setType(0);
       } else {
         this.$message.error(info);
       }
@@ -670,7 +657,12 @@ export default {
         let blob = new Blob([data], {
           type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
         });
-        downloadFile("即时测-单卷测练报表.xlsx", blob);
+        downloadFile(
+          this.status
+            ? "即时测-已归档单卷测练报表.xlsx"
+            : "即时测-单卷测练报表.xlsx",
+          blob
+        );
       } else {
         this.$message.error("下载失败");
       }
diff --git a/src/views/standard/test/archiving.vue b/src/views/standard/test/archiving.vue
new file mode 100644
index 0000000..b4a4280
--- /dev/null
+++ b/src/views/standard/test/archiving.vue
@@ -0,0 +1,873 @@
+<template>
+  <div ref="main" class="page-container">
+    <back-box>
+      <template slot="title">
+        <span>即时测-已归档数据报表</span>
+      </template>
+    </back-box>
+    <div class="answer-header">
+      <div class="sel-box">
+        <el-select
+          class="sel"
+          v-model="query.classId"
+          placeholder="选择班级"
+          @change="changeclass"
+        >
+          <el-option
+            v-for="item in classList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <el-select
+          v-if="role == 'ROLE_BANZHUREN'"
+          class="sel"
+          multiple
+          v-model="query.subjectNames"
+          placeholder="选择科目"
+          @change="changeSub"
+        >
+          <el-option
+            v-for="item in subjectList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <el-select
+          v-else
+          class="sel"
+          v-model="query.subjectNames"
+          placeholder="选择科目"
+        >
+          <el-option
+            v-for="item in subjectList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+        <div class="d1">
+          <el-date-picker
+            v-model="query.startDay"
+            type="date"
+            @change="handleChangeTimeStart"
+            placeholder="选择日期时间"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+          ~
+          <el-date-picker
+            v-model="query.endDay"
+            type="date"
+            placeholder="选择日期时间"
+            @change="handleChangeTimeEnd"
+            value-format="yyyy-MM-dd"
+          >
+          </el-date-picker>
+        </div>
+        <p class="p1">
+          <span @click="setDate(1)" :class="[date == 1 ? 'active' : '', 's1']"
+            >今天</span
+          >
+          <span @click="setDate(2)" :class="[date == 2 ? 'active' : '', 's1']"
+            >本周</span
+          >
+          <span @click="setDate(3)" :class="[date == 3 ? 'active' : '', 's1']"
+            >本月</span
+          >
+          <span @click="setDate(4)" :class="[date == 4 ? 'active' : '', 's1']"
+            >本季度</span
+          >
+        </p>
+        <el-button type="primary" round @click="_QueryData()">筛选</el-button>
+      </div>
+    </div>
+    <div class="table-box">
+      <el-radio-group
+        v-model="tabIndex"
+        @change="changeTab"
+        style="margin-bottom: 20px"
+      >
+        <template v-for="(item, index) in tabList">
+          <el-radio-button
+            v-if="index == 0 || query.startDay != query.endDay"
+            :key="index"
+            :label="index + 1"
+            >{{ item }}</el-radio-button
+          >
+        </template>
+      </el-radio-group>
+      <div v-show="tabIndex == 1" v-loading="loading">
+        <el-table :data="tableData" border style="width: 100%">
+          <el-table-column
+            prop="title"
+            label="试卷名称"
+            fixed
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            prop="examPaperScore"
+            label="卷面分"
+            align="center"
+            width="68"
+          ></el-table-column>
+          <el-table-column prop="answeredNum" label="测验人数" align="center"
+            ><template slot-scope="scoped">{{
+              `${scoped.row.answeredNum}/${scoped.row.classPersonNum}`
+            }}</template></el-table-column
+          >
+          <el-table-column
+            prop="examStartTime"
+            label="测验时间"
+            width="100"
+            align="center"
+          ></el-table-column>
+          <el-table-column prop="avgScore" label="班平均分" align="center"
+            ><template slot-scope="scoped">{{
+              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                scoped.row.answerNum == 0) &&
+              scoped.row.recordStatus == 0
+                ? "-"
+                : scoped.row.avgScore
+            }}</template></el-table-column
+          >
+          <el-table-column prop="highestScore" label="班最高分" align="center"
+            ><template slot-scope="scoped">{{
+              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                scoped.row.answerNum == 0) &&
+              scoped.row.recordStatus == 0
+                ? "-"
+                : scoped.row.highestScore
+            }}</template></el-table-column
+          >
+          <el-table-column prop="lowestScore" label="班最低分" align="center"
+            ><template slot-scope="scoped">{{
+              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                scoped.row.answerNum == 0) &&
+              scoped.row.recordStatus == 0
+                ? "-"
+                : scoped.row.lowestScore
+            }}</template></el-table-column
+          >
+          <el-table-column
+            prop="excellenRate"
+            label="优秀数(率)"
+            sortable
+            align="center"
+            width="110"
+            class-name="p0"
+            ><template slot-scope="scoped">
+              <p
+                v-if="
+                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                    scoped.row.answerNum == 0) &&
+                  scoped.row.arecordStatus == 0
+                "
+              >
+                "-"
+              </p>
+              <template v-else>
+                <p>{{ scoped.row.excellenNum }}</p>
+                <p v-if="scoped.row.excellenNum">
+                  {{ `（${scoped.row.excellenRate}%）` }}
+                </p>
+              </template>
+            </template></el-table-column
+          >
+          <el-table-column
+            prop="goodRate"
+            label="良好数(率)"
+            sortable
+            align="center"
+            width="110"
+            class-name="p0"
+            ><template slot-scope="scoped">
+              <p
+                v-if="
+                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                    scoped.row.answerNum == 0) &&
+                  scoped.row.arecordStatus == 0
+                "
+              >
+                "-"
+              </p>
+              <template v-else>
+                <p>{{ scoped.row.goodNum }}</p>
+                <p v-if="scoped.row.goodNum">
+                  {{ `（${scoped.row.goodRate}%）` }}
+                </p>
+              </template>
+            </template></el-table-column
+          >
+          <el-table-column
+            prop="passRate"
+            label="及格数(率)"
+            sortable
+            align="center"
+            width="110"
+            class-name="p0"
+            ><template slot-scope="scoped">
+              <p
+                v-if="
+                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                    scoped.row.answerNum == 0) &&
+                  scoped.row.arecordStatus == 0
+                "
+              >
+                "-"
+              </p>
+              <template v-else>
+                <p>{{ scoped.row.passNum }}</p>
+                <p v-if="scoped.row.passNum">
+                  {{ `（${scoped.row.passRate}%）` }}
+                </p>
+              </template>
+            </template></el-table-column
+          >
+          <el-table-column
+            prop="failedRate"
+            label="不及格数(率)"
+            sortable
+            align="center"
+            width="130"
+            class-name="p0"
+            ><template slot-scope="scoped">
+              <p
+                v-if="
+                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                    scoped.row.answerNum == 0) &&
+                  scoped.row.arecordStatus == 0
+                "
+              >
+                "-"
+              </p>
+              <template v-else>
+                <p>{{ scoped.row.failedNum }}</p>
+                <p v-if="scoped.row.failedNum">
+                  {{ `（${scoped.row.failedRate}%）` }}
+                </p>
+              </template>
+            </template></el-table-column
+          >
+          <el-table-column label="操作" align="center">
+            <template slot-scope="scoped">
+              <el-tooltip 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 class="pagination-box">
+          <el-pagination
+            small=""
+            layout="total,prev, pager, next"
+            :hide-on-single-page="true"
+            :total="total"
+            @current-change="changePage"
+            :current-page="page"
+            :page-size="size"
+          >
+          </el-pagination>
+        </div>
+      </div>
+      <div v-show="tabIndex == 2" v-loading="loading">
+        <el-empty
+          :image-size="100"
+          v-if="!tableData.length && loading == false"
+          description="没有更多数据"
+        ></el-empty>
+        <template v-if="tableData.length && loading == false">
+          <div id="print-content">
+            <el-table
+              :max-height="tableMaxHeight"
+              v-if="role == 'ROLE_JIAOSHI'"
+              :data="tableData"
+              border
+              style="width: 100%"
+            >
+              <el-table-column
+                prop="studentCode"
+                label="学号"
+                align="center"
+                fixed
+              ></el-table-column>
+              <el-table-column
+                prop="studentName"
+                label="姓名"
+                fixed
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                align="center"
+                v-for="(item, index) in answerList"
+                :key="index"
+                :label="item.title"
+              >
+                <el-table-column
+                  :prop="'score' + index"
+                  :label="index == 0 ? '总分' : '成绩'"
+                  align="center"
+                  :class-name="index % 2 == 0 ? 'bg' : ''"
+                ></el-table-column>
+                <el-table-column
+                  :prop="'classRank' + index"
+                  label="班名"
+                  align="center"
+                  :class-name="index % 2 == 0 ? 'bg' : ''"
+                ></el-table-column>
+              </el-table-column>
+            </el-table>
+            <el-table
+              v-else
+              :data="tableData"
+              :max-height="tableMaxHeight"
+              border
+              style="width: 100%"
+            >
+              <el-table-column
+                prop="studentCode"
+                label="学号"
+                align="center"
+                fixed
+              ></el-table-column>
+
+              <el-table-column
+                prop="studentName"
+                label="姓名"
+                fixed
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                align="center"
+                v-for="(item, index) in answerList"
+                :key="index"
+                :label="item"
+              >
+                <el-table-column
+                  :prop="'examCount' + item"
+                  label="测练数"
+                  align="center"
+                  :class-name="index % 2 == 0 ? 'bg' : ''"
+                ></el-table-column>
+                <el-table-column
+                  :prop="'participationCount' + item"
+                  label="参与数"
+                  align="center"
+                  :class-name="index % 2 == 0 ? 'bg' : ''"
+                ></el-table-column>
+                <el-table-column
+                  :prop="'score' + item"
+                  label="总分"
+                  align="center"
+                  :class-name="index % 2 == 0 ? 'bg' : ''"
+                ></el-table-column>
+                <el-table-column
+                  :prop="'classRank' + item"
+                  label="班名"
+                  align="center"
+                  :class-name="index % 2 == 0 ? 'bg' : ''"
+                ></el-table-column>
+              </el-table-column>
+            </el-table>
+          </div>
+        </template>
+      </div>
+      <p class="down" v-if="tabIndex == 2 && tableData.length">
+        <el-button
+          type="primary"
+          plain
+          round
+          icon="fa fa-cloud-download"
+          @click="downExl"
+          >导出报表</el-button
+        >
+        <el-button
+          v-if="!this.$store.getters.code"
+          @click="print"
+          type="primary"
+          plain
+          round
+          icon="el-icon-printer"
+          >打印</el-button
+        >
+      </p>
+    </div>
+  </div>
+</template>
+
+<script>
+import { formatDate, downloadFile, tablePrint } from "utils";
+import BusEvent from "@/utils/busEvent";
+export default {
+  data() {
+    return {
+      exportLoading: false,
+      tableMaxHeight: 300,
+      role: "",
+      loading: false,
+      loadingDown: false,
+      url: "/api_html/teaching/importSubjectiveScore",
+      examId: "",
+      form: {
+        id: "",
+        title: "",
+        examPaperScore: "",
+      },
+      date: "", //今天-昨天-本周
+      query: {
+        //搜索条件
+        classId: "",
+        subjectNames: "",
+        startDay: "",
+        endDay: "",
+        day: "",
+      },
+      tabList: ["单卷测练报表", "阶段测练报表"],
+      classList: [], //班级
+      subjectList: [], //科目
+      tabIndex: 1, //选项卡
+      tableData: [],
+      answerList: [], //设置多卷内容供tableStage表格数据用
+      page: 1,
+      size: 20,
+      total: 0,
+    };
+  },
+  async created() {
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
+    await this._QueryClassList();
+    if (!this.query.classId) {
+      return;
+    }
+    await this._QuerySubjectList();
+    await this.setDate(1);
+    let startDay = this.query?.startDay;
+    if (!startDay) {
+      this.query.startDay = new Date();
+      this.query.endDay = new Date();
+    }
+  },
+  activated() {
+    const that = this;
+    BusEvent.$on("keepAlive", async function () {
+        that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
+        await that._QueryClassList();
+        if (!that.query.classId) {
+          return;
+        }
+        await that._QuerySubjectList();
+        await that.setDate(1);
+        let startDay = that.query?.startDay;
+        if (!startDay) {
+          that.query.startDay = new Date();
+          that.query.endDay = new Date();
+        }
+    });
+  },
+  methods: {
+    print() {
+      tablePrint("print-content", "即时测-" + this.tabList[this.tabIndex - 1]);
+    },
+    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 == "全部";
+      });
+    },
+    linkTo(obj) {
+      //去详情
+      this.$router.push({
+        path: "/testAnalysis",
+        query: {
+          id: obj.id,
+          title: obj.title,
+          score: obj.examPaperScore,
+          status: 1,
+        },
+      });
+    },
+
+    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) {
+            //中国式星期天是一周的最后一天
+            day = 7;
+          }
+          day--;
+          let aTime = new Date().getTime() - 24 * 60 * 60 * 1000 * day;
+          that.query.startDay = formatDate(new Date(aTime), "yyyy-MM-dd");
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 3:
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          break;
+        case 4:
+          if (aMonth > 0 && aMonth < 4) {
+            aMonth = "1";
+          } else if (aMonth > 3 && aMonth < 7) {
+            aMonth = "4";
+          } else if (aMonth > 6 && aMonth < 10) {
+            aMonth = "7";
+          } else {
+            aMonth = "10";
+          }
+
+          aMonth = aMonth < 10 ? "0" + aMonth : aMonth;
+          that.query.startDay = `${aYear}-${aMonth}-01`;
+          that.query.endDay = formatDate(new Date(), "yyyy-MM-dd");
+          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()) {
+          this.$message.error("任务结束时间不能任务开始时间前面，请重新设置");
+          this.query.startDay = "";
+        }
+      }
+    },
+    handleChangeTimeEnd(val) {
+      this.query.day = "";
+      this.date = "";
+      if (this.query.startDay) {
+        if (new Date(val).getTime() < new Date(this.query.startDay).getTime()) {
+          this.$message.error("任务结束时间不能任务开始时间前面，请重新设置");
+          this.query.endDay = "";
+        }
+      }
+    },
+    changePage(page) {
+      this.page = page;
+      this._QueryData();
+    },
+    changeTab() {
+      this.tableMaxHeight = this.$refs.main.offsetHeight;
+      this.page = 1;
+      this._QueryData();
+    },
+
+    async changeclass() {
+      await this._QuerySubjectList();
+      this.page = 1;
+      this._QueryData();
+    },
+    async changClazz() {
+      this.page = 1;
+      await this._QuerySubjectList();
+      await this._QueryData();
+    },
+    async _QueryClassList() {
+      const fetchClassList =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTClassList
+          : this.$request.tClassList;
+      const { data, status, info } = await fetchClassList({ status: 1 });
+      if (status === 0) {
+        this.classList = data.list.map((item) => {
+          return {
+            value: item.classId,
+            label: item.className,
+          };
+        });
+        this.query.classId = this.classList[0]?.value;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QuerySubjectList() {
+      const fetchSubjectList =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTSubjectList
+          : this.$request.tSubjectList;
+
+      const { data, status, info } = await fetchSubjectList({
+        classId: this.query.classId,
+        status: 1,
+      });
+      if (status === 0) {
+        this.subjectList =
+          data.subjectNames?.map((item) => {
+            return {
+              value: item,
+              label: item,
+            };
+          }) || [];
+        if (this.role == "ROLE_BANZHUREN") {
+          this.subjectList.unshift({
+            value: "全部",
+            label: "全部",
+          });
+          this.query.subjectNames.push(this.subjectList[0]?.value);
+        } else {
+          this.query.subjectNames = this.subjectList[0]?.value;
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryData() {
+      this.tableData = [];
+      if (this.tabIndex == 1) {
+        this.examReportList();
+      } else {
+        this.phaseExamReport();
+      }
+    },
+    //单卷测练
+    async examReportList() {
+      this.loading = true;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          query[key] = this.query[key];
+        }
+      }
+      if (this.role != "ROLE_BANZHUREN") {
+        query.subjectNames = [query.subjectNames];
+      } else {
+        if (
+          query["subjectNames"] &&
+          query["subjectNames"].length == 1 &&
+          query["subjectNames"][0] == "全部"
+        ) {
+          query["subjectNames"] = this.subjectList.map((item) => {
+            return item.value;
+          });
+          query["subjectNames"].shift();
+        }
+        if (!query["subjectNames"]) {
+          this.$message.warning("请选择科目");
+          return;
+        }
+      }
+      const { data, status, info } = await this.$request.examReportList({
+        ...query,
+        page: this.page,
+        size: this.size,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.tableData = (data?.list && [...data?.list]) || [];
+        this.total = data?.count || 0;
+      } else {
+        this.$message.error(info);
+      }
+    },
+    //多卷测练
+    async phaseExamReport() {
+      this.loading = true;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
+            query["subjectName"] = this.query[key];
+          } else {
+            query[key] = this.query[key];
+          }
+        }
+      }
+      if (this.role == "ROLE_BANZHUREN") {
+        if (
+          query["subjectNames"] &&
+          query["subjectNames"]?.length == 1 &&
+          query["subjectNames"][0] == "全部"
+        ) {
+          query["subjectNames"] = this.subjectList.map((item) => {
+            return item.value;
+          });
+          query["subjectNames"]?.shift();
+        }
+      }
+      const phaseExamReport =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTPhaseExamReport
+          : this.$request.phaseExamReport;
+      const { data, status, info } = await phaseExamReport({
+        ...query,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.total = data.count;
+        if (this.role == "ROLE_BANZHUREN") {
+          let subjectName = [];
+          this.tableData = data?.list.map((item) => {
+            let params = {};
+            item.dataList.map((items, index) => {
+              if (!subjectName.includes(items.subjectName)) {
+                subjectName.push(items.subjectName);
+              }
+              params["examCount" + items.subjectName] = items.examCount;
+              params["participationCount" + items.subjectName] =
+                items.participationCount;
+              params["score" + items.subjectName] = items.score;
+              params["classRank" + items.subjectName] = items.classRank;
+            });
+            return {
+              ...item,
+              ...params,
+            };
+          });
+          this.answerList = [...subjectName];
+        } else {
+          let dataIdsList = [],
+            dataList = [];
+          data?.list.map((item) => {
+            item.examList.map((items) => {
+              if (!dataIdsList.includes(items.title)) {
+                dataIdsList.push(items.title);
+                dataList.push(items);
+              }
+            });
+          });
+          console.log(dataList);
+          this.tableData = data?.list.map((item) => {
+            let params = {};
+            dataIdsList.map((ids, index) => {
+              params["score" + index] = "--";
+              params["classRank" + index] = "--";
+              item.examList.map((items) => {
+                if (items.title == ids) {
+                  params["score" + index] = items.score;
+                  params["classRank" + index] = items.classRank;
+                }
+              });
+            });
+            return {
+              ...item,
+              ...params,
+            };
+          });
+          this.answerList = dataList;
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async downExl() {
+      //报表到处
+      if (this.exportLoading == true) return;
+      let query = {};
+      for (let key in this.query) {
+        if (this.query[key] != "") {
+          if (key == "subjectNames" && this.role != "ROLE_BANZHUREN") {
+            query["subjectName"] = this.query[key];
+          } else {
+            query[key] = this.query[key];
+          }
+        }
+      }
+      if (this.role == "ROLE_BANZHUREN") {
+        if (
+          query["subjectNames"] &&
+          query["subjectNames"].length == 1 &&
+          query["subjectNames"][0] == "全部"
+        ) {
+          query["subjectNames"] = this.subjectList.map((item) => {
+            return item.value;
+          });
+          query["subjectNames"].shift();
+        }
+        if (!query["subjectNames"]) {
+          this.$message.warning("请选择科目");
+          return;
+        }
+      }
+      const exportPhaseExamReport =
+        this.role == "ROLE_BANZHUREN"
+          ? this.$request.cTExportPhaseExamReport
+          : this.$request.exportPhaseExamReport;
+      this.exportLoading = true;
+      const data = await exportPhaseExamReport({ ...query });
+      this.exportLoading = false;
+      if (data && !data.code) {
+        let blob = new Blob([data], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        downloadFile("即时测-已归档阶段测练报表.xlsx", blob);
+      } else {
+        this.$message.error(data.info);
+      }
+    },
+  },
+};
+</script>
+
+<style>
+div::-webkit-scrollbar {
+  width: 3px;
+  height: 10px;
+}
+div::-webkit-scrollbar-thumb {
+  border-radius: 10px;
+  background-color: #ccc;
+}
+</style>
+<style lang="scss" scoped>
+.page-container {
+  position: relative;
+  height: 100%;
+  &.active {
+    overflow: hidden;
+  }
+}
+.table-box {
+  margin: 0 20px;
+  padding: 16px;
+  background: #f8f8f8;
+  border-radius: 5px;
+  :deep(.fa-arrow-right) {
+    padding-left: 2px;
+  }
+  :deep(.fa-file-text) {
+    padding-left: 2px;
+  }
+}
+.down {
+  padding-top: 16px;
+}
+.click-b {
+  cursor: pointer;
+  color: #409eff;
+  text-decoration: underline;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/standard/test/index.vue b/src/views/standard/test/index.vue
index 11f860f..0d8b074 100644
--- a/src/views/standard/test/index.vue
+++ b/src/views/standard/test/index.vue
@@ -4,6 +4,23 @@
       <template slot="title">
         <span>即时测-数据报表</span>
       </template>
+      <template slot="btns">
+        <el-tooltip
+          v-if="!code"
+          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">
@@ -93,12 +110,14 @@
         @change="changeTab"
         style="margin-bottom: 20px"
       >
-        <el-radio-button :label="1">单卷测练报表</el-radio-button>
-        <el-radio-button
-          :label="2"
-          v-show="this.query.startDay != this.query.endDay"
-          >阶段测练报表</el-radio-button
-        >
+        <template v-for="(item, index) in tabList">
+          <el-radio-button
+            v-if="index == 0 || query.startDay != query.endDay"
+            :key="index"
+            :label="index + 1"
+            >{{ item }}</el-radio-button
+          >
+        </template>
       </el-radio-group>
       <div v-show="tabIndex == 1" v-loading="loading">
         <el-table :data="tableData" border style="width: 100%">
@@ -485,6 +504,7 @@ import BusEvent from "@/utils/busEvent";
 export default {
   data() {
     return {
+      code: "",
       exportLoading: false,
       tableMaxHeight: 300,
       role: "",
@@ -507,6 +527,7 @@ export default {
         endDay: "",
         day: "",
       },
+      tabList: ["单卷测练报表", "阶段测练报表"],
       classList: [], //班级
       subjectList: [], //科目
       tabIndex: 1, //选项卡
@@ -518,10 +539,14 @@ export default {
     };
   },
   async created() {
+    this.code = localStorage.getItem("csCode") || "";
     this.role =
       this.$store.getters.info.showRole ||
       this.$store.getters.info.permissions[0].role;
     await this._QueryClassList();
+    if (!this.query.classId) {
+      return;
+    }
     await this._QuerySubjectList();
     await this.setDate(1);
     let startDay = this.query?.startDay;
@@ -533,20 +558,25 @@ export default {
   activated() {
     const that = this;
     BusEvent.$on("keepAlive", async function () {
-      that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
-      await that._QueryClassList();
-      await that._QuerySubjectList();
-      await that.setDate(1);
-      let startDay = that.query?.startDay;
-      if (!startDay) {
-        that.query.startDay = new Date();
-        that.query.endDay = new Date();
-      }
+      // if (that.$route.path == "/test") {
+        that.query.subjectNames = that.role == "ROLE_BANZHUREN" ? [] : "";
+        await that._QueryClassList();
+        if (!that.query.classId) {
+          return;
+        }
+        await that._QuerySubjectList();
+        await that.setDate(1);
+        let startDay = that.query?.startDay;
+        if (!startDay) {
+          that.query.startDay = new Date();
+          that.query.endDay = new Date();
+        }
+      // }
     });
   },
   methods: {
     print() {
-      tablePrint("print-content");
+      tablePrint("print-content", "即时测-" + this.tabList[this.tabIndex - 1]);
     },
     changeSub(val) {
       //科目改变触发事件
@@ -560,6 +590,11 @@ export default {
         return sub != "全部" ? item != "全部" : item == "全部";
       });
     },
+    toArchiving() {
+      this.$router.push({
+        path: "/testArchiving",
+      });
+    },
     linkTo(obj) {
       //去详情
       this.$router.push({
@@ -573,12 +608,15 @@ export default {
     },
     toPortrait(obj) {
       //暂时不上线
-      return
+      return;
       if (this.$store.getters.code) {
         return;
       }
       let subjectNames = [];
-      subjectNames = this.role == 'ROLE_BANZHUREN'?[...this.query["subjectNames"]]:[this.query["subjectNames"]];
+      subjectNames =
+        this.role == "ROLE_BANZHUREN"
+          ? [...this.query["subjectNames"]]
+          : [this.query["subjectNames"]];
       if (
         this.query["subjectNames"] &&
         this.query["subjectNames"]?.length == 1 &&
@@ -600,7 +638,7 @@ export default {
           studentCode: obj.studentCode,
           startDay: this.query.startDay,
           endDay: this.query.endDay,
-          date:this.date
+          date: this.date,
         },
       });
     },
@@ -698,9 +736,9 @@ export default {
       this.page = 1;
       this._QueryData();
     },
-     upSuccess(res) {
-      //导入成功  
-      this.$message.success("导入成功")
+    upSuccess(res) {
+      //导入成功
+      this.$message.success("导入成功");
       this.diaUp = false;
       this._QueryData();
     },