diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js
index 97b5242..7cd5ae0 100644
--- a/src/api/apis/apis.js
+++ b/src/api/apis/apis.js
@@ -443,6 +443,50 @@ export default {
       data,
     });
   },
+  //  导入学生答题器文件上传
+  importStudentClicker(data) {
+    return service({
+      url: setUpUrls.importStudentClicker,
+      method: "POST",
+      data,
+    });
+  },
+  //  班级名册模板下载
+  classAndStudentTemplate(data) {
+    return service({
+      url: setUpUrls.classAndStudentTemplate,
+      method: "POST",
+      data,
+      responseType: 'arraybuffer',
+    });
+  },
+  //  班级名册导出
+  exportClassAndStudent(data) {
+    return service({
+      url: setUpUrls.exportClassAndStudent,
+      method: "POST",
+      data,
+      responseType: 'arraybuffer',
+    });
+  },
+  //  教师模板下载
+  teacherTemplate(data) {
+    return service({
+      url: setUpUrls.teacherTemplate,
+      method: "POST",
+      data,
+    });
+  },
+  //  教师导出
+  exportTeacher(data) {
+    return service({
+      url: setUpUrls.exportTeacher,
+      method: "POST",
+      data,
+      responseType: 'arraybuffer',
+    });
+  },
+
   //  删除学生
   delStudent(data) {
     return service({
@@ -938,9 +982,9 @@ export default {
     });
   },
   //  分页查询课时报表列表
-  pPersonal(data) {
+  pPeriodReportList(data) {
     return service({
-      url: setUpUrls.pPersonal,
+      url: setUpUrls.pPeriodReportList,
       method: "POST",
       data
     });
@@ -1177,6 +1221,14 @@ export default {
       data
     });
   },
+   //删除授课端版本
+   delVersion(data) {
+    return service({
+      url: setUpUrls.delVersion,
+      method: "POST",
+      data
+    });
+  },
    //基站统计数据
    pStationReport(data) {
     return service({
@@ -1234,7 +1286,7 @@ export default {
       responseType: 'arraybuffer',
     });
   },
-   //班级名册导出
+   //上传图片
    puploadImg(data) {
     return service({
       url: setUpUrls.uploadImg,
@@ -1242,4 +1294,28 @@ export default {
       data,
     });
   },
+   //学生测练统计
+   studentExamReport(data) {
+    return service({
+      url: setUpUrls.studentExamReport,
+      method: "POST",
+      data,
+    });
+  },
+   //查询最新的授课端应用版本
+   pLatestVersion(data) {
+    return service({
+      url: setUpUrls.pLatestVersion,
+      method: "POST",
+      data,
+    });
+  },
+   //载指定版本授课端
+   pGetAppDownloadUrl(data) {
+    return service({
+      url: setUpUrls.pGetAppDownloadUrl,
+      method: "POST",
+      data,
+    });
+  },
 };
diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js
index bc29003..598ea81 100644
--- a/src/api/urls/apis.js
+++ b/src/api/urls/apis.js
@@ -24,7 +24,7 @@ export default {
   cTExportPhaseInteractiveReport: "/api_html/class/manager/exportPhaseInteractiveReport",
   //班主任- 导出阶段测练报表
   cTExportPhaseExamReport: "/api_html/class/manager/exportPhaseExamReport",
-  
+
   //任课老师-查询管理班级
   tClassList: "/api_html/teaching/classList",
   //任课老师-查询管理班级授课科目
@@ -110,6 +110,19 @@ export default {
   addStudent: "/api_html/school/manager/addStudent",
   //  导入学生答题器绑定模板下载地址
   studentClickerTemplateUrl: "/api_html/school/manager/studentClickerTemplateUrl",
+  //  导入学生答题器文件上传
+  importStudentClicker: "/api_html/school/manager/importStudentClicker",
+  //  班级名册模板下载
+  classAndStudentTemplate: "/api_html/school/manager/classAndStudentTemplate",
+  //  班级名册导出
+  exportClassAndStudent: "/api_html/school/manager/exportClassAndStudent",
+  //  教师模板下载
+  teacherTemplate: "/api_html/school/manager/teacherTemplate",
+  //  教师导入
+  importTeacher: "/api_html/school/manager/importTeacher",
+  //  教师导出
+  exportTeacher: "/api_html/school/manager/exportTeacher",
+
   //  删除学生
   delStudent: "/api_html/school/manager/delStudent",
   //  查询学校教师列表
@@ -201,121 +214,129 @@ export default {
   syncUser: "/api_html/tenant/syncUser",
 
 
-   // 个人版首页统计数据
-   personalIndex:"/api_html/personal/index",
-   // 个人信息
-   getInfo:"/api_html/personal/personalInfo",
-   // 修改个人信息
-   modifyInfo:"/api_html/personal/modifyInfo",
-   //  查询班级列表
-   pClassList:"/api_html/personal/classList",
-   //  查询科目列表
-   pSubjectList:"/api_html/personal/subjectList",
-   //  查询学生列表
-   pStudentList:"/api_html/personal/studentList",
-   //  新增或修改班级
-   pSaveClass:"/api_html/personal/saveClass",
-   //  删除班级
-   pDelClass:"/api_html/personal/delClass",
-   //  增加学生
-   pAddStudent:"/api_html/personal/addStudent",
-   //  删除学生
-   pDelStudent:"/api_html/personal/delStudent",
-   //  查询答题卡类型列表
-   pPaperTagList:"/api_html/personal/paperTagList",
-   //  查询答题卡列表
-   pPaperList:"/api_html/personal/paperList",
-   //  查询答题卡详情
-   pPaperDetail:"/api_html/personal/paperDetail",
-   //  增加答题卡
-   pAddPaper:"/api_html/personal/addPaper",
-   //  修改答题卡
-   pModifyPaper:"/api_html/personal/modifyPaper",
-   //  删除答题卡
-   pDelPaper:"/api_html/personal/delPaper",
-   //  增加答题卡类型
-   pAddPaperType:"/api_html/personal/addPaperType",
-   //  修改答题卡类型
-   pModifyPaperType:"/api_html/personal/modifyPaperType",
-   //  删除答题卡类型
-   pDelPaperType:"/api_html/personal/delPaperType",
-   //  分页查询课时报表列表
-   pPeriodReportList:"/api_html/personal/periodReportList",
-   //  查询阶段问答报表
-   pPhaseAnswerReport:"/api_html/personal/phaseAnswerReport",
-   //  查询阶段互动报表
-   pPhaseInteractiveReport:"/api_html/personal/phaseInteractiveReport",
-   //  查询课时题目列表
-   pPeriodQuestionList:"/api_html/personal/periodQuestionList",
-   //  设置课时报表答案
-   pSetPeriodAnswer:"/api_html/personal/setPeriodAnswer",
-   //  查询课时报表详情
-   pPeriodDetail:"/api_html/personal/periodDetail",
-   //  分页查询课时题目统计列表
-   pPeriodQuestionReport:"/api_html/personal/periodQuestionReport",
-   //  查询课时学生答题明细
-   pPeriodStudentReport:"/api_html/personal/periodStudentReport",
-   //  导出阶段报表
-   pExportPhaseReport:"/api_html/personal/exportPhaseReport",
-   //  分页查询即时测报表
-   pExamReportList:"/api_html/personal/examReportList",
-   //  查询阶段测练报表
-   pPhaseExamReport:"/api_html/personal/phaseExamReport",
-   //  查询即时测报表题目列表
-   pExamQuestionList:"/api_html/personal/examQuestionList",
-   //  设置即时测报表答案
-   pSetExamAnswer:"/api_html/personal/setExamAnswer",
-   //  查询即时测报表详情
-   pExamDetail:"/api_html/personal/examDetail",
-   //  下载导入主观题分模板
-   pSubjectiveScoreTemplate:"/api_html/personal/subjectiveScoreTemplate",
-   //  导入主观题得分
-   pImportSubjectiveScore:"/api_html/personal/importSubjectiveScore",
-   //  分页查询即时测题目统计
-   pExamQuestionReport:"/api_html/personal/examQuestionReport",
-   //  查询即时测学生统计
-   pExamStudentReport:"/api_html/personal/examStudentReport",
-   //  重新判分
-   pReScore:"/api_html/personal/reScore",
-   //  导出单课时报表
-   pExportPeriodReport:"/api_html/personal/exportPeriodReport",
-   //  导出阶段测练报表
-   pExportPhaseExamReport:"/api_html/personal/exportPhaseExamReport",
-   //  导出单卷测练报表
-   pExportExamReport:"/api_html/personal/exportExamReport",
-   //   数据导出
-   pExportData:"/api_html/personal/exportData",
-   //  数据导入
-   pImportData:"/api_html/personal/importData",
+  // 个人版首页统计数据
+  personalIndex: "/api_html/personal/index",
+  // 个人信息
+  getInfo: "/api_html/personal/personalInfo",
+  // 修改个人信息
+  modifyInfo: "/api_html/personal/modifyInfo",
+  //  查询班级列表
+  pClassList: "/api_html/personal/classList",
+  //  查询科目列表
+  pSubjectList: "/api_html/personal/subjectList",
+  //  查询学生列表
+  pStudentList: "/api_html/personal/studentList",
+  //  新增或修改班级
+  pSaveClass: "/api_html/personal/saveClass",
+  //  删除班级
+  pDelClass: "/api_html/personal/delClass",
+  //  增加学生
+  pAddStudent: "/api_html/personal/addStudent",
+  //  删除学生
+  pDelStudent: "/api_html/personal/delStudent",
+  //  查询答题卡类型列表
+  pPaperTagList: "/api_html/personal/paperTagList",
+  //  查询答题卡列表
+  pPaperList: "/api_html/personal/paperList",
+  //  查询答题卡详情
+  pPaperDetail: "/api_html/personal/paperDetail",
+  //  增加答题卡
+  pAddPaper: "/api_html/personal/addPaper",
+  //  修改答题卡
+  pModifyPaper: "/api_html/personal/modifyPaper",
+  //  删除答题卡
+  pDelPaper: "/api_html/personal/delPaper",
+  //  增加答题卡类型
+  pAddPaperType: "/api_html/personal/addPaperType",
+  //  修改答题卡类型
+  pModifyPaperType: "/api_html/personal/modifyPaperType",
+  //  删除答题卡类型
+  pDelPaperType: "/api_html/personal/delPaperType",
+  //  分页查询课时报表列表
+  pPeriodReportList: "/api_html/personal/periodReportList",
+  //  查询阶段问答报表
+  pPhaseAnswerReport: "/api_html/personal/phaseAnswerReport",
+  //  查询阶段互动报表
+  pPhaseInteractiveReport: "/api_html/personal/phaseInteractiveReport",
+  //  查询课时题目列表
+  pPeriodQuestionList: "/api_html/personal/periodQuestionList",
+  //  设置课时报表答案
+  pSetPeriodAnswer: "/api_html/personal/setPeriodAnswer",
+  //  查询课时报表详情
+  pPeriodDetail: "/api_html/personal/periodDetail",
+  //  分页查询课时题目统计列表
+  pPeriodQuestionReport: "/api_html/personal/periodQuestionReport",
+  //  查询课时学生答题明细
+  pPeriodStudentReport: "/api_html/personal/periodStudentReport",
+  //  导出阶段报表
+  pExportPhaseReport: "/api_html/personal/exportPhaseReport",
+  //  分页查询即时测报表
+  pExamReportList: "/api_html/personal/examReportList",
+  //  查询阶段测练报表
+  pPhaseExamReport: "/api_html/personal/phaseExamReport",
+  //  查询即时测报表题目列表
+  pExamQuestionList: "/api_html/personal/examQuestionList",
+  //  设置即时测报表答案
+  pSetExamAnswer: "/api_html/personal/setExamAnswer",
+  //  查询即时测报表详情
+  pExamDetail: "/api_html/personal/examDetail",
+  //  下载导入主观题分模板
+  pSubjectiveScoreTemplate: "/api_html/personal/subjectiveScoreTemplate",
+  //  导入主观题得分
+  pImportSubjectiveScore: "/api_html/personal/importSubjectiveScore",
+  //  分页查询即时测题目统计
+  pExamQuestionReport: "/api_html/personal/examQuestionReport",
+  //  查询即时测学生统计
+  pExamStudentReport: "/api_html/personal/examStudentReport",
+  //  重新判分
+  pReScore: "/api_html/personal/reScore",
+  //  导出单课时报表
+  pExportPeriodReport: "/api_html/personal/exportPeriodReport",
+  //  导出阶段测练报表
+  pExportPhaseExamReport: "/api_html/personal/exportPhaseExamReport",
+  //  导出单卷测练报表
+  pExportExamReport: "/api_html/personal/exportExamReport",
+  //   数据导出
+  pExportData: "/api_html/personal/exportData",
+  //  数据导入
+  pImportData: "/api_html/personal/importData",
 
 
-   /** 平台管理 */
-   //账户管理
-   tenantPage:"/api_html/system/tenantPage",
-   //修改账号
-   updateTenant:"/api_html/system/updateTenant",
-   //新增租户账号
-   addTenant:"/api_html/system/addTenant",
-   // 授课端版本管理
-   versionPage:"/api_html/system/versionPage",
-   // 新增授课端版本
-   addVersion:"/api_html/system/addVersion",
-   // 基站统计数据
-   pStationReport:"/api_html/system/stationReport",
-   // 答题器统计数据
-   pKeyboardReport:"/api_html/system/keyboardReport",
-   // 查询设备列表
-   pDeviceList:"/api_html/system/deviceList",
-   // 查询设备详情
-   pDeviceDetail:"/api_html/system/deviceDetail",
-   // 查询设备日志列表
-   pDeviceLogList:"/api_html/system/deviceLogList",
-   // 文件上传
-   uploadApp:"/file/uploadApp",
-   // 图片上传
-   uploadImg:"/file/uploadImg",
-   // 班级名册导入
-   studentTemplateUrl:"/api_html/personal/studentTemplateUrl",
-   // 班级名册导出
-   exportStudent:"/api_html/personal/exportStudent",
+  /** 平台管理 */
+  //账户管理
+  tenantPage: "/api_html/system/tenantPage",
+  //修改账号
+  updateTenant: "/api_html/system/updateTenant",
+  //新增租户账号
+  addTenant: "/api_html/system/addTenant",
+  // 授课端版本管理
+  versionPage: "/api_html/system/versionPage",
+  // 新增授课端版本
+  addVersion: "/api_html/system/addVersion",
+  // 删除授课端版本
+  delVersion: "/api_html/system/delVersion",
+  // 基站统计数据
+  pStationReport: "/api_html/system/stationReport",
+  // 答题器统计数据
+  pKeyboardReport: "/api_html/system/keyboardReport",
+  // 查询设备列表
+  pDeviceList: "/api_html/system/deviceList",
+  // 查询设备详情
+  pDeviceDetail: "/api_html/system/deviceDetail",
+  // 查询设备日志列表
+  pDeviceLogList: "/api_html/system/deviceLogList",
+  // 文件上传
+  uploadApp: "/file/uploadApp",
+  // 图片上传
+  uploadImg: "/file/uploadImg",
+  // 班级名册导入
+  studentTemplateUrl: "/api_html/personal/studentTemplateUrl",
+  // 班级名册导出
+  exportStudent: "/api_html/personal/exportStudent",
+  // 学生测练统计
+  studentExamReport: "/api_html/personal/studentExamReport",
+  //   查询最新的授课端应用版本
+  pLatestVersion: "/api_html/personal/latestVersion",
+  //   载指定版本授课端
+  pGetAppDownloadUrl: "/api_html/personal/getAppDownloadUrl",
 }
diff --git a/src/assets/img404/bg404.jpg b/src/assets/images/img404/bg404.jpg
index 95e4bde..95e4bde 100644
--- a/src/assets/img404/bg404.jpg
+++ b/src/assets/images/img404/bg404.jpg
diff --git a/src/assets/img404/i404.png b/src/assets/images/img404/i404.png
index 52a430a..52a430a 100644
--- a/src/assets/img404/i404.png
+++ b/src/assets/images/img404/i404.png
diff --git a/src/assets/img404/sign.png b/src/assets/images/img404/sign.png
index cb8333b..cb8333b 100644
--- a/src/assets/img404/sign.png
+++ b/src/assets/images/img404/sign.png
diff --git a/src/router/index.js b/src/router/index.js
index a3a55e7..30890b8 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -8,10 +8,14 @@ import HomeMain from "@/views/index/mainIndex"
 
 // 不是必须加载的组件使用懒加载
 const NotFound = () => import("@/views/page404")
-const ExaminationPaper = () => import("@/views/standard/examinationPaper/index")
-const ExaminationPaperAdd = () => import("@/views/standard/examinationPaper/add")
-const ExaminationPaperEdit = () => import("@/views/standard/examinationPaper/edit")
-const ExaminationPaperRecycle = () => import("@/views/standard/examinationPaper/recycle")
+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 Portrait = () => import("@/views/portrait/index")
+const PortraitDetail = () => import("@/views/portrait/detail")
+
+
 const Ask = () => import("@/views/standard/ask/index")
 const AskAnalysis = () => import("@/views/standard/ask/analysis")
 const Test = () => import("@/views/standard/test/index")
@@ -29,17 +33,11 @@ const SetUpSchool = () => import("@/views/standard/setUp/school")
 const SetUpStudent = () => import("@/views/standard/setUp/student")
 const SetUpTeacher = () => import("@/views/standard/setUp/teacher")
 
-const PersonalExaminationPaper = () => import("@/views/personal/examinationPaper/index")
-const PersonalExaminationPaperAdd = () => import("@/views/personal/examinationPaper/add")
-const PersonalExaminationPaperEdit = () => import("@/views/personal/examinationPaper/edit")
-const PersonalExaminationPaperRecycle = () => import("@/views/personal/examinationPaper/recycle")
 const PersonalAsk = () => import("@/views/personal/ask/index")
 const PersonalAskAnalysis = () => import("@/views/personal/ask/analysis")
 const PersonalTest = () => import("@/views/personal/test/index")
 const PersonalTestAnalysis = () => import("@/views/personal/test/analysis")
 const PersonalDataSync = () => import("@/views/personal/dataSync/index")
-const PersonalPortrait = () => import("@/views/personal/portrait/index")
-const PersonalPortraitDetail = () => import("@/views/personal/portrait/detail")
 const PersonalSetUpStudent = () => import("@/views/personal/setUp/student")
 const PersonalDown = () => import("@/views/personal/down/index")
 const PersonalUserInfo = () => import("@/views/personal/userInfo/index")
@@ -371,6 +369,33 @@ let addrouters = [  //测试用，后续后端获取
       }
     ]
   },
+  {
+    path: "/portrait",
+    iconCls: "fa fa-users", // 图标样式class
+    name: "学生画像",
+    component: Layout,
+    alone: true,
+    children: [
+      {
+        path: "/portrait",
+        iconCls: "fa fa-users", // 图标样式class
+        name: "",
+        component: Portrait,
+        meta: {
+          keepAlive: true,
+        },
+        children: []
+      },
+      {
+        path: "/portraitDetail",
+        iconCls: "", // 图标样式class
+        name: "授课端软件",
+        component: PortraitDetail,
+        parent: "down",
+        children: []
+      }
+    ]
+  },
 ]
 
 const addroutersPersonal = [
@@ -401,14 +426,14 @@ const addroutersPersonal = [
         path: "/examinationPaper",
         iconCls: "fa fa-file-text", // 图标样式class
         name: "examinationPaper",
-        component: PersonalExaminationPaper,
+        component: ExaminationPaper,
         children: []
       },
       {
         path: "/examinationPaperAdd",
         iconCls: "", // 图标样式class
         name: "examinationPaperAdd",
-        component: PersonalExaminationPaperAdd,
+        component: ExaminationPaperAdd,
         parent: "examinationPaper",
         children: []
       },
@@ -416,7 +441,7 @@ const addroutersPersonal = [
         path: "/examinationPaperEdit",
         iconCls: "", // 图标样式class
         name: "修改答题卡",
-        component: PersonalExaminationPaperEdit,
+        component: ExaminationPaperEdit,
         parent: "examinationPaper",
         children: []
       },
@@ -424,7 +449,7 @@ const addroutersPersonal = [
         path: "/examinationPaperRecycle",
         iconCls: "", // 图标样式class
         name: "已归档答题卡",
-        component: PersonalExaminationPaperRecycle,
+        component: ExaminationPaperRecycle,
         parent: "examinationPaper",
         children: []
       },
@@ -498,7 +523,7 @@ const addroutersPersonal = [
         path: "/portrait",
         iconCls: "fa fa-users", // 图标样式class
         name: "",
-        component: PersonalPortrait,
+        component: Portrait,
         meta: {
           keepAlive: true,
         },
@@ -508,7 +533,7 @@ const addroutersPersonal = [
         path: "/portraitDetail",
         iconCls: "", // 图标样式class
         name: "授课端软件",
-        component: PersonalPortraitDetail,
+        component: PortraitDetail,
         parent: "down",
         children: []
       }
diff --git a/src/utils/index.js b/src/utils/index.js
index 166760c..f76c88b 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -197,7 +197,7 @@ export function b64DecodeUnicode(str) {
         })
         .join("")
     );
-  } catch (e) {}
+  } catch (e) { }
   return uni;
 }
 
@@ -568,7 +568,7 @@ function setSectionName(num) {
   }
   return txt;
 }
-function setGradeName(num) {
+export function setGradeName(num) {
   let txt = "";
   switch (num) {
     case 1:
@@ -619,6 +619,9 @@ function setGradeName(num) {
     case 16:
       txt = "大四";
       break;
+    default:
+      txt = "未知";
+      break;
   }
   return txt;
 }
@@ -724,7 +727,7 @@ export function formatGradeNameClass(data) {
           {
             value: item.id,
             label: item.className,
-            leaf:true
+            leaf: true
           },
         ],
       });
@@ -738,7 +741,7 @@ export function formatGradeNameClass(data) {
       gradeNameArr[gradeIndex].children.push({
         value: item.id,
         label: item.className,
-        leaf:true
+        leaf: true
       });
     }
   });
diff --git a/src/views/admin/clientVersion/components/upLoad.vue b/src/views/admin/clientVersion/components/upLoad.vue
index c3e73a1..c15eff1 100644
--- a/src/views/admin/clientVersion/components/upLoad.vue
+++ b/src/views/admin/clientVersion/components/upLoad.vue
@@ -8,15 +8,15 @@
         :action="url"
         :multiple="false"
         :data="{ ...query }"
-        :with-credentials="true"
         :limit="1"
         :on-change="change"
         :on-success="upSuccess"
         :on-error="upError"
+        accept=".zip"
       >
         <!-- accept="application/vnd.ms-excel" -->
         <div class="upload-btn">
-          <el-button class="btn" size="mini" type="primary">选择文件</el-button>
+          <el-button class="btn" size="mini" type="primary">选择zip文件</el-button>
         </div>
       </el-upload>
     </div>
diff --git a/src/views/admin/clientVersion/components/upLoadImg.vue b/src/views/admin/clientVersion/components/upLoadImg.vue
index 250ab1a..e5ef99b 100644
--- a/src/views/admin/clientVersion/components/upLoadImg.vue
+++ b/src/views/admin/clientVersion/components/upLoadImg.vue
@@ -7,10 +7,10 @@
       :action="url"
       :multiple="false"
       :data="{ ...query }"
-      :with-credentials="true"
       :limit="1"
       :on-success="upSuccess"
       :on-error="upError"
+      accept="image/*"
     >
       <!-- accept="application/vnd.ms-excel" -->
       <img v-if="imageUrl" :src="imageUrl" class="avatar" />
diff --git a/src/views/admin/clientVersion/index.vue b/src/views/admin/clientVersion/index.vue
index 3443838..6c1f3a5 100644
--- a/src/views/admin/clientVersion/index.vue
+++ b/src/views/admin/clientVersion/index.vue
@@ -75,7 +75,12 @@
         </el-pagination>
       </div>
     </div>
-    <el-dialog title="添加账号" :visible.sync="diaAdd" width="400">
+    <el-dialog
+      title="添加账号"
+      :visible.sync="diaAdd"
+      v-if="diaAdd"
+      width="400"
+    >
       <el-form
         class="form-box"
         :model="formAdd"
@@ -93,7 +98,7 @@
             </el-input>
           </el-col>
         </el-form-item>
-        <el-form-item label="版本号：" prop="versionNumber">
+        <el-form-item label="版本号：">
           <el-col :span="12">
             <el-input
               placeholder="请输入版本号"
@@ -103,19 +108,19 @@
             </el-input>
           </el-col>
         </el-form-item>
-        <el-form-item label="软件图标：" prop="logo">
+        <el-form-item label="软件图标：">
           <el-col :span="12">
-             <upLoadImg :url="url" @upSuccess="logoSuccess"/>
+            <upLoadImg url="/file/uploadImg" @upSuccess="logoSuccess" />
           </el-col>
         </el-form-item>
-        <el-form-item label="上传全量文件包：" prop="appfiles">
+        <el-form-item label="上传全量文件包：" prop="filePath">
           <el-col :span="12">
-            <upLoad :url="url" @upSuccess="appfilesSuccess"/>
+            <upLoad :url="url" @upSuccess="appfilesSuccess" />
           </el-col>
         </el-form-item>
-        <el-form-item label="上传增量文件包：" prop="addfiles">
+        <el-form-item label="上传增量文件包：" prop="incrementFilePath">
           <el-col :span="12">
-            <upLoad :url="url" @upSuccess="addfilesSuccess"/>
+            <upLoad :url="url" @upSuccess="addfilesSuccess" />
           </el-col>
         </el-form-item>
         <el-form-item label="更新描述：" prop="description">
@@ -138,17 +143,18 @@
 </template>
 
 <script>
-import upLoad from "./components/upLoad.vue"
-import upLoadImg from "./components/upLoadImg.vue"
+import upLoad from "./components/upLoad.vue";
+import upLoadImg from "./components/upLoadImg.vue";
 export default {
-  components:{
+  components: {
     upLoad,
-    upLoadImg
+    upLoadImg,
   },
   data() {
     return {
       url: "/file/uploadApp",
       loading: false,
+      addLoading: false,
       diaAdd: false,
       tableData: [],
       formAdd: {
@@ -163,12 +169,6 @@ export default {
         versionName: [
           { required: true, message: "请输入版本名称", trigger: "blur" },
         ],
-        versionNumber: [
-          { required: true, message: "请输入版本号", trigger: "blur" },
-        ],
-        appImage: [
-          { required: true, message: "请上传软件图标", trigger: "blur" },
-        ],
         filePath: [
           { required: true, message: "请上传全量文件包", trigger: "blur" },
         ],
@@ -198,17 +198,42 @@ export default {
       this.page = page;
       this._QueryData();
     },
-    remove(obj) {},
-    logoSuccess(res){
-      this.formAdd.appImage = res.data;
+    async remove(obj) {
+      const { data, status, info } = await this.$request.delVersion({
+        id: obj.id,
+      });
+      if (status === 0) {
+        this.$message.success("删除成功～");
+        this._QueryData();
+      } else {
+        this.$message.error(info);
+      }
+    },
+    logoSuccess(res) {
+      this.formAdd.appImage = res.data.resId;
     },
-    appfilesSuccess(res){
+    appfilesSuccess(res) {
       this.formAdd.filePath = res.data;
     },
-    addfilesSuccess(res){
+    addfilesSuccess(res) {
       this.formAdd.incrementFilePath = res.data;
     },
-    save() {},
+    async save() {
+      if (this.addLoading) return;
+      this.addLoading = true;
+      const { data, status, info } = await this.$request.addVersion({
+        ...this.formAdd,
+      });
+
+      this.addLoading = false;
+      if (status === 0) {
+        this.diaAdd = false;
+        this.$message.success("添加成功～");
+        this._QueryData();
+      } else {
+        this.$message.error(info);
+      }
+    },
     async _QueryData() {
       this.loading = true;
       this.tableData = [];
diff --git a/src/views/admin/device/index.vue b/src/views/admin/device/index.vue
index 5762de9..73865ee 100644
--- a/src/views/admin/device/index.vue
+++ b/src/views/admin/device/index.vue
@@ -27,27 +27,27 @@
             <div class="answer-header">
               <div class="sel-box">
                 <el-input
-                  placeholder="请输入租户"
+                  placeholder="请输入学校"
                   v-model="query.schoolName"
                   class="input-with-select"
-                  @keyup.enter.native="_QueryData(true)"
+                  @keyup.enter.native="query.loginName='',_QueryData(true)"
                 >
                   <el-button
                     slot="append"
                     icon="el-icon-search"
-                    @click="_QueryData(true)"
+                    @click="query.loginName='',_QueryData(true)"
                   ></el-button>
                 </el-input>
                 <el-input
                   placeholder="请输入租户"
-                  v-model="query.sn"
+                  v-model="query.loginName"
                   class="input-with-select"
-                  @keyup.enter.native="_QueryData(true)"
+                  @keyup.enter.native="query.schoolName='',_QueryData(true)"
                 >
                   <el-button
                     slot="append"
                     icon="el-icon-search"
-                    @click="_QueryData(true)"
+                    @click="query.schoolName='',_QueryData(true)"
                   ></el-button>
                 </el-input>
                 <el-button class="serach-box" round @click="_QueryData(true)"
@@ -135,30 +135,28 @@
           <div class="table-box">
             <div class="answer-header">
               <div class="sel-box">
-                <el-select
-                  class="sel"
-                  v-model="query.school"
-                  placeholder="选择学校"
-                  @change="_QueryData(true)"
+                <el-input
+                  placeholder="请输入学校"
+                  v-model="query.schoolName"
+                  class="input-with-select"
+                  @keyup.enter.native="query.loginName='',_QueryData(true)"
                 >
-                  <el-option
-                    v-for="item in schoolList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
+                  <el-button
+                    slot="append"
+                    icon="el-icon-search"
+                    @click="query.loginName='',_QueryData(true)"
+                  ></el-button>
+                </el-input>
                 <el-input
                   placeholder="请输入租户"
-                  v-model="query.sn"
+                  v-model="query.loginName"
                   class="input-with-select"
-                  @keyup.enter.native="_QueryData(true)"
+                  @keyup.enter.native="query.schoolName='',_QueryData(true)"
                 >
                   <el-button
                     slot="append"
                     icon="el-icon-search"
-                    @click="_QueryData(true)"
+                    @click="query.schoolName='',_QueryData(true)"
                   ></el-button>
                 </el-input>
                 <el-button class="serach-box" round @click="_QueryData(true)"
@@ -255,7 +253,6 @@ export default {
       this.page = 1;
       this.total = 0;
       this.count = 0;
-      this.query.onlineStatus = "";
       this.query.schoolName = "";
       this.query.loginName = "";
       if (val == 1) {
@@ -275,7 +272,6 @@ export default {
       query: {
         schoolName: "",
         loginName: "",
-        onlineStatus: "",
       },
       tableData: [],
       total: 0,
@@ -377,13 +373,6 @@ export default {
           query[key] = this.query[key];
         }
       }
-      if (query.loginName) {
-        delete query.schoolName;
-        delete query.onlineStatus;
-      } else if (query.schoolName) {
-        delete query.loginName;
-        delete query.onlineStatus;
-      }
       if (isRef) {
         this.page = 1;
       }
diff --git a/src/views/admin/device/log.vue b/src/views/admin/device/log.vue
index 6619819..e1318c4 100644
--- a/src/views/admin/device/log.vue
+++ b/src/views/admin/device/log.vue
@@ -296,7 +296,7 @@ export default {
         data = {},
         status,
         info,
-      } = await this.$request.deviceLogList({
+      } = await this.$request.pDeviceLogList({
         ...query,
         deviceId: Number(this.id),
         page: this.page,
diff --git a/src/views/personal/examinationPaper/add.vue b/src/views/examinationPaper/add.vue
index 66aeb88..b02215f 100644
--- a/src/views/personal/examinationPaper/add.vue
+++ b/src/views/examinationPaper/add.vue
@@ -55,6 +55,26 @@
               @click="openTagDia"
             ></el-button>
           </el-form-item>
+          <el-form-item
+            v-if="role != 'ROLE_PERSONAL'"
+            label="年级："
+            prop="gradeName"
+          >
+            <el-select
+              class="sel"
+              v-model="form.gradeName"
+              placeholder=""
+              @change="changeGrade"
+            >
+              <el-option
+                v-for="item in gradeList"
+                :key="item"
+                :label="item"
+                :value="item"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="科目：" prop="subjectName">
             <el-select class="sel" v-model="form.subjectName" placeholder="">
               <el-option
@@ -77,6 +97,16 @@
               label="考试时长"
             ></el-input-number>
           </el-form-item>
+          <el-form-item
+            v-if="role != 'ROLE_PERSONAL'"
+            label="分享范围："
+            prop="sharingType"
+          >
+            <el-radio-group v-model="form.sharingType">
+              <el-radio :label="0">任课班级分享</el-radio>
+              <el-radio :label="1">全年级分享</el-radio>
+            </el-radio-group>
+          </el-form-item>
         </el-form>
         <div class="btn-box">
           <el-button type="danger" plain round @click="linkBack"
@@ -830,23 +860,29 @@
         </div>
       </div>
       <el-dialog
-        :title="upLoadType == 1 ? '上传题干' : '上传题目解析'"
+        :title="stem.type == 1 ? '上传题干' : '上传题目解析'"
         :visible.sync="dialogStem"
+        v-if="dialogStem"
         width="500"
       >
-        <div>
-          <img class="stem-pic" :src="stem.screenshot" alt="" />
+        <div class="upload-box">
+          <img
+            v-if="stem.screenshot || stem.answerScreenshot"
+            :src="
+              stem.type == 1 ? stem.screenshotSrc : stem.answerScreenshotSrc
+            "
+            class="stem-pic"
+          />
           <el-upload
             class="upload-demo"
             action="http://121.40.127.171/file/uploadImg"
             :limit="1"
-            :with-credentials="true"
             :on-success="upSuccess"
             :on-error="upError"
             accept="image/*"
           >
             <el-button size="small" type="primary">{{
-              stem.src ? "重新上传" : "选择照片"
+              stem.screenshot || stem.answerScreenshot ? "重新上传" : "选择照片"
             }}</el-button>
           </el-upload>
         </div>
@@ -930,43 +966,8 @@ export default {
   },
   data() {
     return {
-      dialogStem: false,
-      dialogTag: false,
-      upLoadType: 1,
-      stem: {
-        id: "",
-        type: 1,
-        index: 0,
-        indexs: 0,
-        screenshot: "", //题干图片地址
-        answerScreenshot: "", //题干解析图片地址
-        difficultyFactor: 0, //题目难度
-        knowledge: [], //知识点
-      },
-      type: 1, //1-创建，2-复制答题卡
-      dialogVisible: false, //测验类型设置弹窗
-      addQuestionVisible: false, //添加大题弹窗
-      questionForm: { ...questionForm },
-      questionFormRules: {
-        questionTitle: [
-          { required: true, message: "请输入大题名称", trigger: "blur" },
-          {
-            min: 1,
-            max: 30,
-            message: "长度在 1 到 30 个字符",
-            trigger: "blur",
-          },
-        ],
-      },
-      questionOptions: [
-        { label: "单选题", value: 2 },
-        { label: "多选题", value: 3 },
-        { label: "判断题", value: 4 },
-        { label: "主观题", value: 5 },
-      ],
-      rightOptions: ["A", "B", "C", "D", "E", "F", "G"],
-      addSubQuestionsType: "",
-      step: 1, //步骤
+      role: "",
+      step: 0, //步骤
       gradeList: [], //年级
       subjectList: [], //科目
       answerTypeList: [], //测验类型
@@ -978,6 +979,8 @@ export default {
         subjectName: "",
         examsDuration: 90,
         questionList: [],
+        gradeName: "",
+        sharingType: 0,
       },
       formRules: {
         //答题卡验证
@@ -998,7 +1001,9 @@ export default {
         ],
       },
       tagList: [],
-      diaSetAns: false,
+      diaSetAns: false, //答案开关
+      dialogStem: false, //截图开关
+      dialogTag: false, //打标开关
       formAns: {
         listIndex: 0, //大题位置
         endIndex: 0, //相同题目最后一位题目的questionIndex
@@ -1008,10 +1013,53 @@ export default {
         answerOptions: [], //答案选项
         answerList: "", //答案列表-字符串
       },
+      stem: {
+        type: 1, //类型
+        index: 0, //大题位置
+        indexs: 0, //小题位置
+        screenshot: "", //题干图片id
+        answerScreenshot: "", //题干解析图片id
+        screenshotSrc: "", //题干图片地址显示用保存时删除
+        answerScreenshotSrc: "", //题干解析图片地址显示用保存时删除
+        difficultyFactor: 0, //题目难度
+        knowledge: null, //知识点
+      },
+      type: 1, //1-创建，2-复制答题卡
+      dialogVisible: false, //测验类型设置弹窗
+      addQuestionVisible: false, //添加大题弹窗
+      questionForm: { ...questionForm },
+      questionFormRules: {
+        questionTitle: [
+          { required: true, message: "请输入大题名称", trigger: "blur" },
+          {
+            min: 1,
+            max: 30,
+            message: "长度在 1 到 30 个字符",
+            trigger: "blur",
+          },
+        ],
+      },
+      questionOptions: [
+        { label: "单选题", value: 2 },
+        { label: "多选题", value: 3 },
+        { label: "判断题", value: 4 },
+        { label: "主观题", value: 5 },
+      ],
+      rightOptions: ["A", "B", "C", "D", "E", "F", "G"],
+      addSubQuestionsType: "",
     };
   },
   async created() {
     this.type = this.$route.query.type ? this.$route.query.type : 1;
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
+    if (this.role != "ROLE_PERSONAL") {
+      this.formRules.gradeName = [
+        { required: true, message: "请选择年级", trigger: "blur" },
+      ];
+      await this._GradeList();
+    }
     await this._QuerySubjectList(this.gradeList[0]);
     await this._TypeList();
     if (this.type == 2) {
@@ -1021,18 +1069,25 @@ export default {
   methods: {
     openStem(obj, type, index, indexs) {
       //上传截图
-      this.upLoadType = type;
-      this.stem.id = obj.id;
       this.stem.type = type;
       this.stem.index = index;
       this.stem.indexs = indexs;
-      this.stem.screenshot = type == 1 ? obj.screenshot : obj.answerScreenshot;
+      if (type == 1) {
+        this.stem.screenshot = obj.screenshot || "";
+        this.stem.screenshotSrc = obj.screenshotSrc || "";
+        this.stem.answerScreenshot = "";
+        this.stem.answerScreenshotSrc = "";
+      } else {
+        this.stem.screenshot = "";
+        this.stem.screenshotSrc = "";
+        this.stem.answerScreenshot = obj.answerScreenshot || "";
+        this.stem.answerScreenshotSrc = obj.answerScreenshotSrc || "";
+      }
       this.dialogStem = true;
     },
     openTag(obj, type, index, indexs) {
       //难度，知识点
       this.stem = { ...this.stem, obj };
-      this.stem.id = obj.id;
       this.stem.type = type;
       this.stem.index = index;
       this.stem.indexs = indexs;
@@ -1040,14 +1095,18 @@ export default {
       this.stem.difficultyFactor = obj.difficultyFactor || "";
       this.dialogTag = true;
     },
-    upSuccess(res) {
+    upSuccess(res, file) {
       //图片上传成功
       if (res && res.status == 0) {
-        this.dialogStem = false;
         let keys = this.stem.type == 1 ? "screenshot" : "answerScreenshot";
+        this.stem[keys + "Src"] = res.data.url;
+        this.stem[keys] = res.data.resId;
         this.form.questionList[this.stem.index].subQuestions[this.stem.indexs][
           keys
         ] = this.stem[keys];
+        this.form.questionList[this.stem.index].subQuestions[this.stem.indexs][
+          keys + "Src"
+        ] = this.stem[keys + "Src"];
         this.$message.success("上传成功");
       } else {
         this.$message.error(res.info);
@@ -1175,7 +1234,6 @@ export default {
           val
         );
       } else {
-        console.log(this.questionForm.answerList.split(","));
         this.questionForm.answerList = this.questionForm.answerList
           .split(",")
           .splice(0, val)
@@ -1431,12 +1489,12 @@ export default {
             );
           }
         }
-        console.log(types);
       });
       this.step = 2;
       return;
     },
     formatQuestionList() {
+      //删除批量操作数据
       for (let i = 0; i < this.form.questionList.length; i++) {
         for (
           let j = 0;
@@ -1627,7 +1685,11 @@ export default {
         return;
       }
       //修改测验类型
-      const { data, status, info } = await this.$request.pModifyPaperType({
+      let editPaperType =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pModifyPaperType
+          : this.$request.editPaperType;
+      const { data, status, info } = await editPaperType({
         tagId: obj.id,
         tag: obj.typeName,
       });
@@ -1641,7 +1703,11 @@ export default {
     },
     async removeTypeName(obj) {
       //删除测验类型
-      const { data, status, info } = await this.$request.pDelPaperType({
+      let delPaperType =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pDelPaperType
+          : this.$request.delPaperType;
+      const { data, status, info } = await delPaperType({
         tagId: obj.id,
       });
       if (status == 0) {
@@ -1669,7 +1735,11 @@ export default {
         return;
       }
       //添加测验类型
-      const { data, status, info } = await this.$request.pAddPaperType({
+      let addPaperType =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pAddPaperType
+          : this.$request.addPaperType;
+      const { data, status, info } = await addPaperType({
         tag: this.answerTypeName,
       });
       if (status == 0) {
@@ -1689,8 +1759,21 @@ export default {
       let formDatas = deepClone(this.form);
       for (let i = 0; i < formDatas.questionList.length; i++) {
         delete formDatas.questionList[i].show;
+        for (let j = 0; j < formDatas.questionList[i].subQuestions; j++) {
+          if (!!formDatas.questionList[i].subQuestions[j].answerScreenshotSrc) {
+            delete formDatas.questionList[i].subQuestions[j]
+              .answerScreenshotSrc;
+          }
+          if (!!formDatas.questionList[i].subQuestions[j].screenshotSrc) {
+            delete formDatas.questionList[i].subQuestions[j].screenshotSrc;
+          }
+        }
       }
-      const { data, status, info } = await this.$request.pAddPaper({
+      let addPaper =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pAddPaper
+          : this.$request.addPaper;
+      const { data, status, info } = await addPaper({
         ...formDatas,
       });
       this.saveLoading = false;
@@ -1702,9 +1785,17 @@ export default {
         this.$message.error(info);
       }
     },
+    async changeGrade() {
+      //切换年级查询科目
+      this._QuerySubjectList(this.form.gradeName);
+    },
     async _TypeList() {
       //测验类型查询
-      const { data, status, info } = await this.$request.pPaperTagList({
+      let fetchTypeNames =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pPaperTagList
+          : this.$request.fetchTypeNames;
+      const { data, status, info } = await fetchTypeNames({
         type: 1,
       });
       if (status == 0) {
@@ -1722,30 +1813,51 @@ export default {
         this.$message.error(info);
       }
     },
-
-    async _QuerySubjectList() {
+    async _GradeList() {
+      //查询年级列表
+      const { data, status, info } = await this.$request.fetchGradeList();
+      if (status == 0) {
+        this.gradeList = (data.gradeNames && [...data.gradeNames]) || [];
+        if (this.type != 2) {
+          this.form.gradeName = this.gradeList[0];
+        }
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QuerySubjectList(grade) {
       //查询科目列表
-      const { data, status, info } = await this.$request.pSubjectList();
+      let query = {};
+      let fetchSubjectList =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pSubjectList
+          : this.$request.fetchSubjectList;
+      if (this.role != "ROLE_PERSONAL") {
+        query.gradeName = grade;
+      }
+      const { data, status, info } = await fetchSubjectList({ ...query });
       if (status === 0) {
         this.subjectList =
           data.subjectNames?.map((item) => {
             return {
-              value: item.subjectName,
-              label: item.subjectName,
+              value: this.role == "ROLE_PERSONAL" ?item.subjectName: item ,
+              label: this.role == "ROLE_PERSONAL" ?item.subjectName: item ,
             };
           }) || [];
-        console.log(this.subjectList);
         if (this.subjectList.length) {
           this.form.subjectName = this.subjectList[0].value;
         }
-        console.log(this.form);
       } else {
         this.$message.error(info);
       }
     },
     async _QueryDetail() {
       //查询答题卡详情
-      const { data, status, info } = await this.$request.pPaperDetail({
+      let fetchPaperDetail =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pPaperDetail
+          : this.$request.fetchPaperDetail;
+      const { data, status, info } = await fetchPaperDetail({
         paperId: this.$route.query.paperId,
       });
       if (status == 0) {
@@ -1753,6 +1865,10 @@ export default {
         this.form.tagId = data.tagId === 0 ? "" : data.tagId;
         this.form.subjectName = data.subjectName;
         this.form.examsDuration = data.examsDuration;
+        if (this.role != "ROLE_PERSONAL") {
+          this.form.sharingType = data.sharingType;
+          this.form.gradeName = data.gradeName;
+        }
         this.form.questionList = data.questionList?.map((item) => {
           let subQuestions =
             item.subQuestions?.map((items) => {
@@ -1763,6 +1879,12 @@ export default {
                 selectNum: items.answerOptions.split(",").length,
                 answerOptions: items.answerOptions || "A,B,C,D",
                 correctAnswer: items.correctAnswer,
+                screenshot: items.screenshot || "",
+                screenshotSrc: items.screenshot || "",
+                answerScreenshot: items.answerScreenshot || "",
+                answerScreenshotSrc: items.answerScreenshot || "",
+                difficultyFactor: items.difficultyFactor || "", //题目难度
+                knowledge: items.knowledge || null, //知识点
               };
             }) || [];
           return {
@@ -1800,7 +1922,7 @@ export default {
   .delButton {
     text-indent: -9999999px;
     border-color: #ff6868;
-    background: #ff6868 url("../../../assets/images/arrow.png") no-repeat center;
+    background: #ff6868 url("../../assets/images/arrow.png") no-repeat center;
     background-size: 19px;
     color: transparent;
   }
@@ -2048,10 +2170,15 @@ export default {
     }
   }
 }
-.upload-demo {
-  text-align: center;
-}
-.stem-pic {
-  width: 100%;
+.upload-box {
+  .upload-demo {
+    text-align: center;
+  }
+  .stem-pic {
+    display: block;
+    margin: 0 auto 20px;
+    height: 200px;
+    object-fit: cover;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/personal/examinationPaper/edit.vue b/src/views/examinationPaper/edit.vue
index 7dad0c5..ad93eb8 100644
--- a/src/views/personal/examinationPaper/edit.vue
+++ b/src/views/examinationPaper/edit.vue
@@ -418,23 +418,31 @@
         </div>
       </el-dialog>
       <el-dialog
-        :title="upLoadType == 1 ? '上传题干' : '上传题目解析'"
+        :title="stem.type == 1 ? '上传题干' : '上传题目解析'"
         :visible.sync="dialogStem"
+        v-if="dialogStem"
         width="500"
       >
-        <div>
-          <img class="stem-pic" :src="stem.screenshot" alt="" />
+        <div class="upload-box">
+          <img
+            v-if="stem.screenshot || stem.answerScreenshot"
+            :src="
+              stem.type == 1
+                ? stem.screenshotSrc || stem.screenshot
+                : stem.answerScreenshotSrc || stem.answerScreenshot
+            "
+            class="stem-pic"
+          />
           <el-upload
             class="upload-demo"
             action="http://121.40.127.171/file/uploadImg"
             :limit="1"
-            :with-credentials="true"
             :on-success="upSuccess"
             :on-error="upError"
             accept="image/*"
           >
             <el-button size="small" type="primary">{{
-              stem.src ? "重新上传" : "选择照片"
+              stem.screenshot || stem.answerScreenshot ? "重新上传" : "选择照片"
             }}</el-button>
           </el-upload>
         </div>
@@ -483,16 +491,17 @@ import { deepClone, checkAnswer } from "utils";
 export default {
   data() {
     return {
+      role: "",
       dialogStem: false,
       dialogTag: false,
-      upLoadType: 1,
       stem: {
-        id: "",
-        type: 1,
-        index: 0,
-        indexs: 0,
-        screenshot: "", //题干图片地址
-        answerScreenshot: "", //题干解析图片地址
+        type: 1, //类型
+        index: 0, //大题位置
+        indexs: 0, //小题位置
+        screenshot: "", //题干图片id
+        answerScreenshot: "", //题干解析图片id
+        screenshotSrc: "", //题干图片地址显示用保存时删除
+        answerScreenshotSrc: "", //题干解析图片地址显示用保存时删除
         difficultyFactor: 0, //题目难度
         knowledge: [], //知识点
       },
@@ -541,6 +550,9 @@ export default {
     },
   },
   created() {
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
     this.type = this.$route.query.type || 1;
     this.title = this.$route.query.title || "";
     this._QueryDetail();
@@ -548,18 +560,25 @@ export default {
   methods: {
     openStem(obj, type, index, indexs) {
       //上传截图
-      this.upLoadType = type;
-      this.stem.id = obj.id;
       this.stem.type = type;
       this.stem.index = index;
       this.stem.indexs = indexs;
-      this.stem.screenshot = type == 1 ? obj.screenshot : obj.answerScreenshot;
+      if (type == 1) {
+        this.stem.screenshot = obj.screenshot || "";
+        this.stem.screenshotSrc = obj.screenshotSrc || "";
+        this.stem.answerScreenshot = "";
+        this.stem.answerScreenshotSrc = "";
+      } else {
+        this.stem.screenshot = "";
+        this.stem.screenshotSrc = "";
+        this.stem.answerScreenshot = obj.answerScreenshot || "";
+        this.stem.answerScreenshotSrc = obj.answerScreenshotSrc || "";
+      }
       this.dialogStem = true;
     },
     openTag(obj, type, index, indexs) {
       //难度，知识点
       this.stem = { ...this.stem, obj };
-      this.stem.id = obj.id;
       this.stem.type = type;
       this.stem.index = index;
       this.stem.indexs = indexs;
@@ -567,19 +586,24 @@ export default {
       this.stem.difficultyFactor = obj.difficultyFactor || "";
       this.dialogTag = true;
     },
-    upSuccess(res) {
+    upSuccess(res, file) {
       //图片上传成功
       if (res && res.status == 0) {
-        this.dialogStem = false;
         let keys = this.stem.type == 1 ? "screenshot" : "answerScreenshot";
-        if (typeof this.stem.indexs != undefined) {
+        this.stem[keys + "Src"] = res.data.url;
+        this.stem[keys] = res.data.resId;
+        if (this.questionList[0].subQuestions) {
           this.questionList[this.stem.index].subQuestions[this.stem.indexs][
             keys
           ] = this.stem[keys];
+          this.questionList[this.stem.index].subQuestions[this.stem.indexs][
+            keys + "Src"
+          ] = this.stem[keys + "Src"];
         } else {
           this.questionList[this.stem.index][keys] = this.stem[keys];
+          this.questionList[this.stem.index][keys + "Src"] =
+            this.stem[keys + "Src"];
         }
-
         this.$message.success("上传成功");
       } else {
         this.$message.error(res.info);
@@ -847,12 +871,25 @@ export default {
           for (let j = 0; j < this.questionList[i].subQuestions.length; j++) {
             if (this.questionList[i].subQuestions[j].qusType) {
               this.questionList[i].subQuestions.splice(j, 1);
+            } else {
+              if (!!this.questionList[i].subQuestions[j].answerScreenshotSrc) {
+                delete this.questionList[i].subQuestions[j].answerScreenshotSrc;
+              }
+              if (!!this.questionList[i].subQuestions[j].screenshotSrc) {
+                delete this.questionList[i].subQuestions[j].screenshotSrc;
+              }
             }
           }
         } else {
           if (this.questionList[i].qusType) {
             this.questionList.splice(i, 1);
             i--;
+            if (!!this.questionList[i].answerScreenshotSrc) {
+              delete this.questionList[i].answerScreenshotSrc;
+            }
+            if (!!this.questionList[i].screenshotSrc) {
+              delete this.questionList[i].screenshotSrc;
+            }
           }
         }
       }
@@ -865,19 +902,28 @@ export default {
       //更新答题卡
       let modifyPaper, params;
       if (this.type == 1) {
-        modifyPaper = this.$request.pModifyPaper;
+        modifyPaper =
+          this.role == "ROLE_PERSONAL"
+            ? this.$request.pModifyPaper
+            : this.$request.modifyPaper;
         params = {
           paperId: this.$route.query.paperId,
           questionList: questionList,
         };
       } else if (this.type == 2) {
-        modifyPaper = this.$request.pSetExamAnswer;
+        modifyPaper =
+          this.role == "ROLE_PERSONAL"
+            ? this.$request.pSetExamAnswer
+            : this.$request.setExamAnswer;
         params = {
           examId: this.$route.query.paperId,
           questionList: questionList,
         };
       } else {
-        modifyPaper = this.$request.pSetPeriodAnswer;
+        modifyPaper =
+          this.role == "ROLE_PERSONAL"
+            ? this.$request.pSetPeriodAnswer
+            : this.$request.setPeriodAnswer;
         params = {
           periodId: this.$route.query.paperId,
           questionList: questionList,
@@ -892,12 +938,22 @@ export default {
     },
     async _QueryDetail() {
       //查询详情
-      let detail =
-        this.type == 1
-          ? this.$request.pPaperDetail
-          : this.type == 2
-          ? this.$request.pExamQuestionList
-          : this.$request.pPeriodQuestionList;
+      let detail;
+      if (this.role == "ROLE_PERSONAL") {
+        detail =
+          this.type == 1
+            ? this.$request.pPaperDetail
+            : this.type == 2
+            ? this.$request.pExamQuestionList
+            : this.$request.pPeriodQuestionList;
+      } else {
+        detail =
+          this.type == 1
+            ? this.$request.paperDetail
+            : this.type == 2
+            ? this.$request.examQuestionList
+            : this.$request.periodQuestionList;
+      }
       let params =
         this.type == 1
           ? { paperId: this.$route.query.paperId }
@@ -1190,10 +1246,15 @@ export default {
     }
   }
 }
-.upload-demo {
-  text-align: center;
-}
-.stem-pic {
-  width: 100%;
+.upload-box {
+  .upload-demo {
+    text-align: center;
+  }
+  .stem-pic {
+    display: block;
+    margin: 0 auto 20px;
+    height: 200px;
+    object-fit: cover;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/personal/examinationPaper/index.vue b/src/views/examinationPaper/index.vue
index c69618d..4fda0a0 100644
--- a/src/views/personal/examinationPaper/index.vue
+++ b/src/views/examinationPaper/index.vue
@@ -95,6 +95,31 @@
             <em class="s-line">|</em>
             预计时长：{{ item.examsDuration }}
             <em class="s-line">|</em>
+            <template v-if="role != 'ROLE_PERSONAL'">
+              授课端同步：
+              <span
+                class="clazz"
+                v-for="(clazzChild, indexs) in item.classList"
+                :key="clazzChild.classId"
+                :class="clazzChild.keepStatus == 1 ? 'active' : ''"
+                >{{
+                  `${clazzChild.className}${
+                    indexs != item.classList.length - 1 ? "、" : ""
+                  }`
+                }}
+                <i v-if="clazzChild.keepStatus == 1" class="el-icon-success"></i
+              ></span>
+              <el-tooltip
+                effect="dark"
+                content="刷新同步状态"
+                placement="right"
+              >
+                <i
+                  class="icon-refresh el-icon-refresh"
+                  @click="refreshStic"
+                ></i>
+              </el-tooltip>
+            </template>
           </p>
           <p class="person">
             {{ item.realName }}<em class="s-line">|</em
@@ -123,6 +148,11 @@
               icon="el-icon-more"
             ></el-button>
             <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item
+                :command="1"
+                v-if="userName == item.realName && role != 'ROLE_PERSONAL'"
+                >修改分享范围</el-dropdown-item
+              >
               <el-dropdown-item :command="2">复制</el-dropdown-item>
               <el-dropdown-item :command="3">归档</el-dropdown-item>
             </el-dropdown-menu>
@@ -147,7 +177,20 @@
       content="没有更多数据"
       :image-size="100"
     ></el-empty>
-   
+    <el-dialog title="选择分享范围" :visible.sync="dialogVisible" width="400">
+      <el-form :model="shareForm" :rules="shareRulesForm" label-width="160px">
+        <el-form-item prop="share" label="分享范围：">
+          <el-radio-group v-model="shareForm.sharingType">
+            <el-radio :label="0">任课班级分享</el-radio>
+            <el-radio :label="1">全年级分享</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="saveShare">确 定</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -158,6 +201,7 @@ export default {
     return {
       loading: false,
       userName: "",
+      dialogVisible: false,
       query: {
         classId: "",
         subjectName: "",
@@ -169,12 +213,24 @@ export default {
       typeList: [],
       archivedTotal: 0, //已归档答题卡数量
       tableData: null,
+      shareForm: {
+        id: "",
+        sharingType: 0, //0-任课班级/1-全年级
+      },
+      shareRulesForm: {
+        sharingType: [
+          { required: true, message: "选择分享范围", trigger: "blur" },
+        ],
+      },
       total: 0,
       page: 1,
       size: 20,
     };
   },
   async created() {
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
     this.userName = this.$store.getters.info.name || "";
     await this._QueryClassList();
     await this._QuerySubjectList();
@@ -182,6 +238,11 @@ export default {
     this._QueryTypeList();
   },
   methods: {
+    refreshStic() {
+      setTimeout(function () {
+        window.location.reload();
+      }, 500);
+    },
     toAdd(query) {
       let routerItem = {
         path: "/examinationPaperAdd",
@@ -201,6 +262,12 @@ export default {
       //更多
       const that = this;
       switch (value) {
+        case 1:
+          //修改分享范围
+          that.shareForm.id = item.id;
+          that.shareForm.sharingType = item.sharingType;
+          that.dialogVisible = true;
+          break;
         case 2:
           //复制
           that.toAdd({ type: 2, paperId: item.id });
@@ -215,9 +282,29 @@ export default {
       this.page = page;
       this._QueryData(this.query.title);
     },
+    async saveShare() {
+      //修改分享范围
+      const { data, status, info } = await this.$request.modifyPaper({
+        paperId: this.shareForm.id,
+        sharingType: this.shareForm.sharingType,
+      });
+      if (status === 0) {
+        this.shareForm.id = "";
+        this.shareForm.sharingType = 1;
+        this.dialogVisible = false;
+        this.$message.success(info);
+        this._QueryData(this.query.title == "");
+      } else {
+        this.$message.error(info);
+      }
+    },
     async recovery(item) {
       //归档
-      const { data, status, info } = await this.$request.pModifyPaper({
+      let modifyPaper =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pModifyPaper
+          : this.$request.modifyPaper;
+      const { data, status, info } = await modifyPaper({
         paperId: item.id,
         status: 2,
       });
@@ -232,12 +319,16 @@ export default {
     //切换班级
     async changClazz() {
       await this._QuerySubjectList();
-      this._QueryTypeList()
       this._QueryData(false);
     },
     // 查找答题卡类型
     async _QueryTypeList() {
-      const { data, status, info } = await this.$request.pPaperTagList({
+      let fetchTypeNames =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pPaperTagList
+          : this.$request.fetchTypeNames;
+
+      const { data, status, info } = await fetchTypeNames({
         classId: this.query.classId,
         type: 0,
       });
@@ -251,7 +342,7 @@ export default {
           }) || [];
         this.typeList.unshift({
           value: "",
-          label: "全部",
+          label: "请选择标签",
         });
       } else {
         this.$message.error(info);
@@ -260,14 +351,19 @@ export default {
     // 查找班级
     async _QueryClassList() {
       this.loading = true;
-      const { data, status, info } = await this.$request.pClassList();
+      let fetchClassList =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pClassList
+          : this.$request.fetchClassList;
+
+      const { data, status, info } = await fetchClassList();
       console.log(status);
       if (status === 0) {
         if (!!data.list) {
           this.classList =
             data.list?.map((item) => {
               return {
-                value: item.id,
+                value: this.role == "ROLE_PERSONAL" ? item.id : item.classId,
                 label: item.className,
               };
             }) || [];
@@ -279,7 +375,12 @@ export default {
     },
     // 查找科目
     async _QuerySubjectList() {
-      const { data, status, info } = await this.$request.pSubjectList({
+      let fetchSubjectList =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pSubjectList
+          : this.$request.fetchSubjectList;
+
+      const { data, status, info } = await fetchSubjectList({
         classId: this.query.classId,
       });
       if (status === 0) {
@@ -321,7 +422,12 @@ export default {
         return;
       }
       this.loading = true;
-      const { data, status, info } = await this.$request.pPaperList({
+      let fetchPaperList =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pPaperList
+          : this.$request.fetchPaperList;
+
+      const { data, status, info } = await fetchPaperList({
         ...query,
         status: 1,
         page: this.page,
@@ -439,11 +545,11 @@ export default {
         margin-right: 12px;
       }
     }
-    .icon-refresh{
-      margin-left:20px;
+    .icon-refresh {
+      margin-left: 20px;
       cursor: pointer;
-      &:hover{
-        color:#2e9afe
+      &:hover {
+        color: #2e9afe;
       }
     }
   }
diff --git a/src/views/personal/examinationPaper/recycle.vue b/src/views/examinationPaper/recycle.vue
index a174b3a..47f09bb 100644
--- a/src/views/personal/examinationPaper/recycle.vue
+++ b/src/views/examinationPaper/recycle.vue
@@ -149,6 +149,7 @@
 export default {
   data() {
     return {
+      role: "",
       loading: false,
       props: { multiple: true, checkStrictly: true },
       options: [
@@ -197,6 +198,9 @@ export default {
     };
   },
   async created() {
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
     await this._QueryClassList();
     await this._QuerySubjectList();
     this._QueryTypeList();
@@ -205,7 +209,11 @@ export default {
   methods: {
     async modify(obj) {
       //恢复答题卡
-      const { data, status, info } = await this.$request.pModifyPaper({
+      let modifyPaper =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pModifyPaper
+          : this.$request.modifyPaper;
+      const { data, status, info } = await modifyPaper({
         paperId: obj.id,
         status: 1,
       });
@@ -218,7 +226,11 @@ export default {
     },
     async remove(obj) {
       //删除答题卡
-      const { data, status, info } = await this.$request.pDelPaper({
+      let delPaper =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pDelPaper
+          : this.$request.delPaper;
+      const { data, status, info } = await delPaper({
         paperId: obj.id,
       });
       if (status == 0) {
@@ -255,7 +267,11 @@ export default {
           query[key] = null;
         }
       }
-      const { data, status, info } = await this.$request.pPaperList({
+      let fetchPaperList =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pPaperList
+          : this.$request.fetchPaperList;
+      const { data, status, info } = await fetchPaperList({
         ...query,
         status: 2,
         page: this.page,
@@ -271,14 +287,18 @@ export default {
     },
     // 查找班级
     async _QueryClassList() {
-      const { data, status, info } = await this.$request.pClassList();
+      let fetchClassList =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pClassList
+          : this.$request.fetchClassList;
+      const { data, status, info } = await fetchClassList();
       console.log(status);
       if (status === 0) {
         if (!!data.list) {
           this.classList =
             data.list?.map((item) => {
               return {
-                value: item.id,
+                value: this.role == "ROLE_PERSONAL" ? item.id : item.classId,
                 label: item.className,
               };
             }) || [];
@@ -290,7 +310,12 @@ export default {
     },
     // 查找科目
     async _QuerySubjectList() {
-      const { data, status, info } = await this.$request.pSubjectList({
+     let fetchSubjectList =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pSubjectList
+          : this.$request.fetchSubjectList;
+
+      const { data, status, info } = await fetchSubjectList({
         classId: this.query.classId,
       });
       if (status === 0) {
@@ -308,7 +333,12 @@ export default {
     },
     // 查找答题卡类型
     async _QueryTypeList() {
-      const { data, status, info } = await this.$request.pPaperTagList({
+       let fetchTypeNames =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pPaperTagList
+          : this.$request.fetchTypeNames;
+
+      const { data, status, info } = await fetchTypeNames({
         classId: this.query.classId,
         tyle: 0,
       });
diff --git a/src/views/index/mainIndex.vue b/src/views/index/mainIndex.vue
index 59bae3a..5f512b0 100644
--- a/src/views/index/mainIndex.vue
+++ b/src/views/index/mainIndex.vue
@@ -194,7 +194,7 @@
               对{{ dataInfo.classPeriodCount }}套随堂问答题记录分析
             </p>
           </div>
-          <div class="nav-item item1 item-child2" @click="links('/test')">
+          <div class="nav-item item1 item-child3" @click="links('/test')">
             <img class="icon" src="../../assets/nav/analysis.png" alt="" />
             <p class="p1">即时测报表</p>
             <p class="p2" v-if="dataInfo.examCount">
@@ -403,6 +403,7 @@ export default {
         height: calc(50% - 8px);
         flex-wrap: wrap;
         padding: 12px 0 12px 30px;
+        margin-right:20px;
         .icon {
           width: 60px;
           height: 60px;
@@ -419,6 +420,23 @@ export default {
           margin-right: 0;
         }
       }
+      &.item-child3 {
+        height: calc(50% - 8px);
+        flex-wrap: wrap;
+        padding: 12px 0 12px 30px;
+        .icon {
+          width: 60px;
+          height: 60px;
+        }
+        .p1 {
+          flex: 1;
+          line-height: 60px;
+          margin-bottom: 0;
+        }
+        .p2 {
+          width: 100%;
+        }
+      }
     }
     .item2 {
       width: calc(50% - 10px);
@@ -447,6 +465,7 @@ export default {
       height: 240px;
       display: flex;
       flex-wrap: wrap;
+
     }
     .item4 {
       width: calc(50% - 10px);
diff --git a/src/views/personal/ask/index.vue b/src/views/personal/ask/index.vue
index 44f2cfc..7473f13 100644
--- a/src/views/personal/ask/index.vue
+++ b/src/views/personal/ask/index.vue
@@ -88,202 +88,209 @@
         >
       </el-radio-group>
       <div class="table-cont" v-loading="loading">
-        <div v-show="tabIndex == 1">
-          <el-table
-            :data="tableData"
-            border
-            style="width: 100%"
-            @sort-change="sortChange"
-          >
-            <el-table-column
-              prop="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"
-                  v-if="scoped.row.answerNum == 0"
-                  content="设置答案"
-                  placement="top"
-                >
-                  <el-button
-                    type="primary"
-                    circle
-                    size="mini"
-                    icon="fa fa-file-text"
-                    @click="edit(scoped.row)"
-                  ></el-button>
-                </el-tooltip>
-                <el-tooltip v-else effect="dark" content="详情" placement="top">
-                  <el-button
-                    type="primary"
-                    circle
-                    size="mini"
-                    icon="fa fa-arrow-right"
-                    @click="linkTo(scoped.row)"
-                  ></el-button>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <div v-show="tabIndex == 2">
-          <el-table
-            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"
+        <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"
-                :label="index == 0 ? '总课时数' : '课时数'"
-                :prop="'periodCount' + item"
-              >
-              </el-table-column>
+              ></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"
-                :label="index == 0 ? '总出题数' : '出题数'"
-                :prop="'questionNum' + item"
               >
-              </el-table-column>
+                <template slot-scope="scoped"
+                  >{{ scoped.row.participationRate }}%</template
+                ></el-table-column
+              >
               <el-table-column
+                prop="answerCorrectRate"
+                label="已答总正确率"
+                sortable="custom"
                 align="center"
-                :label="index == 0 ? '总参与度' : '参与度'"
-                :prop="'participationRate' + item"
-                ><template slot-scope="scoped"
-                  >{{ scoped.row["participationRate" + item] }}%</template
+              >
+                <template slot-scope="scoped"
+                  >{{ scoped.row.answerCorrectRate }}%</template
                 >
               </el-table-column>
               <el-table-column
+                prop="classCorrectRate"
+                label="班级总正确率"
+                sortable="custom"
                 align="center"
-                :label="index == 0 ? '总正确率' : '正确率'"
-                :prop="'correctRate' + item"
                 ><template slot-scope="scoped"
-                  >{{ scoped.row["correctRate" + item] }}%</template
-                >
+                  >{{ scoped.row.classCorrectRate }}%</template
+                ></el-table-column
+              >
+              <el-table-column label="操作" align="center">
+                <template slot-scope="scoped">
+                  <el-tooltip
+                    effect="dark"
+                    v-if="scoped.row.answerNum == 0"
+                    content="设置答案"
+                    placement="top"
+                  >
+                    <el-button
+                      type="primary"
+                      circle
+                      size="mini"
+                      icon="fa fa-file-text"
+                      @click="edit(scoped.row)"
+                    ></el-button>
+                  </el-tooltip>
+                  <el-tooltip
+                    v-else
+                    effect="dark"
+                    content="详情"
+                    placement="top"
+                  >
+                    <el-button
+                      type="primary"
+                      circle
+                      size="mini"
+                      icon="fa fa-arrow-right"
+                      @click="linkTo(scoped.row)"
+                    ></el-button>
+                  </el-tooltip>
+                </template>
               </el-table-column>
-            </el-table-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>
+          </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"
-                v-if="index == 0"
-                label="参与分"
-                sortable
-                :prop="'interactionsNum' + item"
-              >
-              </el-table-column>
+                fixed
+              ></el-table-column>
               <el-table-column
-                v-else
+                prop="studentName"
+                label="姓名"
                 align="center"
-                label="互动数"
-                :prop="'interactionsNum' + item"
-              >
-              </el-table-column>
+                fixed
+                width="100"
+              ></el-table-column>
               <el-table-column
-                v-if="index == 0"
+                v-for="(item, index) in phaseOption"
+                :key="index"
+                :label="item"
                 align="center"
-                label="对错分"
-                sortable
-                :prop="'interactionsCorrectNum' + item"
               >
+                <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
-                v-else
+                prop="studentCode"
+                label="学号"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="studentName"
+                label="姓名"
+                align="center"
+                width="100"
+              ></el-table-column>
+              <el-table-column
+                v-for="(item, index) in phaseInter"
+                :key="index"
+                :label="item"
                 align="center"
-                label="参与数"
-                :prop="'interactionsCorrectNum' + item"
               >
+                <el-table-column
+                  align="center"
+                  v-if="index == 0"
+                  label="参与分"
+                  sortable
+                  :prop="'interactionsNum' + item"
+                >
+                </el-table-column>
+                <el-table-column
+                  v-else
+                  align="center"
+                  label="互动数"
+                  :prop="'interactionsNum' + item"
+                >
+                </el-table-column>
+                <el-table-column
+                  v-if="index == 0"
+                  align="center"
+                  label="对错分"
+                  sortable
+                  :prop="'interactionsCorrectNum' + item"
+                >
+                </el-table-column>
+                <el-table-column
+                  v-else
+                  align="center"
+                  label="参与数"
+                  :prop="'interactionsCorrectNum' + item"
+                >
+                </el-table-column>
               </el-table-column>
-            </el-table-column>
-          </el-table>
+            </el-table>
+          </div>
         </div>
         <div class="pagination-box" v-show="tabIndex == 1">
           <el-pagination
@@ -381,7 +388,7 @@ export default {
     });
   },
   methods: {
-     print() {
+    print() {
       tablePrint("print-content");
     },
     changeSub(val) {
@@ -521,7 +528,7 @@ export default {
       if (status === 0) {
         this.classList = data.list.map((item) => {
           return {
-            value: item.classId,
+            value: item.id,
             label: item.className,
           };
         });
@@ -683,11 +690,10 @@ export default {
         this.$message.warning("请选择科目");
         return;
       }
-      const { data, status, info } = await this.$request.pPhaseInteractiveReport(
-        {
+      const { data, status, info } =
+        await this.$request.pPhaseInteractiveReport({
           ...query,
-        }
-      );
+        });
       this.loading = false;
       if (status === 0) {
         let subjectName = [];
diff --git a/src/views/personal/down/index.vue b/src/views/personal/down/index.vue
index ea5370f..d96e0ec 100644
--- a/src/views/personal/down/index.vue
+++ b/src/views/personal/down/index.vue
@@ -8,9 +8,11 @@
     <div class="down-box" v-loading="loading">
       <img class="logo" src="" alt="" />
       <div class="txt">
-        <p class="p1">中天易教授课端 V1.3.4</p>
-        <p class="p2">文件大小：35M</p>
-        <p class="p2">最近更新：2022-12-03 13:30</p>
+        <p class="p1">
+          {{ `${info.appName || ""} ${info.versionName || ""}` }}
+        </p>
+        <p class="p2">文件大小：{{ `${info.fileSize}` }}M</p>
+        <p class="p2">最近更新：{{ info.modifiedTime }}</p>
       </div>
       <el-button type="primary" @click="downCard">立即下载</el-button>
     </div>
@@ -22,13 +24,38 @@ export default {
   data() {
     return {
       loading: false,
+      info: {
+        id:"",
+        appName: "",
+        appImage: "",
+        versionName: "",
+        fileSize: "",
+        modifiedTime: "",
+      },
     };
   },
+  created() {
+    this.latestVersion();
+  },
   methods: {
+    async latestVersion() {
+      const { data, status, info } = await this.$request.pLatestVersion();
+      if (status == 0) {
+        this.info = { ...data };
+        this.info.fileSize =
+          (this.info.fileSize &&
+            (this.info.fileSize / 1024 / 1024).toFixed(2)) ||
+          "--";
+      } else {
+        this.$message.error(info);
+      }
+    },
     async downCard() {
       if (this.loading == true) return;
       this.loading = true;
-      const { data, status, info } = await this.$request.latestClickersApp();
+      const { data, status, info } = await this.$request.pGetAppDownloadUrl({
+        versionId:this.info.id
+      });
       this.loading = false;
       if (status == 0) {
         const a = document.createElement("a");
@@ -51,7 +78,7 @@ export default {
 }
 
 .down-box {
-  padding:20px 50px;
+  padding: 20px 50px;
   display: flex;
   align-items: center;
 }
diff --git a/src/views/personal/setUp/student.vue b/src/views/personal/setUp/student.vue
index 0a89616..942d7a1 100644
--- a/src/views/personal/setUp/student.vue
+++ b/src/views/personal/setUp/student.vue
@@ -450,15 +450,9 @@ export default {
       let { data, info, status } = await this.$request.studentTemplateUrl();
       this.loadingDown = false;
       if (status == 0) {
-        // getBlob(data.downloadUrl).then((res) => {
-        //   downloadFile("学生模板", res);
-        // });
-        const a = document.createElement("a");
-        a.href = data.downloadUrl;
-        a.download = data.appName;
-        document.body.appendChild(a);
-        a.click();
-        a.remove();
+        getBlob(data.downloadUrl).then((res) => {
+          downloadFile("学生模板", res);
+        });
       } else {
         this.$message.error(info);
       }
diff --git a/src/views/personal/test/index.vue b/src/views/personal/test/index.vue
index 4916a6c..f0f2c3e 100644
--- a/src/views/personal/test/index.vue
+++ b/src/views/personal/test/index.vue
@@ -517,6 +517,8 @@ export default {
           id: obj.studentId,
           classId: obj.classId,
           subjectNames: subjectNames.join(","),
+          studentName:obj.studentName,
+          studentCode:obj.studentCode,
         },
       });
     },
@@ -648,7 +650,7 @@ export default {
       if (status === 0) {
         this.classList = data.list.map((item) => {
           return {
-            value: item.classId,
+            value: item.id,
             label: item.className,
           };
         });
diff --git a/src/views/personal/portrait/detail.vue b/src/views/portrait/detail.vue
index fa96804..e4def47 100644
--- a/src/views/personal/portrait/detail.vue
+++ b/src/views/portrait/detail.vue
@@ -60,8 +60,10 @@
       </div>
     </div>
     <div class="page-content">
-      <p class="tips">张三 （学号：1301） 测练总次数：16</p>
-      <div class="chart">
+      <p class="tips">
+        {{ studentName }}（学号：{{ studentCode }}） 测练总次数：{{ count }}
+      </p>
+      <div class="chart" v-if="tableData.length">
         <template v-if="type == 1">
           <radarChart id="radarChart" :params="radarChartData" />
         </template>
@@ -69,6 +71,7 @@
           <lineChart id="lineChart" :params="lineChartData" :xAxis="xAxis" />
         </template>
       </div>
+
       <div class="tab-box">
         <el-table
           v-show="type == 1"
@@ -82,22 +85,22 @@
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="cl"
+            prop="examCount"
             label="参与测练数"
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="bg"
+            prop="highestScore"
             label="班最高分"
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="bp"
+            prop="avgScore"
             label="班平均分"
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="br"
+            prop="examScore"
             label="个人得分"
             align="center"
           ></el-table-column>
@@ -109,22 +112,22 @@
           style="width: 100%"
         >
           <el-table-column
-            prop="subjectName"
+            prop="title"
             label="课堂测练"
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="br"
+            prop="examScore"
             label="个人成绩"
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="bp"
+            prop="avgScore"
             label="平均成绩"
             align="center"
           ></el-table-column>
           <el-table-column
-            prop="pm"
+            prop="classRank"
             label="班级排名"
             align="center"
           ></el-table-column>
@@ -143,6 +146,8 @@ export default {
   data() {
     return {
       id: "",
+      studentName: "",
+      studentCode: "",
       classId: "",
       subjectNames: [],
       type: 1,
@@ -156,28 +161,8 @@ export default {
       date: "",
       subjectList: [], //科目
       radarChartData: {
-        indicator: [
-          { name: "语文" },
-          { name: "数学" },
-          { name: "地理" },
-          { name: "物理" },
-          { name: "化学" },
-          { name: "生物" },
-        ],
-        num: [
-          {
-            name: "班最高分",
-            value: [100, 99, 98, 99, 100, 100],
-          },
-          {
-            name: "班平均分",
-            value: [95, 85, 90, 86, 92, 87],
-          },
-          {
-            name: "本人得分",
-            value: [90, 80, 95, 82, 95, 89],
-          },
-        ],
+        indicator: [],
+        num: [],
       },
       lineChartData: [
         {
@@ -194,24 +179,16 @@ export default {
         },
       ],
       xAxis: ["卷1", "卷2", "卷3", "卷4", "卷5"],
-      tableData: [
-        {
-          subjectName: "语文",
-          cl: 5,
-          bg: 100,
-          bp: 90,
-          br: 95,
-          pm: 1,
-        },
-      ],
+      tableData: [],
+      count: 0, //测练数
     };
   },
   async created() {
     this.id = this.$route.query.id;
     this.classId = this.$route.query.classId;
+    this.studentCode = this.$route.query.studentCode;
+    this.studentName = this.$route.query.studentName;
     this.subjectNames = this.$route.query.subjectNames?.split(",") || [];
-    this.type =
-      this.subjectNames.length > 1 || this.subjectNames.length == 0 ? 1 : 2;
     await this._QuerySubjectList();
     await this.setDate(1);
     let startDay = this.query?.startDay;
@@ -231,8 +208,9 @@ export default {
         return sub != "全部" ? item != "全部" : item == "全部";
       });
       this.type =
-        this.query.subjectNames.length > 1 ||
-        this.query.subjectNames.length == 0
+        this.query.subjectNames.length > 1
+          ? 1
+          : this.query.subjectNames[0] == "全部" && this.subjectList.length != 2
           ? 1
           : 2;
     },
@@ -324,7 +302,16 @@ export default {
         });
         if (this.subjectNames.length == 0) {
           this.query.subjectNames.push(this.subjectList[0]?.value);
+        } else {
+          this.query.subjectNames = [...this.subjectNames];
         }
+        this.type =
+          this.query.subjectNames.length > 1
+            ? 1
+            : this.query.subjectNames[0] == "全部" &&
+              this.subjectList.length != 2
+            ? 1
+            : 2;
       } else {
         this.$message.error(info);
       }
@@ -337,12 +324,62 @@ export default {
           query[key] = this.query[key];
         }
       }
-      return;
-      const { data, status, info } = await this.$request.studentList({
+      delete query.subjectNames;
+      let subjectNames;
+      if (
+        this.query.subjectNames.length == 1 &&
+        this.query.subjectNames[0] == "全部"
+      ) {
+        subjectNames = this.subjectList
+          .filter((item) => {
+            return item.value != "全部";
+          })
+          .map((item) => {
+            return item.value;
+          });
+      } else {
+        subjectNames = [...this.query.subjectNames];
+      }
+      const { data, status, info } = await this.$request.studentExamReport({
+        studentId: this.id,
+        subjectNames: subjectNames,
         ...query,
       });
       this.loading = false;
       if (status === 0) {
+        this.count = 0;
+        this.tableData = data.list || [];
+        if (this.type == 1) {
+          this.radarChartData.indicator = [];
+          this.radarChartData.num = [
+            { name: "班最高分", value: [] },
+            { name: "班平均分", value: [] },
+            { name: "本人得分", value: [] },
+          ];
+          this.tableData.map((item) => {
+            this.count += item.examCount;
+            this.radarChartData.indicator.push({
+              name: item.subjectName,
+            });
+            this.radarChartData.num[0].value.push(item.highestScore);
+            this.radarChartData.num[1].value.push(item.avgScore);
+            this.radarChartData.num[2].value.push(item.examScore);
+          });
+        } else {
+          this.count = data.count;
+          this.xAxis = [];
+          this.lineChartData = [
+            { name: "班平均分", value: [] },
+            { name: "个人成绩", value: [] },
+            { name: "班级排名", value: [] },
+          ];
+          this.tableData.map((item) => {
+            this.xAxis.push(item.title);
+            this.lineChartData[0].value.push(item.avgScore);
+            this.lineChartData[1].value.push(item.examScore);
+            this.lineChartData[2].value.push(item.classRank);
+          });
+        }
       } else {
         this.$message.error(info);
       }
diff --git a/src/views/personal/portrait/index.vue b/src/views/portrait/index.vue
index 71fecef..633e7ac 100644
--- a/src/views/personal/portrait/index.vue
+++ b/src/views/portrait/index.vue
@@ -69,8 +69,8 @@
               {{ item.studentName }} <i class="fa fa-calculator"></i>
               {{ item.clickerSn }}
             </p>
-            <p class="p2">{{ item.sectionName + item.className }}</p>
-            <p class="p3">最近活跃：{{ item.time }}</p>
+            <p class="p2">{{ gradeName(item.grade) }}</p>
+            <p class="p3">最近活跃：{{ item.modifiedTime }}</p>
           </div>
           <el-button
             class="btn"
@@ -87,11 +87,12 @@
 </template>
 
 <script>
-import { formatDate } from "utils";
+import { formatDate, setGradeName } from "utils";
 import BusEvent from "@/utils/busEvent";
 export default {
   data() {
     return {
+      role: "",
       query: {
         //搜索条件
         classId: "",
@@ -101,24 +102,16 @@ export default {
       },
       date: "",
       classList: [],
-      tableData: [
-        {
-          studentId: "111",
-          studentName: "丁方菲",
-          studentCode: 123321,
-          clickerSn: 32312,
-          sectionName: "初一",
-          className: "三班",
-          classId:12,
-          time: "2022-11-04 18:09:49",
-        },
-      ],
+      tableData: [],
       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();
     await this.setDate(1);
     let startDay = this.query?.startDay;
@@ -140,12 +133,17 @@ export default {
     });
   },
   methods: {
+    gradeName(type) {
+      return setGradeName(type);
+    },
     linkDetail(obj) {
       this.$router.push({
         path: "/portraitDetail",
         query: {
-          id: obj.studentId,
-          classId:obj.classId,
+          studentName: obj.studentName,
+          studentCode: obj.studentCode,
+          id: obj.id,
+          classId: this.query.classId,
         },
       });
     },
@@ -224,11 +222,16 @@ export default {
       }
     },
     async _QueryClassList() {
-      const { data, status, info } = await this.$request.pClassList();
+      let fetchClassList =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pClassList
+          : this.$request.fetchClassList;
+
+      const { data, status, info } = await fetchClassList();
       if (status === 0) {
         this.classList = data.list.map((item) => {
           return {
-            value: item.classId,
+            value: this.role == "ROLE_PERSONAL" ? item.id : item.classId,
             label: item.className,
           };
         });
@@ -245,8 +248,11 @@ export default {
           query[key] = this.query[key];
         }
       }
-      return;
-      const { data, status, info } = await this.$request.pStudentList({
+      let studentList =
+        this.role == "ROLE_PERSONAL"
+          ? this.$request.pStudentList
+          : this.$request.tStudentList;
+      const { data, status, info } = await studentList({
         ...query,
         page: this.page,
         size: this.size,
diff --git a/src/views/standard/ask/analysis.vue b/src/views/standard/ask/analysis.vue
index 642efb3..feffeea 100644
--- a/src/views/standard/ask/analysis.vue
+++ b/src/views/standard/ask/analysis.vue
@@ -53,75 +53,85 @@
             反馈时长：{{ setDuration(detail.consumingDuration) }}
           </li>
         </ul>
-        <el-table v-if="type == 1" :data="tableData" border style="width: 100%">
-          <el-table-column prop="questionIndex" label="题号" align="center"
-            ><template slot-scope="scoped"
-              >Q{{ scoped.row.questionIndex }}</template
-            ></el-table-column
+        <div id="print-content">
+          <el-table
+            v-if="type == 1"
+            :data="tableData"
+            border
+            style="width: 100%"
           >
-          <el-table-column prop="questionType" label="题型" align="center">
-            <template slot-scope="scoped">{{
-              setSubPro(scoped.row.questionType)
-            }}</template>
-          </el-table-column>
-          <el-table-column
-            prop="answeredNum"
-            label="答题人数"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="correctAnswerNum"
-            label="答对人数"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="participationRate"
-            label="班级参与度"
-            sortable
-            align="center"
-            ><template slot-scope="scoped"
-              >{{ scoped.row.participationRate }}%</template
-            ></el-table-column
-          >
-          <el-table-column
-            prop="classCorrectRate"
-            label="班级正确率"
-            sortable
-            align="center"
-            ><template slot-scope="scoped"
-              >{{ scoped.row.classCorrectRate }}%</template
-            ></el-table-column
-          >
-          <el-table-column
-            prop="answerCorrectRate"
-            label="已答正确率"
-            sortable
-            align="center"
-            ><template slot-scope="scoped"
-              >{{ scoped.row.answerCorrectRate }}%</template
-            ></el-table-column
-          >
-          <el-table-column prop="correctAnswer" label="正确答案" align="center">
-            <template slot-scope="scoped">{{
-              scoped.row.correctAnswer == 1
-                ? "✓"
-                : scoped.row.correctAnswer == 2
-                ? "✗"
-                : scoped.row.correctAnswer
-            }}</template></el-table-column
-          >
-          <el-table-column prop="fallible" label="干扰答案" align="center"
-            ><template slot-scope="scoped">{{
-              scoped.row.fallible == 1
-                ? "✓"
-                : scoped.row.fallible == 2
-                ? "✗"
-                : scoped.row.fallible
-            }}</template></el-table-column
-          >
-          <!-- <el-table-column prop="screenshot" label="题干" align="center">
+            <el-table-column prop="questionIndex" label="题号" align="center"
+              ><template slot-scope="scoped"
+                >Q{{ scoped.row.questionIndex }}</template
+              ></el-table-column
+            >
+            <el-table-column prop="questionType" label="题型" align="center">
+              <template slot-scope="scoped">{{
+                setSubPro(scoped.row.questionType)
+              }}</template>
+            </el-table-column>
+            <el-table-column
+              prop="answeredNum"
+              label="答题人数"
+              sortable
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="correctAnswerNum"
+              label="答对人数"
+              sortable
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="participationRate"
+              label="班级参与度"
+              sortable
+              align="center"
+              ><template slot-scope="scoped"
+                >{{ scoped.row.participationRate }}%</template
+              ></el-table-column
+            >
+            <el-table-column
+              prop="classCorrectRate"
+              label="班级正确率"
+              sortable
+              align="center"
+              ><template slot-scope="scoped"
+                >{{ scoped.row.classCorrectRate }}%</template
+              ></el-table-column
+            >
+            <el-table-column
+              prop="answerCorrectRate"
+              label="已答正确率"
+              sortable
+              align="center"
+              ><template slot-scope="scoped"
+                >{{ scoped.row.answerCorrectRate }}%</template
+              ></el-table-column
+            >
+            <el-table-column
+              prop="correctAnswer"
+              label="正确答案"
+              align="center"
+            >
+              <template slot-scope="scoped">{{
+                scoped.row.correctAnswer == 1
+                  ? "✓"
+                  : scoped.row.correctAnswer == 2
+                  ? "✗"
+                  : scoped.row.correctAnswer
+              }}</template></el-table-column
+            >
+            <el-table-column prop="fallible" label="干扰答案" align="center"
+              ><template slot-scope="scoped">{{
+                scoped.row.fallible == 1
+                  ? "✓"
+                  : scoped.row.fallible == 2
+                  ? "✗"
+                  : scoped.row.fallible
+              }}</template></el-table-column
+            >
+            <!-- <el-table-column prop="screenshot" label="题干" align="center">
             <template slot-scope="scoped">
               <el-image
                 v-if="scoped.row.screenshot"
@@ -131,139 +141,158 @@
               >
               </el-image><span v-else>暂无</span></template
           ></el-table-column> -->
-        </el-table>
-        <el-table v-if="type == 2" :data="tableData" border style="width: 100%">
-          <el-table-column
-            prop="studentCode"
-            label="学号"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="studentName"
-            label="姓名"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="answerTimes"
-            label="答题次数"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="consumingDuration"
-            label="答题耗时"
-            align="center"
-          ><template slot-scope="scoped">{{setDuration(scoped.row.consumingDuration)}}</template></el-table-column>
-          <el-table-column
-            prop="correctAnswerTimes"
-            label="答对次数"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="participationRate"
-            label="参与度"
-            sortable
-            align="center"
-            ><template slot-scope="scoped"
-              >{{ scoped.row.participationRate }}%</template
-            ></el-table-column
+          </el-table>
+          <el-table
+            v-if="type == 2"
+            :data="tableData"
+            border
+            style="width: 100%"
           >
-          <el-table-column
-            prop="correctRate"
-            label="正确率"
-            sortable
-            align="center"
-            ><template slot-scope="scoped"
-              >{{ scoped.row.correctRate }}%</template
-            ></el-table-column
+            <el-table-column
+              prop="studentCode"
+              label="学号"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="studentName"
+              label="姓名"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="answerTimes"
+              label="答题次数"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="consumingDuration"
+              label="答题耗时"
+              align="center"
+              ><template slot-scope="scoped">{{
+                setDuration(scoped.row.consumingDuration)
+              }}</template></el-table-column
+            >
+            <el-table-column
+              prop="correctAnswerTimes"
+              label="答对次数"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="participationRate"
+              label="参与度"
+              sortable
+              align="center"
+              ><template slot-scope="scoped"
+                >{{ scoped.row.participationRate }}%</template
+              ></el-table-column
+            >
+            <el-table-column
+              prop="correctRate"
+              label="正确率"
+              sortable
+              align="center"
+              ><template slot-scope="scoped"
+                >{{ scoped.row.correctRate }}%</template
+              ></el-table-column
+            >
+            <el-table-column
+              prop="answerCorrectRate"
+              label="已答正确率"
+              sortable
+              align="center"
+              ><template slot-scope="scoped"
+                >{{ scoped.row.answerCorrectRate }}%</template
+              ></el-table-column
+            >
+            <el-table-column
+              v-for="(item, index) in optionsList"
+              :key="index"
+              :label="'Q' + (index + 1)"
+              align="center"
+              ><template slot-scope="scoped">
+                <span :class="scoped.row['isRight' + index] ? '' : 'red'">{{
+                  scoped.row["answer" + index]
+                }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-table
+            v-if="type == 3"
+            :data="tableData"
+            border
+            style="width: 100%"
           >
-          <el-table-column
-            prop="answerCorrectRate"
-            label="已答正确率"
-            sortable
-            align="center"
-            ><template slot-scope="scoped"
-              >{{ scoped.row.answerCorrectRate }}%</template
-            ></el-table-column
+            <el-table-column
+              prop="studentCode"
+              label="学号"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="studentName"
+              label="姓名"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="rushAnswerTimes"
+              label="抢答成功次数"
+              sortable
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="rushAnswerCorrectTimes"
+              label="答对次数"
+              sortable
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="checkAnswerTimes"
+              label="抽答次数"
+              sortable
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="checkAnswerCorrectTimes"
+              label="抽答答对次数"
+              sortable
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="interactionsNum"
+              label="参与得分"
+              sortable
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="interactionsCorrectNum"
+              label="对错得分"
+              sortable
+              align="center"
+            ></el-table-column>
+          </el-table>
+          <el-table
+            v-if="type == 4"
+            :data="tableData"
+            border
+            style="width: 100%"
           >
-          <el-table-column
-            v-for="(item, index) in optionsList"
-            :key="index"
-            :label="'Q' + (index + 1)"
-            align="center"
-            ><template slot-scope="scoped">
-              <span :class="scoped.row['isRight' + index] ? '' : 'red'">{{
-                scoped.row["answer" + index]
-              }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-table v-if="type == 3" :data="tableData" border style="width: 100%">
-          <el-table-column
-            prop="studentCode"
-            label="学号"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="studentName"
-            label="姓名"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="rushAnswerTimes"
-            label="抢答成功次数"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="rushAnswerCorrectTimes"
-            label="答对次数"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="checkAnswerTimes"
-            label="抽答次数"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="checkAnswerCorrectTimes"
-            label="抽答答对次数"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="interactionsNum"
-            label="参与得分"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="interactionsCorrectNum"
-            label="对错得分"
-            sortable
-            align="center"
-          ></el-table-column>
-        </el-table>
-        <el-table v-if="type == 4" :data="tableData" border style="width: 100%">
-          <el-table-column
-            prop="studentName"
-            label="姓名"
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="checkInTime"
-            label="签到时间"
-            sortable
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="makeUpTime"
-            label="补签时间"
-            sortable
-            align="center"
-          ></el-table-column>
-        </el-table>
+            <el-table-column
+              prop="studentName"
+              label="姓名"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="checkInTime"
+              label="签到时间"
+              sortable
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              prop="makeUpTime"
+              label="补签时间"
+              sortable
+              align="center"
+            ></el-table-column>
+          </el-table>
+        </div>
         <div class="pagination-box" v-show="type == 1">
           <el-pagination
             small=""
@@ -285,6 +314,14 @@
             icon="fa fa-cloud-download"
             >导出报表</el-button
           >
+          <el-button
+            @click="print"
+            type="primary"
+            plain
+            round
+            icon="el-icon-printer"
+            >打印</el-button
+          >
           <!-- <el-button @click="edit" type="primary" round>修改答案</el-button> -->
         </p>
       </div>
@@ -301,7 +338,7 @@
 </template>
 
 <script>
-import { downloadFile } from "@/utils";
+import { downloadFile,tablePrint } from "@/utils";
 export default {
   data() {
     return {
@@ -327,28 +364,31 @@ export default {
     this.periodDetail();
   },
   methods: {
+    print() {
+      tablePrint("print-content");
+    },
     setType(type) {
       this.type = type;
       this.page = 1;
       this._QueryData();
     },
-    setDuration(times){
-      let m = parseInt(times/1000 / 60)
-      let s = parseInt((times/1000)%60)
-      let ms = times
+    setDuration(times) {
+      let m = parseInt(times / 1000 / 60);
+      let s = parseInt((times / 1000) % 60);
+      let ms = times;
       let aTime;
-      if(times==0){
-        aTime = `0`
-      }else{
-        if(m==0&&s==0){
-          aTime = `${ms}毫秒`
-        }else if(m==0&&s!=0){
-          aTime = `${s}秒`
-        }else if(m!=0&&s!=0){
-          aTime = `${m}分${s}秒`
+      if (times == 0) {
+        aTime = `0`;
+      } else {
+        if (m == 0 && s == 0) {
+          aTime = `${ms}毫秒`;
+        } else if (m == 0 && s != 0) {
+          aTime = `${s}秒`;
+        } else if (m != 0 && s != 0) {
+          aTime = `${m}分${s}秒`;
         }
       }
-      return aTime
+      return aTime;
     },
     setSubPro(type) {
       let tit;
@@ -458,8 +498,8 @@ export default {
           });
           this.optionsList = [...optionsList];
         } else {
-          this.tableData = data?.list.sort((a,b)=>{
-            return a.questionIndex-b.questionIndex
+          this.tableData = data?.list.sort((a, b) => {
+            return a.questionIndex - b.questionIndex;
           });
         }
         this.total = data.count;
@@ -504,7 +544,9 @@ div::-webkit-scrollbar-thumb {
   display: flex;
   justify-content: space-between;
 }
-.red{color:#f30}
+.red {
+  color: #f30;
+}
 .page-content {
   padding: 20px 20px 0;
 }
diff --git a/src/views/standard/ask/index.vue b/src/views/standard/ask/index.vue
index 58da1d1..31bb92d 100644
--- a/src/views/standard/ask/index.vue
+++ b/src/views/standard/ask/index.vue
@@ -22,7 +22,7 @@
           </el-option>
         </el-select>
         <el-select
-          v-if="role == 'ROLE_BANZHUREN'"
+          v-if="role == 'ROLE_BANZHUREN' || role == 'ROLE_PERSONAL'"
           class="sel"
           multiple
           v-model="query.subjectNames"
@@ -104,333 +104,340 @@
           >阶段互动报表</el-radio-button
         >
       </el-radio-group>
-      <!-- <p class="table-tit" v-if="tabIndex != 1">
-        <span>总课时数：10</span>
-        <span>互动总数：22</span>
-      </p> -->
       <div class="table-cont" v-loading="loading">
-        <div v-show="tabIndex == 1">
-          <el-table
-            :data="tableData"
-            border
-            style="width: 100%"
-            @sort-change="sortChange"
-          >
-            <el-table-column
-              prop="title"
-              label="课时"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="questionNum"
-              label="题目总数"
-              align="center"
-              width="100"
-            ></el-table-column>
-            <el-table-column
-              prop="startTime"
-              label="上课时间"
-              align="center"
-            ></el-table-column>
-            <el-table-column
-              prop="participationRate"
-              label="参与度"
-              sortable="custom"
-              align="center"
-            >
-              <template slot-scope="scoped"
-                >{{ scoped.row.participationRate }}%</template
-              ></el-table-column
+        <div id="print-content">
+          <div v-show="tabIndex == 1">
+            <el-table
+              :data="tableData"
+              border
+              style="width: 100%"
+              @sort-change="sortChange"
             >
-            <el-table-column
-              prop="answerCorrectRate"
-              label="已答总正确率"
-              sortable="custom"
-              align="center"
-            >
-              <template slot-scope="scoped"
-                >{{ scoped.row.answerCorrectRate }}%</template
+              <el-table-column
+                prop="title"
+                label="课时"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="questionNum"
+                label="题目总数"
+                align="center"
+                width="100"
+              ></el-table-column>
+              <el-table-column
+                prop="startTime"
+                label="上课时间"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="participationRate"
+                label="参与度"
+                sortable="custom"
+                align="center"
               >
-            </el-table-column>
-            <el-table-column
-              prop="classCorrectRate"
-              label="班级总正确率"
-              sortable="custom"
-              align="center"
-              ><template slot-scope="scoped"
-                >{{ scoped.row.classCorrectRate }}%</template
-              ></el-table-column
-            >
-            <el-table-column label="操作" align="center">
-              <template slot-scope="scoped">
-                <el-tooltip
-                  effect="dark"
-                  v-if="scoped.row.answerNum == 0"
-                  content="设置答案"
-                  placement="top"
-                >
-                  <el-button
-                    type="primary"
-                    circle
-                    size="mini"
-                    icon="fa fa-file-text"
-                    @click="edit(scoped.row)"
-                  ></el-button>
-                </el-tooltip>
-                <el-tooltip v-else effect="dark" content="详情" placement="top">
-                  <el-button
-                    type="primary"
-                    circle
-                    size="mini"
-                    icon="fa fa-arrow-right"
-                    @click="linkTo(scoped.row)"
-                  ></el-button>
-                </el-tooltip>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-        <div v-show="tabIndex == 2">
-          <el-table
-            v-if="role == 'ROLE_JIAOSHI'"
-            :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
+                <template slot-scope="scoped"
+                  >{{ scoped.row.participationRate }}%</template
+                ></el-table-column
               >
-            </el-table-column>
-            <el-table-column
-              prop="classRank"
-              label="总正确率班排名"
-              sortable
-              align="center"
-            ></el-table-column>
-          </el-table>
-          <el-table
-            :max-height="tableMaxHeight"
-            v-else
-            :data="tableData"
-            border
-            style="width: 100%"
-          >
-            <el-table-column
-              prop="studentCode"
-              label="学号"
-              align="center"
-              fixed
-            ></el-table-column>
-            <el-table-column
-              prop="studentName"
-              label="姓名"
-              align="center"
-              fixed
-              width="100"
-            ></el-table-column>
-            <el-table-column
-              v-for="(item, index) in phaseOption"
-              :key="index"
-              :label="item"
-              align="center"
-            >
               <el-table-column
+                prop="answerCorrectRate"
+                label="已答总正确率"
+                sortable="custom"
                 align="center"
-                :label="index == 0 ? '总课时数' : '课时数'"
-                :prop="'periodCount' + item"
               >
+                <template slot-scope="scoped"
+                  >{{ scoped.row.answerCorrectRate }}%</template
+                >
               </el-table-column>
               <el-table-column
+                prop="classCorrectRate"
+                label="班级总正确率"
+                sortable="custom"
                 align="center"
-                :label="index == 0 ? '总出题数' : '出题数'"
-                :prop="'questionNum' + item"
+                ><template slot-scope="scoped"
+                  >{{ scoped.row.classCorrectRate }}%</template
+                ></el-table-column
               >
+              <el-table-column label="操作" align="center">
+                <template slot-scope="scoped">
+                  <el-tooltip
+                    effect="dark"
+                    v-if="scoped.row.answerNum == 0"
+                    content="设置答案"
+                    placement="top"
+                  >
+                    <el-button
+                      type="primary"
+                      circle
+                      size="mini"
+                      icon="fa fa-file-text"
+                      @click="edit(scoped.row)"
+                    ></el-button>
+                  </el-tooltip>
+                  <el-tooltip
+                    v-else
+                    effect="dark"
+                    content="详情"
+                    placement="top"
+                  >
+                    <el-button
+                      type="primary"
+                      circle
+                      size="mini"
+                      icon="fa fa-arrow-right"
+                      @click="linkTo(scoped.row)"
+                    ></el-button>
+                  </el-tooltip>
+                </template>
               </el-table-column>
+            </el-table>
+          </div>
+          <div v-show="tabIndex == 2">
+            <el-table
+              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"
-                :label="index == 0 ? '总参与度' : '参与度'"
-                :prop="'participationRate' + item"
-                ><template slot-scope="scoped"
-                  >{{ scoped.row["participationRate" + item] }}%</template
+              ></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"
-                :label="index == 0 ? '总正确率' : '正确率'"
-                :prop="'correctRate' + item"
-                ><template slot-scope="scoped"
-                  >{{ scoped.row["correctRate" + item] }}%</template
+              ></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-column>
-          </el-table>
-        </div>
-        <div v-show="tabIndex == 3">
-          <el-table
-            v-if="role == 'ROLE_JIAOSHI'"
-            :max-height="tableMaxHeight"
-            :data="tableData"
-            border
-            style="width: 100%"
-          >
-            <el-table-column
-              prop="studentCode"
-              label="学号"
-              fixed
-              align="center"
-            ></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
-            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>
+          </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"
-                v-if="index == 0"
-                label="参与分"
+                width="100"
+              ></el-table-column>
+              <el-table-column
+                prop="rushAnswerTimes"
+                label="抢答成功次数"
                 sortable
-                :prop="'interactionsNum' + item"
-              >
-              </el-table-column>
+                align="center"
+              ></el-table-column>
               <el-table-column
-                v-else
+                prop="rushAnswerCorrectTimes"
+                label="抢答答对次数"
+                sortable
                 align="center"
-                label="互动数"
-                :prop="'interactionsNum' + item"
-              >
-              </el-table-column>
+              ></el-table-column>
               <el-table-column
-                v-if="index == 0"
+                prop="checkAnswerTimes"
+                label="抽答次数"
+                sortable
                 align="center"
-                label="对错分"
+              ></el-table-column>
+              <el-table-column
+                prop="checkAnswerCorrectTimes"
+                label="抽答答对次数"
                 sortable
-                :prop="'interactionsCorrectNum' + item"
-              >
-              </el-table-column>
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                prop="interactionsNum"
+                label="参与得分"
+                sortable
+                align="center"
+              ></el-table-column>
               <el-table-column
-                v-else
+                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"
-                label="参与数"
-                :prop="'interactionsCorrectNum' + item"
               >
+                <el-table-column
+                  align="center"
+                  v-if="index == 0"
+                  label="参与分"
+                  sortable
+                  :prop="'interactionsNum' + item"
+                >
+                </el-table-column>
+                <el-table-column
+                  v-else
+                  align="center"
+                  label="互动数"
+                  :prop="'interactionsNum' + item"
+                >
+                </el-table-column>
+                <el-table-column
+                  v-if="index == 0"
+                  align="center"
+                  label="对错分"
+                  sortable
+                  :prop="'interactionsCorrectNum' + item"
+                >
+                </el-table-column>
+                <el-table-column
+                  v-else
+                  align="center"
+                  label="参与数"
+                  :prop="'interactionsCorrectNum' + item"
+                >
+                </el-table-column>
               </el-table-column>
-            </el-table-column>
-          </el-table>
+            </el-table>
+          </div>
         </div>
         <div class="pagination-box" v-show="tabIndex == 1">
           <el-pagination
@@ -456,21 +463,22 @@
             icon="fa fa-cloud-download"
             >导出报表</el-button
           >
+          <el-button
+            @click="print"
+            type="primary"
+            plain
+            round
+            icon="el-icon-printer"
+            >打印</el-button
+          >
         </p>
       </div>
     </div>
-    <set-answer
-      :diaVisible="dialogVisible"
-      :questionList="form.questionList"
-      :paperId="form.id"
-      @saveSuccess="handleSuccess"
-      @cancel="cancel"
-    />
   </div>
 </template>
 
 <script>
-import { formatDate, deepClone, downloadFile } from "utils";
+import { formatDate, deepClone, downloadFile, tablePrint } from "utils";
 import BusEvent from "@/utils/busEvent";
 export default {
   data() {
@@ -478,8 +486,6 @@ export default {
       tableMaxHeight: 300,
       role: "",
       loading: false,
-      dialogVisible: false,
-      form: { questionList: [] },
       date: "", //今天-昨天-本周
       query: {
         //搜索条件
@@ -506,7 +512,9 @@ export default {
     };
   },
   async created() {
-    this.role = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role;
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
     this.query.subjectNames = this.role == "ROLE_BANZHUREN" ? [] : "";
     await this._QueryClassList();
     await this._QuerySubjectList();
@@ -532,6 +540,9 @@ export default {
     });
   },
   methods: {
+    print() {
+      tablePrint("print-content");
+    },
     changeSub(val) {
       let sub;
       if (val && val.length) {
@@ -623,26 +634,14 @@ export default {
       }
     },
     async edit(item) {
-      if (this.editLoading) return;
-      this.editLoading = true;
-      const { data, status, info } = await this.$request.periodQuestionList({
-        periodId: item.id,
+      this.$router.push({
+        path: "/examinationPaperEdit",
+        query: {
+          paperId: item.id,
+          title: item.title,
+          type: 3,
+        },
       });
-      this.editLoading = false;
-      if (status === 0) {
-        this.form.id = item.id;
-        this.form.questionList = (data.list && [...data.list]) || [];
-        this.dialogVisible = true;
-      } else {
-        this.$message.error(info);
-      }
-    },
-    cancel() {
-      this.dialogVisible = false;
-    },
-    handleSuccess() {
-      this.dialogVisible = false;
-      this._QueryData();
     },
     tabChange() {
       this.tableMaxHeight = this.$refs.main.offsetHeight;
diff --git a/src/views/standard/setUp/school.vue b/src/views/standard/setUp/school.vue
index ed9dd8c..527ddf6 100644
--- a/src/views/standard/setUp/school.vue
+++ b/src/views/standard/setUp/school.vue
@@ -5,7 +5,7 @@
         <span>学校设置</span>
       </template>
       <template slot="btns" v-if="!code">
-        <el-tooltip effect="dark" content="导入学校名单" placement="bottom">
+        <el-tooltip effect="dark" content="导入班级名单" placement="bottom">
           <el-button
             type="primary"
             icon="el-icon-upload2"
@@ -15,6 +15,16 @@
             @click="diaUp = true"
           ></el-button>
         </el-tooltip>
+        <el-tooltip effect="dark" content="导出班级名单" placement="bottom">
+          <el-button
+            type="primary"
+            icon="el-icon-download"
+            size="mini"
+            plain
+            circle
+            @click="exportClazzExl"
+          ></el-button>
+        </el-tooltip>
       </template>
     </back-box>
     <div class="page-content">
@@ -81,9 +91,14 @@
       </div>
     </div>
     <el-dialog title="导入学校名单" :visible.sync="diaUp" width="400">
-      <up-load id="downDevice" :url="url"  @upSuccess="upSuccess" fileName="学校名单">
+      <up-load
+        id="downDevice"
+        :url="url"
+        @upSuccess="upSuccess"
+        fileName="学校名单"
+      >
         <p class="down-txt" slot="down">
-          通过Excel名单导入学校名单，点击
+          通过Excel导入学校全部班级名单，点击
           <el-link type="danger" @click="downExcel">模板下载</el-link> 。
         </p>
       </up-load>
@@ -230,9 +245,9 @@ export default {
   },
   data() {
     return {
-      code: "",//长水跳转标志
+      code: "", //长水跳转标志
       loading: false,
-      url: "xxx",
+      url: "/api_html/school/manager/importClassAndStudent",
       diaUp: false,
       diaSchool: false,
       diaGrade: false,
@@ -246,7 +261,8 @@ export default {
         tenantName: "",
       },
       tableData: [],
-      formSchool: {//修改学校
+      formSchool: {
+        //修改学校
         sections: "",
         managePwd: "",
         contactPerson: "",
@@ -264,7 +280,8 @@ export default {
           },
         ],
       },
-      formGrade: {//修改年级
+      formGrade: {
+        //修改年级
         gradeName: "",
         subjectNames: [],
         classList: [],
@@ -292,23 +309,26 @@ export default {
     this._QuerySubject();
   },
   methods: {
-    upSuccess(){//导入成功
-    this.diaUp = false
+    upSuccess() {
+      //导入成功
+      this.diaUp = false;
       this._QueryDataSchool();
       this._QueryDataGrade();
     },
-    setGrade(obj) {//打开年级设置
+    setGrade(obj) {
+      //打开年级设置
       this.formGrade.subjectNames = obj.subjectNames;
       this.formGrade.classList = obj.classList;
       this.formGrade.gradeName = obj.gradeName;
       this.showAll = false;
       this.diaGrade = true;
     },
-    addSubjectName() {//添加科目
+    addSubjectName() {
+      //添加科目
       if (!this.subjectName) {
         this.$message.warning("请填写科目名称");
         return;
-      }else if(this.subjectList.includes(this.subjectName)){
+      } else if (this.subjectList.includes(this.subjectName)) {
         this.$message.warning("科目已存在，请重新填写～");
         return;
       }
@@ -316,7 +336,8 @@ export default {
       this.formGrade.subjectNames.push(this.subjectName);
       this.subjectName = "";
     },
-    editSchool() {//保存修改学校信息
+    editSchool() {
+      //保存修改学校信息
       if (!this.formSchool.sections.length) {
         this.$message.error("请选择学段！");
         return;
@@ -349,7 +370,8 @@ export default {
         }
       });
     },
-    async editGrade() {//保存修改年级信息
+    async editGrade() {
+      //保存修改年级信息
       if (!this.formGrade.subjectNames.length) {
         this.$message.error("请选择科目！");
         return;
@@ -371,7 +393,8 @@ export default {
         this.$message.error(info);
       }
     },
-    async _QueryDataSchool() {//学校详情
+    async _QueryDataSchool() {
+      //学校详情
       this.loading = true;
       const { data, status, info } = await this.$request.schoolDetail();
       this.loading = false;
@@ -406,18 +429,29 @@ export default {
       }
     },
     async downExcel() {
-      let data = await this.$request.downDevice({
-        id: this.id,
-      });
+      let data = await this.$request.classAndStudentTemplate();
       if (data && !data.code) {
         let blob = new Blob([data], {
           type: "application/vnd.ms-excel;charset=utf-8",
         });
-        downloadFile(`设备信息.xlsx`, blob);
+        downloadFile(`班级名单模版.xlsx`, blob);
       } else {
         this.$message.error(data.info);
       }
     },
+    async exportClazzExl() {
+      this.loadingDown = true;
+      let data = await this.$request.exportClassAndStudent();
+      this.loadingDown = false;
+      if (data) {
+        let blob = new Blob([data], {
+          type: "application/vnd.ms-excel;charset=utf-8",
+        });
+        downloadFile(`班级名单.xlsx`, blob);
+      } else {
+        this.$message.error("下载失败");
+      }
+    },
   },
 };
 </script>
diff --git a/src/views/standard/setUp/student.vue b/src/views/standard/setUp/student.vue
index 650c373..bee7f5c 100644
--- a/src/views/standard/setUp/student.vue
+++ b/src/views/standard/setUp/student.vue
@@ -347,19 +347,6 @@ export default {
       this.diaUp = false;
       this._QueryData(3);
     },
-    async downExcel() {
-      this.loadingDown = true;
-      let { data, info, status } =
-        await this.$request.studentClickerTemplateUrl();
-      this.loadingDown = false;
-      if (status == 0) {
-        getBlob(data.downloadUrl).then((res) => {
-          downloadFile("学生答题器绑定模板", res);
-        });
-      } else {
-        this.$message.error(info);
-      }
-    },
     async removeStu(obj, index) {
       const { data, status, info } = await this.$request.delStudent({
         studentId: obj.id,
@@ -470,6 +457,19 @@ export default {
         this.$message.error(info);
       }
     },
+     async downExcel() {
+      this.loadingDown = true;
+      let { data, info, status } =
+        await this.$request.studentClickerTemplateUrl();
+      this.loadingDown = false;
+      if (status == 0) {
+        getBlob(data.downloadUrl).then((res) => {
+          downloadFile("学生答题器绑定模板", res);
+        });
+      } else {
+        this.$message.error(info);
+      }
+    },
   },
 };
 </script>
diff --git a/src/views/standard/setUp/teacher.vue b/src/views/standard/setUp/teacher.vue
index 4d620c9..1802e73 100644
--- a/src/views/standard/setUp/teacher.vue
+++ b/src/views/standard/setUp/teacher.vue
@@ -5,7 +5,7 @@
         <span>教师管理</span>
       </template>
       <template slot="btns" v-if="!code">
-        <!-- <el-tooltip effect="dark" content="导入教师名单" placement="bottom">
+        <el-tooltip effect="dark" content="导入教师名单" placement="bottom">
           <el-button
             type="primary"
             icon="el-icon-upload2"
@@ -14,7 +14,17 @@
             circle
             @click="diaUp = true"
           ></el-button>
-        </el-tooltip> -->
+        </el-tooltip>
+        <el-tooltip effect="dark" content="导出教师名单" placement="bottom">
+          <el-button
+            type="primary"
+            icon="el-icon-download"
+            size="mini"
+            plain
+            circle
+            @click="exportTeacherExl"
+          ></el-button>
+        </el-tooltip>
         <el-tooltip effect="dark" content="添加教师" placement="bottom">
           <el-button
             type="primary"
@@ -217,7 +227,12 @@
       </div>
     </div>
     <el-dialog title="导入教师名单" :visible.sync="diaUp" width="600">
-      <up-load id="downTeacher" :url="url"  @upSuccess="upSuccess" fileName="教师名单">
+      <up-load
+        id="downTeacher"
+        :url="url"
+        @upSuccess="upSuccess"
+        fileName="教师名单"
+      >
         <p class="down-txt" slot="down">
           通过Excel名单导入教师名单，点击
           <el-link type="danger" @click="downExcel">模板下载</el-link> 。
@@ -300,7 +315,8 @@
               >
               </el-option>
             </el-select>
-            <el-cascader size="small"
+            <el-cascader
+              size="small"
               v-if="item.roleId == 6"
               class="sel-t"
               collapse
@@ -310,7 +326,8 @@
               :options="gradeClassList"
               :props="{ expandTrigger: 'hover' }"
             ></el-cascader>
-            <el-cascader size="small"
+            <el-cascader
+              size="small"
               v-if="item.roleId == 7"
               class="sel-t"
               collapse
@@ -320,7 +337,8 @@
               :options="classList"
               :props="{ expandTrigger: 'hover' }"
             ></el-cascader>
-            <el-cascader size="small"
+            <el-cascader
+              size="small"
               v-if="item.roleId == 8"
               class="sel-t"
               collapse
@@ -346,13 +364,13 @@
 </template>
 
 <script>
-import { downloadFile, formatGradeClass, randomWord } from "@/utils";
+import { downloadFile, formatGradeClass, randomWord, getBlob } from "@/utils";
 export default {
   data() {
     return {
       code: "",
       loading: false,
-      url: "",
+      url: "/api_html/school/manager/importTeacher",
       diaUp: false,
       diaTeacher: false,
       isAdd: false,
@@ -423,8 +441,9 @@ export default {
     await this._QueryClass();
   },
   methods: {
-    upSuccess(){//导入成功
-    this.diaUp = false
+    upSuccess() {
+      //导入成功
+      this.diaUp = false;
       this._QueryData(10);
     },
     addRoleList() {
@@ -494,7 +513,6 @@ export default {
               ...obj,
             });
           } else {
-            
             res = await this.$request.updateTeacher({
               teacherId: this.formTeacher.id,
               teacherName: this.formTeacher.teacherName,
@@ -626,7 +644,7 @@ export default {
       //角色
       const { data, status, info } = await this.$request.delTeacherManager({
         teacherId: obj.teacherId,
-        ...query
+        ...query,
       });
       if (status === 0) {
         this._QueryData(10);
@@ -755,16 +773,27 @@ export default {
       }
     },
     async downExcel() {
-      let data = await this.$request.downDevice({
-        id: this.id,
-      });
-      if (data && !data.code) {
+      let { data, status, info } = await this.$request.teacherTemplate();
+      debugger;
+      if (status == 0) {
+        getBlob(data.downloadUrl).then((res) => {
+          downloadFile("教师名单模板", res);
+        });
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async exportTeacherExl() {
+      this.loadingDown = true;
+      let data = await this.$request.exportTeacher();
+      this.loadingDown = false;
+      if (data) {
         let blob = new Blob([data], {
           type: "application/vnd.ms-excel;charset=utf-8",
         });
         downloadFile(`教师名单.xlsx`, blob);
       } else {
-        this.$message.error(data.info);
+        this.$message.error("下载失败");
       }
     },
   },
diff --git a/src/views/standard/test/analysis.vue b/src/views/standard/test/analysis.vue
index 8706f6d..8a0f167 100644
--- a/src/views/standard/test/analysis.vue
+++ b/src/views/standard/test/analysis.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="main" class="page-container" :class="dialogVisible ? 'active' : ''">
+  <div ref="main" class="page-container">
     <back-box>
       <template slot="title">
         <span>单卷分析</span>
@@ -53,7 +53,7 @@
           >作答明细表</span
         >
       </div>
-      <div class="table-box" v-loading="loading">
+      <div id="print-content" class="table-box" v-loading="loading">
         <el-table
           :max-height="tableMaxHeight"
           v-show="type == 1"
@@ -131,15 +131,19 @@
             :label="item.title"
             :prop="'count' + index"
             align="center"
-            ><template slot-scope="scope"><p class="persent">{{
-              scope.row.questionType == "5"
-                ? ""
-                : scope.row["option" + index]
-                ? `${scope.row["option" + index]}(${
-                    scope.row["persent" + index]
-                  })`
-                : ""
-            }}</p></template>
+            ><template slot-scope="scope"
+              ><p class="persent">
+                {{
+                  scope.row.questionType == "5"
+                    ? ""
+                    : scope.row["option" + index]
+                    ? `${scope.row["option" + index]}(${
+                        scope.row["persent" + index]
+                      })`
+                    : ""
+                }}
+              </p></template
+            >
           </el-table-column>
         </el-table>
         <div class="hui-box" v-show="type == 1">
@@ -340,9 +344,7 @@
             :label="'Q' + item.id"
           >
             <template slot-scope="scope">
-              <span
-                v-if="tableData[index]?.questionType==5"
-              >*</span>
+              <span v-if="tableData[index]?.questionType == 5">*</span>
               <span
                 v-else-if="scope.row['answer' + item.id]"
                 :class="scope.row['isRight' + item.id] ? '' : 'error'"
@@ -352,11 +354,14 @@
               <span
                 v-else
                 :class="scope.row['questionType' + item.id] == 5 ? '' : 'error'"
-              >-</span>
+                >-</span
+              >
             </template>
           </el-table-column>
         </el-table>
-        <div class="down">
+      </div>
+      <div class="down">
+        <div>
           <el-button
             @click="exportData"
             type="primary"
@@ -365,33 +370,32 @@
             icon="fa fa-cloud-download"
             >导出报表</el-button
           >
-          <div>
-            <el-button
-              v-if="examReport.subjectiveScore != 0"
-              @click="diaUp = true"
-              type="primary"
-              round
-              v-loading="exportLoading"
-              >导入主观题分数</el-button
-            >
-            <el-button
-              @click="edit"
-              type="primary"
-              v-if="examReport.subjectiveScore != examReport.examPaperScore"
-              round
-              >修改答案</el-button
-            >
-          </div>
+          <el-button
+            @click="print"
+            type="primary"
+            plain
+            round
+            icon="el-icon-printer"
+            >打印</el-button
+          >
+        </div>
+        <div>
+          <el-button
+            v-if="examReport.subjectiveScore != 0"
+            @click="diaUp = true"
+            type="primary"
+            round
+            v-loading="exportLoading"
+            >导入主观题分数</el-button
+          >
+          <el-button
+            @click="edit"
+            type="primary"
+            v-if="examReport.subjectiveScore != examReport.examPaperScore"
+            round
+            >查看题目</el-button
+          >
         </div>
-      </div>
-      <div class="edit-dia" v-show="dialogVisible" height="100%">
-        <editAnswer
-          ref="editAnswer"
-          :title="title"
-          :score="score"
-          @cancel="cancel"
-          @saveSuccess="saveSuccess"
-        />
       </div>
       <el-dialog title="导入主观题分数" :visible.sync="diaUp" width="600">
         <up-load
@@ -417,17 +421,14 @@
 </template>
 
 <script>
-import { downloadFile } from "@/utils";
-import editAnswer from "./editAnswer.vue";
+import { downloadFile, tablePrint } from "@/utils";
 export default {
-  components: { editAnswer },
   data() {
     return {
       tableMaxHeight: 600,
       loading: false,
       exportLoading: false,
       diaUp: false,
-      dialogVisible: false,
       url: "/api_html/teaching/importSubjectiveScore",
       id: "",
       title: "",
@@ -466,10 +467,12 @@ export default {
   created() {
     this.id = this.$route.query.id;
     this.title = this.$route.query.title || "";
-    this.score = this.$route.query.score || "";
     this._QueryData();
   },
   methods: {
+    print() {
+      tablePrint("print-content");
+    },
     upSuccess() {
       //导入成功
       this.diaUp = false;
@@ -499,15 +502,14 @@ export default {
       return tit;
     },
     edit() {
-      this.$refs.editAnswer.edit(this.id);
-      this.dialogVisible = true;
-    },
-    cancel() {
-      this.dialogVisible = false;
-    },
-    saveSuccess() {
-      this.dialogVisible = false;
-      this._QueryData();
+      this.$router.push({
+        path: "/examinationPaperEdit",
+        query: {
+          paperId: this.id,
+          title: this.title,
+          type: 2,
+        },
+      });
     },
     changePage(page) {
       this.page = page;
@@ -568,7 +570,9 @@ export default {
           }
           detail.map((items, index) => {
             params["que" + items.id] = items.id;
-            params["score" + items.id] = String(items.score).includes('.')?Number(items.score).toFixed(2):items.score;
+            params["score" + items.id] = String(items.score).includes(".")
+              ? Number(items.score).toFixed(2)
+              : items.score;
             params["answer" + items.id] =
               items.answer == 1 ? "✓" : items.answer == 2 ? "✗" : items.answer;
             params["isRight" + items.id] = items.isRight;
@@ -608,13 +612,17 @@ export default {
           let defaultArr = detail?.filter((item) => {
             return item.option != "未答";
           });
-          
+
           optionsList.map((items, index) => {
             if (index != 4) {
               params["count" + index] =
-                defaultArr[index]?.option != "未答" ? defaultArr[index]?.count : "";
+                defaultArr[index]?.option != "未答"
+                  ? defaultArr[index]?.count
+                  : "";
               params["persent" + index] =
-                defaultArr[index]?.option != "未答" ? defaultArr[index]?.persent : "";
+                defaultArr[index]?.option != "未答"
+                  ? defaultArr[index]?.persent
+                  : "";
               params["option" + index] =
                 defaultArr[index]?.option != "未答"
                   ? defaultArr[index]?.option == 1
@@ -651,17 +659,14 @@ export default {
       if (this.exportLoading == true) return;
       this.exportLoading = true;
       const data = await this.$request.exportExamReport({
-        examId:this.id
+        examId: this.id,
       });
       this.exportLoading = false;
       if (data) {
-         let blob = new Blob([data], {
+        let blob = new Blob([data], {
           type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
         });
-        downloadFile(
-          "即时测-单卷测练报表.xlsx",
-          blob
-        );
+        downloadFile("即时测-单卷测练报表.xlsx", blob);
       } else {
         this.$message.error("下载失败");
       }
@@ -715,7 +720,7 @@ div::-webkit-scrollbar-thumb {
     z-index: 10;
   }
 }
-.persent{
+.persent {
   white-space: nowrap;
 }
 .error {
diff --git a/src/views/standard/test/editAnswer.vue b/src/views/standard/test/editAnswer.vue
deleted file mode 100644
index 5eb7059..0000000
--- a/src/views/standard/test/editAnswer.vue
+++ /dev/null
@@ -1,908 +0,0 @@
-<template>
-  <div>
-    <div class="back">
-      <div class="back-l" @click="cancel">
-        <i class="fa fa-mail-reply-all"></i>
-        <p>修改答案</p>
-      </div>
-    </div>
-    <div class="form-box">
-      <div class="answer-title">
-        <p class="name">{{ title }}</p>
-        <p class="totals">卷面总分：{{ score }}分</p>
-      </div>
-      <div v-if="questionList && questionList.length">
-        <template v-if="questionList[0].subQuestions">
-          <div v-for="(question, index) in questionList" :key="index">
-            <p class="question-title">
-              <span>{{ setBigNum(index) }}、</span>
-              <span class="title-txt">{{ question.questionTitle }}</span>
-              <span>共 {{ question.score }} 分</span>
-            </p>
-            <ul class="questions-ul">
-              <li class="sub-questions">
-                <div class="qs-num">题号</div>
-                <div class="qs-type">题型</div>
-                <div class="qs-score">分数</div>
-                <div class="qs-partScore">漏选得分</div>
-                <div class="qs-options qs-options2">选项设置</div>
-              </li>
-              <li
-                v-for="(subQuestions, indexs) in question.subQuestions"
-                :key="indexs"
-              >
-                <p
-                  class="set-ans-btn"
-                  v-if="
-                    subQuestions.qusType &&
-                    subQuestions.subNum &&
-                    subQuestions.subNum > 4
-                  "
-                >
-                  <el-button type="primary" @click="setFormAns(indexs, index)"
-                    >批量设置答案</el-button
-                  >
-                </p>
-                <div v-else class="sub-questions">
-                  <div class="qs-num">{{ subQuestions.questionIndex }}</div>
-                  <div class="qs-type">
-                    {{ setSubPro(subQuestions.questionType) }}
-                  </div>
-                  <div class="qs-score">
-                    {{ subQuestions.score }}
-                  </div>
-                  <div class="qs-partScore">
-                    <p v-if="subQuestions.questionType != 3">--</p>
-                    <el-input-number
-                      class="number-ipt"
-                      v-else
-                      size="medium"
-                      :min="0"
-                      :precision="2"
-                      :max="subQuestions.score"
-                      :step="0.5"
-                      v-model="subQuestions.partScore"
-                      label="漏选得分"
-                    ></el-input-number>
-                  </div>
-                  <div class="qs-options qs-options2">
-                    <p v-if="subQuestions.questionType == 5">--</p>
-                    <p v-if="subQuestions.questionType == 4" class="answer-box">
-                      <span
-                        class="answer-s"
-                        :class="subQuestions.correctAnswer == 1 ? 'active' : ''"
-                        @click="subQuestions.correctAnswer = 1"
-                        >✓</span
-                      >
-                      <span
-                        class="answer-s"
-                        :class="subQuestions.correctAnswer == 2 ? 'active' : ''"
-                        @click="subQuestions.correctAnswer = 2"
-                        >✗</span
-                      >
-                    </p>
-                    <p v-if="subQuestions.questionType == 3" class="answer-box">
-                      <template
-                        v-for="option in subQuestions.answerOptions.split(',')"
-                      >
-                        <span
-                          v-if="option"
-                          class="answer-s"
-                          :class="
-                            subQuestions.correctAnswer.includes(option)
-                              ? 'active'
-                              : ''
-                          "
-                          :key="option"
-                          @click="changAnswer(subQuestions, option)"
-                          >{{ option }}</span
-                        >
-                      </template>
-                    </p>
-                    <p v-if="subQuestions.questionType == 2" class="answer-box">
-                      <template
-                        v-for="option in subQuestions.answerOptions.split(',')"
-                      >
-                        <span
-                          class="answer-s"
-                          v-if="option"
-                          :class="
-                            subQuestions.correctAnswer == option ? 'active' : ''
-                          "
-                          :key="option"
-                          @click="subQuestions.correctAnswer = option"
-                          >{{ option }}</span
-                        >
-                      </template>
-                    </p>
-                  </div>
-                </div>
-              </li>
-            </ul>
-          </div>
-        </template>
-        <ul class="questions-ul" v-else>
-          <li class="sub-questions">
-            <div class="qs-num">题号</div>
-            <div class="qs-type">题型</div>
-            <div class="qs-score">分数</div>
-            <div class="qs-partScore">漏选得分</div>
-            <div class="qs-options qs-options2">选项设置</div>
-          </li>
-          <li v-for="(subQuestions, indexs) in questionList" :key="indexs">
-            <p
-              class="set-ans-btn"
-              v-if="
-                subQuestions.qusType &&
-                subQuestions.subNum &&
-                subQuestions.subNum > 4
-              "
-            >
-              <el-button type="primary" @click="setFormAns(indexs)"
-                >批量设置答案</el-button
-              >
-            </p>
-            <div v-else class="sub-questions">
-              <div class="qs-num">{{ subQuestions.questionIndex }}</div>
-              <div class="qs-type">
-                {{ setSubPro(subQuestions.questionType) }}
-              </div>
-              <div class="qs-score">
-                {{ subQuestions.score }}
-              </div>
-              <div class="qs-partScore">
-                <p v-if="subQuestions.questionType != 3">--</p>
-                <el-input-number
-                  class="number-ipt"
-                  v-else
-                  size="medium"
-                  :min="0"
-                  :precision="2"
-                  :max="subQuestions.score"
-                  :step="0.5"
-                  v-model="subQuestions.partScore"
-                  label="漏选得分"
-                ></el-input-number>
-              </div>
-              <div class="qs-options qs-options2">
-                <p v-if="subQuestions.questionType == 5">--</p>
-                <p v-if="subQuestions.questionType == 4" class="answer-box">
-                  <span
-                    class="answer-s"
-                    :class="subQuestions.correctAnswer == 1 ? 'active' : ''"
-                    @click="subQuestions.correctAnswer = 1"
-                    >✓</span
-                  >
-                  <span
-                    class="answer-s"
-                    :class="subQuestions.correctAnswer == 2 ? 'active' : ''"
-                    @click="subQuestions.correctAnswer = 2"
-                    >✗</span
-                  >
-                </p>
-                <p v-if="subQuestions.questionType == 3" class="answer-box">
-                  <template
-                    v-for="option in subQuestions.answerOptions.split(',')"
-                  >
-                    <span
-                      v-if="option"
-                      class="answer-s"
-                      :class="
-                        subQuestions.correctAnswer.includes(option)
-                          ? 'active'
-                          : ''
-                      "
-                      :key="option"
-                      @click="changAnswer(subQuestions, option)"
-                      >{{ option }}</span
-                    >
-                  </template>
-                </p>
-                <p v-if="subQuestions.questionType == 2" class="answer-box">
-                  <template
-                    v-for="option in subQuestions.answerOptions.split(',')"
-                  >
-                    <span
-                      class="answer-s"
-                      v-if="option"
-                      :class="
-                        subQuestions.correctAnswer == option ? 'active' : ''
-                      "
-                      :key="option"
-                      @click="subQuestions.correctAnswer = option"
-                      >{{ option }}</span
-                    >
-                  </template>
-                </p>
-              </div>
-            </div>
-          </li>
-        </ul>
-      </div>
-      <div class="btn-box">
-        <el-button type="danger" plain round @click="cancel">取消</el-button>
-        <el-button type="primary" round @click="saveAnswer">保存</el-button>
-      </div>
-    </div>
-    <el-dialog
-      title="批量设置答案"
-      :close-on-click-modal="false"
-      :visible.sync="diaSetAns"
-      width="400"
-      :modal-append-to-body="false"
-    >
-      <div class="qs-options">
-        <p class="dia-tips">
-          请点击选项按钮设置答案,多选题题目之间用“,”隔开，若添加5道题：“AC,AD,BD,AC,CD”
-        </p>
-        <p>{{ setSubPro(formAns.qusType) }}：</p>
-        <p class="ipt">
-          <el-input
-            ref="formAnsIpt"
-            v-if="formAns.qusType == 2 || formAns.qusType == 3"
-            v-model="formAns.answerList"
-            @keydown.native="keydownAnswer($event, formAns.qusType)"
-            @input="setAllAnswer($event, formAns.qusType)"
-          ></el-input>
-          <el-input
-            v-if="formAns.qusType == 4"
-            v-model="formAns.answerList"
-            readonly=""
-          ></el-input>
-        </p>
-        <p class="answer-box">
-          <template v-if="formAns.qusType == 4">
-            <span
-              class="answer-s active"
-              @click="
-                formAns.answerList.length < formAns.subNum
-                  ? (formAns.answerList += '✓')
-                  : ''
-              "
-              >✓</span
-            >
-            <span
-              class="answer-s active"
-              @click="
-                formAns.answerList.length < formAns.subNum
-                  ? (formAns.answerList += '✗')
-                  : ''
-              "
-              >✗</span
-            >
-          </template>
-          <template v-if="formAns.qusType == 3">
-            <span
-              class="answer-s active"
-              v-for="option in formAns.answerOptions.split(',')"
-              :key="option"
-              @click="setMultiple(formAns, option)"
-              >{{ option }}</span
-            >
-            <span
-              class="answer-s active"
-              @click="setMultiple(formAns, ',')"
-              >,</span
-            >
-          </template>
-          <template v-if="formAns.qusType == 2">
-            <span
-              class="answer-s active"
-              v-for="option in formAns.answerOptions.split(',')"
-              :key="option"
-              @click="
-                formAns.answerList.length < formAns.subNum
-                  ? (formAns.answerList += option)
-                  : ''
-              "
-              >{{ option }}</span
-            >
-          </template>
-          <span
-            class="answer-s delButton"
-            @click="formAns.answerList = formAns.answerList.slice(0, -1)"
-            >x</span
-          >
-          <span class="answer-s ac" @click="formAns.answerList = ''">ac</span>
-        </p>
-      </div>
-      <div class="dialog-footer" slot="footer">
-        <el-button @click="saveFormAns">确 定</el-button>
-        <el-button @click="diaSetAns = false">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { deepClone, checkAnswer } from "utils";
-export default {
-  props: {
-    title: "",
-    score: "",
-  },
-  watch: {
-    // id: {
-    //   handler: function (val) {
-    //     if (val) {
-    //       this.edit();
-    //     }
-    //   },
-    //   immediate: true,
-    // },
-  },
-  data() {
-    return {
-      id: "",
-      diaSetAns: false,
-      form: {},
-      questionList: [],
-      formAns: {
-        listIndex: 0, //大题位置
-        endIndex: 0, //相同题目最后一位题目的questionIndex
-        index:0,
-        qusType: "", //题目类型
-        subNum: 0, //数量
-        answerOptions: [], //答案选项
-        answerList: "", //答案列表-字符串
-      },
-    };
-  },
-  created() {
-    // this.edit();
-  },
-  methods: {
-    cancel() {
-      this.$emit("cancel");
-    },
-    setSubPro(type) {
-      let tit;
-      switch (type) {
-        case 2:
-          tit = "单选题";
-          break;
-        case 3:
-          tit = "多选题";
-          break;
-        case 4:
-          tit = "判断题";
-          break;
-        case 5:
-          tit = "主观题";
-          break;
-      }
-      return tit;
-    },
-    setBigNum(num) {//转题号格式
-      let txt = "";
-      let bigNum = [
-        "一",
-        "二",
-        "三",
-        "四",
-        "五",
-        "六",
-        "七",
-        "八",
-        "九",
-        "十",
-        "十一",
-        "十二",
-        "十三",
-        "十四",
-        "十五",
-        "十六",
-        "十七",
-        "十八",
-        "十九",
-        "二十",
-      ];
-      txt = bigNum[num];
-
-      return txt;
-    },
-    keydownAnswer(event, type) {
-      let answerA = "ABCDEFG";
-      let answer_a = "abcdefg";
-      answerA = answerA.substring(0, this.formAns.subNum);
-      answer_a = answer_a.substring(0, this.formAns.subNum);
-      answerA += answer_a;
-      answerA = type == 2 ? answerA : answerA + ",";
-      if (
-        event.key == "Meta" ||
-        event.key == "CapsLock" ||
-        event.key == "Shift" ||
-        event.key == "Enter" ||
-        event.key == "Alt" ||
-        event.key == "Backspace" ||
-        event.key == "Delete" ||
-        event.key == "ArrowUp" ||
-        event.key == "ArrowDown" ||
-        event.key == "ArrowLeft" ||
-        event.key == "v" ||
-        event.key == "V" ||
-        event.key == "ArrowRight"
-      )
-        return;
-      if (!answerA.includes(event.key)) {
-        event.returnValue = "";
-      }
-    },
-    setAllAnswer(event, type) {//批量设置答案输入格式化答案
-      let str = this.formAns.answerList;
-      let str2 = checkAnswer(
-        str,
-        type,
-        this.formAns.answerOptions.split(",").length,
-        this.formAns.subNum
-      );
-      this.formAns.answerList = str2;
-    },
-    setAnswer(type, ans) {//答案显示格式
-      let txt = "";
-      if (type == 2) {
-        txt = ans;
-      } else if (type == 3) {
-        txt = ans + ",";
-      } else if (type == 4) {
-        txt = ans == 1 ? "✓" : ans == 2 ? "✗" : "";
-      }
-      return txt;
-    },
-    insertTxtAndSetcursor(answerList, str) {//调整重新设置答案后的光标位置
-      let element = this.$refs.formAnsIpt.$el.children[0]; // 获取到指定标签
-      let startPos = element.selectionStart; // 获取光标开始的位置
-      if (startPos === undefined) {
-        // 如果没有光标位置 不操作
-        return answerList;
-      } else {
-        return {
-          text:
-            answerList.substring(0, startPos) +
-            str +
-            answerList.substring(startPos), // 将文本插入
-          startPos: startPos + str.length,
-        };
-      }
-    },
-    setMultiple(obj, answer) { //多选答案设置
-      let resault = this.insertTxtAndSetcursor(obj.answerList || "", answer);
-      obj.answerList = resault.text;
-      let str = obj.answerList;
-      let str2 = checkAnswer(
-        str,
-        3,
-        obj.answerOptions.split(",").length,
-        obj.subNum
-      );
-      obj.answerList = str2;
-      this.$refs.formAnsIpt.$el.children[0].focus();
-      this.$refs.formAnsIpt.$el.children[0].selectionStart = resault.startPos;
-    },
-    changAnswer(sub, option) {//设置多选答案
-      let str = new RegExp(option, "g");
-      if (sub.correctAnswer?.includes(option)) {
-        sub.correctAnswer = sub.correctAnswer.replace(str, "");
-      } else {
-        let arrs = (sub.correctAnswer && sub.correctAnswer.split("")) || [];
-        arrs.push(option);
-        sub.correctAnswer = arrs.sort().join("");
-      }
-    },
-    setFormAns(indexs, index) {//初始化要修改的答案
-      if (this.questionList[0].subQuestions) {
-        this.formAns = { ...this.questionList[index].subQuestions[indexs] };
-        this.formAns.listIndex = index;
-         let startIndex = (this.formAns.index+1) - this.formAns.subNum;//批量设置答案开始位置
-        let answerList = "";
-        this.questionList[index].subQuestions.map((item, subIdx) => {
-          if (subIdx >= startIndex) {
-            answerList += this.setAnswer(item.questionType, item.correctAnswer);
-            if (subIdx != indexs) {
-              if (!!item.qusType) {
-                answerList = "";
-              }
-            } else {
-              if (item.qusType == 3) {
-                answerList = answerList.slice(0, -1);
-              }
-              this.formAns.answerList = answerList;
-            }
-          }
-        });
-      } else {
-        this.formAns = { ...this.questionList[indexs] };
-        this.formAns.listIndex = indexs;
-        let startIndex = this.formAns.endIndex - this.formAns.subNum;
-        let answerList = "";
-        this.questionList[index].map((item, subIdx) => {
-          if (subIdx >= startIndex) {
-            answerList += this.setAnswer(item.questionType, item.correctAnswer);
-            if (subIdx != indexs) {
-              if (!!item.qusType) {
-                answerList = "";
-              }
-            } else {
-              if (item.qusType == 3) {
-                answerList = answerList.slice(0, -1);
-              }
-              this.formAns.answerList = answerList;
-            }
-          }
-        });
-      }
-      this.diaSetAns = true;
-    },
-    saveFormAns() {
-      //批量修改答案
-      let EndIndex;
-      let subNum = this.formAns.subNum - 1;
-      if (this.questionList[this.formAns.listIndex].subQuestions) {
-        this.questionList[this.formAns.listIndex].subQuestions.some(
-          (item, index) => {
-            if (this.formAns.endIndex == item.questionIndex) {
-              EndIndex = index;
-              return;
-            }
-          }
-        );
-      } else {
-        this.questionList.some((item, index) => {
-          if (this.formAns.endIndex == item.questionIndex) {
-            EndIndex = index;
-            return;
-          }
-        });
-      }
-
-      for (let i = 0; i <= subNum; i++) {
-        let correctAnswer = "";
-        if (this.formAns.qusType == 2) {
-          correctAnswer = this.formAns.answerList[subNum - i] || "";
-        } else if (this.formAns.qusType == 3) {
-          correctAnswer = this.formAns.answerList.split(",")[subNum - i] || "";
-        } else if (this.formAns.qusType == 4) {
-          correctAnswer =
-            this.formAns.answerList[subNum - i] == "✓"
-              ? 1
-              : this.formAns.answerList[subNum - i] == "✗"
-              ? 2
-              : "";
-        }
-        if (this.questionList[0].subQuestions) {
-          this.questionList[this.formAns.listIndex].subQuestions[
-            EndIndex - i
-          ].correctAnswer = correctAnswer;
-        } else {
-          this.questionList[EndIndex - i].correctAnswer = correctAnswer;
-        }
-      }
-      this.diaSetAns = false;
-    },
-    async edit(id) {
-      //修改答案
-      this.id = id;
-      const { data, status, info } = await this.$request.examQuestionList({
-        examId: id,
-      });
-      if (status == 0) {
-        this.questionList = deepClone(data?.list || []);
-      } else {
-        this.$message.error(info);
-      }
-      if (!!this.questionList[0].subQuestions) {
-        this.questionList?.map((item) => {
-          let types = [{}];
-          let addndex = 0;
-          item.subQuestions.map((sub, index) => {
-            if (!!sub.questionType) {
-              if (sub.questionType == types[addndex].qusType && sub.questionType != 5) {
-                //同类型批量答案+1
-                types[addndex].subNum += 1;
-                if (
-                  types[addndex].answerOptions.length < sub.answerOptions.length
-                ) {
-                  types[addndex].answerOptions = sub.answerOptions;
-                }
-                types[addndex].answerList += this.setAnswer(
-                  sub.questionType,
-                  sub.correctAnswer
-                );
-                if (index == item.subQuestions.length - 1) {
-                  //循环最后类型数量大于等于5，保存批量答案
-                  if (types[addndex].subNum && types[addndex].subNum >= 5) {
-                    types[addndex].endIndex = sub.questionIndex;
-                    types[addndex].index = index;
-                  }
-                }
-              } else {
-                if (types[addndex].subNum && types[addndex].subNum >= 5) {
-                  //不同类型时如果原有类型数量大于等于5，保存批量答案
-                  types[addndex].endIndex =
-                    item.subQuestions[index - 1].questionIndex;
-                  types[addndex].index = index - 1;
-                  addndex += 1;
-                  types[addndex] = {};
-                }
-                //不同类型初始化批量答案
-                types[addndex].qusType = sub.questionType;
-                types[addndex].subNum = 1;
-                types[addndex].answerOptions = sub.answerOptions;
-                types[addndex].answerList = this.setAnswer(
-                  sub.questionType,
-                  sub.correctAnswer
-                );
-              }
-            }
-          });
-          for (let i = 0; i < types.length; i++) {
-            if (types[i].qusType == 3) {
-              types[i].answerList = types[i].answerList.slice(0, -1);
-            }
-            if (types[i].subNum >= 5) {
-              item.subQuestions.splice(
-                types[i].index + i + 1,
-                0,
-                deepClone(types[i])
-              );
-            }
-          }
-        });
-      } else {
-        let types = [{}];
-        let addndex = 0;
-        this.questionList?.map((sub, index) => {
-          if (!!sub.questionType) {
-            if (sub.questionType == types[addndex].qusType && sub.questionType != 5) {
-              //同类型批量答案+1
-              types[addndex].subNum += 1;
-              if (
-                types[addndex].answerOptions.length < sub.answerOptions.length
-              ) {
-                types[addndex].answerOptions = sub.answerOptions;
-              }
-              types[addndex].answerList += this.setAnswer(
-                sub.questionType,
-                sub.correctAnswer
-              );
-              if (index == this.questionList.length - 1) {
-                //循环最后类型数量大于等于5，保存批量答案
-                if (types[addndex].subNum && types[addndex].subNum >= 5) {
-                  types[addndex].endIndex = sub.questionIndex;
-                  types[addndex].index = index;
-                }
-              }
-            } else {
-              if (types[addndex].subNum && types[addndex].subNum >= 5) {
-                //不同类型时如果原有类型数量大于等于5，保存批量答案
-                types[addndex].endIndex =
-                  this.questionList[index - 1].questionIndex;
-                types[addndex].index = index - 1;
-                addndex += 1;
-                types[addndex] = {};
-              }
-              //不同类型初始化批量答案
-              types[addndex].qusType = sub.questionType;
-              types[addndex].subNum = 1;
-              types[addndex].answerOptions = sub.answerOptions;
-              types[addndex].answerList = this.setAnswer(
-                sub.questionType,
-                sub.correctAnswer
-              );
-            }
-          }
-        });
-        for (let i = 0; i < types.length; i++) {
-          if (types[i].qusType == 3) {
-            types[i].answerList = types[i].answerList.slice(0, -1);
-          }
-          if (types[i].subNum >= 5) {
-            item.subQuestions.splice(
-              types[i].index + i + 1,
-              0,
-              deepClone(types[i])
-            );
-          }
-        }
-      }
-
-      this.dialogVisible = true;
-    },
-    async saveAnswer() {
-      //保存答案
-      for (let i = 0; i < this.questionList.length; i++) {
-        if (this.questionList[0].subQuestions) {
-          for (let j = 0; j < this.questionList[i].subQuestions.length; j++) {
-            if (this.questionList[i].subQuestions[j].qusType) {
-              this.questionList[i].subQuestions.splice(j, 1);
-            }
-          }
-        } else {
-          if (this.questionList[i].qusType) {
-            this.questionList.splice(i, 1);
-            i--;
-          }
-        }
-      }
-      const { data, status, message } = await this.$request.setExamAnswer({
-        examId: this.id,
-        questionList: [...this.questionList],
-      });
-      if (status == 0) {
-        this.$emit("saveSuccess");
-      } else {
-        this.$message.error(message);
-      }
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.back {
-  width: 100%;
-  height: 56px;
-  border-bottom: 1px solid #e2e2e2;
-  display: flex;
-  align-items: center;
-  padding: 0 20px;
-  box-sizing: border-box;
-  .back-l {
-    display: flex;
-    align-items: center;
-    cursor: pointer;
-    flex-shrink: 0;
-    font-size: 18px;
-    font-weight: 500;
-  }
-  .fa-mail-reply-all {
-    font-size: 28px;
-    color: #b3b3b3;
-    margin-right: 12px;
-  }
-}
-.form-box {
-  padding: 20px;
-}
-.answer-title {
-  text-align: center;
-  font-size: 20px;
-  color: #333;
-  font-weight: 700;
-  padding-bottom: 20px;
-  .totals {
-    font-size: 16px;
-    color: #888;
-    font-weight: normal;
-  }
-}
-.question-title {
-  line-height: 40px;
-  .ipt {
-    width: 300px;
-    margin: 0 16px 0 10px;
-    :deep(.el-input__inner) {
-      border-radius: 20px;
-      border-color: #667ffd;
-      background: rgba($color: #667ffd, $alpha: 0.05);
-    }
-  }
-  .delete {
-    margin-right: 8px;
-  }
-  .title-txt {
-    margin-right: 20px;
-    font-size: 16px;
-    font-weight: 700;
-  }
-}
-.questions-ul {
-  border-left: 1px solid #e2e2e2;
-  border-top: 1px solid #e2e2e2;
-  margin: 12px 0;
-}
-.sub-questions {
-  width: 100%;
-  display: flex;
-  border-bottom: 1px solid #e2e2e2;
-  & > div {
-    min-height: 40px;
-    padding: 5px;
-    flex-shrink: 0;
-    border-right: 1px solid #e2e2e2;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-  }
-  .qs-num {
-    width: 80px;
-  }
-  .qs-type {
-    width: 160px;
-  }
-  .qs-score,
-  .qs-partScore {
-    width: 160px;
-  }
-  .qs-options {
-    flex: 1;
-  }
-  .qs-set {
-    width: 80px;
-  }
-  .qs-options2 {
-    text-align: left;
-    justify-content: flex-start;
-    padding-left: 20px;
-    .answer-s {
-      cursor: pointer;
-    }
-  }
-  :deep(.el-select) {
-    .el-input__inner {
-      border-radius: 20px;
-      border-color: #667ffd;
-      width: 150px;
-      height: 32px;
-      line-height: 32px;
-      background: rgba($color: #667ffd, $alpha: 0.05);
-    }
-    .el-input__icon {
-      line-height: 32px;
-    }
-  }
-}
-.set-ans-btn {
-  width: 100%;
-  padding: 10px 0 10px 630px;
-  box-sizing: border-box;
-  border-bottom: 1px solid #e2e2e2;
-}
-.fa-exchange {
-  color: #667ffd;
-  cursor: pointer;
-  font-size: 16px;
-  margin-left: 10px;
-}
-.dia-btn {
-  border-radius: 20px;
-  margin: 0 20px;
-  padding: 10px 20px;
-}
-.dia-tips {
-  padding-bottom: 10px;
-}
-.answer-s {
-  width: 32px;
-  height: 28px;
-  cursor: pointer;
-  user-select: none;
-}
-.set-questions {
-  display: flex;
-  margin-bottom: 12px;
-  width: 100%;
-  .qs-num {
-    flex-shrink: 0;
-    margin-right: 10px;
-  }
-}
-.qs-options {
-  flex: 1;
-  .ipt {
-    margin-bottom: 5px;
-  }
-  .delButton {
-    border-color: #ff6868;
-    background: #ff6868 url("../../../assets/images/arrow.png") no-repeat center;
-    background-size: 19px;
-    cursor: pointer;
-    color: transparent;
-  }
-  .ac {
-    border-color: #ff6868;
-    background: #ff6868;
-    color: #fff;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/standard/test/index.vue b/src/views/standard/test/index.vue
index b91b5b5..d40d18e 100644
--- a/src/views/standard/test/index.vue
+++ b/src/views/standard/test/index.vue
@@ -329,96 +329,105 @@
           description="没有更多数据"
         ></el-empty>
         <template v-if="tableData.length && loading == false">
-          <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"
+          <div id="print-content">
+            <el-table
+              :max-height="tableMaxHeight"
+              v-if="role == 'ROLE_JIAOSHI'"
+              :data="tableData"
+              border
+              style="width: 100%"
             >
               <el-table-column
-                :prop="'score' + index"
-                :label="index == 0 ? '总分' : '成绩'"
+                prop="studentCode"
+                label="学号"
                 align="center"
-                :class-name="index % 2 == 0 ? 'bg' : ''"
+                fixed
               ></el-table-column>
               <el-table-column
-                :prop="'classRank' + index"
-                label="班名"
+                prop="studentName"
+                label="姓名"
+                fixed
                 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>
+                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="'participationCount' + item"
-                label="参与数"
+                prop="studentCode"
+                label="学号"
                 align="center"
-                :class-name="index % 2 == 0 ? 'bg' : ''"
+                fixed
               ></el-table-column>
+
               <el-table-column
-                :prop="'score' + item"
-                label="总分"
+                prop="studentName"
+                label="姓名"
+                fixed
                 align="center"
-                :class-name="index % 2 == 0 ? 'bg' : ''"
-              ></el-table-column>
+              >
+                <template slot-scope="scoped"
+                  ><span class="click-b" @click="toPortrait(scoped.row)">
+                    {{ scoped.row.studentName }}
+                  </span></template
+                >
+              </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>
+                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">
@@ -430,6 +439,14 @@
           @click="downExl"
           >导出报表</el-button
         >
+        <el-button
+          @click="print"
+          type="primary"
+          plain
+          round
+          icon="el-icon-printer"
+          >打印</el-button
+        >
       </p>
     </div>
     <el-dialog title="导入主观题分数" :visible.sync="diaUp" width="600">
@@ -452,24 +469,13 @@
         <el-button @click="diaUp = false">取 消</el-button>
       </div>
     </el-dialog>
-    <div class="edit-dia" v-show="dialogVisible" height="100%">
-      <editAnswer
-        ref="editAnswer"
-        :title="form.title"
-        :score="form.examPaperScore"
-        @cancel="cancel"
-        @saveSuccess="saveSuccess"
-      />
-    </div>
   </div>
 </template>
 
 <script>
-import { formatDate, downloadFile } from "utils";
-import editAnswer from "./editAnswer.vue";
+import { formatDate, downloadFile, tablePrint } from "utils";
 import BusEvent from "@/utils/busEvent";
 export default {
-  components: { editAnswer },
   data() {
     return {
       exportLoading: false,
@@ -480,7 +486,6 @@ export default {
       loadingDown: false,
       url: "/api_html/teaching/importSubjectiveScore",
       examId: "",
-      dialogVisible: false,
       form: {
         id: "",
         title: "",
@@ -506,7 +511,9 @@ export default {
     };
   },
   async created() {
-    this.role = this.$store.getters.info.showRole || this.$store.getters.info.permissions[0].role;
+    this.role =
+      this.$store.getters.info.showRole ||
+      this.$store.getters.info.permissions[0].role;
     await this._QueryClassList();
     await this._QuerySubjectList();
     await this.setDate(1);
@@ -530,7 +537,11 @@ export default {
     });
   },
   methods: {
-    changeSub(val) {//科目改变触发事件
+    print() {
+      tablePrint("print-content");
+    },
+    changeSub(val) {
+      //科目改变触发事件
       let sub;
       if (val && val.length) {
         let leng = val.length - 1;
@@ -552,17 +563,36 @@ export default {
         },
       });
     },
-    uploadSJ(obj) {//导入开关
+    toPortrait(obj) {
+      let subjectNames = [];
+      subjectNames = [...this.query["subjectNames"]];
+      if (
+        this.query["subjectNames"] &&
+        this.query["subjectNames"]?.length == 1 &&
+        this.query["subjectNames"][0] == "全部"
+      ) {
+        subjectNames = this.subjectList.map((item) => {
+          return item.value;
+        });
+        subjectNames?.shift();
+      }
+      //去学生画像
+      this.$router.push({
+        path: "/portraitDetail",
+        query: {
+          id: obj.studentId,
+          classId: obj.classId,
+          subjectNames: subjectNames.join(","),
+          studentName: obj.studentName,
+          studentCode: obj.studentCode,
+        },
+      });
+    },
+    uploadSJ(obj) {
+      //导入开关
       this.examId = obj.id;
       this.diaUp = true;
     },
-    cancel() {
-      this.dialogVisible = false;
-    },
-    saveSuccess() {//修改答案回调
-      this.dialogVisible = false;
-      this._QueryData();
-    },
     setDate(index) {
       const that = this;
       this.date = index == this.date ? "" : index;
@@ -638,9 +668,14 @@ export default {
       this._QueryData();
     },
     edit(item) {
-      this.form = { ...item };
-      this.$refs.editAnswer.edit(this.form.id);
-      this.dialogVisible = true;
+      this.$router.push({
+        path: "/examinationPaperEdit",
+        query: {
+          paperId: item.id,
+          title: item.title,
+          type: 2,
+        },
+      });
     },
     changeTab() {
       this.tableMaxHeight = this.$refs.main.offsetHeight;
@@ -848,7 +883,8 @@ export default {
         this.$message.error(info);
       }
     },
-    async downExl() {//报表到处
+    async downExl() {
+      //报表到处
       if (this.exportLoading == true) return;
       let query = {};
       for (let key in this.query) {
@@ -892,7 +928,8 @@ export default {
         this.$message.error("下载失败");
       }
     },
-    async downExcel() {//模板下载
+    async downExcel() {
+      //模板下载
       this.loadingDown = true;
       let data = await this.$request.subjectiveScoreTemplate({
         examId: this.examId,
@@ -944,16 +981,7 @@ div::-webkit-scrollbar-thumb {
 .down {
   padding-top: 16px;
 }
-.edit-dia {
-  position: absolute;
-  left: 0;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  width: 100%;
-  height: calc(100vh - 70px);
-  background: #fff;
-  overflow-y: auto;
-  z-index: 10;
+.click-b {
+  cursor: pointer;
 }
 </style>
\ No newline at end of file
diff --git a/vue.config.js b/vue.config.js
index 79f0fbf..936163a 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -22,7 +22,6 @@ module.exports = {
     },
     proxy: {
       "/": {
-        // target:"http://47.104.214.8",
         target:"http://121.40.127.171",
         changeOrigin: true,
         ws:true,