diff --git a/public/static/课件模板.docx b/public/static/课件模板.docx
index c26e1ac..25e2dd4 100644
--- a/public/static/课件模板.docx
+++ b/public/static/课件模板.docx
diff --git a/src/App.vue b/src/App.vue
index 5aef7fe..6561d77 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -13,88 +13,84 @@ export default {
 	mounted() {
 
 	},
-	created() {
-		this.$nextTick(() => {
+	methods: {
+		_reSize() {
+
 			const $app = this.$refs.app;
-			// 设置 屏幕 百分比 尺寸 适配
-			const standardScale = "100%" / "100%";
-			window.addEventListener(
-				"resize",
-				_.debounce(function () {
 
-					const docHeight = document.body.clientHeight;
+			const standardScale = "100%" / "100%";
 
-					const docWidth = document.body.clientWidth;
+			const docHeight = document.body.clientHeight;
 
-					if (docWidth < 1700) {
+			const docWidth = document.body.clientWidth; 
+ 
+			if (docWidth < 1700) { 
+				const currentScale = docHeight / docWidth;
 
-						const currentScale = docHeight / docWidth;
+				let [scale, translate] = [0, 0];
+				if (currentScale < standardScale) {
+					// 以高度计算
+					scale = docHeight / 1080;
 
-						let [scale, translate] = [0, 0];
+					const shouleWidth = 1920 * scale;
 
-						if (currentScale < standardScale) {
-							// 以高度计算
-							scale = docHeight / 1080;
+					const offsetWidth = docWidth - shouleWidth;
 
-							const shouleWidth = 1920 * scale;
+					translate =
+						offsetWidth > 0 ? `translate(${offsetWidth / 2}px, 0)` : "";
 
-							const offsetWidth = docWidth - shouleWidth;
+				} else {
+					// 以宽度计算
+					scale = docWidth / 1920;
 
-							translate =
-								offsetWidth > 0 ? `translate(${offsetWidth / 2}px, 0)` : "";
-								
-						} else {
-							// 以宽度计算
-							scale = docWidth / 1920;
+					const shouleHeight = 1080 * scale;
 
-							const shouleHeight = 1080 * scale;
+					const offsetHeight = docHeight - shouleHeight;
 
-							const offsetHeight = docHeight - shouleHeight;
+					translate =
+						offsetHeight > 0 ? `translate(0, ${offsetHeight / 2}px)` : "";
+				}
 
-							translate =
-								offsetHeight > 0 ? `translate(0, ${offsetHeight / 2}px)` : "";
-						} 
-			
-						if (docHeight <= 700) {
+				if (docHeight <= 700) {
 
-							$app.style.cssText = `
+					$app.style.cssText = `
 								transform: scale(${scale}) ${translate};
 								transform-origin: top left;
 								min-width: 1920px;
-								min-height: 850px; 
-          					`; 
-						}
-						else if (docHeight <= 750) {
-							
-							$app.style.cssText = `
+								min-height: 885px; 
+          					`;
+				}
+				else if (docHeight <= 780) {
+
+					$app.style.cssText = `
 								transform: scale(${scale}) ${translate};
 								transform-origin: top left;
 								min-width: 1920px;
-								min-height:920px; 
-          					`; 
-						}
-						else {
-							$app.style.cssText = `
+								min-height:910px; 
+          					`;
+				}
+				else {
+					$app.style.cssText = `
 								transform: scale(${scale}) ${translate};
 								transform-origin: top left;
 								min-width: 1920px;
-								min-height:1080px; 
-          					`; 
-						}
+								min-height:1045px; 
+          					`;
+				}
 
-					} else {
-						$app.style.cssText = '';
-					}
-				}),
-				300
-			);
+			} else {
+				$app.style.cssText = '';
+			}
+		},
+	},
+	created() {
+		let that = this;
 
+		this.$nextTick(() => {
 			if (document.createEvent) {
-				var event = document.createEvent("HTMLEvents");
-				event.initEvent("resize", true, true);
-				window.dispatchEvent(event);
+				that._reSize();
 			} else if (document.createEventObject) {
-				window.fireEvent("onresize");
+				that._reSize();
 			}
 		});
 	}
@@ -106,7 +102,7 @@ export default {
 body {
 	margin: 0px;
 	padding: 0px;
-	font-family: Microsoft YaHei, Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, SimSun, sans-serif; 
+	font-family: Microsoft YaHei, Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, SimSun, sans-serif;
 	-webkit-font-smoothing: antialiased;
 }
 
diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js
index 9507ba0..d099a45 100644
--- a/src/api/apis/apis.js
+++ b/src/api/apis/apis.js
@@ -23,12 +23,22 @@ const downService = (url, data) => {
     responseType: 'arraybuffer',
   });
 }
-export default { 
+export default {
   // 知识点
   gKnowledge(section, subject) {
-    return defaltService(setUpUrls.gtestExamReport, {
-      ...subject, ...section
-    })
+    var requestParams = [];
+    if (section) {
+      requestParams.push("section=" + section);
+    }
+    if (subject) {
+      requestParams.push("subject=" + subject);
+    }
+    var requestUrl = setUpUrls.gKnowledge + (requestParams.length >= 1 ? "?" + requestParams.join("&") : "");
+    return defaltGetService(requestUrl)
+  },
+   // 年级组长-成绩概要
+  gclassdiffReport(data) {
+    return defaltService(setUpUrls.gclassdiffReport, data)
   },
   // 年级组长-成绩测验单
   gTestExamReport(data) {
@@ -213,6 +223,9 @@ export default {
   periodReportList(data) {
     return defaltService(setUpUrls.periodReportList, data)
   },
+  classdiffreport(data) {
+    return defaltService(setUpUrls.classdiffreport, data)
+  },
   //任课老师-查询阶段问答报表
   phaseAnswerReport(data) {
     return defaltService(setUpUrls.phaseAnswerReport, data)
@@ -680,6 +693,9 @@ export default {
   pModifyPaper(data) {
     return defaltService(setUpUrls.pModifyPaper, data)
   },
+  pModifyPaperNew(data) {
+    return defaltService(setUpUrls.pModifyPaperNew, data)
+  },
   //  删除答题卡
   pDelPaper(data) {
     return defaltService(setUpUrls.pDelPaper, data)
diff --git a/src/api/axios.js b/src/api/axios.js
index 89387b9..70276fe 100644
--- a/src/api/axios.js
+++ b/src/api/axios.js
@@ -3,7 +3,7 @@ import NProgress from "nprogress";
 import { Message } from "element-ui";
 import router from "@/router/index";
 import store from "@/store";
-import conf from "../config/index"; // 路径配置
+import conf from "@/config/index";  // 路径配置
 import { getURLParams } from "@/utils";
 
 let code = getURLParams("code") || getURLParams("dockkey") || localStorage.getItem("csCode") || "";
diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js
index 85e46ef..b433de8 100644
--- a/src/api/urls/apis.js
+++ b/src/api/urls/apis.js
@@ -1,7 +1,7 @@
 
 export default {
-   // 年级组长-查询报表列表
-  gKnowledge: "/api_html/knowledge/list",
+  // 年级组长-查询报表列表
+  gKnowledge: "/knowledge/list",
   // 年级组长-查询报表列表
   gListExamReport: "/api_html/grade/manager/listExamReport",
   // 年级组长-查询管理的班级
@@ -17,6 +17,8 @@ export default {
   gExportPhaseInteractiveReport: "/api_html/grade/manager/exportPhaseInteractiveReport",
   // 年级组长-成绩测验单
   gtestExamReport: "/api_html/grade/manager/testExamReport",
+  // 年级组长-考试概要
+  gclassdiffReport: "/api_html/grade/manager/classdiffreport",
   // 年级组长-试题分析
   gpaperExamReport: "/api_html/grade/manager/paperExamReport",
   // 年级组长-学生成绩排行
@@ -62,13 +64,15 @@ export default {
 
   //任课老师-查询管理班级
   tClassList: "/api_html/teaching/classList",
+  //任老师-报表详情
+  classdiffreport: "/api_html/teaching/classdiffreport",
   tpaperExamReport: "/api_html/teaching/paperExamReport",
   // 任课老师-学生成绩排行
   tstudentExamReport2: "/api_html/teaching/studentExamReport2",
   // 任课老师-班级情况对比
   tclassdiffExamReport: "/api_html/teaching/classdiffExamReport",
   tClassFromGrade: "/api_html/teaching/grade/classList",
-  tClassGrade:'/api_html/teaching/grade',
+  tClassGrade: '/api_html/teaching/grade',
   //任课老师-测验成绩单
   tTestExamReport: "/api_html/teaching/testExamReport",
   //任课老师-查询答题卡详情
@@ -82,7 +86,7 @@ export default {
   phaseAnswerReport: "/api_html/teaching/phaseAnswerReport",
   //任课老师-查询阶段互动报表
   phaseInteractiveReport: "/api_html/teaching/phaseInteractiveReport",
-  exportPhaseExamReport: "/api_html/teaching/exportPhaseExamReport",  
+  exportPhaseExamReport: "/api_html/teaching/exportPhaseExamReport",
   //任课老师-查询课时题目列表
   periodQuestionList: "/api_html/teaching/periodQuestionList",
   //任课老师-设置课时报表答案
@@ -93,6 +97,8 @@ export default {
   periodQuestionReport: "/api_html/teaching/periodQuestionReport",
   //任课老师-查询课时学生答题明细
   periodStudentReport: "/api_html/teaching/periodStudentReport",
+  //  修改答题卡
+  pModifyPaperNew: "/api_html/teaching/modifyPaperNew",
   //任课老师-分页查询即时测报表
   examReportList: "/api_html/teaching/examReportList",
   //任课老师-查询阶段测练报表
diff --git a/src/assets/css/index.scss b/src/assets/css/index.scss
index 62f2730..8e42948 100644
--- a/src/assets/css/index.scss
+++ b/src/assets/css/index.scss
@@ -347,6 +347,26 @@ ul {
 
 // 默认实体
 .default-body {
+
+  .anwser-column {
+    border: 1px solid #ebeef5;
+
+    padding: 0px !important;
+
+    .cell {
+      height: 100%;
+      width: calc(100% - 2px);
+    }
+
+    .red {
+      height: 100%;
+      width: 100%;
+      background: #FBEEDC;
+      color: red;
+      display: block;
+    }
+  }
+
   font-size: 14px;
   font-weight: 400;
   color: #303133;
@@ -386,7 +406,7 @@ ul {
       }
 
       tr,
-      td {
+      td:not(.anwser-column) {
         height: 40px;
         padding: 5px 0px !important;
         border: 1px solid #ebeef5;
@@ -432,6 +452,12 @@ ul {
       line-height: 40px;
     }
 
+    .el-tag__close {
+      height: 100% !important;
+      line-height: 1.2;
+      min-width: 20px;
+    }
+
     .filter-input,
     .filter-select {
       width: 13%;
@@ -464,39 +490,108 @@ ul {
   }
 }
 
-@media screen and (max-width: 1921px) and (max-height: 1081px) {
-  * :not(.p1, .fa, .el-button, .el-icon-upload, h1, h2, h3, h4, h5, h6) {
+@media screen and (max-width: 1200px) {
+  .flex-content {
+    padding: 55px !important;
+  }
+
+  .flex-btn {
+    position: fixed !important;
+    z-index: 999 !important;
+    bottom: 30px !important;
+    padding: 10px 10px !important;
+    right: 0px !important;
+    background-color: white !important;
+    width: calc(100% - 280px) !important;
+  }
+}
+
+@media screen and (max-width: 1500px) and (min-width: 1201px) {
+  .flex-content {
+    padding: 55px !important;
+  }
+
+  .flex-btn {
+    position: fixed !important;
+    z-index: 999 !important;
+    bottom: 30px !important;
+    padding: 10px 10px !important;
+    right: 0px !important;
+    background-color: white !important;
+    width: calc(100% - 280px) !important;
+  }
+}
+
+@media screen and (min-width: 1501px) {
+  .flex-content {
+    padding: 25px !important;
+  }
+
+  .flex-btn {
+    position: fixed !important;
+    z-index: 999 !important;
+    bottom: -10px !important;
+    padding: 10px 0px !important;
+    right: 30px !important;
+    background-color: white !important;
+    width: calc(100% - 280px) !important;
+  }
+
+}
+
+
+@media screen and (max-width: 1920px) {
+  * :not(.p1, .fa, .el-button, .el-icon-upload, h1, h2, h3, h4, h5, h6, .el-progress__text) {
+
     font-size: 18px !important;
 
-    .default-title {
-      font-size: 24px !important;
+
+
+    .default-body-detail * {
+      font-size: 15px !important;
+
+      .cell {
+        padding-left: 2px !important;
+        padding-right: 2px !important;
+      }
     }
 
-    .el-button * {
-      font-size: 16px !important;
+    .default-title {
+      font-size: 24px !important;
     }
 
-    .el-select-dropdown__item * {
+    .el-select-dropdown__item *,
+    .small-button * {
       font-size: 16px !important;
     }
 
     .el-form :not(h1, h2, h3, h4, h5, h6),
     .el-dropdown-menu__item,
-    .el-cascader-node__label {
+    .el-form-item__error,
+    .el-dialog__body .el-checkbox *,
+    .el-checkbox__label {
       font-size: 16px !important;
     }
-
   }
 }
 
-@media screen and (min-width: 1921px) and (min-height: 1081px) {
-  * :not(.p1, .fa, .el-button, .el-icon-upload, h1, h2, h3, h4, h5, h6) {
+@media screen and (min-width: 1921px) {
+  * :not(.p1, .fa, .el-button, .el-icon-upload, h1, h2, h3, h4, h5, h6, .el-progress__text) {
 
     font-size: 14px !important;
 
+    .default-body-detail * {
+      font-size: 13px !important;
+
+      .cell {
+        padding-left: 4px !important;
+        padding-right: 4px !important;
+      }
+    }
+
     .default-body .default-filter * {
       line-height: 38px !important;
-    }
+    } 
 
     .card-content {
       width: 48% !important;
@@ -506,13 +601,16 @@ ul {
       font-size: 24px !important;
     }
 
-    .el-select-dropdown__item * {
+    .el-select-dropdown__item *,
+    .small-button * {
       font-size: 12px !important;
     }
 
     .el-form :not(h1, h2, h3, h4, h5, h6),
     .el-dropdown-menu__item,
-    .el-cascader-node__label {
+    .el-form-item__error,
+    .el-dialog__body .el-checkbox *,
+    .el-checkbox__label {
       font-size: 12px !important;
     }
 
diff --git a/src/components/upload.vue b/src/components/upload.vue
index a8f9a36..1cab921 100644
--- a/src/components/upload.vue
+++ b/src/components/upload.vue
@@ -2,8 +2,9 @@
   <div>
     <slot name="down"></slot>
     <div class="d1">
-      <el-upload class="upload-demo" ref="upload" :action="url" :multiple="false" :data="{ ...query }"
-        :with-credentials="true" :limit="1" :on-change="change" :on-success="upSuccess" :on-error="upError">
+      <el-upload class="upload-demo" ref="upload" :action="uploadUrl" :multiple="false" :data="{ ...query }"
+        :with-credentials="true" :limit="1" :on-remove="removec" :on-change="change" :on-success="upSuccess"
+        :on-error="upError">
         <!-- accept="application/vnd.ms-excel" -->
         <div class="upload-btn">
           <i class="el-icon-upload"></i>
@@ -11,10 +12,15 @@
         </div>
       </el-upload>
     </div>
+    <div class="d1">
+      <el-progress :percentage="percent" v-if="percent > 0"></el-progress>
+    </div>
+    <slot name="descption"></slot>
   </div>
 </template>
 
 <script>
+import conf from "@/config/index"; // 路径配置
 export default {
   name: "downUpData",
   props: {
@@ -36,6 +42,28 @@ export default {
     },
   },
   computed: {
+    percent: function () {
+      var _percentage = 0;
+      console.log(this.isOked)
+      if (this.file?.percentage) _percentage = this.file?.percentage;
+      if (_percentage >= 100) {
+        if (!this.isOked) _percentage = 96;
+        else _percentage = 100;
+      }
+      return _percentage;
+    },
+    uploadUrl: function () {
+      var requestUrl = '';
+      var ogrinUrl = this.$props.url;
+      var baseUrl = conf.baseURL;
+      if (baseUrl == '/' && ogrinUrl.indexOf('/') == 0) {
+        requestUrl = ogrinUrl;
+      }
+      else {
+        requestUrl = baseUrl + ogrinUrl
+      }
+      return requestUrl;
+    },
     query: function () {
       if (this.id) {
         return {
@@ -57,12 +85,16 @@ export default {
   data() {
     return {
       file: null,
+      isOked: false
     };
   },
   methods: {
+    removec(file, fileList) {
+      this.file = null;
+      this.isOked = false;
+    },
     async submitUpload() {
       this.$refs.upload.submit();
-
       // const formData = new FormData()
       // formData.append('id',this.componentId)
       // formData.append('file',new File(this.file.raw))
@@ -75,6 +107,7 @@ export default {
       // }
     },
     upSuccess(res) {
+      this.isOked = true;
       if (res && res.status == 0) {
         this.$message.success("上传成功");
         this.$emit("upSuccess", res);
@@ -84,6 +117,7 @@ export default {
       }
     },
     upError(res) {
+      this.isOked = true;
       if (res && res.status == 0) {
         this.$message.error("上传失败");
       } else {
@@ -101,11 +135,13 @@ export default {
 .d1 {
   padding: 10px;
   overflow: hidden;
+
   :deep(.el-upload-list) {
     width: 100%;
   }
-  
+
 }
+
 .btn {
   border-radius: 8px;
   font-weight: normal;
@@ -115,7 +151,7 @@ export default {
   display: flex;
   flex-direction: column;
   align-items: center;
-  
+
 }
 
 .upload-btn {
@@ -131,3 +167,14 @@ export default {
 
 }
 </style>
+
+<style>
+.el-progress__text {
+  margin-left: 10px !important;
+  font-size: 14px !important;
+}
+
+.el-upload-list .el-progress {
+  display: none !important;
+}
+</style>
diff --git a/src/config/index.js b/src/config/index.js
index 082ae1d..a29c918 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -1,7 +1,7 @@
 const modeUrl = {
   // 开发环境
   development: {
-    baseURL: "/",
+    baseURL: "/api/",
     authBaseURL: "",
     $cdn:""
   },
diff --git a/src/router/index.js b/src/router/index.js
index e58c11b..f34cb7a 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -346,7 +346,7 @@ let addrouters = [
       path: "/testReportDetail",
       iconCls: "",
       name: "testReportDetail",
-      demoRoles: ["ROLE_JIAOSHI"],
+      demoRoles: ["ROLE_JIAOSHI","ROLE_BANZHUREN"],
       component: askTestReportDetail,
       hidden: true,
       children: []
diff --git a/src/store/index.js b/src/store/index.js
index 59780ff..38a429e 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -41,7 +41,7 @@ const store = new Vuex.Store({
       localStorage.setItem("info", JSON.stringify(data));
     },
     setRouters: (state, routers) => {
-      console.log('current', state);
+      state.addRouters = [];
       let addrouterList = []
       if (state.info.showRole == 'ROLE_PERSONAL') {
         addrouterList = [...addroutersPersonal]
@@ -55,12 +55,10 @@ const store = new Vuex.Store({
         }
       }
 
-      let aRouters = addrouterList.filter((item) => {
-
+      let aRouters = addrouterList.filter((item) => { 
         let path = item.children[0]?.path.replace("/", "");
         if (routers?.includes(path) == true) return item;
-        else if (item.demoRoles?.includes(state.info.showRole) == true) return item;
-
+        else if (item.demoRoles?.includes(state.info.showRole) == true) return item; 
         if (item.children) {
           item.children = item.children.filter((itemFilter) => {
             return itemFilter.demoRoles?.includes(state.info.showRole) == true
@@ -102,7 +100,6 @@ const store = new Vuex.Store({
         .then((res) => {
           let response = res;
           if (response.status == 0) {
-            console.log(response)
             const userInfo = { ...response.data };
             if (userInfo.permissions && userInfo.permissions.length) {
               userInfo.showRoleName = response.data.permissions[0]?.roleName;
@@ -121,6 +118,7 @@ const store = new Vuex.Store({
                 hidden: true,
                 children: [],
               });
+              sessionStorage.setItem("RouteRefresh", false);
               if (params.url) {
                 window.location.href = params.url;
               } else {
diff --git a/src/utils/index.js b/src/utils/index.js
index afe7a11..285e70a 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -106,30 +106,23 @@ export function deepClone(obj) {
   return result;
 }
 
-export function getKnowledge(knowledge) {
+export function getKnowledge(knowledgeParam) {
+  if (!knowledgeParam) return "";
 
-  if (!knowledge) return "";
+  var knowledge = knowledgeParam + "";
 
-  var splitPoints = s.Split(',');
+  var knowledges = knowledge.split(',');
 
-  var result = "";
-
-  splitPoints.forEach(split => {
-
-    var ss = split.Split('#').filter(dd => dd.length >= 1);
+  var resultArray = [];
 
+  knowledges.forEach(ksplit => {
+    var ss = ksplit.split('#').filter(dd => dd.length >= 1);
     if (ss.length > 0) {
-      result += ss[ss.Length - 1] + "；";
+      resultArray.push(ss[ss.length - 1]);
     }
   })
 
-  if (result.length > 1) result = result.substring(0, result.length - 1);
-
-  if (result.length == 1) {
-    return "";
-  }
-
-  return result;
+  return resultArray.join('；');
 }
 
 // // 3DES加密
@@ -854,74 +847,425 @@ export function formatGradeNameClass(data) {
   });
   return gradeNameArr;
 }
+_
+
+export function tablePrint(options) {
 
-export function tablePrint(id, title, type = null) {
+  var id = options.id;
+  var title = options.title;
+  var lindex = options.lindex;
+  var splitParam = options.splitParam ?? 20;
+  var printType = options.printType;
+  var fixedColumn = options.fixedColumn ?? 0;
+  var diffNumber = options.diffNumber ?? 0;
+  var diffStNumber = options.diffStNumber ?? 0;
   let divs = document.getElementById(id);
   let awin = window.open("", "_blank");
   awin.document.getElementsByTagName(
     "head"
-  )[0].innerHTML = `<style> @media print {@page {size:A4 landscape;margin:10mm}
-    body{margin:5mm;font-size:8px;}}
-    body{-webkit-print-color-adjust: exact;}
-    .tit{text-align:center;font-size:20px;color:#333;line-height:24px;font-weight:700;padding:10px 0;margin:0;}
-    .table-box,.el-table,.el-table__body-wrapper,.el-table--border{max-height:99999999px!important;height:auto;width:auto!important;max-width:1400px;margin: 0 auto;}
-    .el-table{width:100%}
-    .print-hidden{display:none;}
-    .el-table,.el-table__body-wrapper{max-height:auto}
-    .el-table .el-table__cell{padding:12px 0}
-    .el-table thead tr:first-child th.el-table__cell{border-top: 1px solid #ccc}
-    .el-table thead tr:first-child th.el-table__cell:first-child{border-left: 1px solid #ccc;}
-    .el-table thead tr th.el-table__cell{background:#ccc}
-    .el-table tbody tr td.el-table__cell:first-child{border-left: 1px solid #ccc;}
-    .el-table td.el-table__cell{border-bottom: 1px solid #ccc;}
-    .el-table--border .el-table__cell{border-right: 1px solid #ccc;}
-    .el-table--border th.el-table__cell, .el-table__fixed-right-patch{border-bottom: 1px solid #ccc;}
-    .el-table .el-table__cell.gutter{border:none!important;}
-    .el-table__fixed{display:none!important}
-    .el-table .el-table__cell.is-center{text-align:center!important}
-    .el-table .el-table__cell.is-hidden>*{visibility: inherit;}
-    .el-table__cell.gutter{display:none}
-    ul,li{margin:0;padding:0;list-style:none}
-    .hui-box{display: flex;text-align: center;}
-    .hui-box .s-txt{width: 61px;line-height: 144px;background: #ccc;font-size: 16px;color: #fff;font-weight: 700;border:1px solid #ccc;box-sizing:border-box}
-    .hui-li{display: flex;}
-    .hui-s{height: 48px;line-height: 48px;border-right: 1px solid #ccc;border-bottom: 1px solid #ccc;box-sizing: border-box;}
-    .hui-s.s1{width: 100px;}
-    .hui-s.s2{ width: 110px;}
-    .hui-s.s3{width: 120px;}
-    .info { display: flex;flex-wrap: wrap;border-left: 1px solid #ccc;border-top: 1px solid #ccc;margin-bottom: 12px;}
-    .info-item {width: 25%;height: 50px;box-sizing: border-box;flex-shrink: 0;background: #f8f8f8;border-right: 1px solid #ccc;border-bottom: 1px solid #ccc;line-height: 50px;text-align: center;}
-    .row-line { width: calc(20% - 2px);
-  border: 1px solid #ebeef5;
-  background: #f5f7fa;
-  display: inline-block;
-  height: 40px;
-  line-height: 40px;
-
-  .line-subfix {
-    margin-left: 10px;
-  }}
-   
-    .el-table__header,.el-table__body{width:100%!important;}
-    #print-table{max-width:1400px;margin: 0 auto;width: 100%;}
-    .hide{max-width:1400px;margin: 0 auto;width: 100%;border-left: 1px solid #ccc;border-spacing:0;box-sizing:border-box}
-    .hide thead th{background:#ccc;line-height: 48px;border-right: 1px solid #ccc;box-sizing:border-box}
-    .hide tbody tr td{line-height: 48px;border-right: 1px solid #ccc;text-align:center;box-sizing:border-box}
-    .hide td{border-bottom: 1px solid #ccc;}
+  )[0].innerHTML = `<style>    
+     @media print {
+        @page {
+            size: A4 portrait;
+            margin: 4mm
+        }
+ 
+     
+     body {
+            margin: 2mm;
+            font-size: 8px;  
+      } 
+    }
+  
+    * :not(.tit) {
+        font-size: 10px;
+    }
+    
+
+    body {
+        -webkit-print-color-adjust: exact;
+    }
+    .el-table__fixed-right{
+       display: none;
+    }
+    .tit {
+        text-align: center;
+        font-size: 14px;
+        color: #333;
+        line-height: 24px;
+        font-weight: 700;
+        /* padding: 10px 0; */
+        margin: 0;
+    }
+
+    .table-box,
+    .el-table,
+    .el-table__body-wrapper,
+    .el-table--border {
+        max-height: 99999999px !important;
+        height: auto;
+        width: auto !important;
+        max-width: 1400px;
+        margin: 5px auto;
+    }
+
+    .el-table,table {
+        width: 100%;
+        margin-bottom:10px;
+    }
+ 
+    .print-hidden,.el-tabs__nav {
+        display: none;
+    }
+
+    .el-table,
+    .el-table__body-wrapper {
+        max-height: auto
+    }
+
+    .el-table .el-table__cell {
+        padding: 2px 0;
+        border-right: 1px solid black; 
+        min-width:50px;
+    }
+  
+    .el-table thead tr:first-child th.el-table__cell {
+        border-top: 1px solid black; 
+    }
+
+    .el-table thead tr:first-child th.el-table__cell:first-child {
+        border-left: 1px solid black;
+    }
+
+    .el-table thead tr th.el-table__cell {
+        background: #ccc
+    }  
+     .el-table thead tr th{
+        height:auto;
+        word-wrap:break-word;
+        word-break:break-all;
+        overflow:hidden;
+     }
+    .el-table tbody tr td.el-table__cell:first-child {
+        border-left: 1px solid black;
+    }
+ 
+    .el-table td.el-table__cell {
+        border-bottom: 1px solid black;
+    }
+
+    .el-table--border .el-table__cell {
+        border-right: 1px solid black;
+    }
+
+    .el-table--border th.el-table__cell,
+    .el-table__fixed-right-patch {
+        border-bottom: 1px solid black;
+    }
+
+    .el-table .el-table__cell.gutter {
+        border: none !important;
+    }
+
+    .el-table__fixed {
+        display: none !important
+    }
+
+    .el-table .el-table__cell {
+        text-align: center !important
+    }
+
+    .el-table .el-table__cell.is-hidden>* {
+        visibility: inherit;
+    }
+
+    .el-table__cell.gutter {
+        display: none
+    }
+
+    ul,
+    li {
+        margin: 0;
+        padding: 0;
+        list-style: none
+    }
+
+    .hui-box {
+        display: flex;
+        text-align: center;
+    }
+
+    .hui-box .s-txt {
+        width: 61px;
+        line-height: 144px;
+        background: #ccc;
+        font-size: 16px;
+        color: #fff;
+        font-weight: 700;
+        border: 1px solid #ccc;
+        box-sizing: border-box
+    }
+
+    .hui-li {
+        display: flex;
+    }
+
+    .hui-s {
+        height: 48px;
+        line-height: 48px;
+        border-right: 1px solid #ccc;
+        border-bottom: 1px solid #ccc;
+        box-sizing: border-box;
+    }
+
+    .hui-s.s1 {
+        width: 100px;
+    }
+
+    .hui-s.s2 {
+        width: 110px;
+    }
+
+    .hui-s.s3 {
+        width: 120px;
+    }
+
+    .info {
+        display: flex;
+        flex-wrap: wrap;
+        border-left: 1px solid #ccc;
+        border-top: 1px solid #ccc;
+        margin-bottom: 12px;
+    }
+
+    .info-item {
+        width: 25%;
+        height: 50px;
+        box-sizing: border-box;
+        flex-shrink: 0;
+        background: #f8f8f8;
+        border-right: 1px solid #ccc;
+        border-bottom: 1px solid #ccc;
+        line-height: 50px;
+        text-align: center;
+    }
+
+    .row-line {
+        width: 33%;
+        border: 1px solid #ebeef5;
+        background: #f5f7fa;
+        display: inline-block;
+        height: 30px;
+        line-height: 30px;
+
+        .line-subfix {
+            margin-left: 10px;
+        }
+    }
+        
+    .row-line-5 {
+        width: 19.5% !important; 
+    }
+        
+    .row-line-4 {
+        width: 24.5% !important; 
+    }
+    .el-table__header,
+    .el-table__body {
+        width: 100% !important;
+    }
+
+    #print-table {
+        max-width: 1400px;
+        margin: 0 auto;
+        width: 100%;
+    }
+
+    .hide {
+        max-width: 1400px;
+        margin: 0 auto;
+        width: 100%;
+        border-left: 1px solid #ccc;
+        border-spacing: 0;
+        box-sizing: border-box
+    }
+
+    .hide thead th {
+        background: #ccc;
+        line-height: 48px;
+        border-right: 1px solid #ccc;
+        box-sizing: border-box
+    }
+
+    .hide tbody tr td {
+        line-height: 48px;
+        border-right: 1px solid #ccc;
+        text-align: center;
+        box-sizing: border-box
+    }
+
+    .hide td {
+        border-bottom: 1px solid #ccc;
+    }
     </style>`;
+  var splitNumber = splitParam ? splitParam : 20;
+
   let aDom = divs.cloneNode(true);
-  if (!type) {
-    let aTbody = aDom.getElementsByClassName("el-table__body")[0]?.getElementsByTagName("tbody")[0];
-    aDom.getElementsByClassName("el-table__header")[0].append(aTbody);
+
+  let thead = aDom.querySelectorAll('.el-table__header-wrapper thead');
+
+  let tbody = aDom.querySelectorAll('.el-table__body-wrapper table');
+
+  var lastNotHiddenNumber = 0;
+
+  if (tbody.length >= 1) {
+
+    for (var tb = 0; tb < tbody.length; tb++) {
+
+      var currentTbody = tbody[tb];
+
+      var currentThead = thead[tb];
+
+      var headTrs = currentThead.querySelectorAll('tr');
+
+      var headThs = null;
+
+      if (lindex != null && lindex >= 0)
+        headThs = headTrs[lindex].querySelectorAll('th');
+      else
+        headThs = headTrs[headTrs.length - 1].querySelectorAll('th');
+
+      if (headThs.length > splitNumber) {
+
+        var bodyTrs = currentTbody.querySelectorAll('tr');
+
+        var roas = Math.ceil(headThs.length / splitNumber);
+
+        if (fixedColumn) {
+
+          var thLength = headThs.length;
+
+          thLength -= splitNumber;
+
+          roas = 1;
+
+          splitNumber -= fixedColumn;
+
+          roas += Math.ceil(thLength / splitNumber);
+
+        } else fixedColumn = 0;
+
+        for (var stao = 1; stao < roas; stao++) {
+
+          var newThead = currentThead.cloneNode(true);
+
+          var newTbody = currentTbody.cloneNode();
+
+          var newTrs = newThead.querySelectorAll('tr');
+
+          for (var trds = 0; trds < newTrs.length; trds++) {
+
+            var newThs = newTrs[trds].querySelectorAll('th');
+
+            var index = 0;
+
+            for (var lpss = 0; lpss < newThs.length; lpss++) {
+
+              var newTh = newThs[lpss];
+
+              if (!newTh) continue;
+
+              if (stao == roas - 1 && index >= (splitNumber + fixedColumn)) {
+                var currentTh = headTrs[trds].querySelectorAll('th')[lpss];
+                if (currentTh) {
+                  currentTh.style.display = "none";
+                }
+              }
+
+              var min = (stao + 1) * splitNumber;
+
+              var max = stao * splitNumber;
+
+              if (fixedColumn != 0) {
+                min += fixedColumn;
+                max += fixedColumn;
+              }
+
+              if (index >= min || index < max) {
+                if (trds == 0 && fixedColumn != 0 && lpss < fixedColumn) {
+                  if (stao == roas - 1) lastNotHiddenNumber += 1;
+                  continue;
+                }
+                newTh.style.display = "none";
+              }
+              else if (stao == roas - 1) lastNotHiddenNumber += 1;
+
+
+              var colspan = Number(newTh.getAttribute('colspan')) || 0;
+
+              index += 1;
+
+              if (colspan > 1) {
+                index += colspan - 1;
+              }
+            }
+          }
+
+          for (var trd = 0; trd < bodyTrs.length; trd++) {
+            var currentTr = bodyTrs[trd];
+            var newTr = currentTr.cloneNode(true);
+            var currentTds = currentTr.querySelectorAll('td');
+            var newTds = newTr.querySelectorAll('td');
+            var length = headThs.length + diffNumber;
+            for (var lps = 0; lps < length; lps++) {
+              var lpsIndex = lps;
+              if (lps > diffStNumber) lpsIndex = lps - diffNumber;
+              var newTd = newTds[lps];
+              if (!newTd) continue;
+              if (stao == roas - 1 && lpsIndex >= (splitNumber + fixedColumn)) {
+                var currentTd = currentTds[lps];
+                if (currentTd) {
+                  currentTd.style.display = "none";
+                }
+              }
+              var min = (stao + 1) * splitNumber;
+              var max = stao * splitNumber;
+              if (fixedColumn != 0) {
+                min += fixedColumn;
+                max += fixedColumn;
+              }
+              if (lpsIndex >= min || lpsIndex < max) {
+                if (fixedColumn != 0 && lpsIndex < fixedColumn) continue;
+                newTd.style.display = "none";
+              }
+            }
+            newTbody.appendChild(newTr);
+          }
+
+          if (lastNotHiddenNumber == fixedColumn) continue;
+          newTbody.appendChild(newThead);
+
+          newTbody.classList.add('_addedList');
+
+          currentTbody.parentNode.parentNode.append(newTbody);
+        }
+      }
+
+      currentTbody.appendChild(currentThead);
+    }
   }
+
   if (title) {
     let pTit = awin.document.createElement('p')
     pTit.className = "tit"
     pTit.innerHTML = title
     awin.document.body.append(pTit)
   }
+
   awin.document.body.append(aDom);
+
   awin.print();
+
   awin.close()
 }
 
diff --git a/src/views/admin/clientVersion/components/upLoad.vue b/src/views/admin/clientVersion/components/upLoad.vue
index c15eff1..05dee67 100644
--- a/src/views/admin/clientVersion/components/upLoad.vue
+++ b/src/views/admin/clientVersion/components/upLoad.vue
@@ -5,7 +5,7 @@
       <el-upload
         class="upload-demo"
         ref="upload"
-        :action="url"
+        :action="uploadUrl"
         :multiple="false"
         :data="{ ...query }"
         :limit="1"
@@ -24,6 +24,8 @@
 </template>
 
 <script>
+import conf from "@/config/index";  // 路径配置
+
 export default {
   name: "downUpData",
   props: {
@@ -43,6 +45,24 @@ export default {
       file: null,
     };
   },
+  computed: {
+    uploadUrl: function () {
+
+      var requestUrl = '';
+
+      var ogrinUrl = this.$props.url;
+
+      var baseUrl = conf.baseURL;
+
+      if (baseUrl == '/' && ogrinUrl.indexOf('/') == 0) {
+        requestUrl = ogrinUrl;
+      }
+      else {
+        requestUrl = baseUrl + ogrinUrl
+      } 
+      return requestUrl;
+    }
+  },
   methods: {
     async submitUpload() {
       this.$refs.upload.submit();
diff --git a/src/views/admin/clientVersion/components/upLoadImg.vue b/src/views/admin/clientVersion/components/upLoadImg.vue
index e5ef99b..bd34f07 100644
--- a/src/views/admin/clientVersion/components/upLoadImg.vue
+++ b/src/views/admin/clientVersion/components/upLoadImg.vue
@@ -4,7 +4,7 @@
     <el-upload
       class="avatar-uploader"
       ref="upload"
-      :action="url"
+      :action="uploadUrl"
       :multiple="false"
       :data="{ ...query }"
       :limit="1"
@@ -20,6 +20,8 @@
 </template>
 
 <script>
+import conf from "@/config/index";  // 路径配置
+
 export default {
   name: "downUpData",
   props: {
@@ -33,6 +35,24 @@ export default {
       type: String,
       default: "",
     },
+  }, 
+  computed: {
+    uploadUrl: function () {
+
+      var requestUrl = '';
+
+      var ogrinUrl = this.$props.url;
+
+      var baseUrl = conf.baseURL;
+
+      if (baseUrl == '/' && ogrinUrl.indexOf('/') == 0) {
+        requestUrl = ogrinUrl;
+      }
+      else {
+        requestUrl = baseUrl + ogrinUrl
+      } 
+      return requestUrl;
+    }
   },
   data() {
     return {
diff --git a/src/views/basic/ask/analysis.vue b/src/views/basic/ask/analysis.vue
index ebfda6e..4190f16 100644
--- a/src/views/basic/ask/analysis.vue
+++ b/src/views/basic/ask/analysis.vue
@@ -132,7 +132,10 @@ export default {
       if (this.types == 2) {
         title = this.subjectNames.join();
       }
-      tablePrint("print-content", this.className + title + "_" + name);
+      tablePrint({
+        id: "print-content",
+        title: this.className + title + "_" + name
+      });
     },
     setType(type) {
       this.type = type;
diff --git a/src/views/basic/ask/archiving.vue b/src/views/basic/ask/archiving.vue
index 5340d7d..907adf2 100644
--- a/src/views/basic/ask/archiving.vue
+++ b/src/views/basic/ask/archiving.vue
@@ -104,8 +104,8 @@
                 </el-table-column>
                 <el-table-column align="center" :label="index == 0 ? '总参与度' : '参与度'"
                   :prop="'participationRate' + item"><template slot-scope="scoped">
-                    {{ scoped.row["participationRate" +  item] }}%
-              </template>
+                    {{ 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]
@@ -233,8 +233,10 @@ export default {
   methods: {
     print() {
       tablePrint(
-        "print-content",
-        "随堂问-已归档" + this.tabList[this.tabIndex - 1]
+        {
+          id: "print-content",
+          title: "随堂问-已归档" + this.tabList[this.tabIndex - 1]
+        }
       );
     },
     changeSub(val) {
diff --git a/src/views/basic/ask/components/answerQustion.vue b/src/views/basic/ask/components/answerQustion.vue
index db57ac2..6802207 100644
--- a/src/views/basic/ask/components/answerQustion.vue
+++ b/src/views/basic/ask/components/answerQustion.vue
@@ -307,9 +307,9 @@ export default {
             detail.map((items, index) => {
               params["isRight" + index] = items.isRight;
               params["answer" + index] =
-                items.answer == 1
+                items.answer == 1 && items.questionType == 4
                   ? "✓"
-                  : items.answer == 2
+                  : items.answer == 2 && items.questionType == 4
                   ? "✗"
                   : items.answer;
             });
diff --git a/src/views/basic/ask/components/example.vue b/src/views/basic/ask/components/example.vue
index e1fc813..c9bbdd9 100644
--- a/src/views/basic/ask/components/example.vue
+++ b/src/views/basic/ask/components/example.vue
@@ -17,16 +17,16 @@
       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 == 1 && scoped.row.questionType == 4
         ? "✓"
-        : scoped.row.correctAnswer == 2
+        : scoped.row.correctAnswer == 2 && scoped.row.questionType == 4
           ? "✗"
           : 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 == 1 && scoped.row.questionType == 4
       ? "✓"
-      : scoped.row.fallible == 2
+      : scoped.row.fallible == 2 && scoped.row.questionType == 4
         ? "✗"
         : scoped.row.fallible
     }}</template></el-table-column>
diff --git a/src/views/basic/askTestQuestion/components/askBzrMulti.vue b/src/views/basic/askTestQuestion/components/askBzrMulti.vue
index 50329b0..0e70690 100644
--- a/src/views/basic/askTestQuestion/components/askBzrMulti.vue
+++ b/src/views/basic/askTestQuestion/components/askBzrMulti.vue
@@ -1,7 +1,7 @@
 <template>
     <div style="margin-right: 20px;width: 100%">
         <el-row class="row-type">
-            <label>阶段报表类型</label>
+            <label>报表类型</label>
             <el-select class="opration-select" v-model="currentType">
                 <el-option v-for="(item, index) in types" :lable="item" :key="index" :value="item" />
             </el-select>
@@ -50,7 +50,8 @@
             }}</template>
                             </el-table-column>
                         </el-table-column>
-                        <el-table-column label="查看雷达图" fixed="right" width="100" align="center">
+                        <el-table-column label="查看雷达图" fixed="right" width="100" align="center"
+                            class-name="print-hidden">
                             <template slot-scope="scoped">
                                 <el-button type="text" @click="openRandarChart(scoped.row)">查看</el-button>
                             </template>
@@ -99,7 +100,7 @@
         <el-dialog :append-to-body="true" class="chart-dia" :visible.sync="redarVisible" :title="radarChart.title"
             width="800">
             <div class="chart-box">
-                <RadarChart id="radarChart" :params="radarChart" />
+                <RadarChart id="radarChart" :params="radarChart" :tooltipFormatter="true" />
             </div>
         </el-dialog>
     </div>
@@ -188,8 +189,29 @@ export default {
             }
         },
         _print() {
+            var splitParam = 0;
+            var diffNumber = 0;
+            var diffStNumber = 0;
+            if (this.currentType == '学生多科作答表现') {
+                splitParam = 16;
+                diffNumber = 2;
+                diffStNumber = 15;
+            }
+            else if (this.currentType == '学生多科互动表现') {
+                splitParam = 15;
+                diffNumber = 4;
+                diffStNumber = 14;
+            }
 
-            tablePrint("print-content", this.currentType);
+            tablePrint({
+                id: "print-content",
+                title: this.currentType,
+                lindex: 1,
+                splitParam: splitParam,
+                fixedColumn: 2,
+                diffNumber: diffNumber,
+                diffStNumber: diffStNumber
+            });
         },
         async refresh() {
             await this._changeType();
@@ -264,7 +286,7 @@ export default {
 
             let subjectName = [];
 
-            this.answersList = answersResponse.data.list?.map((item) => {
+            this.answersList = answersResponse.data?.list?.map((item) => {
 
                 let params = {};
 
@@ -291,7 +313,6 @@ export default {
 
             this.answersOptions = [...optionsList];
 
-            console.log(this.answersList)
         },
         async _multiDisciplinaryInteraction() {
 
@@ -323,7 +344,7 @@ export default {
 
             this.interactionList = interactionReponse.data?.list?.map((item) => {
                 let params = {};
-                item.dataList?.filter((items, index) => { 
+                item.dataList?.filter((items, index) => {
                     if (!subjectName.includes(items.subjectName) && items.subjectName != '全部科目') {
                         subjectName.push(items.subjectName);
                     }
diff --git a/src/views/basic/askTestQuestion/components/askListReport.vue b/src/views/basic/askTestQuestion/components/askListReport.vue
index 7d2d14d..31f25c4 100644
--- a/src/views/basic/askTestQuestion/components/askListReport.vue
+++ b/src/views/basic/askTestQuestion/components/askListReport.vue
@@ -3,35 +3,35 @@
         <el-table class="default-table" :data="$props.datas" border>
             <el-table-column prop="subjectName" label="科目" width="180" />
             <el-table-column prop="title" label="课时名称" />
-            <el-table-column prop="participationRate" label="总参与度" width="180" >
+            <el-table-column prop="participationRate" label="总参与度" width="180">
                 <template slot-scope="scoped">
                     {{ scoped.row.participationRate }}%
                 </template>
             </el-table-column>
-            <el-table-column prop="answerCorrectRate" label="已答正确率" width="180" >
+            <el-table-column prop="answerCorrectRate" label="已答正确率" width="180">
                 <template slot-scope="scoped">
                     {{ scoped.row.answerCorrectRate }}%
                 </template>
             </el-table-column>
-            <el-table-column prop="classCorrectRate" label="班级正确率" width="180" >
+            <el-table-column prop="classCorrectRate" label="班级正确率" width="180">
                 <template slot-scope="scoped">
-                {{ scoped.row.classCorrectRate }}%
-            </template>
+                    {{ scoped.row.classCorrectRate }}%
+                </template>
             </el-table-column>
             <el-table-column prop="questionNum" label="题目总数" width="180" />
             <el-table-column prop="startTime" label="上课时间" width="220" />
             <el-table-column label="操作" width="200">
                 <template slot-scope="scoped">
-                    <template v-if="scoped.row.answerNum == 0">
+                    <!-- <template v-if="scoped.row.answerNum == 0">
                         <el-button v-if="role != 'ROLE_BANZHUREN'" type="text"
                             @click="_edit(scoped.row)">设置答案</el-button>
                         <template v-else>未设置答案</template>
-                    </template>
+                    </template> -->
                     <el-button type="text" @click="_linkToDetail(scoped.row)">查看</el-button>
-                    <el-popconfirm v-if="role != 'ROLE_BANZHUREN'" title="确定删除吗？" @confirm="_remove(scoped.row)">
+                    <!-- <el-popconfirm v-if="role != 'ROLE_BANZHUREN'" title="确定删除吗？" @confirm="_remove(scoped.row)">
                         <el-button class="remove-test" slot="reference" type="text" style="color:red;margin-left:10px"
                             :loading="scoped.row.loading">删除</el-button>
-                    </el-popconfirm>
+                    </el-popconfirm> -->
                 </template>
             </el-table-column>
         </el-table>
@@ -70,13 +70,15 @@ export default {
                 },
             });
         },
-        _edit(item) {
+        _edit(item) {  
             this.$router.push({
                 path: "/examinationPaperEdit",
                 query: {
                     paperId: item.id,
                     title: item.title,
                     type: 3,
+                    subjectName: item.subjectName,
+                    sectionName: item.sectionName
                 },
             });
         },
diff --git a/src/views/basic/askTestQuestion/components/askSummaryReport.vue b/src/views/basic/askTestQuestion/components/askSummaryReport.vue
index 87fdb5e..f84eb4d 100644
--- a/src/views/basic/askTestQuestion/components/askSummaryReport.vue
+++ b/src/views/basic/askTestQuestion/components/askSummaryReport.vue
@@ -1,7 +1,7 @@
 <template>
     <div style="margin-right: 20px;width: 100%">
         <el-row class="row-type">
-            <label>阶段报表类型</label>
+            <label>报表类型</label>
             <el-select class="opration-select" v-model="currentType">
                 <el-option v-for="(item, index) in types" :lable="item" :key="index" :value="item" />
             </el-select>
@@ -13,75 +13,75 @@
         <div id="print-content">
             <div v-if="currentType == '题目作答表现汇总'">
                 <el-row class="row-subfix" style="margin-top:10px">
-                    <div class="row-line">
+                    <div class="row-line row-line">
                         <span class="line-subfix">班级：</span>
                         <span class="line-value">{{ detail.className }}</span>
                     </div>
-                    <div class="row-line">
+                    <div class="row-line row-line">
                         <span class="line-subfix">科目：</span>
                         <span class="line-value">{{ detail.subjectName }}</span>
                     </div>
-                    <div class="row-line">
+                    <div class="row-line row-line">
                         <span class="line-subfix">课时数：</span>
                         <span class="line-value">{{ $props.askReportIds.length }}</span>
                     </div>
-                    <div class="row-line">
+                    <div class="row-line ">
                         <span class="line-subfix">上课时间：</span>
                         <span class="line-value">{{ detail.startTime }}</span>
                     </div>
-                    <div class="row-line">
+                    <div class="row-line ">
                         <span class="line-subfix">下课时间：</span>
                         <span class="line-value">{{ detail.endTime }}</span>
                     </div>
                 </el-row>
                 <el-row class="row-subfix">
-                    <div class="row-line">
+                    <div class="row-line row-line-5">
                         <span class="line-subfix">班级人数：</span>
                         <span class="line-value">{{ detail.classPersonNum }}</span>
                     </div>
-                    <div class="row-line">
+                    <div class="row-line row-line-5">
                         <span class="line-subfix">签到人数：</span>
                         <span class="line-value">{{ detail.checkInCount }}</span>
                     </div>
-                    <div class="row-line">
+                    <div class="row-line row-line-5">
                         <span class="line-subfix">题目总数：</span>
                         <span class="line-value">{{ detail.questionNum }}</span>
                     </div>
-                    <div class="row-line">
+                    <div class="row-line row-line-5">
                         <span class="line-subfix">答题总数：</span>
                         <span class="line-value">{{ detail.totalAnswersNum }}</span>
                     </div>
-                    <div class="row-line">
+                    <div class="row-line row-line-5">
                         <span class="line-subfix">课时时长：</span>
-                        <span class="line-value">{{ setDuration(detail.duration) }}</span>
+                        <span class="line-value">{{ setDuration(detail.consumingDuration) }}</span>
                     </div>
                 </el-row>
                 <el-row class="row-subfix">
-                    <div class="row-line">
+                    <div class="row-line row-line-5">
                         <span class="line-subfix">答对总数：</span>
                         <span class="line-value">{{ detail.totalCorrectAnswersNum }}</span>
                     </div>
-                    <div class="row-line">
+                    <div class="row-line row-line-5">
                         <span class="line-subfix">总参与度：</span>
                         <span class="line-value">{{ detail.participationRate ? detail.participationRate : 0 }}%</span>
                     </div>
-                    <div class="row-line">
+                    <div class="row-line row-line-5">
                         <span class="line-subfix">班级正确率：</span>
                         <span class="line-value">{{ detail.classCorrectRate ? detail.classCorrectRate : 0 }}%</span>
                     </div>
-                    <div class="row-line">
+                    <div class="row-line row-line-5">
                         <span class="line-subfix">已达正确率：</span>
                         <span class="line-value">{{ detail.answerCorrectRate ? detail.answerCorrectRate : 0 }}%</span>
                     </div>
-                    <div class="row-line">
+                    <div class="row-line row-line-5">
                         <span class="line-subfix">反馈时长：</span>
-                        <span class="line-value">{{ setDuration(detail.consumingDuration) }}</span>
+                        <span class="line-value">{{ setDuration(detail.duration) }}</span>
                     </div>
                 </el-row>
                 <el-row class="row-table">
                     <el-table class="default-table" :data="singleSubjectSummary" border>
                         <el-table-column prop="title" label="课时-题号" />
-                        <el-table-column label="题干" width="80">
+                        <el-table-column label="题干" class-name="print-hidden" width="80">
                             <template slot-scope="scoped">
                                 <el-button type="text" @click="openStem(scoped.row)">查看</el-button>
                             </template>
@@ -104,9 +104,10 @@
 
                         <el-table-column prop="knowledge" label="知识点(单题)" width="150">
                             <template slot-scope="scoped">
-                                <el-tooltip effect="dark" :content="scoped.row.knowledge" placement="left">
+                                <el-tooltip effect="dark" :content="_knowledge(scoped.row.knowledge)"
+                                    placement="bottom">
                                     <span class="overflowText">
-                                        {{  scoped.row.knowledge }}
+                                        {{ _knowledge(scoped.row.knowledge) }}
                                     </span>
                                 </el-tooltip>
                             </template>
@@ -114,8 +115,8 @@
                         <el-table-column prop="correctAnswer" label="正确答案(单题)" width="150">
                             <template slot-scope="scoped">
                                 {{
-                scoped.row.correctAnswer == 1 ? "✓" :
-                    scoped.row.correctAnswer == 2 ? "✗" :
+                scoped.row.questionType == 4 && scoped.row.correctAnswer == 1 ? "✓" :
+                    scoped.row.questionType == 4 && scoped.row.correctAnswer == 2 ? "✗" :
                         scoped.row.correctAnswer
             }}
                             </template>
@@ -123,8 +124,8 @@
                         <el-table-column prop="fallible" label="干扰选项(单题)" width="150">
                             <template slot-scope="scoped">
                                 {{
-                    scoped.row.fallible == 1 ? "✓" :
-                        scoped.row.fallible == 2 ? "✗" :
+                    scoped.row.questionType == 4 && scoped.row.fallible == 1 ? "✓" :
+                        scoped.row.questionType == 4 && scoped.row.fallible == 2 ? "✗" :
                             scoped.row.fallible
                 }}
                             </template>
@@ -134,48 +135,52 @@
             </div>
             <div v-if="currentType == '学生单科表现作答汇总表'">
                 <el-row class="row-subfix" style="margin-top:10px">
-                    <div class="row-line">
+                    <div class="row-line row-line-4">
                         <span class="line-subfix">班级：</span>
                         <span class="line-value">{{ detail.className }}</span>
                     </div>
-                    <div class="row-line">
+                    <div class="row-line row-line-4">
                         <span class="line-subfix">科目：</span>
                         <span class="line-value">{{ detail.subjectName }}</span>
                     </div>
-                    <div class="row-line">
-                        <span class="line-subfix">开始时间：</span>
-                        <span class="line-value">{{ $props.queryParams.dateRange[0] }}</span>
+                    <div class="row-line row-line-4">
+                        <span class="line-subfix">开始日期：</span>
+                        <span class="line-value">{{ $props.queryParams.dateRange && $props.queryParams.dateRange.length
+                > 1 ?
+                $props.queryParams.dateRange[0] : "" }}</span>
                     </div>
-                    <div class="row-line">
-                        <span class="line-subfix">截止时间：</span>
-                        <span class="line-value">{{ $props.queryParams.dateRange[1] }}</span>
+                    <div class="row-line row-line-4">
+                        <span class="line-subfix">截止日期：</span>
+                        <span class="line-value">{{ $props.queryParams.dateRange && $props.queryParams.dateRange.length
+                > 1 ?
+                $props.queryParams.dateRange[1] : "" }}</span>
                     </div>
-                    <div class="row-line">
+                    <!-- <div class="row-line">
                         <span class="line-subfix">下课时间：</span>
                         <span class="line-value">{{ detail.endTime }}</span>
-                    </div>
+                    </div> -->
                 </el-row>
                 <el-row class="row-subfix">
-                    <div class="row-line">
+                    <div class="row-line row-line-4">
                         <span class="line-subfix">课时数：</span>
                         <span class="line-value">{{ $props.askReportIds.length }}</span>
                     </div>
-                    <div class="row-line">
+                    <div class="row-line row-line-4">
                         <span class="line-subfix">总出题数：</span>
                         <span class="line-value">{{ detail.questionNum }}</span>
                     </div>
-                    <div class="row-line">
+                    <div class="row-line row-line-4">
                         <span class="line-subfix">查询时间：</span>
                         <span class="line-value">{{ detail.selectDate }}</span>
                     </div>
-                    <div class="row-line">
+                    <div class="row-line row-line-4">
                         <span class="line-subfix">查询老师：</span>
-                        <span class="line-value">{{ detail.answerCorrectRate }}</span>
+                        <span class="line-value">{{ this.$store.getters.info.name }}</span>
                     </div>
-                    <div class="row-line">
+                    <!-- <div class="row-line row-line-5">
                         <span class="line-subfix">课时时长：</span>
                         <span class="line-value">{{ setDuration(detail.consumingDuration) }}</span>
-                    </div>
+                    </div> -->
                 </el-row>
                 <el-row class="row-table">
                     <el-table class="default-table" :data="studentPerformance">
@@ -194,7 +199,7 @@
                         <el-table-column prop="answerCorrectRate" label="已答正确率" width="120">
                             <template slot-scope="scoped">{{ scoped.row.answerCorrectRate }}%</template>
                         </el-table-column>
-                        <el-table-column prop="correctAnswerNum" label="查看折线图" width="120">
+                        <el-table-column prop="correctAnswerNum" label="查看折线图" class-name="print-hidden" width="120">
                             <template slot-scope="scoped">
                                 <el-button type="text" text @click="openLineChart(scoped.row)">查看</el-button>
                             </template>
@@ -225,25 +230,27 @@
             </div>
         </el-dialog>
         <el-dialog :append-to-body="true" class="stem" :visible.sync="stem.visible" :title="'题干'" width="800">
-            <iframe v-if="stem && stem.src" :src="stem.src" style="width: 100%;min-height: 400px;" />
+            <Preview v-if="stem && stem.src" :src="stem.src" :key="stem.src" />
         </el-dialog>
         <ExportDia :exportStudent="exportStudent" :diaShow="diaShow" @cancel="cancel" @exportData="_exportData"
             :type="'折线图'" />
     </div>
 </template>
 <script>
-import { formatDate,getKnowledge } from "utils";
+import { formatDate, getKnowledge } from "utils";
 import { downloadFile, tablePrint } from "@/utils";
 import LineChart from "@/components/charts/lineChart";
+import Preview from "@/components/preview";
 export default {
     name: "askSummaryReport",
     components: {
-        LineChart
+        LineChart,
+        Preview
     },
     props: {
         askReportIds: Array,
         queryParams: Object,
-            role: "",
+        role: "",
     },
 
     watch: {
@@ -282,6 +289,7 @@ export default {
             },
             //题干数据对象
             stem: {
+                type: "html",
                 visible: false,
                 src: null
             }
@@ -292,13 +300,19 @@ export default {
         await this._detail();
     },
     methods: {
+        _knowledge(knowledgeParam) {
+            return getKnowledge(knowledgeParam)
+        },
         _export() {
             this.diaShow = true;
         },
         _print() {
-            let title = this.detail.title || this.subjectNames.join();
 
-            tablePrint("print-content", title + "_" + this.currentType);
+            let title = this.detail.title || this.subjectNames?.join();
+            tablePrint({
+                id: "print-content",
+                title: title + "_" + this.currentType
+            });
         },
         cancel() {
             this.diaShow = false;
@@ -307,7 +321,9 @@ export default {
 
             let studentIds = arr;
 
-            let query = {};
+            let query = {
+                size: 9999
+            };
 
             if (studentIds != null) {
                 if (studentIds.length > 0) {
@@ -348,6 +364,7 @@ export default {
             await this._detail();
         },
         async _changeType() {
+            this.detail.selectDate = formatDate(new Date(), "yyyy-MM-dd");
             switch (this.currentType) {
                 case "题目作答表现汇总": { await this._singleSubjectSummary(); }; break;
                 case "学生单科表现作答汇总表": { await this._studentPerformance(); }; break;
@@ -422,8 +439,10 @@ export default {
                 this.$message.error(detailReponse.info);
                 return;
             }
+
             this.detail = detailReponse.data;
-            this.detail.selectDate = formatDate(new Date(), "yyyy-MM-dd");
+
+
         },
         async _singleSubjectSummary() {
 
@@ -439,6 +458,7 @@ export default {
             let query = {
                 periodIds: this.$props.askReportIds,
                 classIds: [this.$props.queryParams.class],
+                size: 9999
             };
 
             let periodListReponse = await periodList({
@@ -538,10 +558,11 @@ export default {
                     name: "已答正确率",
                     value: answerCorrectRate,
                 },
-            ]; 
+            ];
         },
         openStem(stemRow) {
             this.stem.src = stemRow.screenshot ?? "";
+            console.log('stem', this.stem)
             this.stem.visible = true;
         },
         openExport() {
@@ -584,6 +605,20 @@ export default {
     }
 }
 
+.row-line-4 {
+    width: calc(25% - 4px);
+    border: 1px solid #ebeef5;
+    background: #f5f7fa;
+    display: inline-block;
+    height: 40px;
+    line-height: 40px;
+
+    .line-subfix {
+        margin-left: 10px;
+
+    }
+}
+
 .row-table {
     margin-top: 20px;
 }
diff --git a/src/views/basic/askTestQuestion/components/testBzrMulti.vue b/src/views/basic/askTestQuestion/components/testBzrMulti.vue
index 0ee0a9e..4d587dc 100644
--- a/src/views/basic/askTestQuestion/components/testBzrMulti.vue
+++ b/src/views/basic/askTestQuestion/components/testBzrMulti.vue
@@ -1,7 +1,7 @@
 <template>
     <div style="margin-right: 20px;width: 100%">
         <div v-if="status == 'select'">
-            <el-row class="row-type">
+            <el-row class="row-type print-hidden">
 
                 <div style="float: right;">
                     <el-button type="primary" :disabled="multipleSelection.length < 1" class="opration-btn"
@@ -28,7 +28,10 @@
         <div v-if="status == 'selected'">
             <el-container style="height: 100%;width: 100%;">
                 <el-main id="print-content">
-                    <el-row class="row-type">
+                    <el-row class="row-type print-hidden">
+                        <div style="float: left;">    
+                             <el-button @click="_backa">返回</el-button>
+                        </div>
                         <div style="float: right;">
                             <el-button type="primary" @click="_import" class="opration-btn"
                                 icon="el-icon-upload2">导出报表</el-button>
@@ -83,26 +86,21 @@
                                         }}</template>
                                 </el-table-column>
                             </el-table-column>
-                            <el-table-column label="查看雷达图">
+                            <el-table-column label="查看雷达图" class-name="print-hidden">
                                 <template slot-scope="scoped">
                                     <el-button type="text" @click="openRandarChart(scoped.row)">查看</el-button>
                                 </template>
                             </el-table-column>
                         </el-table>
                     </el-row>
-                </el-main>
-                <el-footer>
-                    <div style="float: right;margin-top: 10px;">
-                        <el-button @click="_backa">返回</el-button>
-                    </div>
-                </el-footer>
+                </el-main> 
             </el-container>
 
         </div>
         <el-dialog class="chart-dia" :visible.sync="redarVisible" :title="radarChart.title" width="800"
             :append-to-body="true">
             <div class="chart-box">
-                <RadarChart id="testRadarChart" :params="radarChart"  />
+                <RadarChart id="testRadarChart" :params="radarChart" />
             </div>
         </el-dialog>
     </div>
@@ -171,7 +169,15 @@ export default {
     },
     methods: {
         _print() {
-            tablePrint("print-content", this.currentType);
+            tablePrint({
+                id: "print-content",
+                title: this.currentType,
+                lindex: 1,
+                splitParam: 16,
+                fixedColumn: 2,
+                diffNumber: 2,
+                diffStNumber: 15
+            }); 
         },
         _checkAll() {
             // this.multipleSelection = [...] 
@@ -276,9 +282,9 @@ export default {
             this.exportStudent = [];
         },
         openRandarChart(obj) {
-         
+
             let max = 0;
-         
+
             const dataList = obj.dataList.slice(1, obj.dataList.length);
             let subjectList = dataList.map((item) => {
                 let score = Number(item.highestScore || item.score);
@@ -330,10 +336,10 @@ export default {
                     value: dataList.map((item) => item.score),
                     name: "本人得分",
                 },
-            ]; 
+            ];
 
             this.radarChart.title = obj.studentName + "-多科阶段作答表现图";
-            console.log(this.radarChart)
+            
             this.redarVisible = true;
         },
         async _loadData() {
diff --git a/src/views/basic/askTestQuestion/components/testListReport.vue b/src/views/basic/askTestQuestion/components/testListReport.vue
index 08229b2..298ba7c 100644
--- a/src/views/basic/askTestQuestion/components/testListReport.vue
+++ b/src/views/basic/askTestQuestion/components/testListReport.vue
@@ -150,7 +150,9 @@ export default {
                     paperId: item.id,
                     title: item.title,
                     type: 2, //搜索题目详情类型
-                    examType: item.examPaperId == 0 ? 1 : 2,
+                    examType: item.examPaperId == 0 ? 1 : 2, 
+                    subjectName: item.subjectName,
+                    sectionName: item.sectionName
                 },
             });
         },
diff --git a/src/views/basic/askTestQuestion/components/testMultiClassReport.vue b/src/views/basic/askTestQuestion/components/testMultiClassReport.vue
index 7e883e9..8d7a53c 100644
--- a/src/views/basic/askTestQuestion/components/testMultiClassReport.vue
+++ b/src/views/basic/askTestQuestion/components/testMultiClassReport.vue
@@ -1,7 +1,7 @@
 <template>
     <div style="margin-right: 20px;width: 100%">
         <el-row class="row-type">
-            <label>阶段报表类型</label>
+            <label>报表类型</label>
             <el-select class="opration-select" v-model="currentType" style="margin-left: 10px;">
                 <el-option v-for="(item, index) in types" :lable="item" :key="index" :value="item" />
             </el-select>
@@ -9,11 +9,12 @@
         <el-row class="row-type" style="margin-top: 10px;">
             <el-table v-if="$props.params" class="default-table" :data="listReport">
                 <el-table-column prop="subjectName" label="科目" width="100" />
-                <el-table-column prop="paperName" label="试卷名称"   />
+                <el-table-column prop="paperName" label="试卷名称" />
                 <el-table-column prop="classCorrectRate" label="已考班级">
                     <template slot-scope="scoped">
                         <el-checkbox-group v-model="scoped.row.checkedClassList">
-                            <el-checkbox :key="index" v-for="(item, index) in scoped.row.classInfos" :label="item.classId">
+                            <el-checkbox :key="index" v-for="(item, index) in scoped.row.classInfos"
+                                :label="item.classId">
                                 {{ item.className }}
                             </el-checkbox>
                         </el-checkbox-group>
@@ -48,7 +49,7 @@ export default {
         }
     },
     methods: {
-        _linkToDetail(dataRow) { 
+        _linkToDetail(dataRow) {
             this.$router.push({
                 path: "/testReportDetail",
                 query: {
@@ -62,7 +63,7 @@ export default {
             });
         },
         async _loadDatas() {
-     
+
             var dataRequestParams = {
                 classIds: this.$props.params.class ? [this.$props.params.class] :
                     this.$props.params.classIds ? [...this.$props.params.classIds] : null,
@@ -72,7 +73,7 @@ export default {
                 subjects: this.$props.params.subject ? [this.$props.params.subject] :
                     this.$props.params.subjects ? [...this.$props.params.subjects] : null
             };
-           
+
             var dataRequest = this.$request.tListExamReport;
 
 
diff --git a/src/views/basic/askTestQuestion/components/testSummaryReport.vue b/src/views/basic/askTestQuestion/components/testSummaryReport.vue
index ef38bb2..137053d 100644
--- a/src/views/basic/askTestQuestion/components/testSummaryReport.vue
+++ b/src/views/basic/askTestQuestion/components/testSummaryReport.vue
@@ -51,7 +51,7 @@
                 }}</template>
                         </el-table-column>
                     </el-table-column>
-                    <el-table-column label="查看折线图" fixed="right" align="center" width="120">
+                    <el-table-column label="查看折线图" class-name="print-hidden" fixed="right" align="center" width="120">
                         <template slot-scope="scoped">
                             <el-button type="text" @click="_openLineChart(scoped.row)">查看</el-button>
                         </template>
@@ -133,11 +133,15 @@ export default {
             let query = {
                 examIds: this.$props.testReportIds,
                 classIds: [this.$props.queryParams.class],
-                subjectName: [this.$props.queryParams.subject],
-                startDay: this.$props.queryParams.dateRange[0] ?? null,
-                endDay: this.$props.queryParams.dateRange[1] ?? null,
+                subjectName: [this.$props.queryParams.subject]
             };
 
+            if (this.$props.queryParams.dateRange && this.$props.queryParams.dateRange.length >= 2) {
+                query.startDay = this.$props.queryParams.dateRange[0];
+                query.endDay = this.$props.queryParams.dateRange[1];
+            }
+
+
             const { data, status, info } = await phaseExamReport({
                 ...query
             });
@@ -158,7 +162,7 @@ export default {
                     }
                 });
             });
-            console.log('lsit', data?.list)
+
             this.stageReport = data?.list.map((item) => {
                 let params = {};
                 dataIdsList.map((ids, index) => {
@@ -224,10 +228,17 @@ export default {
             }
         },
         _print() {
-            tablePrint("print-content", "即时测-已归档单课时报表");
+            tablePrint({
+                id: "print-content",
+                title: "即时测-阶段报表",
+                splitParam: 18,
+                fixedColumn: 2,
+                diffNumber: 2,
+                diffStNumber: 3
+            });
         },
         _titleClick() { },
-        _openLineChart(chartRow) { 
+        _openLineChart(chartRow) {
             var subejct = this.$props.role == 'ROLE_BANZHUREN' ? this.$props.queryParams.subjects[0] : this.$props.queryParams.subject;
             this.lineChart.title = `${chartRow.studentName}-${subejct}-即时测-多卷作答表现图`;
             this.lineChart.visible = true;
diff --git a/src/views/basic/askTestQuestion/detail.vue b/src/views/basic/askTestQuestion/detail.vue
index 9ec3873..b6f0b8e 100644
--- a/src/views/basic/askTestQuestion/detail.vue
+++ b/src/views/basic/askTestQuestion/detail.vue
@@ -1,5 +1,5 @@
 <template>
-    <el-container class="default-body">
+    <el-container class="default-body default-body-detail">
         <el-header>
             <back-box class="detailBack">
                 <template slot="title">
@@ -11,7 +11,7 @@
         </el-header>
         <div class="default-filter">
             <el-row class="row-type">
-                <label>阶段报表类型</label>
+                <label>报表类型</label>
                 <el-select @change="_changeType" v-if="dataType && currentType" class="opration-select"
                     v-model="currentType">
                     <el-option v-for="(item, index) in types" :lable="item.name" :key="index" :value="item.name" />
@@ -19,14 +19,14 @@
                 <div style="float: right;">
                     <span v-if="(dataType == '2' && currentType == '测验成绩单') ||
                             (dataType == '2' && currentType == '试题分析') ||
-                            (dataType == '3' && currentType == '学生成绩排名榜')">
+                            (dataType == '3' && currentType == '学生成绩排名')">
                         单题低分率：
                         <el-input-number class="parent-number" v-model="lowLevel" :min="1" :max="100" label="低分率">
                         </el-input-number>
                     </span>
 
                     <el-button v-if="(dataType == '3' && currentType == '班级对比情况表') ||
-                            (dataType == '3' && currentType == '学生成绩排名榜')" @click="_studentLevelSet"
+                            (dataType == '3' && currentType == '学生成绩排名')" @click="_studentLevelSet"
                         class="green-el-button">
                         设置学生成绩等级
                     </el-button>
@@ -37,13 +37,13 @@
                 </div>
             </el-row>
         </div>
-        <el-main>
+        <el-main v-loading="loading">
             <div style=" padding: 20px;" id="print-content">
-                <div style="margin-bottom:20px;background:#ffb3b3;padding:10px 20px;" class="tips"
+                <div style="margin-bottom:20px;background:#ffb3b3;padding:10px 20px;" class="tips print-hidden"
                     v-if="paperModifyLog.modifiedTime && !status">
                     <p class="tips-p">
                         <i class="fa fa-bell-o"></i>
-                        {{ `${paperModifyLog.modifiedTime} ${paperModifyLog.realName}` }}修改了答案，是否重新记分？
+                        {{ `${paperModifyLog.modifiedTime} ${paperModifyLog.realName}` }}修改了试卷，是否重新记分？
                         <el-button type="danger" round @click="_reScore" size="mini">重新计分</el-button>
                         <el-button type="danger" round plain size="mini"
                             @click="paperModifyLog.modifiedTime = ''">暂时不计</el-button>
@@ -73,53 +73,53 @@
                         </div>
                     </el-row>
                     <el-row class="row-subfix">
-                        <div class="row-line">
+                        <div class="row-line  row-line-5">
                             <span class="line-subfix">班级人数：</span>
                             <span class="line-value">{{ detail.classPersonNum }}</span>
                         </div>
-                        <div class="row-line">
+                        <div class="row-line  row-line-5">
                             <span class="line-subfix">签到人数：</span>
                             <span class="line-value">{{ detail.checkInCount }}</span>
                         </div>
-                        <div class="row-line">
+                        <div class="row-line  row-line-5">
                             <span class="line-subfix">题目总数：</span>
                             <span class="line-value">{{ detail.questionNum }}</span>
                         </div>
-                        <div class="row-line">
+                        <div class="row-line  row-line-5">
                             <span class="line-subfix">答题总数：</span>
                             <span class="line-value">{{ detail.totalAnswersNum }}</span>
                         </div>
-                        <div class="row-line">
+                        <div class="row-line  row-line-5">
                             <span class="line-subfix">课时时长：</span>
                             <span class="line-value">{{ setDuration(detail.duration) }}</span>
                         </div>
                     </el-row>
                     <el-row class="row-subfix">
-                        <div class="row-line">
+                        <div class="row-line  row-line-5">
                             <span class="line-subfix">答对总数：</span>
                             <span class="line-value">{{ detail.totalCorrectAnswersNum }}</span>
                         </div>
-                        <div class="row-line">
+                        <div class="row-line  row-line-5">
                             <span class="line-subfix">总参与度：</span>
                             <span class="line-value">{{ detail.participationRate }}%</span>
                         </div>
-                        <div class="row-line">
+                        <div class="row-line  row-line-5">
                             <span class="line-subfix">班级正确率：</span>
                             <span class="line-value">{{ detail.classCorrectRate }}%</span>
                         </div>
-                        <div class="row-line">
-                            <span class="line-subfix">已达正确率：</span>
+                        <div class="row-line  row-line-5">
+                            <span class="line-subfix">已答正确率：</span>
                             <span class="line-value">{{ detail.answerCorrectRate }}%</span>
                         </div>
-                        <div class="row-line">
+                        <div class="row-line  row-line-5">
                             <span class="line-subfix">反馈时长：</span>
-                            <span class="line-value">{{ setDuration(detail.consumingDuration) }}</span>
+                            <span class="line-value">{{ setDuration1000(detail.consumingDuration) }}</span>
                         </div>
                     </el-row>
                     <el-row class="row-table">
                         <el-table class="default-table" :data="askItemAnalysis">
                             <el-table-column prop="title" label="课时-题号" />
-                            <el-table-column label="题干" width="80">
+                            <el-table-column label="题干" class-name="print-hidden" width="80">
                                 <template slot-scope="scoped">
                                     <el-button type="text" size="mini" @click="openStem(scoped.row)">查看</el-button>
                                 </template>
@@ -140,12 +140,21 @@
                                 <template slot-scope="scoped">{{ scoped.row.answerCorrectRate }}%</template>
                             </el-table-column>
 
-                            <el-table-column prop="knowledge" label="知识点(单题)" width="150" />
+                            <el-table-column prop="knowledge" label="知识点(单题)" width="150">
+                                <template slot-scope="scoped">
+                                    <el-tooltip effect="dark" :content="_knowledge(scoped.row.knowledge)"
+                                        placement="bottom">
+                                        <span class="overflowText">
+                                            {{ _knowledge(scoped.row.knowledge) }}
+                                        </span>
+                                    </el-tooltip>
+                                </template>
+                            </el-table-column>
                             <el-table-column prop="correctAnswer" label="正确答案(单题)" width="150">
                                 <template slot-scope="scoped">
                                     {{
-                            scoped.row.correctAnswer == 1 ? "✓" :
-                                scoped.row.correctAnswer == 2 ? "✗" :
+                            scoped.row.correctAnswer == 1 && scoped.row.questionType == 4 ? "✓" :
+                                scoped.row.correctAnswer == 2 && scoped.row.questionType == 4 ? "✗" :
                                     scoped.row.correctAnswer
                         }}
                                 </template>
@@ -153,8 +162,8 @@
                             <el-table-column prop="fallible" label="干扰选项(单题)" width="150">
                                 <template slot-scope="scoped">
                                     {{
-                                scoped.row.fallible == 1 ? "✓" :
-                                    scoped.row.fallible == 2 ? "✗" :
+                                scoped.row.fallible == 1 && scoped.row.questionType == 4 ? "✓" :
+                                    scoped.row.fallible == 2 && scoped.row.questionType == 4 ? "✗" :
                                         scoped.row.fallible
                             }}
                                 </template>
@@ -168,24 +177,21 @@
                             <el-table-column prop="studentCode" label="学号"></el-table-column>
                             <el-table-column prop="studentName" label="姓名"></el-table-column>
                             <el-table-column prop="answerTimes" label="答题次数"></el-table-column>
-                            <el-table-column prop="consumingDuration" label="答题耗时"><template slot-scope="scoped">{{
-                            setDuration(scoped.row.consumingDuration)
-                        }}
+                            <el-table-column prop="consumingDuration" label="答题耗时"><template slot-scope="scoped">
+                                    {{ setDuration1000(scoped.row.consumingDuration) }}
                                 </template></el-table-column>
                             <el-table-column prop="correctAnswerTimes" label="答对次数">
-                                <template slot-scope="scoped">{{
-                                scoped.row.correctAnswerTimes ||
-                                    Number(scoped.row.correctAnswerTimes) === 0
-                                    ? scoped.row.correctAnswerTimes
-                                    : "-"
-                            }}</template>
+                                <template slot-scope="scoped">
+                                    {{ scoped.row.correctAnswerTimes || Number(scoped.row.correctAnswerTimes) === 0 ?
+                            scoped.row.correctAnswerTimes : "-" }}
+                                </template>
                             </el-table-column>
                             <el-table-column prop="participationRate" label="参与度"><template slot-scope="scoped">{{
-                                scoped.row.participationRate ||
-                                    Number(scoped.row.participationRate) === 0
-                                    ? scoped.row.participationRate + "%"
-                                    : "-"
-                            }}</template></el-table-column>
+                            scoped.row.participationRate ||
+                                Number(scoped.row.participationRate) === 0
+                                ? scoped.row.participationRate + "%"
+                                : "-"
+                        }}</template></el-table-column>
                             <el-table-column prop="correctRate" label="正确率"><template slot-scope="scoped">{{
                                 scoped.row.correctRate || Number(scoped.row.correctRate) === 0
                                     ? scoped.row.correctRate + "%"
@@ -197,11 +203,11 @@
                                     ? scoped.row.answerCorrectRate + "%"
                                     : "-"
                             }}</template></el-table-column>
-                            <el-table-column v-for="(item, index) in askPeriodQuestionItemOptions" :key="index"
+                            <el-table-column class-name="anwser-column"
+                                v-for="(item, index) in askPeriodQuestionItemOptions" :key="index"
                                 :label="'Q' + (index + 1)"><template slot-scope="scoped">
-                                    <span :class="scoped.row['isRight' + index] ? '' : 'red'">{{
-                            scoped.row["answer" + index] || "-"
-                        }}</span>
+                                    <div :class="scoped.row['isRight' + index] ? '' : 'red'">{{ scoped.row["answer" +
+                            index] || "-" }}</div>
                                 </template>
                             </el-table-column>
                         </el-table>
@@ -223,19 +229,19 @@
                 </div>
                 <div v-if="dataType == '1' && currentType == '学生签到表现'">
                     <el-row class="row-subfix">
-                        <div class="row-line">
+                        <div class="row-line row-line-5">
                             <span class="line-subfix">应到人数：</span>
                             <span class="line-value">{{ detail.classPersonNum }}</span>
                         </div>
-                        <div class="row-line">
+                        <div class="row-line row-line-5">
                             <span class="line-subfix">实到人数：</span>
                             <span class="line-value">{{ detail.checkInCount }}</span>
                         </div>
-                        <div class="row-line">
+                        <div class="row-line row-line-5">
                             <span class="line-subfix">迟到人数：</span>
                             <span class="line-value">{{ detail.classPersonNum - detail.checkInCount }}</span>
                         </div>
-                        <div class="row-line">
+                        <div class="row-line row-line-5">
                             <span class="line-subfix">未到人数：</span>
                             <span class="line-value">{{ detail.classPersonNum - detail.checkInCount }}</span>
                         </div>
@@ -279,8 +285,8 @@
                         </el-table>
                     </el-row>
                     <el-row class="row-subfix">
-                        <el-table class="default-table" style="margin-top: 10px" :data="studentList">
-                            <el-table-column :width="item.label == '学号' ? 120 : 0" :prop="item.prop" :label="item.label"
+                        <el-table class="default-table" style="margin-top: 10px" :data="studentList" ref="table">
+                            <el-table-column :width="item.label == '学号' ? 90 : 0" :prop="item.prop" :label="item.label"
                                 :key="index" v-for="(item, index) in studentHeader" />
                         </el-table>
                     </el-row>
@@ -399,7 +405,7 @@
                                             {{ scoped.row.missPeopleNumber }}</span> 人
                                     </span>
                                     <span style="margin: 10px 0;"
-                                        v-for="(item, index) in scoped.row.details.filter(item => !item.right)">
+                                        v-for="(item, index) in scoped.row.details.filter(item => item.option.indexOf('未答') < 0 && !item.right)">
                                         选{{ item.option }}：{{ item.students.join("/") }}
                                     </span>
                                     <span></span>
@@ -416,7 +422,16 @@
                                 {{ setSubPro(scope.row.questionType) }}
                             </template>
                         </el-table-column>
-                        <el-table-column prop="knowledge" width="100" label="知识点"></el-table-column>
+                        <el-table-column prop="knowledge" width="100" label="知识点">
+                            <template slot-scope="scoped">
+                                <el-tooltip effect="dark" :content="_knowledge(scoped.row.knowledge)"
+                                    placement="bottom">
+                                    <span class="overflowText">
+                                        {{ _knowledge(scoped.row.knowledge) }}
+                                    </span>
+                                </el-tooltip>
+                            </template>
+                        </el-table-column>
                         <el-table-column prop="score" width="100" label="满分值"></el-table-column>
                         <el-table-column width="110" prop="highestScore" label="班最高分"></el-table-column>
                         <el-table-column width="110" prop="lowestScore" label="班最低分"></el-table-column>
@@ -433,17 +448,17 @@
                         <el-table-column prop="classScoringRate" width="120" label="已考得分率">
                             <template slot-scope="scoped">
                                 <div v-if="scoped.row.type == 'colspan'">
-                                    {{ scoped.row.classScoringRate }}
+                                    {{ scoped.row.scoringRate }}
                                 </div>
-                                <div :class="scoped.row.classScoringRate <= lowLevel ? 'lowLevelClass' : ''" v-else>
-                                    {{ Number(scoped.row.classScoringRate).toFixed(2) }}%
+                                <div :class="scoped.row.scoringRate <= lowLevel ? 'lowLevelClass' : ''" v-else>
+                                    {{ Number(scoped.row.scoringRate).toFixed(2) }}%
                                 </div>
                             </template>
                         </el-table-column>
                         <el-table-column prop="correctAnswer" label="答案"><template slot-scope="scoped">{{
-                            scoped.row.correctAnswer == 1
+                            scoped.row.correctAnswer == 1 && scoped.row.questionType == 4
                                 ? "✓"
-                                : scoped.row.correctAnswer == 2
+                                : scoped.row.correctAnswer == 2 && scoped.row.questionType == 4
                                     ? "✗"
                                     : scoped.row.correctAnswer
                         }}</template>
@@ -501,7 +516,7 @@
                             <el-table-column prop="subjectiveExamScore" label="主观题分"></el-table-column>
                         </el-table-column>
                         <el-table-column v-for="(item, index) in studentQuestionOptions" :key="index"
-                            :label="'Q' + item.id" :prop="'score' + item.id">
+                            :label="'Q' + item.questionIndex" :prop="'score' + item.id">
                         </el-table-column>
                     </el-table>
                 </div>
@@ -511,15 +526,15 @@
                         <el-table-column prop="studentName" label="姓名"></el-table-column>
                         <el-table-column prop="className" label="班级"></el-table-column>
                         <el-table-column prop="examScore" label="总分"></el-table-column>
-                        <el-table-column v-for="(item, index) in studentAnseredOptions" :key="index"
-                            :label="'Q' + item.id">
+                        <el-table-column class-name="anwser-column" v-for="(item, index) in studentAnseredOptions"
+                            :key="index" :label="'Q' + item.questionIndex">
                             <template slot-scope="scope">
                                 <span v-if="studentAnsered[index]?.questionType == 5">*</span>
                                 <span v-else-if="scope.row['answer' + item.id]"
-                                    :class="scope.row['isRight' + item.id] ? '' : 'error'">
+                                    :class="scope.row['isRight' + item.id] ? '' : 'red'">
                                     {{ scope.row["answer" + item.id] }}
                                 </span>
-                                <span v-else :class="scope.row['questionType' + item.id] == 5 ? '' : 'error'">-</span>
+                                <span v-else :class="scope.row['questionType' + item.id] == 5 ? '' : 'red'">-</span>
                             </template>
                         </el-table-column>
                     </el-table>
@@ -535,8 +550,8 @@
                         </el-table-column>
                         <el-table-column prop="title" label="参与度" width="120">
                             <template slot-scope="scoped">
-                                {{ Number(scoped.row.testCount   * 100 / scoped.row.classCount).toFixed(2) }}%
-                              
+                                {{ Number(scoped.row.testCount * 100 / scoped.row.classCount).toFixed(2) }}%
+
                             </template>
                         </el-table-column>
                         <el-table-column prop="avg" label="班平均分" width="120" />
@@ -562,9 +577,10 @@
                         </el-table-column>
                         <el-table-column prop="knowledge" label="知识点">
                             <template slot-scope="scoped">
-                                <el-tooltip effect="dark" :content="scoped.row.knowledge" placement="left">
+                                <el-tooltip effect="dark" :content="_knowledge(scoped.row.knowledge)"
+                                    placement="bottom">
                                     <span class="overflowText">
-                                        {{ scoped.row.knowledge }}
+                                        {{ _knowledge(scoped.row.knowledge) }}
                                     </span>
                                 </el-tooltip>
                             </template>
@@ -572,8 +588,7 @@
                         <el-table-column prop="score" label="满分值" width="120" />
                         <el-table-column prop="avgScore" label="年级平均分" width="120">
                             <template slot-scope="scoped">
-                                <div v-if="scoped.row.type == 'colspan'"
-                                    :class="scoped.row.avgScore <= lowLevel ? 'lowLevelClass' : ''">
+                                <div v-if="scoped.row.type == 'colspan'">
                                     {{ Number(scoped.row.avgScore).toFixed(2) }} %
                                 </div>
                                 <div v-else>
@@ -581,36 +596,44 @@
                                 </div>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="gradeScoringRate" label="年级得分率" width="120">
+                        <el-table-column prop="gradeScoringRate" label="年级已考得分率" width="120">
                             <template slot-scope="scoped">
-                                <div v-if="scoped.row.type == 'colspan'">
-                                    {{ scoped.row.gradeScoringRate }}
+                                <div v-if="scoped.row.questionIndex == '汇总'">
+                                    {{ scoped.row.gradeScoringRate.toFixed(2) }} %
+                                </div>
+                                <div v-else-if="scoped.row.type == 'colspan'">
+                                    {{ scoped.row.gradeScoringRate.toFixed(2) }}
                                 </div>
-                                <div v-else="scoped.row.gradeScoringRate"
-                                    :class="scoped.row.gradeScoringRate <= lowLevel ? 'lowLevelClass' : ''">
-                                    {{ Number(scoped.row.gradeScoringRate).toFixed(2) }} %
+                                <div v-else="scoped.row.gradeScoringRate">
+                                    {{ Number(scoped.row.gradeScoringRate * 100).toFixed(2) }} %
                                 </div>
                             </template>
                         </el-table-column>
-                        <el-table-column prop="correctAnswer" label="答案" width="120" />
+                        <el-table-column prop="correctAnswer" label="答案" width="120">
+                            <template slot-scope="scoped">
+                                {{
+                            scoped.row.correctAnswer == 1 && scoped.row.questionType == 4 ? "✓" :
+                                scoped.row.correctAnswer == 2 && scoped.row.questionType == 4 ? "✗" :
+                                    scoped.row.correctAnswer
+                        }}
+                            </template>
+                        </el-table-column>
                         <el-table-column v-for="(item, index) in testPaperExamReportOptions" :key="index"
                             :label="item.title" :prop="'count' + index" width="120">
                             <template slot-scope="scope">
                                 <p class="persent">
                                     {{
-                            scope.row.questionType == "5"
-                                ? ""
-                                : scope.row["option" + index]
-                                    ? `${scope.row["option" + index]}(${scope.row["persent" + index] ?? "0"
-                                    })`
-                                    : ""
+                            scope.row.questionType == "5" ? "" : scope.row["option" + index]
+                                ? `${scope.row["option" + index]}(${scope.row["persent" + index] ?? "0"
+                                })`
+                                : ""
                         }}
                                 </p>
                             </template>
                         </el-table-column>
                     </el-table>
                 </div>
-                <div v-if="dataType == '3' && currentType == '学生成绩排名榜'">
+                <div v-if="dataType == '3' && currentType == '学生成绩排名'">
                     <el-table class="default-table" :data="testStudentExamReport">
                         <el-table-column prop="gradeRank" label="年级排行" />
                         <el-table-column prop="code" label="学号" />
@@ -623,7 +646,8 @@
             </div>
         </el-main>
         <el-dialog class="stem" :visible.sync="stem.visible" :title="'题干'" width="800" :append-to-body="true">
-            <iframe v-if="stem && stem.src" :src="stem.src" style="width: 100%;min-height: 400px;" />
+            <Preview v-if="stem && stem.src" :src="stem.src" :key="stem.src" />
+            <!-- <iframe v-if="stem && stem.src" :src="stem.src" style="width: 100%;min-height: 400px;" /> -->
         </el-dialog>
         <el-dialog :append-to-body="true" :close-on-click-modal="false" title="学生等级设置"
             :visible.sync="studentLevelDialog" width="900px" @closed="_studentLevelClose">
@@ -704,10 +728,11 @@
     </el-container>
 </template>
 <script>
-import { formatDate, downloadFile, tablePrint } from "utils";
+import Preview from "@/components/preview";
+import { formatDate, downloadFile, tablePrint, getKnowledge } from "utils";
 export default {
     name: "reportDetail",
-    components: { testScoreSet: () => import("./components/testScoreSet.vue"), },
+    components: { testScoreSet: () => import("./components/testScoreSet.vue"), Preview },
     async created() {
         this.role =
 
@@ -733,12 +758,11 @@ export default {
 
         await this._queryDefaultLevels();
 
-        if (this.dataType == '2') {
-            await this._examDetail();
-        }
+        await this._examDetail();
     },
     data() {
         return {
+            loading: true,
             status: 0,
             //导出相关
             paperModifyLog: {},
@@ -808,7 +832,7 @@ export default {
             // 学生签到情况
             askCheckinStatus: [],
             // 报表详情
-            testReport: {
+            examReport: {
                 subjectiveScore: 0,
                 subjectiveHighestScore: "",
                 subjectiveLowestScore: "",
@@ -859,6 +883,22 @@ export default {
                 return tit;
             },
             setDuration(times) {
+                let m = parseInt(times / 60);
+                let s = parseInt(times % 60);
+                console.log(times)
+                let aTime;
+                if (times == 0) {
+                    aTime = `0`;
+                } else {
+                    if (m == 0 && times != 0) {
+                        aTime = `${times}秒`;
+                    } else if (m != 0 && times != 0) {
+                        aTime = `${m}分${s}秒`;
+                    }
+                }
+                return aTime;
+            },
+            setDuration1000(times) {
                 let m = parseInt(times / 1000 / 60);
                 let s = parseInt((times / 1000) % 60);
                 let ms = times;
@@ -885,7 +925,7 @@ export default {
                 name: "试题分析"
             }, {
                 dataType: "3",
-                name: "学生成绩排名榜"
+                name: "学生成绩排名"
             }, {
                 dataType: "2",
                 name: "测验成绩单"
@@ -930,22 +970,52 @@ export default {
         }
     },
     methods: {
+        _knowledge(param) {
+            return getKnowledge(param);
+        },
         async _examDetail() {
-            const examDetail =
-                this.role == "ROLE_PERSONAL"
-                    ? this.$request.pExamDetail
-                    : this.$request.examDetail;
+            if (this.dataType == 2) {
+                const examDetail =
+                    this.role == "ROLE_PERSONAL"
+                        ? this.$request.pExamDetail
+                        : this.$request.examDetail;
 
-            let { data, info, status } = await examDetail({
-                examId: this.ids[0],
-            });
-            console.log('detail', data, data.paperModifyLog)
-            if (status === 0) {
-                if (data.paperModifyLog) {
-                    this.paperModifyLog = { ...data?.paperModifyLog };
+                let { data, info, status } = await examDetail({
+                    examId: this.ids[0],
+                });
+
+                if (status === 0) {
+                    this.examReport = { ...data?.examReport };
+
+                    if (data.paperModifyLog) {
+                        this.paperModifyLog = { ...data?.paperModifyLog };
+                    }
+                } else {
+                    this.$message.error(info);
                 }
-            } else {
-                this.$message.error(info);
+            }
+            else if (this.dataType == 3) {
+                let paramObj = JSON.parse(JSON.stringify(this.fromData))
+                if (paramObj.levelType == 0) {
+                    paramObj.levels = paramObj.levels.map((item) => {
+                        item[1] = ((item[1] / 100) * this.examPaperScore).toFixed(1);
+                        item[2] = ((item[2] / 100) * this.examPaperScore).toFixed(1);
+                        return item;
+                    });
+                }
+
+                let { data, info, status } = await this.$request.classdiffreport({
+                    paperId: this.ids[0],
+                    classIds: this.classIds,
+                    reportRange: paramObj
+                });
+
+                if (status != 0) {
+                    this.$message.error(info);
+                    return;
+                }
+
+                this.examReport = { ...data };
             }
         },
         async _reScore() {
@@ -958,6 +1028,7 @@ export default {
                 await this._changeType();
                 this.paperModifyLog.modifiedTime = "";
                 this.paperModifyLog.realName = "";
+                location.reload();
             } else {
                 this.$message.error(info);
             }
@@ -1004,15 +1075,22 @@ export default {
                 if (columnIndex == 0) {
                     return [3, 1];
                 }
-                // else if (columnIndex == 6) {
-                //     return [3, 1];
-                // }
-                // else if (columnIndex == 7) {
-                //     return [3, 5];
-                // }
+                else if (columnIndex == 8) {
+                    return [3, 1];
+                }
+                else if (columnIndex == 9) {
+                    return [3, this.testQuestionOptions.length];
+                }
+                else if (columnIndex >= 9) {
+                    return [0, 0];
+                }
                 else {
                     return [1, 1]
                 }
+            } else if (rowIndex > this.testQuestions?.length - 3) {
+                if (columnIndex >= 7) {
+                    return [0, 0];
+                }
             }
             else {
                 return [1, 1]
@@ -1027,11 +1105,18 @@ export default {
                     return [3, 1];
                 }
                 else if (columnIndex == 7) {
-                    return [3, 5];
+                    return [3, this.testPaperExamReportOptions.length];
+                }
+                else if (columnIndex >= 7) {
+                    return [0, 0];
                 }
                 else {
                     return [1, 1]
                 }
+            } else if (rowIndex > this.testPaperExamReport?.length - 3) {
+                if (columnIndex >= 5) {
+                    return [0, 0];
+                }
             }
             else {
                 return [1, 1]
@@ -1141,7 +1226,6 @@ export default {
                 }
             }
             else if (this.dataType == '3') {
-
                 let paramObj = JSON.parse(JSON.stringify(this.fromData))
 
                 if (paramObj.levelType == 0) {
@@ -1174,9 +1258,48 @@ export default {
 
         },
         _print() {
-            tablePrint("print-content", this.title + "_" + this.currentType);
+            var splitNumber = null;
+            var index = null;
+            var printType = 0;
+            var fixedColumn = null;
+            var diffNumber = null;
+            var diffStNumber = null;
+            if (this.dataType == '1' && this.currentType == '学生作答表现') {
+                splitNumber = 18;
+                fixedColumn = 2;
+                diffNumber = 2;
+                diffStNumber = 17;
+            }
+            else if (this.dataType == '2' && this.currentType == '小题分报表') {
+                splitNumber = 18;
+                index = 0;
+                fixedColumn = 2;
+                diffNumber = 2;
+                diffStNumber = 3;
+                printType = '即时测-小题分报表';
+            }
+            else if (this.dataType == '2' && this.currentType == '试题分析') {
+                splitNumber = 17;
+            }
+            else if (this.dataType == '2' && this.currentType == '作答明细') {
+                fixedColumn = 3;
+                diffNumber = 3;
+                diffStNumber = 17;
+                splitNumber = 18;
+            }
+            tablePrint({
+                id: "print-content",
+                title: this.title + "_" + this.currentType,
+                lindex: index,
+                splitParam: splitNumber,
+                printType: printType,
+                fixedColumn: fixedColumn,
+                diffNumber: diffNumber,
+                diffStNumber: diffStNumber
+            });
         },
         async _changeType() {
+            this.loading = true;
             if (this.dataType == "1") {
                 if (this.currentType == "试题分析") {
                     await this._loadAskItemAnalysis();
@@ -1216,10 +1339,11 @@ export default {
                 else if (this.currentType == "试题分析") {
                     await this._testPaperExamReport();
                 }
-                else if (this.currentType == "学生成绩排名榜") {
+                else if (this.currentType == "学生成绩排名") {
                     await this._testStudentExamReport();
                 }
             }
+            this.loading = false;
         },
         async _testPaperExamReport() {
             //主观
@@ -1251,31 +1375,30 @@ export default {
             let response = await request({
                 paperId: this.ids[0],
                 classIds: this.classIds,
+                size: 9999
             });
 
             if (response.status != 0) {
                 this.$message.error(response.info);
                 return;
             }
-            
-            var  maxOption  = 0;
-            response.data.forEach((item) =>{   
-                if(item.details){ 
-                    if(maxOption < item.details.length)
-                    {
+
+            var maxOption = 0;
+            response.data.forEach((item) => {
+                if (item.details) {
+                    if (maxOption < item.details.length) {
                         maxOption = item.details.length;
-                    }   
+                    }
                 }
-             
-          })
-          
-            let optionsList = []; 
 
-            for(var io=0;io<maxOption;io++){
+            })
+
+            let optionsList = [];
+
+            for (var io = 0; io < maxOption; io++) {
                 optionsList.push({})
             }
 
-            // let optionsList = [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}];
 
             let tableData = response.data?.map((item) => {
 
@@ -1298,6 +1421,7 @@ export default {
 
                 let params = {};
 
+
                 const detail = item?.details ?? [];
 
                 let lastOPtion = detail?.find((item) => {
@@ -1308,7 +1432,7 @@ export default {
                 });
 
                 optionsList.map((items, index) => {
-                    if (index != 4) {
+                    if (index < maxOption - 1) {
                         params["count" + index] =
                             defaultArr[index]?.option != "未答"
                                 ? defaultArr[index]?.count
@@ -1319,9 +1443,9 @@ export default {
                                 : "";
                         params["option" + index] =
                             defaultArr[index]?.option != "未答"
-                                ? defaultArr[index]?.option == 1
+                                ? defaultArr[index]?.option == 1 && item.questionType == 4
                                     ? "✓"
-                                    : defaultArr[index]?.option == 2
+                                    : defaultArr[index]?.option == 2 && item.questionType == 4
                                         ? "✗"
                                         : defaultArr[index]?.option
                                 : "";
@@ -1330,12 +1454,10 @@ export default {
                         items["title"] = "未答";
                         params["count" + index] = lastOPtion?.count ?? "";
                         params["persent" + index] = lastOPtion?.persent ?? "";
-                        params["option" + index] = "?";
+                        params["option" + index] = "未答";
                     }
                 });
 
-
-
                 return {
                     ...item,
                     ...params,
@@ -1347,30 +1469,29 @@ export default {
             });
 
             this.testPaperExamReportOptions = [...optionsList];
-
             this.testPaperExamReport.push({
                 questionIndex: "汇总",
-                questionType: "客观题",
-                score: objective.sum,
-                avgScore: objective.avg == 0 ? 0 : Number(objective.avg).toFixed(2),
-                gradeScoringRate: objective.avg == 0 ? 0 : Number(objective.avg * 100 / objective.sum).toFixed(2),
+                questionType: "主观题",
+                score: this.examReport.subjectiveScore,
+                avgScore: this.examReport.subjectiveAvgScore,
+                gradeScoringRate: this.examReport.subjectiveRate,
                 correctAnswer: "备注"
             })
 
             this.testPaperExamReport.push({
-                questionIndex: "主观题",
+                questionIndex: "客观题",
                 type: "colspan",
-                knowledge: subjective.sum,
-                score: subjective.avg == 0 ? 0 : Number(subjective.avg).toFixed(2),
-                avgScore: subjective.avg == 0 ? 0 : Number(subjective.avg * 100 / subjective.sum).toFixed(2)
+                knowledge: this.examReport.objectiveScore,
+                score: this.examReport.objectiveAvgScore,
+                avgScore: this.examReport.objectiveRate
             })
 
             this.testPaperExamReport.push({
                 questionIndex: "合计",
                 type: "colspan",
-                knowledge: summary.sum,
-                score: summary.avg == 0 ? 0 : Number(summary.avg).toFixed(2),
-                avgScore: summary.avg == 0 ? 0 : Number(summary.avg * 100 / summary.sum).toFixed(2)
+                knowledge: this.examReport.examPaperScore,
+                score: this.examReport.avg,
+                avgScore: this.examReport.rate
             })
         },
         async _testStudentExamReport() {
@@ -1466,50 +1587,43 @@ export default {
 
             var studentResults = [];
 
-            for (var iheader = 0; iheader < 3; iheader++) {
-                for (
-                    var imapping = 0;
-                    imapping < this.studentMapping.length;
-                    imapping++
-                ) {
-                    studentHeaders.push({
-                        prop: this.studentMapping[imapping].key + "_" + iheader,
-                        label: this.studentMapping[imapping].label,
-                        key: this.studentMapping[imapping].key,
-                    });
-                }
+            for (var iheader = 0; iheader < 17; iheader++) {
+                studentHeaders.push({
+                    prop: "column" + iheader,
+                    label: this.studentMapping[iheader % this.studentMapping.length].label,
+                    key: this.studentMapping[iheader % this.studentMapping.length].key,
+                });
             }
 
+            var studentList = response.data.gradeExamStudentReports;
+
             this.studentHeader = [...studentHeaders];
 
-            for (var isp = 0; isp < response.data.gradeExamStudentReports.length; isp++) {
+            var stuRow = Math.ceil(studentList.length * 1.00 / 3);
 
-                var item = {};
+            for (var isp = 0; isp < studentList.length; isp++) {
 
-                for (
-                    var iamapping = 0;
-                    iamapping < studentHeaders.length;
-                    iamapping++
-                ) {
-                    var currentData = response.data.gradeExamStudentReports[isp];
+                var row = isp % stuRow;
 
-                    if (!currentData) continue;
+                var col = parseInt(isp / stuRow);
 
-                    var currentHeader = studentHeaders[iamapping];
+                var item = {};
 
-                    item[currentHeader.prop] = currentData[currentHeader.key];
+                if (studentResults.length <= row)
+                    studentResults.push({});
 
-                    if (
-                        iamapping >= this.studentMapping.length - 1 &&
-                        iamapping % this.studentMapping.length == 0
-                    ) {
-                        isp += 1;
-                    }
-                }
+                item = studentResults[row];
 
-                studentResults.push(item);
-            }
+                var studentResult = studentList[isp];
 
+                item["column" + (6 * col)] = studentResult.code;
+                item["column" + (6 * col + 1)] = studentResult.name;
+                item["column" + (6 * col + 2)] = studentResult.gradeRank;
+                item["column" + (6 * col + 3)] = studentResult.exam;
+                item["column" + (6 * col + 4)] = studentResult.objective;
+                item["column" + (6 * col + 5)] = studentResult.subjective;
+            }
+            console.log(studentResults)
             this.studentList = [...studentResults];
 
             var show4Area = true;  //显示4选项区域
@@ -1530,7 +1644,9 @@ export default {
 
             for (var i = 0; i < questionList.length; i++) {
 
-                var correctAnswerValue = questionList[i].correctAnswer == "1" ? "✓" : questionList[i].correctAnswer == 2 ? "✗" : questionList[i].correctAnswer;
+                var correctAnswerValue =
+                    questionList[i].questionType == 4 && questionList[i].correctAnswer == "1" ? "✓" :
+                        questionList[i].questionType == 4 && questionList[i].correctAnswer == "2" ? "✗" : questionList[i].correctAnswer;
 
                 var missCount = 0;
 
@@ -1562,6 +1678,10 @@ export default {
                     minOptions = 2;
                     optionNumList.push(2);
                 }
+                if (questionList[i].questionType == 3) {
+                    if (minOptions > 4) minOptions = 4;
+                }
+
             }
 
             show4Area = minOptions <= 4;
@@ -1593,7 +1713,9 @@ export default {
 
                     var currentRow = areaList[row];
 
-                    var correctAnswerValue = question.correctAnswer == "1" ? "✓" : question.correctAnswer == "2" ? "✗" : question.correctAnswer;
+                    var correctAnswerValue =
+                        question.questionType == 4 && question.correctAnswer == "1" ? "✓" :
+                            question.questionType == 4 && question.correctAnswer == "2" ? "✗" : question.correctAnswer;
 
                     var details = question.details.filter(fl => {
                         return fl.option.indexOf('未答') < 0;
@@ -1615,8 +1737,8 @@ export default {
                             var questionColumn = 'column' + Number(6 * col + ilr);
 
                             if (details.length <= 4) {
-
-                                var questionOption = questionDetail ? (questionDetail.option == "1" ? "✓" : questionDetail.option == "2" ? "✗" : questionDetail.option) : "- -"
+                                var questionOption = questionDetail ? (question.questionType == 4 && questionDetail.option == "1" ? "✓" :
+                                    question.questionType == 4 && questionDetail.option == "2" ? "✗" : questionDetail.option) : "- -"
 
                                 if (questionOption != "- -") questionOption += "(" + questionDetail.persent + ")";
 
@@ -1662,7 +1784,8 @@ export default {
 
                         var currentRow = areaList[row];
 
-                        var correctAnswerValue = question.correctAnswer == "1" ? "✓" : question.correctAnswer == 2 ? "✗" : question.correctAnswer;
+                        var correctAnswerValue = question.questionType == 4 && question.correctAnswer == "1" ? "✓" :
+                            question.questionType == 4 && question.correctAnswer == "2" ? "✗" : question.correctAnswer;
 
                         for (var ilr = 0; ilr < 9; ilr++) {
 
@@ -1719,7 +1842,8 @@ export default {
 
                         var currentRow = areaList[row];
 
-                        var correctAnswerValue = question.correctAnswer == "1" ? "✓" : question.correctAnswer == 2 ? "✗" : question.correctAnswer;
+                        var correctAnswerValue = question.questionType == 4 && question.correctAnswer == "1" ? "✓" :
+                            question.questionType == 4 && question.correctAnswer == "2" ? "✗" : question.correctAnswer;
 
                         for (var ilr = 0; ilr < 12; ilr++) {
 
@@ -1774,7 +1898,8 @@ export default {
                     : this.$request.periodDetail;
 
             let response = await request({
-                periodIds: this.ids
+                periodIds: this.ids,
+                size: 9999
             });
 
             if (response.status != 0) {
@@ -1794,7 +1919,8 @@ export default {
 
             let listResponse = await listRequest({
                 periodIds: this.ids,
-                classIds: this.classIds
+                classIds: this.classIds,
+                size: 9999
             });
 
             if (listResponse.status != 0) {
@@ -1827,12 +1953,13 @@ export default {
                 if (detail.length > this.askPeriodQuestionItemOptions.length) {
                     this.askPeriodQuestionItemOptions = [...detail];
                 }
+
                 detail.map((items, index) => {
                     params["isRight" + index] = items.isRight;
                     params["answer" + index] =
-                        items.answer == 1
+                        items.answer == "1" && items.questionType == 4
                             ? "✓"
-                            : items.answer == 2
+                            : items.answer == "2" && items.questionType == 4
                                 ? "✗"
                                 : items.answer;
                 });
@@ -1878,7 +2005,6 @@ export default {
 
             this.askCheckinStatus = response.data.list;
 
-            console.log(detailResponse, response)
 
         },
         async _loadTestDetail() {
@@ -1934,15 +2060,16 @@ export default {
                 if (detail.length > optionsList.length) {
                     optionsList = [...detail];
                 }
+
                 detail.map((items, index) => {
                     params["que" + items.id] = items.id;
                     params["score" + items.id] = String(items.score).includes(".")
                         ? Number(items.score)
                         : items.score;
                     params["answer" + items.id] =
-                        items.answer == 1 ? "✓" : items.answer == 2 ? "✗" : items.answer;
+                        items.questionType == 4 && items.answer == "1" ? "✓" : items.questionType == 4 && items.answer == "2" ? "✗" : items.answer;
                     params["isRight" + items.id] = items.isRight;
-                    params["questionType" + items.id] = items.questionType;
+                    params["questionType" + items.id] = item.questionType;
                 });
                 return {
                     ...item,
@@ -2017,22 +2144,22 @@ export default {
                 min: 9999,
                 answeredRate: 0
             };
- 
+
             var maxOption = 0;
-            
-            data?.list?.forEach((item) =>{  
-              
-                const detail = JSON.parse(item.detail); 
-                
-                if(maxOption < detail.length)
-                {
+
+            data?.list?.forEach((item) => {
+
+                const detail = JSON.parse(item.detail);
+
+                if (maxOption < detail.length) {
+
                     maxOption = detail.length;
-                }   
+                }
             })
-            
-            let optionsList = []; 
 
-            for(var io=0;io<maxOption;io++){
+            let optionsList = [];
+
+            for (var io = 0; io < maxOption; io++) {
                 optionsList.push({})
             }
 
@@ -2059,21 +2186,21 @@ export default {
                             : "";
                     params["option" + index] =
                         defaultArr[index]?.option != "未答"
-                            ? defaultArr[index]?.option == 1
+                            ? defaultArr[index]?.option == "1" && item?.questionType == 4
                                 ? "✓"
-                                : defaultArr[index]?.option == 2
+                                : defaultArr[index]?.option == "2" && item?.questionType == 4
                                     ? "✗"
                                     : defaultArr[index]?.option
                             : "";
+
                     items["title"] = "选项" + (index + 1);
-                    // if (index != 4) {
-
-                    // } else {
-                    //     items["title"] = "未答";
-                    //     params["count" + index] = lastOPtion.count;
-                    //     params["persent" + index] = lastOPtion.persent;
-                    //     params["option" + index] = "?";
-                    // }
+                    if (index >= optionsList.length - 1) {
+                        items["title"] = "未答";
+                        params["count" + index] = lastOPtion.count;
+                        params["persent" + index] = lastOPtion.persent;
+                        params["option" + index] = "未答";
+                    }
+
                 });
 
                 summary.sum += parseFloat(item.score);
@@ -2117,47 +2244,46 @@ export default {
                 questionIndex: "汇总",
                 questionType: "主观题",
                 //满分值
-                score: subjective.sum,
+                score: this.examReport.subjectiveScore,
                 //最高分
-                highestScore: subjective.max,
+                highestScore: this.examReport.subjectiveHighestScore,
                 //最低分
-                lowestScore: subjective.min == 9999 ? 0 : subjective.min,
+                lowestScore: this.examReport.subjectiveLowestScore,
                 //平均分
-                avgScore: subjective.avg == 0 ? 0 : Number(subjective.avg).toFixed(2),
+                avgScore: this.examReport.subjectiveAvgScore,
                 //已考得分率
-                classScoringRate: subjective.sum == 0 ? 0 : Number(subjective.avg * 100 / subjective.sum).toFixed(2)
+                scoringRate: this.examReport.subjectiveScoringRate,
+                correctAnswer: "备注"
             })
 
             this.testQuestions.push({
                 questionIndex: "客观题",
                 type: "colspan",
                 //满分值
-                knowledge: objective.sum,
+                knowledge: this.examReport.objectiveScore,
                 //最高分
-                score: objective.max,
+                score: this.examReport.objectiveHighestScore,
                 //最低分
-                highestScore: objective.min == 9999 ? 0 : objective.min,
+                highestScore: this.examReport.objectiveLowestScore,
                 //平均分
-                lowestScore: objective.avg == 0 ? 0 : Number(objective.avg).toFixed(2),
+                lowestScore: this.examReport.objectiveAvgScore,
                 //已考得分率
-                avgScore: objective.sum == 0 ? 0 : Number(objective.avg * 100 / objective.sum).toFixed(2)
+                avgScore: this.examReport.objectiveScoringRate
             })
 
-
-
             this.testQuestions.push({
                 questionIndex: "合计",
                 type: "colspan",
                 //满分值
-                knowledge: summary.sum,
+                knowledge: this.examReport.examPaperScore,
                 //最高分
-                score: summary.max,
+                score: this.examReport.highestScore,
                 //最低分
-                highestScore: summary.min == 9999 ? 0 : summary.min,
+                highestScore: this.examReport.lowestScore,
                 //平均分
-                lowestScore: summary.avg == 0 ? 0 : Number(summary.avg).toFixed(2),
+                lowestScore: this.examReport.avgScore,
                 //已考得分率
-                avgScore: summary.sum == 0 ? 0 : Number(summary.avg / summary.sum * 100).toFixed(2)
+                avgScore: this.examReport.scoringRate
             })
         },
         keydownRange(event) {
@@ -2192,9 +2318,12 @@ export default {
     margin-top: 20px;
 }
 
-.red {
-    color: #f30;
-}
+
+
+
+// .red {
+//     color: #f30;
+// }
 
 .dia-tab-box {
     font-size: 14px;
diff --git a/src/views/basic/askTestQuestion/gradeAnalysisDetail.vue b/src/views/basic/askTestQuestion/gradeAnalysisDetail.vue
index 7de18f4..acfb718 100644
--- a/src/views/basic/askTestQuestion/gradeAnalysisDetail.vue
+++ b/src/views/basic/askTestQuestion/gradeAnalysisDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-container class="default-body">
+  <el-container class="default-body default-body-detail">
     <el-header>
       <back-box class="detailBack">
         <template slot="title">
@@ -45,7 +45,7 @@
                   <span class="line-subfix">试卷名称：</span>
                   <el-tooltip effect="dark" :content="item.paperName" placement="left">
                     <span class="line-value">{{ item.paperName }}</span>
-                  </el-tooltip> 
+                  </el-tooltip>
                 </div>
                 <div class="row-line">
                   <span class="line-subfix">测验时间：</span>
@@ -183,7 +183,7 @@
                           {{ scoped.row.missPeopleNumber }}</span> 人
                       </span>
                       <span style="margin: 10px 0;"
-                        v-for="(item, index) in scoped.row.details.filter(item => !item.right)">
+                        v-for="(item, index) in scoped.row.details.filter(item => item.option.indexOf('未答') < 0 && !item.right)">
                         选{{ item.option }}：{{ item.students.join("/") }}
                       </span>
                       <span></span>
@@ -199,7 +199,7 @@
               <el-button type="default" style="margin-left:0px" :size="'small'"
                 @click="_changePage('next')">下一页</el-button>
             </div>
-            <div style="display: none;">
+            <div style="height: 1px;overflow: hidden;">
               <div id="test-print">
                 <div v-for="(testTranscript, index) in testTranscriptDatas">
                   <div style="margin-top:20px">
@@ -313,7 +313,7 @@
                                 {{ scoped.row.missPeopleNumber }}</span> 人
                             </span>
                             <span style="margin: 10px 0;"
-                              v-for="(item, index) in scoped.row.details.filter(item => !item.right)">
+                              v-for="(item, index) in scoped.row.details.filter(item => item.option.indexOf('未答') < 0 && !item.right)">
                               选{{ item.option }}：{{ item.students.join("/") }}
                             </span>
                             <span></span>
@@ -325,10 +325,9 @@
                 </div>
               </div>
             </div>
-
           </el-tab-pane>
           <el-tab-pane :name="'班级对比情况'" :label="`班级对比情况`" style="padding: 0 20px">
-            <div style="float: right;margin-bottom: 20px;">
+            <div class="print-hidden" style="float: right;margin-bottom: 20px;">
               <el-button @click="_studentLevelSet" class="green-el-button" type="primary">
                 设置学生成绩等级
               </el-button>
@@ -382,7 +381,7 @@
             </el-table>
           </el-tab-pane>
           <el-tab-pane :name="'试题分析表'" :label="`试题分析表`" style="padding: 0 20px">
-            <div style="float: right;margin-bottom: 20px;">
+            <div class="print-hidden" style="float: right;margin-bottom: 20px;">
               单题低分率
               <el-input-number class="parent-number" v-model="lowLevel" :min="1" :max="100" label="低分率">
               </el-input-number>
@@ -399,11 +398,16 @@
               </el-table-column>
               <el-table-column prop="knowledge" label="知识点">
                 <template slot-scope="scoped">
-                  <el-tooltip effect="dark" :content="scoped.row.knowledge" placement="left">
-                    <span class="overflowText">
-                      {{ scoped.row.knowledge }}
-                    </span>
-                  </el-tooltip>
+                  <div v-if="scoped.row.type == 'colspan'">
+                    {{ scoped.row.knowledge }}
+                  </div>
+                  <div v-else>
+                    <el-tooltip effect="dark" :content="_knowledge(scoped.row.knowledge)" placement="bottom">
+                      <span class="overflowText">
+                        {{ _knowledge(scoped.row.knowledge) }}
+                      </span>
+                    </el-tooltip>
+                  </div>
                 </template>
               </el-table-column>
               <el-table-column prop="score" label="满分值" width="120">
@@ -427,11 +431,11 @@
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column prop="gradeScoringRate" label="年级得分率" width="120">
+              <el-table-column prop="gradeScoringRate" label="年级已考得分率" width="150">
                 <template slot-scope="scoped">
                   <div v-if="scoped.row.type == 'colspan'"
                     :class="scoped.row.gradeScoringRate < lowLevel ? 'lowLevelClass' : ''">
-                    {{ scoped.row.gradeScoringRate }} %
+                    {{ Number(scoped.row.gradeScoringRate).toFixed(2) }} %
                   </div>
                   <div v-else="scoped.row.gradeScoringRate"
                     :class="Number(scoped.row.gradeScoringRate * 100) < lowLevel ? 'lowLevelClass' : ''">
@@ -458,7 +462,7 @@
             </el-table>
           </el-tab-pane>
           <el-tab-pane :name="'学生成绩排行'" :label="`学生成绩排行`" style="padding: 0 20px">
-            <div style="float: right;margin-bottom: 20px;">
+            <div class="print-hidden" style="float: right;margin-bottom: 20px;">
               <el-button @click="_import" type="primary" class="opration-btn" icon="el-icon-upload2">导出报表</el-button>
               <el-button @click="_print" type="primary" class="opration-btn" icon="el-icon-printer">打印报表</el-button>
             </div>
@@ -553,7 +557,7 @@
 </template>
 
 <script>
-import { formatDate, downloadFile, tablePrint } from "utils";
+import { formatDate, downloadFile, tablePrint, getKnowledge } from "utils";
 export default {
   data() {
     return {
@@ -577,6 +581,24 @@ export default {
         question10List: [],
         questionTotal: [],
       },
+      // 报表详情
+      examReport: {
+        subjectiveScore: 0,
+        subjectiveHighestScore: "",
+        subjectiveLowestScore: "",
+        subjectiveAvgScore: "",
+        subjectiveClassScoringRate: "",
+        objectiveScore: "",
+        objectiveHighestScore: "",
+        objectiveLowestScore: "",
+        objectiveAvgScore: "",
+        objectiveClassScoringRate: "",
+        examPaperScore: "",
+        highestScore: "",
+        lowestScore: "",
+        avgScore: "",
+        classScoringRate: "",
+      },
       currentPage: 0,
       totalPage: 0,
       checkedClassInfos: [],
@@ -652,8 +674,29 @@ export default {
     this.checkedClassInfos = this.classInfos?.map(item => item.classId);
     this.tabType = "成绩测验单";
     await this._queryDefaultLevels();
+    await this._examDetail();
   },
   methods: {
+    _knowledge(knowledgeParam) {
+      return getKnowledge(knowledgeParam)
+    },
+    async _examDetail() {
+
+      const request = this.$request.gclassdiffReport;
+
+      let { data, info, status } = await request({
+        paperId: this.paperId,
+        classIds: this.checkedClassInfos,
+      });
+
+      if (status != 0) {
+        this.$message.error(info);
+        return;
+      }
+
+      this.examReport = { ...data };
+
+    },
     async _anys() {
       this.queryLoading = true;
       switch (this.tabType) {
@@ -762,12 +805,20 @@ export default {
           return [3, 1];
         }
         else if (columnIndex == 7) {
-          return [3, 5];
+          return [3, this.testPaperExamReportOptions.length];
+        }
+        else if (columnIndex >= 7) {
+          return [0, 0];
         }
         else {
           return [1, 1]
         }
       }
+      else if (rowIndex > this.testPaperExamReport?.length - 3) {
+        if (columnIndex >= 5) {
+          return [0, 0];
+        }
+      }
       else {
         return [1, 1]
       }
@@ -810,14 +861,21 @@ export default {
 
         this.testTranscriptDatas = [];
         for (var page = 0; page < this.checkedClassInfos.length; page++) {
-          this.testTranscriptDatas.push(await this._testExamReport(page));
+          this.testTranscriptDatas.push(await this._testExamReport(page, 1));
         }
         setTimeout(() => {
-          tablePrint("test-print", this.tabType);
-        }, 500);
+          tablePrint({
+            id: "test-print",
+            title: this.tabType
+          });
+        }, 1000);
       }
       else {
-        tablePrint("print-content", this.tabType);
+        tablePrint({
+          id: "print-content",
+          title: this.tabType,
+          printType: '年级组长-' + this.tabType
+        });
       }
     },
     async _import() {
@@ -865,7 +923,6 @@ export default {
         this.$message.error("下载失败");
       }
     },
-    _detailQ(id) { },
     setSubPro(type) {
       let tit;
       switch (type) {
@@ -922,48 +979,43 @@ export default {
 
       var studentResults = [];
 
-      for (var iheader = 0; iheader < 3; iheader++) {
-        for (
-          var imapping = 0;
-          imapping < this.studentMapping.length;
-          imapping++
-        ) {
-          studentHeaders.push({
-            prop: this.studentMapping[imapping].key + "_" + iheader,
-            label: this.studentMapping[imapping].label,
-            key: this.studentMapping[imapping].key,
-          });
-        }
+      for (var iheader = 0; iheader < 17; iheader++) {
+        studentHeaders.push({
+          prop: "column" + iheader,
+          label: this.studentMapping[iheader % this.studentMapping.length].label,
+          key: this.studentMapping[iheader % this.studentMapping.length].key,
+        });
       }
 
       demoTestTranscript.studentHeader = [...studentHeaders];
 
-      for (var isp = 0; isp < response.data.gradeExamStudentReports.length; isp++) {
+      var studentList = response.data.gradeExamStudentReports;
 
-        var item = {};
+      this.studentHeader = [...studentHeaders];
 
-        for (
-          var iamapping = 0;
-          iamapping < studentHeaders.length;
-          iamapping++
-        ) {
-          var currentData = response.data.gradeExamStudentReports[isp];
+      var stuRow = Math.ceil(studentList.length * 1.00 / 3);
 
-          if (!currentData) continue;
+      for (var isp = 0; isp < studentList.length; isp++) {
 
-          var currentHeader = studentHeaders[iamapping];
+        var row = isp % stuRow;
 
-          item[currentHeader.prop] = currentData[currentHeader.key];
+        var col = parseInt(isp / stuRow);
 
-          if (
-            iamapping >= this.studentMapping.length - 1 &&
-            iamapping % this.studentMapping.length == 0
-          ) {
-            isp += 1;
-          }
-        }
+        var item = {};
+
+        if (studentResults.length <= row)
+          studentResults.push({});
+
+        item = studentResults[row];
 
-        studentResults.push(item);
+        var studentResult = studentList[isp];
+
+        item["column" + (6 * col)] = studentResult.code;
+        item["column" + (6 * col + 1)] = studentResult.name;
+        item["column" + (6 * col + 2)] = studentResult.gradeRank;
+        item["column" + (6 * col + 3)] = studentResult.exam;
+        item["column" + (6 * col + 4)] = studentResult.objective;
+        item["column" + (6 * col + 5)] = studentResult.subjective;
       }
 
       demoTestTranscript.studentList = [...studentResults];
@@ -986,7 +1038,9 @@ export default {
 
       for (var i = 0; i < questionList.length; i++) {
 
-        var correctAnswerValue = questionList[i].correctAnswer == "1" ? "✓" : questionList[i].correctAnswer == 2 ? "✗" : questionList[i].correctAnswer;
+        var correctAnswerValue =
+          questionList[i].questionType == 4 && questionList[i].correctAnswer == "1" ? "✓" :
+            questionList[i].questionType == 4 && questionList[i].correctAnswer == "2" ? "✗" : questionList[i].correctAnswer;
 
         var missCount = 0;
 
@@ -1019,10 +1073,11 @@ export default {
           minOptions = 2;
           optionNumList.push(2);
         }
+        if (questionList[i].questionType == 3) {
+          if (minOptions > 4) minOptions = 4;
+        }
       }
 
-      console.log(demoTestTranscript.questionTotal)
-
       show4Area = minOptions <= 4;
 
       show7Area = optionNumList.filter(o => o > 4 && o <= 7);
@@ -1052,7 +1107,8 @@ export default {
 
           var currentRow = areaList[row];
 
-          var correctAnswerValue = question.correctAnswer == "1" ? "✓" : question.correctAnswer == 2 ? "✗" : question.correctAnswer;
+          var correctAnswerValue = question.questionType == 4 && question.correctAnswer == "1" ? "✓" :
+            question.questionType == 4 && question.correctAnswer == "2" ? "✗" : question.correctAnswer;
 
           var details = question.details.filter(fl => {
             return fl.option.indexOf('未答') < 0;
@@ -1075,7 +1131,9 @@ export default {
 
               if (details.length <= 4) {
 
-                var questionOption = questionDetail ? (questionDetail.option == "1" ? "✓" : questionDetail.option == "2" ? "✗" : questionDetail.option) : "- -"
+                var questionOption = questionDetail ? (
+                  question.questionType == 4 && questionDetail.option == "1" ? "✓" :
+                    question.questionType == 4 && questionDetail.option == "2" ? "✗" : questionDetail.option) : "- -"
 
                 if (questionOption != "- -") questionOption += "(" + questionDetail.persent + ")";
 
@@ -1121,7 +1179,8 @@ export default {
 
             var currentRow = areaList[row];
 
-            var correctAnswerValue = question.correctAnswer == "1" ? "✓" : question.correctAnswer == 2 ? "✗" : question.correctAnswer;
+            var correctAnswerValue = question.questionType == 4 && question.correctAnswer == "1" ? "✓" :
+              question.questionType == 4 && question.correctAnswer == "2" ? "✗" : question.correctAnswer;
 
             for (var ilr = 0; ilr < 9; ilr++) {
 
@@ -1177,7 +1236,8 @@ export default {
 
             var currentRow = areaList[row];
 
-            var correctAnswerValue = question.correctAnswer == "1" ? "✓" : question.correctAnswer == 2 ? "✗" : question.correctAnswer;
+            var correctAnswerValue = question.questionType == 4 && question.correctAnswer == "1" ? "✓" :
+              question.questionType == 4 && question.correctAnswer == "2" ? "✗" : question.correctAnswer;
 
             for (var ilr = 0; ilr < 12; ilr++) {
 
@@ -1281,8 +1341,12 @@ export default {
           return item.option != "未答";
         });
 
+        if (item.questionType == 4) {
+          item.correctAnswer = item.correctAnswer == 1 ? "✓" : "✗"
+        }
+
         optionsList.map((items, index) => {
-          if (index != 4) {
+          if (index < maxOption - 1) {
             params["count" + index] =
               defaultArr[index]?.option != "未答"
                 ? defaultArr[index]?.count
@@ -1291,11 +1355,12 @@ export default {
               defaultArr[index]?.option != "未答"
                 ? defaultArr[index]?.persent
                 : "";
+
             params["option" + index] =
               defaultArr[index]?.option != "未答"
-                ? defaultArr[index]?.option == 1
+                ? defaultArr[index]?.option == 1 && item?.questionType == 4
                   ? "✓"
-                  : defaultArr[index]?.option == 2
+                  : defaultArr[index]?.option == 2 && item?.questionType == 4
                     ? "✗"
                     : defaultArr[index]?.option
                 : "";
@@ -1304,7 +1369,7 @@ export default {
             items["title"] = "未答";
             params["count" + index] = lastOPtion?.count ?? "";
             params["persent" + index] = lastOPtion?.persent ?? "";
-            params["option" + index] = "?";
+            params["option" + index] = "未答";
           }
         });
 
@@ -1336,35 +1401,38 @@ export default {
 
       this.testPaperExamReportOptions = [...optionsList];
 
-      console.log(objective, subjective, summary, Number(objective.avg / objective.sum))
+      var examReport = this.examReport;
+
       this.testPaperExamReport.push({
         questionIndex: "汇总",
         questionType: "客观题",
         type: "colspan",
-        score: objective.sum,
-        avgScore: objective.avg == 0 ? 0 : Number(objective.avg).toFixed(2),
-        gradeScoringRate: objective.avg == 0 ? 0 : Number(objective.avg * 100 / objective.sum).toFixed(2),
+        knowledge: "",
+        score: examReport.objectiveScore.toFixed(2),
+        avgScore: examReport.objectiveAvgScore == 0 ? 0.00 : Number(examReport.objectiveAvgScore).toFixed(2),
+        gradeScoringRate: examReport.objectiveRate == 0 ? 0.00 : Number(examReport.objectiveRate).toFixed(2),
         correctAnswer: "备注"
       })
 
       this.testPaperExamReport.push({
         questionIndex: "主观题",
         type: "colspan",
-        knowledge: subjective.sum,
-        score: subjective.avg == 0 ? 0 : Number(subjective.avg).toFixed(2),
-        avgScore: subjective.avg == 0 ? 0 : Number(subjective.avg * 100 / subjective.sum).toFixed(2)
+        knowledge: examReport.subjectiveScore == 0 ? 0.00 : Number(examReport.subjectiveScore).toFixed(2),
+        score: examReport.subjectiveAvgScore == 0 ? 0.00 : Number(examReport.subjectiveAvgScore).toFixed(2),
+        avgScore: examReport.subjectiveRate == 0 ? 0.00 : Number(examReport.subjectiveRate).toFixed(2)
       })
 
       this.testPaperExamReport.push({
         questionIndex: "合计",
         type: "colspan",
-        knowledge: summary.sum,
-        score: summary.avg == 0 ? 0 : Number(summary.avg).toFixed(2),
-        avgScore: summary.avg == 0 ? 0 : Number(summary.avg * 100 / summary.sum).toFixed(2)
+        knowledge: examReport.examPaperScore.toFixed(2),
+        score: examReport.avg == 0 ? 0.00 : Number(examReport.avg).toFixed(2),
+        avgScore: examReport.rate == 0 ? 0.00 : Number(examReport.rate).toFixed(2)
       })
     },
     async _testStudentExamReport() {
       this.testStudentExamReport = [];
+
       if (!this.checkedClassInfos || this.checkedClassInfos?.length <= 0) return;
 
       const request = this.$request.gStudentExamReport;
@@ -1427,7 +1495,6 @@ export default {
         return item;
       });
     },
-    _delete() { },
   },
 };
 </script>
diff --git a/src/views/basic/askTestQuestion/index.vue b/src/views/basic/askTestQuestion/index.vue
index 34e02f2..3a090c0 100644
--- a/src/views/basic/askTestQuestion/index.vue
+++ b/src/views/basic/askTestQuestion/index.vue
@@ -33,7 +33,7 @@
             <el-button type="primary" @click="_serach">
                 筛选
             </el-button>
-            <el-radio-group v-model="dateStatus" class="default-date-radio-group">
+            <el-radio-group v-model="query.dateStatus" class="default-date-radio-group">
                 <el-radio-button label="onDay">今天</el-radio-button>
                 <el-radio-button label="onWeek">本周</el-radio-button>
                 <el-radio-button label="onMonth">本月</el-radio-button>
@@ -73,7 +73,7 @@
                                                     <el-popconfirm style="color:gray !important;"
                                                         @confirm="_deleteDetermineQ(item.id)"
                                                         :title="dataType == 1 ? '确认删除此课件' : '确认删除此试卷'">
-                                                        <el-button style="color:#606266 !important;"
+                                                        <el-button class="small-button" :size="'small'" style="color:#606266 !important;"
                                                             @click.native="_delete(item.id)" type="text"
                                                             slot="reference">删除</el-button>
                                                     </el-popconfirm>
@@ -109,7 +109,7 @@
                                             <div class="pic" v-if="dataType == 2" style="margin-left: 44px;">
                                                 <img src="../../../assets/images/tishu.png" />
                                             </div>
-                                            <div class="text" v-if="dataType == 2"> 预计时长：</div>
+                                            <div class="text" v-if="dataType == 2"> 考试时长：</div>
                                             <div class="value" v-if="dataType == 2">{{ item.examsDuration }}
                                                 分钟
                                             </div>
@@ -159,11 +159,12 @@
                                             <el-dropdown-menu slot="dropdown">
                                                 <el-dropdown-item
                                                     @click.native="_detailQ(item.id)">查看</el-dropdown-item>
+                                                <el-dropdown-item @click.native="_copy(item)">复制</el-dropdown-item>
                                                 <el-dropdown-item>
                                                     <el-popconfirm style="color:gray !important;"
                                                         @confirm="_deleteDetermineQ(item.id)"
                                                         :title="dataType == 1 ? '确认删除此课件' : '确认删除此试卷'">
-                                                        <el-button style="color:#606266 !important;"
+                                                        <el-button class="small-button" :size="'small'" style="color:#606266 !important;"
                                                             @click.native="_delete(item.id)" type="text"
                                                             slot="reference">删除</el-button>
                                                     </el-popconfirm>
@@ -199,7 +200,7 @@
                                             <div class="pic" v-if="dataType == 2" style="margin-left: 44px;">
                                                 <img src="../../../assets/images/tishu.png" />
                                             </div>
-                                            <div class="text" v-if="dataType == 2"> 预计时长：</div>
+                                            <div class="text" v-if="dataType == 2"> 考试时长：</div>
                                             <div class="value" v-if="dataType == 2">{{ item.examsDuration }}
                                                 分钟
                                             </div>
@@ -231,45 +232,49 @@
             </div>
         </el-main>
         <el-footer class="el-footer-pagination">
-            <el-pagination @current-change="pageSizeChange" background layout="prev, pager, next" :size="listPage.size"
-                :current-page="listPage.page" :total="listPage.total">
+            <el-pagination @current-change="pageSizeChange" background layout="prev, pager, next"
+                :page-size="listPage.size" :current-page="listPage.page" :total="listPage.total">
             </el-pagination>
         </el-footer>
         <el-dialog :append-to-body="true" :close-on-click-modal="false" title="上传word文档" :visible.sync="diaUp"
             width="600px">
             <upload :url="url" :params="{ type: importType }" @upSuccess="upSuccess" fileName="下载">
                 <div class="down-box p0" slot="down">
-                    <p class="down-head" v-if="importType == 1">
-                        <span>第一步：</span>
-                        <!-- <el-link type="primary" @click="downExcel">下载模板,</el-link> -->
-                        <span>或者导出菁优网试卷/组卷网(学科网)试卷；
-                            为保证第三方试卷导入成功，请注意参考导出示例：</span>
+                    <div class="down-head" v-if="importType == 1">
+                        <span>第一步：
+                            导出菁优网试卷/组卷网(学科网)试卷；为保证第三方试卷导入成功，请注意参考导出示例：
+                        </span>
+                        <p> 菁优网示例如下：</p>
                         <span class="img-box">
                             <el-image class="img" :src="examplePic" :preview-src-list="examplePicList">
                             </el-image>
-                            菁优网示例 </span>/
+                        </span>
+                        <p> 组卷网(学科网)示例如下：</p>
                         <span class="img-box">
                             <el-image class="img" :src="examplePic2" :preview-src-list="examplePicList2">
                             </el-image>
-                            组卷网(学科网)示例。
                         </span>
-                    </p>
-                    <p class="down-head" v-if="importType == 2">
-                        <span>第一步：
-                            <el-link type="primary" @click="downExcel">下载模板,</el-link>
-                            导出菁优网试卷/组卷网(学科网)试卷；为保证第三方试卷导入成功，请注意参考导出示例：</span>
+                    </div>
+
+                    <div class="down-head" v-if="importType == 2">
+                        <span>
+                            第一步：
+                            <el-link type="primary" @click="downExcel">下载模板</el-link>，
+                            或者导出菁优网试卷/组卷网(学科网)试卷；为保证第三方试卷导入成功，请注意参考导出示例：
+                        </span>
+                        <p> 菁优网示例如下：</p>
                         <span class="img-box">
                             <el-image class="img" :src="examplePic" :preview-src-list="examplePicList">
                             </el-image>
-                            菁优网示例
+
                         </span>
-                        /
+                        <p> 组卷网(学科网)示例如下：</p>
                         <span class="img-box">
                             <el-image class="img" :src="examplePic2" :preview-src-list="examplePicList2">
                             </el-image>
-                            组卷网(学科网)示例。
+
                         </span>
-                    </p>
+                    </div> 
                     <p>第二步：上传完成编辑好的试卷。</p>
                 </div>
             </upload>
@@ -303,15 +308,15 @@ export default {
             sharedList: [],
             dataType: "1",
             importType: 0,
-            tabType: "0",
-            dateStatus: "-1",
+            tabType: "0", 
             url: "/api_html/common/paper/upload", //上传文档地址
             listPage: {
                 page: 1,
                 size: 8,
                 total: 0,
             },
-            query: {
+            query: {  
+                dateStatus: "-1",
                 title: "",
                 class: null,
                 subject: null,
@@ -334,18 +339,19 @@ export default {
             this.listPage.page = 1;
             this._serach();
         },
-        'dateStatus'(val) {
+        'query.dateStatus'(val) { 
             var dateRange = setDateRules(val);
+
             this.query.dateRange = [dateRange.startDay, dateRange.endDay];
         }
     },
-    async created() {
+    async created() { 
         this.dataType = location.href.endsWith("askPreparationQuestions") ? "1" : "2";
         this.code = this.$store.getters.csCode;
         this.role =
             this.$store.getters.info.showRole ||
             this.$store.getters.info.permissions[0].role;
-        this.dateStatus = "onWeek";
+        this.query.dateStatus = "onWeek"; 
         await this._loadQueryDatas();
     },
     methods: {
@@ -534,6 +540,8 @@ export default {
                 subjectName: "",
                 tagId: "",
                 title: "",
+                start: null,
+                end: null,
                 type: this.dataType, //试卷类型
                 share: this.tabType, //分享类型
             };
@@ -542,9 +550,10 @@ export default {
             queryParams.subjectName = this.query.subject;
             queryParams.tagId = this.query.tagId;
             queryParams.title = this.query.paper;
-            // queryParams.start = this.query.dateRange[0];
-            // queryParams.end = this.query.dateRange[1];
-
+            if (this.query?.dateRange?.length >= 2) {
+                queryParams.start = this.query.dateRange[0] ?? "";
+                queryParams.end = this.query.dateRange[1] ?? "";
+            }
             const { data, status, info } = await fetchPaperList({
                 ...queryParams,
                 status: 1,
@@ -560,7 +569,7 @@ export default {
             this.createdCount = data?.myCount || 0;
             this.sharedCount = data?.gradeCount || 0;
             this.listPage.total = data.total;
-
+            console.log('page', this.listPage)
             if (this.tabType == "0") {
                 this.defaultList = [];
                 if (data?.list) this.defaultList = [...data?.list];
@@ -696,7 +705,7 @@ export default {
         margin-top: 3px;
     }
 
-    width: 48.5%;
+    width: 48.4%;
     display: inline-block;
     margin-bottom: 10px;
     min-height: 190px;
diff --git a/src/views/basic/askTestQuestion/report.vue b/src/views/basic/askTestQuestion/report.vue
index 7394ec0..a103f96 100644
--- a/src/views/basic/askTestQuestion/report.vue
+++ b/src/views/basic/askTestQuestion/report.vue
@@ -4,18 +4,17 @@
       <div class="default-title">{{ dataType == "1" ? '随堂问报表' : '即时测报表' }}</div>
     </el-header>
     <div class="default-filter">
-      <!-- <el-input v-model="query.paper" placeholder="报表名称" suffix-icon="el-icon-search" class="filter-input" type="number"
-        clearable /> -->
       <el-select @change="_changeClass" v-model="query.class" class="filter-select" placeholder="选择班级">
         <el-option v-for="item in  classList " :key="item.classId" :label="item.className" :value="item.classId" />
       </el-select>
       <el-select v-model="query.subject" v-if="role == 'ROLE_JIAOSHI'" placeholder="选择科目" class="filter-select">
-        <el-option v-for=" item in subjectList" :key="item" :label="item" :value="item" />
+        <el-option v-for="item in subjectList" :key="item" :label="item" :value="item" />
       </el-select>
-      <el-select v-model="query.subjects" style="width: 18%;" collapse-tags v-if="role == 'ROLE_BANZHUREN'" multiple placeholder="选择科目"
-        class="filter-select">
-        <el-option v-for="item in subjectList" :key="item" :label="item" :value="item">
-          <!-- <el-checkbox :checked="checkedSubject.indexOf(item) >= 0" @click="subjectCheck(item)">{{ item }}</el-checkbox> -->
+      <el-select v-model="query.subjects" multiple popper-class="select-popover-class" v-if="role == 'ROLE_BANZHUREN'"
+        placeholder="选择科目" collapse-tags class="filter-select" style="width: 18%;">
+        <el-checkbox :value="selectAll" @change="selectAllHandle">全部科目</el-checkbox>
+        <el-option v-for="(item, index) in subjectList" :key="index" :value="item" :label="item">
+          <el-checkbox :value="query.subjects.includes(item)" :label="item" />
         </el-option>
       </el-select>
       <el-date-picker class="filter-datePicker" @change="_dateChange" v-model="query.dateRange" type="daterange"
@@ -31,29 +30,29 @@
     <el-main>
       <div style="position: relative">
         <el-tabs v-model="tabType" v-loading="queryLoading" type="card" class="default-tabs" :key="tabIndexs">
-          <el-tab-pane v-if="dataType == 1 && role == 'ROLE_JIAOSHI'" :name="'0'" :label="`阶段报表`">
+          <el-tab-pane v-if="dataType == 1 && role == 'ROLE_JIAOSHI'" :name="'0'" :label="`单课时报表`">
+            <askListReport v-if="apiDatas.askReportList" :datas="apiDatas.askReportList" @opration="_serach" />
+          </el-tab-pane>
+          <el-tab-pane v-if="dataType == 1 && role == 'ROLE_JIAOSHI'" :name="'1'" :label="`阶段报表`">
             <askSummaryReport ref="askSummaryReport" v-if="apiDatas.askReportIds" :askReportIds="apiDatas.askReportIds"
               :queryParams="query" />
           </el-tab-pane>
-          <el-tab-pane v-if="dataType == 1 && role == 'ROLE_JIAOSHI'" :name="'1'" :label="`单课时报表`">
-            <askListReport v-if="apiDatas.askReportList" :datas="apiDatas.askReportList" @opration="_serach" />
-          </el-tab-pane>
           <el-tab-pane v-if="dataType == 1 && role == 'ROLE_BANZHUREN' && query.status == 'multi'" :name="'0'"
             :label="`多科表现`" :queryParams="query">
             <askBzrMulti v-if="apiDatas.askReportIds" :askReportIds="apiDatas.askReportIds" :queryParams="query" />
           </el-tab-pane>
           <el-tab-pane v-if="dataType == 1 && role == 'ROLE_BANZHUREN' && query.status == 'single'" :name="'1'"
             :label="`单科表现`" :queryParams="query">
-            <askSummaryReport :role="role" ref="askSummaryReport" v-if="apiDatas.askReportIds" :askReportIds="apiDatas.askReportIds"
-              :queryParams="query" />
+            <askSummaryReport :role="role" ref="askSummaryReport" v-if="apiDatas.askReportIds"
+              :askReportIds="apiDatas.askReportIds" :queryParams="query" />
+          </el-tab-pane>
+          <el-tab-pane v-if="dataType == 2 && role == 'ROLE_JIAOSHI'" :name="'0'" :label="`单卷报表`">
+            <testListReport :datas="apiDatas.testReportList" @opration="_serach" />
           </el-tab-pane>
-          <el-tab-pane v-if="dataType == 2 && role == 'ROLE_JIAOSHI'" :name="'0'" :label="`阶段报表`">
+          <el-tab-pane v-if="dataType == 2 && role == 'ROLE_JIAOSHI'" :name="'1'" :label="`阶段报表`">
             <testSummaryReport v-if="apiDatas.testReportIds" :testReportIds="apiDatas.testReportIds"
               @headerClick="_headerClick" :queryParams="query" />
           </el-tab-pane>
-          <el-tab-pane v-if="dataType == 2 && role == 'ROLE_JIAOSHI'" :name="'1'" :label="`单卷报表`">
-            <testListReport :datas="apiDatas.testReportList" @opration="_serach" />
-          </el-tab-pane>
           <el-tab-pane v-if="dataType == 2 && role == 'ROLE_JIAOSHI'" :name="'2'" :label="`多班对比报表`">
             <testMultiClassReport :params="query" />
           </el-tab-pane>
@@ -65,7 +64,7 @@
           <el-tab-pane v-if="dataType == 2 && role == 'ROLE_BANZHUREN' && query.status == 'single'" :name="'1'"
             :label="`单科表现`">
             <testSummaryReport v-if="apiDatas.testReportIds" :role="role" :list="apiDatas.testReportList"
-              :testReportIds="apiDatas.testReportIds" :queryParams="query" />
+              :testReportIds="apiDatas.testReportIds" :queryParams="query" @headerClick="_headerClick" />
           </el-tab-pane>
           <div slot="tab-bar">
             <el-button type="primary" icon="el-icon-plus">新增</el-button>
@@ -127,7 +126,7 @@ export default {
     };
   },
   watch: {
-    'dateStatus'(val) {
+    'dateStatus' (val) {
       if (val == -1) return;
       var dateRange = setDateRules(val);
       this.query.dateRange = [dateRange.startDay, dateRange.endDay];
@@ -136,15 +135,10 @@ export default {
       this.dataType = location.href.endsWith("askReport") ? "1" : "2";
       this._loadQueryDatas();
     },
-    'dataType'() {
-      if (this.dataType == "1") {
-        this.tabType = "0"
-      }
-      else if (this.dataType == "2") {
-        this.tabType = "0"
-      }
+    'query'(value) {
+
     },
-    async 'query.subjects'(value) {
+    async 'query.subjects' (value) {
       if (this.role == "ROLE_BANZHUREN") {
         if (value.length == 1 && value[0] != '全部科目') {
           this.query.status = 'single';
@@ -153,7 +147,10 @@ export default {
         }
         else {
           this.query.status = 'multi';
-          this.tabType = '0';
+          if (this.role == 'ROLE_BANZHUREN')
+            this.tabType = '0';
+          else
+            this.tabType = '1';
           await this._serach();
         }
       }
@@ -169,13 +166,19 @@ export default {
     this.dateStatus = "onWeek";
     await this._loadQueryDatas();
   },
+  computed: {
+    selectAll() {
+      return this.query?.subjects?.filter(f => f != '全部科目').length === this.subjectList.length;
+    }
+  },
   methods: {
-    _opr() {
-      alert('opr');
-    },
     _dateChange() {
       this.dateStatus = -1;
     },
+    selectAllHandle() {
+      if (this.selectAll) this.query.subjects = [];
+      else this.query.subjects = [...this.subjectList]
+    },
     async _ReScore() {
       //重新记分 
       let { data, info, status } = await this.$request.reScore({
@@ -210,9 +213,7 @@ export default {
         return;
       }
       this.subjectList = data?.subjectNames ?? [];
-      if (this.role == "ROLE_BANZHUREN") {
-        this.subjectList.unshift("全部科目");
-      }
+
       this.query.subject = data?.subjectNames[0] ?? "";
       this.checkedSubject = [...this.subjectList];
       this.query.subjects = this.checkedSubject;
@@ -263,7 +264,6 @@ export default {
       else {
         queryParams.subjectNames = [this.query.subject];
       }
-      console.log(queryParams, this.query.subject)
 
       queryParams.startDay = this.query.dateRange
         ? this.query.dateRange[0]
@@ -287,7 +287,9 @@ export default {
           this.$message.error(askReportResponse.info);
           return;
         }
+        
         this.apiDatas.askReportList = [...askReportResponse?.data?.list ?? []];
+
         this.apiDatas.askReportIds = [... this.apiDatas?.askReportList?.map((item) => item.id) ?? []];
 
         if (this.$refs["askSummaryReport"]) {
@@ -367,6 +369,22 @@ export default {
 };
 </script>
 <style lang="scss">
+/* 控制全选按钮样式 */
+.select-popover-class .el-scrollbar__view>.el-checkbox {
+  padding: 5px 20px;
+}
+
+/* 取消多选框触发事件 */
+.select-popover-class .el-scrollbar__view>li .el-checkbox {
+  pointer-events: none;
+}
+
+/* 隐藏多选框选中勾选样式 √ */
+.select-popover-class .el-scrollbar__view>li::after {
+  display: none;
+}
+
+
 .el-tabs__content {
   padding-left: 20px !important;
   padding-right: 0px !important;
diff --git a/src/views/basic/askTestQuestion/update.vue b/src/views/basic/askTestQuestion/update.vue
index 61d3e1d..1684b87 100644
--- a/src/views/basic/askTestQuestion/update.vue
+++ b/src/views/basic/askTestQuestion/update.vue
@@ -47,7 +47,7 @@
                   <div class="bigQuestionTitle" v-if="paperType != 1">
                     {{ question.questionTitle }}
                     (共{{ question.subQuestions.filter(subQuestion => subQuestion &&
-              subQuestion.questionId && subQuestion.questionType).length }}小题，
+              subQuestion.questionIndex && subQuestion.questionType).length }}小题，
                     共{{ question.score }}分)
                   </div>
                   <div v-if="paperType == 2 && index == 0" class="courseware-title sub-questions">
@@ -61,9 +61,9 @@
                   </div>
 
                   <div class="courseware-content sub-questions" v-if="subQuestion &&
-              subQuestion.questionId && subQuestion.questionType && question.subQuestions"
+              subQuestion.questionIndex && subQuestion.questionType && question.subQuestions"
                     v-for="(subQuestion, subIndex) in question.subQuestions">
-                    <div class="qs-num">{{ subQuestion.questionId }}</div>
+                    <div class="qs-num">{{ subQuestion.questionIndex }}</div>
                     <div class="qs-stem">
                       <iframe style="height: 100% !important" class="screenshot" :src="subQuestion.screenshot"></iframe>
                     </div>
@@ -108,7 +108,7 @@
                         <span class="answer-s answer-opration" v-if="!isViewer"
                           @click="openStem(subQuestion, 4, index, subIndex)">+</span>
                         <span class="answer-s answer-opration" v-if="!isViewer"
-                          @click="openStem(subQuestion, 4, index, subIndex)">-</span>
+                          @click="openStem(subQuestion, 5, index, subIndex)">-</span>
                       </p>
                       <p v-if="subQuestion.questionType == 2" class="answer-box">
                         <template :disabled="isViewer" v-for="option in subQuestion.answerOptions.split(',')">
@@ -134,18 +134,18 @@
                         <el-button class="icon-tickets" type="text"
                           @click="openStem(subQuestion, 2, index, subIndex)">修改解析</el-button>
                       </div>
-                      <div class="qs-set" v-if="false">
+                      <div class="qs-set">
                         <el-button type="text" @click="openKnowledge(subQuestion, index, subIndex)">修改知识点</el-button>
                       </div>
-                      <div class="qs-set" style="margin-left:10px">
+                      <div class="qs-set">
                         <el-popconfirm @confirm="_deleteDetermineQ(subIndex, index)" title="这是一小题确定删除吗？">
-                          <!-- <el-button style="color:red" type="text" slot="reference">删除</el-button> -->
+                          <!-- <el-button style="color:red; " type="text" slot="reference">删除</el-button> -->
                         </el-popconfirm>
                       </div>
                     </div>
                   </div>
                   <div v-if="!question.subQuestions" class="courseware-content sub-questions">
-                    <div class="qs-num">{{ question.questionId }}</div>
+                    <div class="qs-num">{{ question.questionIndex }}</div>
                     <div class="qs-stem">
                       <iframe style="height: 100% !important" class="screenshot" :src="question.screenshot"></iframe>
                     </div>
@@ -206,10 +206,10 @@
                         <el-button class="icon-tickets" type="text"
                           @click="openStem(question, 2, index, 0)">修改解析</el-button>
                       </div>
-                      <div class="qs-set" v-if="false">
+                      <div class="qs-set">
                         <el-button type="text" @click="openKnowledge(question, index, 0)">修改知识点</el-button>
                       </div>
-                      <div class="qs-set" style="margin-left:10px">
+                      <div class="qs-set">
                         <el-popconfirm @confirm="_deleteDetermineQ(0, index)" title="这是一小题确定删除吗？">
                           <!-- <el-button style="color:red" type="text" slot="reference">删除</el-button> -->
                         </el-popconfirm>
@@ -221,28 +221,28 @@
             </div>
           </div>
         </div>
-        <el-dialog :close-on-click-modal="false" title="选择班级分享" :visible.sync="classSharingType" width="800"
-          :modal-append-to-body="false" :append-to-body="true">
-          <div>
+        <el-dialog title="选择班级分享" :visible.sync="classSharingType" width="800" :close-on-click-modal="false"
+          :append-to-body="true">
+          <div :key="classSharingType">
             <el-row class="row-subfix">
               <div class="row-line">
                 <span class="line-subfix">年级：</span>
                 <span class="line-value">{{ gradeName }}</span>
               </div>
             </el-row>
-            <el-row class="row-subfix" style="margin-top: 20px;">
+            <el-row v-if="gradeClass.length >= 1" class="row-subfix" style="margin-top: 20px;">
               <span class="line-subfix" style="float: left;">班级：</span>
               <div class="row-line" style="float: left;
               background:rgb(245,247,250);padding:15px 10px;width: calc(100% - 80px);border-radius:5px;">
                 <span class="line-value" style="min-height: 300px;border-radius: 4px; background: rgb(247,247,250);">
                   <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
                     @change="handleCheckAllChange">全选</el-checkbox>
-                  <el-checkbox-group v-model="checkedClass" style="margin-top: 15px;"
-                    @change="handleCheckedClassChange">
-                    <el-checkbox v-for="(item, index) in gradeClass" :label="item.id" :key="item.id">
+                  <div>
+                    <el-checkbox @change="handleCheckedClassChange" v-model="item.isChecked" :key="index"
+                      v-for="(item, index) in gradeClass" :label="item.id">
                       {{ item.className }}
                     </el-checkbox>
-                  </el-checkbox-group>
+                  </div>
                 </span>
               </div>
             </el-row>
@@ -323,23 +323,9 @@
           </div>
         </el-dialog>
         <el-dialog :append-to-body="true" :close-on-click-modal="false" title="知识点" :visible.sync="dialogKnowledge"
-          width="500px">
-          <div>
-            <el-form ref="form" :model="stem" label-width="160px">
-              <el-form-item label="知识点：">
-                <el-cascader size="small" filterable :show-all-levels="false" clearable placeholder="选择知识点"
-                  v-model="stem.knowledge" :options="knowledgeData" :props="{
-              expandTrigger: 'hover',
-              multiple: true,
-              checkStrictly: true,
-            }"></el-cascader>
-              </el-form-item>
-            </el-form>
-          </div>
-          <div slot="footer">
-            <el-button @click="dialogKnowledge = false">取 消</el-button>
-            <el-button type="primary" @click="setKnowledge">确 定</el-button>
-          </div>
+          width="60%">
+          <knowledgePoints :key="dialogKnowledge" @opration="knowledgeOpration" :sectionName="stem.sectionName"
+            :subjectName="stem.subjectName" :knowledges="stem.knowledge" />
         </el-dialog>
       </div>
       <div class="content-fi">
@@ -352,7 +338,7 @@
 
 <script>
 import { deepClone, checkAnswer } from "utils";
-import knowledgeList from "assets/js/knowledgeList.js";
+import conf from "@/config/index";
 export default {
   data() {
     return {
@@ -409,7 +395,7 @@ export default {
       //v1.5
       dialogStem: false, //截图开关
       dialogKnowledge: false, //知识点开关
-      knowledgeList: { ...knowledgeList },
+      // knowledgeList: { ...knowledgeList },
       classList: [],
       stem: {
         type: 1,
@@ -420,7 +406,7 @@ export default {
         knowledge: [], //知识点
       },
       gradeClassList: [], //学段列表
-      uploadUrl: "/file/uploadImgToHtml",
+      // uploadUrl: "/file/uploadImgToHtml",
       iframeLoading: false,
       examType: 2,
     };
@@ -439,31 +425,22 @@ export default {
       }, 0);
       return Number(score).toFixed(2);
     },
-    // 知识点列表 根据学段-科目筛选
-    knowledgeData: function () {
-      let jsons = [];
-      if (this.form.gradeName && this.form.subjectName) {
-        let sectionName = "";
-        this.gradeClassList?.map((item) => {
-          if (this.form.gradeName == item.gradeName) {
-            sectionName = item.sectionName;
-          }
-        });
-        if (
-          sectionName &&
-          Object.keys(this.knowledgeList).includes(sectionName)
-        ) {
-          if (
-            Object.keys(this.knowledgeList[sectionName]).includes(
-              this.form.subjectName
-            )
-          ) {
-            jsons = this.knowledgeList[sectionName][this.form.subjectName];
-          }
-        }
+    uploadUrl: function () {
+      var requestUrl = '';
+
+      var ogrinUrl = '/file/uploadImgToHtml';
+
+      var baseUrl = conf.baseURL;
+
+      if (baseUrl == '/' && ogrinUrl.indexOf('/') == 0) {
+        requestUrl = ogrinUrl;
       }
-      return jsons;
-    },
+      else {
+        requestUrl = baseUrl + ogrinUrl
+      }
+
+      return requestUrl;
+    }
   },
   created() {
     this.role =
@@ -481,17 +458,47 @@ export default {
     this._GradeList();
   },
   methods: {
+    // 知识点
+    openKnowledge(obj, index, indexs) {
+      this.stem.index = index;
+      this.stem.indexs = indexs;
+      this.stem.knowledge = obj.knowledge;
+      if (this.form.gradeName && this.form.subjectName) {
+        var matchClass = this.gradeClassList.find((item) => {
+          if (this.form.gradeName == item.gradeName) {
+            return item.sectionName;
+          }
+        });
+        this.stem.sectionName = matchClass?.sectionName ?? "";
+        this.stem.subjectName = this.form.subjectName ?? "";
+      }
+      this.dialogKnowledge = true;
+    },
+    knowledgeOpration(target) {
+      if (target.opration == 'confirm') {
+        this.form.questionList[this.stem.index].
+          subQuestions[this.stem.indexs].knowledge = target.knowledges.join(",");
+        this.dialogKnowledge = false;
+      }
+      else {
+        this.dialogKnowledge = false;
+      }
+    },
     _checkedClass() {
+      this.checkedClass = this.gradeClass.filter(item => item.isChecked).map(imap => imap.id);
       this.classSharingType = false;
     },
     handleCheckAllChange(val) {
-      this.checkedClass = val ? this.gradeClass?.map(item => item.id) : [];
+      this.gradeClass.forEach(item => {
+        item.isChecked = val;
+      })
       this.isIndeterminate = false;
     },
-    handleCheckedClassChange(value) {
+    handleCheckedClassChange() {
+      var value = this.gradeClass.filter(item => item.isChecked);
       let checkedCount = value.length;
-      this.checkAll = checkedCount === this.checkedClass.length;
-      this.isIndeterminate = checkedCount > 0 && checkedCount < this.checkedClass.length;
+      this.checkAll = checkedCount === this.gradeClass.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.gradeClass.length;
     },
     async _selectClassSharingType() {
 
@@ -505,10 +512,16 @@ export default {
 
       if (classResponse.status != 0) {
         this.$message.error(classResponse.info);
+        return;
       }
 
-      this.gradeClass = [...classResponse.data];
-
+      this.gradeClass = [...classResponse.data.map(item => {
+        return {
+          isChecked: this.checkedClass.includes(item.id),
+          id: item.id,
+          className: item.className
+        }
+      })];
     },
     // v1.5
     //上传截图
@@ -594,25 +607,7 @@ export default {
     upError(res) {
       this.$message.error("上传失败");
     },
-    // 打开知识点
-    openKnowledge(obj, index, indexs) {
-      this.stem.index = index;
-      this.stem.indexs = indexs || 0;
-      this.stem.knowledge = (obj.knowledge && obj.knowledge.split("#")) || [];
-      this.dialogKnowledge = true;
-    },
-    // 选择知识点
-    setKnowledge() {
-      if (this.questionList[0]?.subQuestions) {
-        this.questionList[this.stem.index].subQuestions[
-          this.stem.indexs
-        ].knowledge = this.stem.knowledge.join("#");
-      } else {
-        this.questionList[this.stem.index].knowledge =
-          this.stem.knowledge.join("#");
-      }
-      this.dialogKnowledge = false;
-    },
+
     //end
 
     linkBack() {
@@ -893,7 +888,7 @@ export default {
         modifyPaper =
           this.role == "ROLE_PERSONAL"
             ? this.$request.pModifyPaper
-            : this.$request.modifyPaper;
+            : this.$request.pModifyPaperNew;
         params = {
           classIds: this.checkedClass,
           sharingType: this.form.sharingType,
@@ -936,7 +931,7 @@ export default {
           });
         }
       } else {
-        this.$message.error(message);
+        this.$message.error(info);
       }
     },
     async _QueryDetail() {
@@ -1384,11 +1379,12 @@ export default {
   }
 
   .qs-set {
-    width: 80px;
+    display: inline-block;
+    padding: 0px 5px;
   }
 
   .qs-oprations {
-    width: 300px;
+    width: 320px;
   }
 
   .qs-options {
diff --git a/src/views/basic/down/client.vue b/src/views/basic/down/client.vue
index a0523f6..33df151 100644
--- a/src/views/basic/down/client.vue
+++ b/src/views/basic/down/client.vue
@@ -19,12 +19,7 @@
         </div>
         <div class="down-box">
           <p class="txt">默认参数配置</p>
-          <el-button
-            class="down-btn"
-            type="primary"
-            @click="getAppDownloadUrl(false)"
-            >立即下载</el-button
-          >
+          <el-button class="down-btn" type="primary" @click="getAppDownloadUrl(false)">立即下载</el-button>
         </div>
       </div>
       <!-- <ul class="down-ul">
@@ -54,46 +49,35 @@
           <i class="fa fa-mail-reply-all"></i>
           <p>
             {{
-              `${type == 1 ? "参数设置" : formData.configName}`
-            }}
+            `${type == 1 ? "参数设置" : formData.configName}`
+          }}
           </p>
         </div>
       </div>
       <div class="form-box">
-        <el-form
-          ref="forms"
-          :model="formData"
-          :rules="ruleForm"
-          label-width="180px"
-        >
+        <el-form ref="forms" :model="formData" :rules="ruleForm" label-width="180px">
           <el-form-item label="配置名称：" prop="configName" v-if="type == 1">
             <el-col :span="12">
-              <el-input
-                v-model.trim="formData.configName"
-                placeholder="请填写配置名称"
-              ></el-input>
+              <el-input v-model.trim="formData.configName" placeholder="请填写配置名称"></el-input>
             </el-col>
           </el-form-item>
           <el-form-item label="主菜单设置：" prop="mainMenu">
             <el-checkbox-group v-model="formData.mainMenu" :max="4">
               <el-checkbox v-for="item in menuList" :label="item" :key="item">{{
-                item
-              }}</el-checkbox>
+            item
+          }}</el-checkbox>
             </el-checkbox-group>
           </el-form-item>
           <el-form-item label="弹出菜单组：" prop="popupMenu">
             <el-radio-group v-model="formData.popupMenu">
               <p class="popup-menu">
-                <el-radio :label="1"
-                  ><span>1：签到点名</span> <span> 2：导入导出</span>
-                  <span>3：班级管理</span> <span>4：系统设置</span></el-radio
-                >
+                <el-radio :label="1"><span>1：签到点名</span> <span> 2：导入导出</span>
+                  <span>3：班级管理</span> <span>4：系统设置</span></el-radio>
               </p>
               <p class="popup-menu popup-menu1">
                 <el-radio :label="2">
                   <span>1：签到点名</span> <span> 2：导入导出</span>
-                  <span>3：考试任务</span> <span>4：系统设置</span></el-radio
-                >
+                  <span>3：考试任务</span> <span>4：系统设置</span></el-radio>
               </p>
             </el-radio-group>
           </el-form-item>
@@ -101,56 +85,24 @@
             <el-col :span="12">
               <div class="silde-box">
                 <p class="silde-p">
-                  <span class="num" :style="{ left: formData.failedSet + '%' }"
-                    >{{ formData.failedSet }}%</span
-                  >
-                  <el-slider
-                    v-model="formData.failedSet"
-                    :show-tooltip="false"
-                  ></el-slider
-                  ><span class="txt" :style="{ left: formData.failedSet + '%' }"
-                    >不及格</span
-                  >
+                  <span class="num" :style="{ left: formData.failedSet + '%' }">{{ formData.failedSet }}%</span>
+                  <el-slider v-model="formData.failedSet" :show-tooltip="false"></el-slider><span class="txt"
+                    :style="{ left: formData.failedSet + '%' }">不及格</span>
                 </p>
                 <p class="silde-p">
-                  <span class="num" :style="{ left: formData.passSet + '%' }"
-                    >{{ formData.passSet }}%</span
-                  >
-                  <el-slider
-                    v-model="formData.passSet"
-                    :show-tooltip="false"
-                  ></el-slider
-                  ><span class="txt" :style="{ left: formData.passSet + '%' }"
-                    >及格</span
-                  >
+                  <span class="num" :style="{ left: formData.passSet + '%' }">{{ formData.passSet }}%</span>
+                  <el-slider v-model="formData.passSet" :show-tooltip="false"></el-slider><span class="txt"
+                    :style="{ left: formData.passSet + '%' }">及格</span>
                 </p>
                 <p class="silde-p">
-                  <span class="num" :style="{ left: formData.goodSet + '%' }"
-                    >{{ formData.goodSet }}%</span
-                  >
-                  <el-slider
-                    v-model="formData.goodSet"
-                    :show-tooltip="false"
-                  ></el-slider
-                  ><span class="txt" :style="{ left: formData.goodSet + '%' }"
-                    >良好</span
-                  >
+                  <span class="num" :style="{ left: formData.goodSet + '%' }">{{ formData.goodSet }}%</span>
+                  <el-slider v-model="formData.goodSet" :show-tooltip="false"></el-slider><span class="txt"
+                    :style="{ left: formData.goodSet + '%' }">良好</span>
                 </p>
                 <p class="silde-p">
-                  <span
-                    class="num"
-                    :style="{ left: formData.excellenSet + '%' }"
-                    >{{ formData.excellenSet }}%</span
-                  >
-                  <el-slider
-                    v-model="formData.excellenSet"
-                    :show-tooltip="false"
-                  ></el-slider
-                  ><span
-                    class="txt"
-                    :style="{ left: formData.excellenSet + '%' }"
-                    >优秀</span
-                  >
+                  <span class="num" :style="{ left: formData.excellenSet + '%' }">{{ formData.excellenSet }}%</span>
+                  <el-slider v-model="formData.excellenSet" :show-tooltip="false"></el-slider><span class="txt"
+                    :style="{ left: formData.excellenSet + '%' }">优秀</span>
                 </p>
               </div>
             </el-col>
@@ -161,14 +113,8 @@
               <el-radio :label="1">即时抢答</el-radio>
               <el-radio :label="2">老师选择</el-radio>
             </el-radio-group>
-            <el-input-number
-              v-show="formData.viesAnswerSet === 0"
-              size="small"
-              class="count-down"
-              v-model="formData.countdown"
-              :step="1"
-              :step-strictly="true"
-            ></el-input-number>
+            <el-input-number v-show="formData.viesAnswerSet === 0" size="small" class="count-down"
+              v-model="formData.countdown" :step="1" :step-strictly="true"></el-input-number>
             <span v-show="formData.viesAnswerSet == 0">秒</span>
           </el-form-item>
           <el-form-item label="抽答设置：" prop="ballotAnswerSet">
@@ -178,66 +124,28 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item label="单选题选项默认个数：" prop="singleChoiceNum">
-            <el-input-number
-              size="small"
-              class="count-down count-down2"
-              v-model="formData.singleChoiceNum"
-              :min="2"
-              :max="7"
-              :step="1"
-              :step-strictly="true"
-            ></el-input-number
-            >个
+            <el-input-number size="small" class="count-down count-down2" v-model="formData.singleChoiceNum" :min="2"
+              :max="7" :step="1" :step-strictly="true"></el-input-number>个
           </el-form-item>
           <el-form-item label="多选题选项默认个数：" prop="multipleChoiceNum">
-            <el-input-number
-              size="small"
-              class="count-down count-down2"
-              v-model="formData.multipleChoiceNum"
-              :min="2"
-              :max="7"
-              :step="1"
-              :step-strictly="true"
-            ></el-input-number
-            >个
+            <el-input-number size="small" class="count-down count-down2" v-model="formData.multipleChoiceNum" :min="2"
+              :max="7" :step="1" :step-strictly="true"></el-input-number>个
           </el-form-item>
           <el-form-item label="测—单题型默认题数：" prop="singleTypeNum">
-            <el-input-number
-              size="small"
-              class="count-down count-down2"
-              v-model="formData.singleTypeNum"
-              :min="2"
-              :max="25"
-              :step="1"
-              :step-strictly="true"
-            ></el-input-number
-            >个
+            <el-input-number size="small" class="count-down count-down2" v-model="formData.singleTypeNum" :min="2"
+              :max="25" :step="1" :step-strictly="true"></el-input-number>个
           </el-form-item>
           <el-form-item label="问—倒计时：" prop="askCountdown">
             <el-switch v-model="askCount" @change="askCountChange"> </el-switch>
-            <el-input-number
-              v-show="askCount"
-              size="small"
-              class="count-down"
-              v-model="formData.askCountdown"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-            ></el-input-number>
+            <el-input-number v-show="askCount" size="small" class="count-down" v-model="formData.askCountdown" :min="0"
+              :step="1" :step-strictly="true"></el-input-number>
             {{ askCount ? "秒" : "" }}
           </el-form-item>
           <el-form-item label="测—倒计时：" prop="viesAnswerSet">
             <el-switch v-model="examsDuration" @change="examsDurationChange">
             </el-switch>
-            <el-input-number
-              v-show="examsDuration"
-              size="small"
-              class="count-down"
-              v-model="formData.examsDuration"
-              :min="0"
-              :step="1"
-              :step-strictly="true"
-            ></el-input-number>
+            <el-input-number v-show="examsDuration" size="small" class="count-down" v-model="formData.examsDuration"
+              :min="0" :step="1" :step-strictly="true"></el-input-number>
             {{ examsDuration ? "分" : "" }}
           </el-form-item>
           <el-form-item label="答题结构展示：" prop="displayModel">
@@ -515,7 +423,7 @@ export default {
         this.$message.error(info);
       }
     },
-    async getAppDownloadUrl(configId) {
+    async getAppDownloadUrl(configId) { 
       const { data, status, info } = await this.$request.getAppDownloadUrl({
         configId: configId || "",
       });
@@ -539,49 +447,60 @@ export default {
   width: 100%;
   position: relative;
 }
+
 .page-content {
   padding: 30px;
+
   .content-top {
     padding: 20px 50px 20px 20px;
     display: flex;
     justify-content: space-between;
     align-items: center;
+
     .cont-info {
       flex: 1;
       display: flex;
       align-items: center;
+
       .logo {
         width: 140px;
         margin-right: 16px;
       }
+
       .name {
         font-size: 20px;
         color: #333;
         line-height: 24px;
         padding-bottom: 12px;
       }
+
       .txt {
         font-size: 15px;
         color: #7f7f7f;
         line-height: 25px;
       }
     }
+
     .down-box {
       width: 200px;
       text-align: center;
+
       .txt {
         font-size: 16px;
         padding-bottom: 8px;
       }
+
       .down-btn {
         font-size: 20px;
       }
     }
   }
+
   .down-ul {
     display: flex;
     flex-wrap: wrap;
     padding: 0 20px;
+
     .down-li {
       width: calc(50% - 12px);
       height: 72px;
@@ -594,22 +513,27 @@ export default {
       border-radius: 10px;
       background: #f8f8f8;
       box-shadow: 2px 2px 5px #ccc;
+
       &:nth-child(2n) {
         margin-right: 0;
       }
+
       font-size: 16px;
       color: #667ffd;
+
       .p1 {
         cursor: pointer;
       }
     }
   }
 }
+
 :deep(.el-button.is-round) {
   width: 120px;
   text-align: center;
   padding: 10px 0;
 }
+
 .edit-dia {
   position: absolute;
   left: 0;
@@ -620,6 +544,7 @@ export default {
   height: calc(100vh - 80px);
   background: #fff;
   overflow-y: auto;
+
   .back {
     width: 100%;
     height: 56px;
@@ -628,6 +553,7 @@ export default {
     align-items: center;
     padding: 0 20px;
     box-sizing: border-box;
+
     .back-l {
       display: flex;
       align-items: center;
@@ -636,26 +562,33 @@ export default {
       font-size: 18px;
       font-weight: 500;
     }
+
     .fa-mail-reply-all {
       font-size: 28px;
       color: #b3b3b3;
       margin-right: 12px;
     }
   }
+
   .form-box {
     padding: 20px;
+
     .popup-menu {
       padding-bottom: 16px;
+
       span {
         padding-right: 12px;
       }
     }
+
     .popup-menu1 {
       padding-bottom: 0;
     }
+
     .count-down {
       width: 48px;
       margin: 0 8px 0 20px;
+
       :deep(.el-input__inner) {
         width: 48px;
         height: 32px;
@@ -664,25 +597,31 @@ export default {
         border-color: #667ffd;
         padding: 0;
       }
+
       :deep(.el-input-number__decrease) {
         display: none;
       }
+
       :deep(.el-input-number__increase) {
         display: none;
       }
     }
+
     .count-down2 {
       margin-left: 0;
     }
+
     .silde-box {
       position: relative;
       width: 100%;
       height: 60px;
+
       .silde-p {
         width: 100%;
         position: absolute;
         padding-top: 20px;
-        & > span {
+
+        &>span {
           position: absolute;
           width: 48px;
           text-align: center;
@@ -690,19 +629,24 @@ export default {
           flex-shrink: 0;
           font-size: 12px;
         }
+
         :deep(.el-slider) {
           flex: 1;
         }
+
         :deep(.el-slider__runway) {
           margin: 5px 0;
         }
+
         :deep(.el-slider__runway) {
           background-color: #409eff;
         }
+
         .num {
           top: 0;
           transform: translateX(-24px);
         }
+
         .txt {
           bottom: -20px;
           transform: translateX(-24px);
diff --git a/src/views/basic/setUp/clazz.vue b/src/views/basic/setUp/clazz.vue
index 6bf9396..7cccb40 100644
--- a/src/views/basic/setUp/clazz.vue
+++ b/src/views/basic/setUp/clazz.vue
@@ -82,9 +82,12 @@
           <upload id="downTeacher" drag :url="url"
             style="border:rgb(219,226,235) dashed 1px;margin:0px auto;width: 80%;padding:40px 0px;border-radius: 5px;"
             @upSuccess="upSuccess" fileName="班级名单">
-            <p class="down-txt" slot="down">
-              通过Excel名单导入班级名单模板
-            </p>
+            <div class="down-txt" slot="down" style="padding: 0px !important;">
+              <span style="text-align: center;margin:0px auto;">通过Excel名单导入班级名单模板</span>
+            </div>
+            <div class="down-txt" slot="descption" style="padding: 0px !important;">
+              <span style="text-align: center;margin:0px auto;color:red;">为避免导入班级类型出错，上传文件的名称必须包含“行政班”或“教学班”。</span>
+            </div>
           </upload>
         </el-row>
       </div>
diff --git a/src/views/basic/setUp/student.vue b/src/views/basic/setUp/student.vue
index 3f764bd..6d10425 100644
--- a/src/views/basic/setUp/student.vue
+++ b/src/views/basic/setUp/student.vue
@@ -230,7 +230,7 @@
             @change="changeClazz()"
             placeholder="选择当前班级"
           >
-            <el-option
+            <el-option :key="index"
               v-for="(item, index) in formStuCla.classList"
               :label="item.className"
               :value="item.id"
diff --git a/src/views/basic/setUp/teacher.vue b/src/views/basic/setUp/teacher.vue
index c46d538..9244362 100644
--- a/src/views/basic/setUp/teacher.vue
+++ b/src/views/basic/setUp/teacher.vue
@@ -25,6 +25,12 @@
           <el-option label="行政班" :value="0"></el-option>
           <el-option label="教学班" :value="1"></el-option>
         </el-select>
+        <el-select class="sel" @change="_QueryData(5)" v-model="query.role" placeholder="选择角色">
+          <el-option disabled label="请选择" :value="9"></el-option>
+          <el-option label="年级组长" :value="'年级组长'"></el-option>
+          <el-option label="班主任" :value="'班主任'"></el-option>
+          <el-option label="任课老师" :value="'任课老师'"></el-option>
+        </el-select>
         <el-cascader size="small" class="sel sel2" clearable placeholder="选择范围" @change="_QueryData(1)"
           v-model="query.gradeClassSub" :options="gradeClassSubList" :props="{
         multiple: true,
@@ -59,19 +65,17 @@
             <el-checkbox v-show="showDel" v-model="AllTeacher" :indeterminate="indeterminate"
               @change="handleCheckAllChange">{{ "" }}</el-checkbox>
             <span class="txt">教师列表</span>
-            <el-popconfirm v-show="showDel" title="确定所选教师格式化吗？" @confirm="remove">
+            <el-popconfirm v-show="showDel" title="确定清除所选教师的任课信息吗？" @confirm="remove">
               <img slot="reference" class="clear" src="../../../assets/images/shuazi.svg" alt="" />
             </el-popconfirm>
           </p>
           <el-checkbox-group v-model="clearTeacher" @change="handleCheckedChange">
             <ul class="teacher-ul">
               <li class="teacher-item" v-for="item in teacherList" :key="item.id">
-                <el-checkbox v-show="showDel" :label="item.id">{{
-        ""
-      }}</el-checkbox>
+                <el-checkbox v-show="showDel" :label="item.id">{{ "" }}</el-checkbox>
                 <p class="name" :class="showTId == item.id ? 'active' : ''" @click="showTeacher(item)">
-                  {{ item.realName
-                  }}<template v-if="setClass(item)">（{{ setClass(item) }}）</template>
+                  {{ item.realName }}
+                  <template v-if="setClass(item)">（{{ setClass(item) }}）</template>
                 </p>
               </li>
             </ul>
@@ -97,6 +101,26 @@
       }}
             </p>
           </div>
+          <div class="grade-box" v-if="teacherDetail.teacherGradeList && teacherDetail.teacherGradeList.length">
+            <p class="h-title">年级组长</p>
+            <ul class="grade-info">
+              <li class="grade-li" v-for="item in teacherDetail.teacherGradeList" :key="item.classId">
+                <el-popconfirm title="确定删除吗？" @confirm="delTeacherManager(item, 0)" v-if="!code">
+                  <i class="el-icon-delete" slot="reference"></i>
+                </el-popconfirm>
+                <div class="grade-item">
+                  <p class="grade-name">
+                    {{ item.gradeName }}
+                  </p>
+                  <div class="grade-class">
+                    <p>
+                      <i class="fa fa-address-book-o"></i>学生：{{ item.studentNum }}个
+                    </p>
+                  </div>
+                </div>
+              </li>
+            </ul>
+          </div>
           <div class="grade-box" v-if="teacherDetail.managerList && teacherDetail.managerList.length">
             <p class="h-title">班主任</p>
             <ul class="grade-info">
@@ -119,9 +143,7 @@
               </li>
             </ul>
           </div>
-          <div class="grade-box" v-if="teacherDetail.teacherCourseList &&
-        teacherDetail.teacherCourseList.length
-        ">
+          <div class="grade-box" v-if="teacherDetail.teacherCourseList && teacherDetail.teacherCourseList.length">
             <p class="h-title">任课老师</p>
             <ul class="grade-info">
               <li class="grade-li" v-for="item in teacherDetail.teacherCourseList"
@@ -146,35 +168,6 @@
               </li>
             </ul>
           </div>
-          <!-- <div
-            class="grade-box"
-            v-if="
-              teacherDetail.teacherGradeList &&
-              teacherDetail.teacherGradeList.length
-            "
-          >
-            <p class="h-title">备课组长</p>
-            <ul
-              class="grade-info"
-              v-for="item in teacherDetail.teacherGradeList"
-              :key="item.grade"
-            >
-              <li class="grade-li">
-                <el-popconfirm
-                  title="确定删除吗？"
-                  @confirm="delTeacherManager(item, 3)"
-                  v-if="!code"
-                >
-                  <i class="el-icon-delete" slot="reference"></i>
-                </el-popconfirm>
-                <div class="grade-item">
-                  <p class="grade-name">
-                    {{ item.gradeName }}（{{ item.subjectName }}）
-                  </p>
-                </div>
-              </li>
-            </ul>
-          </div> -->
         </div>
       </div>
     </div>
@@ -213,27 +206,29 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item v-show="isAdd || (!isAdd && setTercherType == 2)" label="教师角色：" prop="roleList">
-          <div class="role-list" v-for="(item, index) in formTeacher.roleList" :key="item.id">
-            <el-select class="sel-c" v-model="item.roleId" placeholder="选择角色" @change="item.classId = []">
-              <el-option v-for="item in teacherRoleList" :key="item.value" :label="item.label" :value="item.value">
-              </el-option>
-            </el-select>
-            <el-cascader size="small" v-if="item.roleId == 6" class="sel-t" collapse clearable placeholder="选择年级-班级"
-              v-model="item.classId" :options="gradeClassList" :props="{ expandTrigger: 'hover' }"></el-cascader>
-            <el-cascader size="small" v-if="item.roleId == 7" class="sel-t teacher-cascader" collapse clearable
-              placeholder="选择年级-科目-班级" v-model="item.classId" :options="gradeSubListClass"
-              :props="{ expandTrigger: 'hover', multiple: true }" popperClass="cascader-clazz"></el-cascader>
-            <el-cascader size="small" v-if="item.roleId == 8" class="sel-t" collapse clearable placeholder="选择年级-科目"
-              v-model="item.classId" :options="gradeList" :props="{ expandTrigger: 'hover' }"></el-cascader>
-            <el-select   v-if="item.roleId == 3" v-model="item.gradeId" placeholder="选择年级">
-              <el-option v-for="item in gradeList" :key="item.value" :label="item.label" :value="item.value">
-              </el-option>
-            </el-select>
-            <i class="el-icon-close" @click="removeRoleList(index)"></i>
+          <div class="role-list-main">
+            <div class="role-list" v-for="(item, index) in formTeacher.roleList" :key="item.id">
+              <el-select class="sel-c" v-model="item.roleId" placeholder="选择角色" @change="item.classId = []">
+                <el-option v-for="item in teacherRoleList" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+              <el-cascader size="small" v-if="item.roleId == 6" class="sel-t" collapse clearable placeholder="选择年级-班级"
+                v-model="item.classId" :options="gradeClassList" :props="{ expandTrigger: 'hover' }"></el-cascader>
+              <el-cascader size="small" v-if="item.roleId == 7" class="sel-t teacher-cascader" collapse clearable
+                placeholder="选择年级-科目-班级" v-model="item.classId" :options="gradeSubListClass"
+                :props="{ expandTrigger: 'hover', multiple: true }" popperClass="cascader-clazz"></el-cascader>
+              <el-cascader size="small" v-if="item.roleId == 8" class="sel-t" collapse clearable placeholder="选择年级-科目"
+                v-model="item.classId" :options="gradeList" :props="{ expandTrigger: 'hover' }"></el-cascader>
+              <el-select v-if="item.roleId == 3" v-model="item.gradeId" placeholder="选择年级">
+                <el-option v-for="item in gradeList" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+              <i class="el-icon-close" @click="removeRoleList(index)"></i>
+            </div>
+            <p class="add-box">
+              <el-button icon="el-icon-plus" @click="addRoleList">添加</el-button>
+            </p>
           </div>
-          <p class="add-box">
-            <el-button icon="el-icon-plus" @click="addRoleList">添加</el-button>
-          </p>
         </el-form-item>
       </el-form>
       <div class="dialog-footer" slot="footer">
@@ -338,7 +333,7 @@ export default {
         ],
         sex: [{ required: true, message: "请选择性别", trigger: "blur" }],
         roleList: [
-          { required: true, message: "请选择角色信息", trigger: "blur" },
+          { required: false, message: "请选择角色信息", trigger: "blur" },
         ],
       },
 
@@ -549,21 +544,18 @@ export default {
       let ERR_OK = this.formTeacher.roleList.length > 0;
       if (ERR_OK) {
         let [managerList, teacherCourseList, gradeGroupList] = [[], [], []];
+        console.log(this.formTeacher.roleList)
         this.formTeacher.roleList.map((item) => {
           if (item.roleId == 6) {
             managerList.push({
               classId: item.classId[1],
-              className:
-                this.classList.find((items) => items.value == item.classId[1])
-                  ?.label || "",
+              className: this.classList.find((items) => items.value == item.classId[1])?.label || "",
             });
           } else if (item.roleId == 7) {
             item.classId.map((clazz) => {
               teacherCourseList.push({
                 classId: clazz[2],
-                className:
-                  this.classList.find((items) => items.value == clazz[2])
-                    ?.label || "",
+                className: this.classList.find((items) => items.value == clazz[2])?.label || "",
                 subjectName: clazz[1],
               });
             });
@@ -571,17 +563,8 @@ export default {
           else if (item.roleId == 3) {
             gradeGroupList.push({
               grade: item.gradeId
-            }) 
+            })
           }
-          // else {
-          //   gradeGroupList.push({
-          //     grade: item.classId[0],
-          //     gradeName:
-          //       this.gradeList.find((items) => items.id == item.classId[0])
-          //         ?.label || "",
-          //     subjectName: item.classId[1],
-          //   });
-          // }
         });
         return {
           managerList,
@@ -589,36 +572,29 @@ export default {
           gradeGroupList,
         };
       } else {
-        return false;
+        if (this.setTercherType == 2)
+          return false;
+        return true;
       }
     },
     //教师角色数据转换为form格式数据
     toTeacherForm() {
       this.formTeacher.roleList = [];
+      //班主任 
       this.formTeacher.managerList?.map((item) => {
         this.formTeacher.roleList.push({
           id: randomWord(true, 16, 20),
           roleId: 6,
-          classId: [
-            this.classList.find(
-              (items) =>
-                items.value == item.classId ||
-                items.label.includes(item.className)
-            )?.grade,
-            item.classId,
-          ],
+          classId: [item.grade, item.classId],
         });
       });
+      //任课老师
       let teacherClassId = [];
       this.formTeacher.teacherCourseList?.map((item) => {
         teacherClassId.push([
           item.grade,
           item.subjectName,
-          this.classList.find(
-            (items) =>
-              items.value == item.classId ||
-              items.label.includes(item.className)
-          ).value,
+          this.classList.find((items) => items.value == item.classId).value,
         ]);
       });
       if (teacherClassId.length) {
@@ -628,21 +604,25 @@ export default {
           classId: [...teacherClassId],
         });
       }
-      // this.formTeacher.gradeGroupList?.map((item) => {
-      //   this.formTeacher.roleList.push({
-      //     id: randomWord(true, 16, 20),
-      //     roleId: 8,
-      //     classId: [
-      //       this.gradeList.find((items) => items.id == item.classId[0]).id,
-      //       item.subjectName,
-      //     ],
-      //   });
-      // });
+      //年级组长
+      this.formTeacher.teacherGradeList?.map((item) => {
+        this.formTeacher.roleList.push({
+          id: randomWord(true, 16, 20),
+          roleId: 3,
+          gradeId: item.grade
+        });
+      });
+      console.log(this.formTeacher)
     },
     //删除教师角色
     async delTeacherManager(obj, type) {
       let query;
       switch (type) {
+        case 0:
+          query = {
+            garde: obj.grade,
+          };
+          break;
         case 1:
           query = {
             classId: obj.classId,
@@ -734,7 +714,8 @@ export default {
         this.query.phone = "";
         this.query.gradeClassSub = [];
         query.type = this.query.type;
-      } else {
+      }
+      else {
         query = { ...this.query };
         query.grades = [];
         query.classIds = [];
@@ -995,6 +976,7 @@ export default {
   }
 
   .teacher-list {
+
     width: 240px;
 
     .h-title {
@@ -1122,6 +1104,7 @@ export default {
           font-weight: bold;
           line-height: 18px;
           padding-bottom: 12px;
+          padding-right: 5px;
         }
 
         .grade-class {
@@ -1154,10 +1137,15 @@ export default {
   margin-right: 12px;
 }
 
+.role-list-main {
+  float: left;
+}
+
 .role-list {
   margin-bottom: 10px;
   position: relative;
 
+
   .sel-p {
     position: absolute;
     left: 146px;
diff --git a/src/views/basic/test/archiving.vue b/src/views/basic/test/archiving.vue
index ad647c0..34158ea 100644
--- a/src/views/basic/test/archiving.vue
+++ b/src/views/basic/test/archiving.vue
@@ -7,82 +7,33 @@
     </back-box>
     <div class="answer-header">
       <div class="sel-box">
-        <el-select
-          class="sel"
-          v-model="query.classId"
-          placeholder="选择班级"
-          @change="changeclass"
-        >
-          <el-option
-            v-for="item in classList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
+        <el-select class="sel" v-model="query.classId" placeholder="选择班级" @change="changeclass">
+          <el-option v-for="item in classList" :key="item.value" :label="item.label" :value="item.value">
           </el-option>
         </el-select>
-        <el-select
-          v-if="role == 'ROLE_BANZHUREN'"
-          class="sel"
-          multiple
-          v-model="query.subjectNames"
-          placeholder="选择科目"
-          @change="changeSub"
-        >
-          <el-option
-            v-for="item in subjectList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
+        <el-select v-if="role == 'ROLE_BANZHUREN'" class="sel" multiple v-model="query.subjectNames" placeholder="选择科目"
+          @change="changeSub">
+          <el-option v-for="item in subjectList" :key="item.value" :label="item.label" :value="item.value">
           </el-option>
         </el-select>
-        <el-select
-          v-else
-          class="sel"
-          v-model="query.subjectNames"
-          placeholder="选择科目"
-        >
-          <el-option
-            v-for="item in subjectList"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
+        <el-select v-else class="sel" v-model="query.subjectNames" placeholder="选择科目">
+          <el-option v-for="item in subjectList" :key="item.value" :label="item.label" :value="item.value">
           </el-option>
         </el-select>
         <div class="d1">
-          <el-date-picker
-            v-model="query.startDay"
-            type="date"
-            @change="handleChangeTimeStart"
-            placeholder="选择日期时间"
-            value-format="yyyy-MM-dd"
-          >
+          <el-date-picker v-model="query.startDay" type="date" @change="handleChangeTimeStart" placeholder="选择日期时间"
+            value-format="yyyy-MM-dd">
           </el-date-picker>
           ~
-          <el-date-picker
-            v-model="query.endDay"
-            type="date"
-            placeholder="选择日期时间"
-            @change="handleChangeTimeEnd"
-            value-format="yyyy-MM-dd"
-          >
+          <el-date-picker v-model="query.endDay" type="date" placeholder="选择日期时间" @change="handleChangeTimeEnd"
+            value-format="yyyy-MM-dd">
           </el-date-picker>
         </div>
         <p class="p1">
-          <span @click="setDate(1)" :class="[date == 1 ? 'active' : '', 's1']"
-            >今天</span
-          >
-          <span @click="setDate(2)" :class="[date == 2 ? 'active' : '', 's1']"
-            >本周</span
-          >
-          <span @click="setDate(3)" :class="[date == 3 ? 'active' : '', 's1']"
-            >本月</span
-          >
-          <span @click="setDate(4)" :class="[date == 4 ? 'active' : '', 's1']"
-            >本季度</span
-          >
+          <span @click="setDate(1)" :class="[date == 1 ? 'active' : '', 's1']">今天</span>
+          <span @click="setDate(2)" :class="[date == 2 ? 'active' : '', 's1']">本周</span>
+          <span @click="setDate(3)" :class="[date == 3 ? 'active' : '', 's1']">本月</span>
+          <span @click="setDate(4)" :class="[date == 4 ? 'active' : '', 's1']">本季度</span>
         </p>
         <el-button type="primary" round @click="_QueryData()">筛选</el-button>
       </div>
@@ -104,71 +55,39 @@
       </el-radio-group> -->
       <div v-show="tabIndex == 1" v-loading="loading">
         <el-table :data="tableData" border style="width: 100%">
-          <el-table-column
-            prop="title"
-            label="试卷名称"
-            fixed
-            align="center"
-          ></el-table-column>
-          <el-table-column
-            prop="examPaperScore"
-            label="卷面分"
-            align="center"
-            width="68"
-          ></el-table-column>
-          <el-table-column prop="answeredNum" label="测验人数" align="center"
-            ><template slot-scope="scoped">{{
-              `${scoped.row.answeredNum}/${scoped.row.classPersonNum}`
-            }}</template></el-table-column
-          >
-          <el-table-column
-            prop="examStartTime"
-            label="测验时间"
-            width="100"
-            align="center"
-          ></el-table-column>
-          <el-table-column prop="avgScore" label="班平均分" align="center"
-            ><template slot-scope="scoped">{{
-              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                scoped.row.answerNum == 0) &&
+          <el-table-column prop="title" label="试卷名称" fixed align="center"></el-table-column>
+          <el-table-column prop="examPaperScore" label="卷面分" align="center" width="68"></el-table-column>
+          <el-table-column prop="answeredNum" label="测验人数" align="center"><template slot-scope="scoped">{{
+          `${scoped.row.answeredNum}/${scoped.row.classPersonNum}`
+        }}</template></el-table-column>
+          <el-table-column prop="examStartTime" label="测验时间" width="100" align="center"></el-table-column>
+          <el-table-column prop="avgScore" label="班平均分" align="center"><template slot-scope="scoped">{{
+            (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+              scoped.row.answerNum == 0) &&
               scoped.row.recordStatus == 0
-                ? "-"
-                : scoped.row.avgScore
-            }}</template></el-table-column
-          >
-          <el-table-column prop="highestScore" label="班最高分" align="center"
-            ><template slot-scope="scoped">{{
-              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                scoped.row.answerNum == 0) &&
+              ? "-"
+              : scoped.row.avgScore
+          }}</template></el-table-column>
+          <el-table-column prop="highestScore" label="班最高分" align="center"><template slot-scope="scoped">{{
+            (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+              scoped.row.answerNum == 0) &&
               scoped.row.recordStatus == 0
-                ? "-"
-                : scoped.row.highestScore
-            }}</template></el-table-column
-          >
-          <el-table-column prop="lowestScore" label="班最低分" align="center"
-            ><template slot-scope="scoped">{{
-              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                scoped.row.answerNum == 0) &&
+              ? "-"
+              : scoped.row.highestScore
+          }}</template></el-table-column>
+          <el-table-column prop="lowestScore" label="班最低分" align="center"><template slot-scope="scoped">{{
+            (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+              scoped.row.answerNum == 0) &&
               scoped.row.recordStatus == 0
-                ? "-"
-                : scoped.row.lowestScore
-            }}</template></el-table-column
-          >
-          <el-table-column
-            prop="excellenRate"
-            label="优秀数(率)"
-            sortable
-            align="center"
-            width="110"
-            class-name="p0"
-            ><template slot-scope="scoped">
-              <p
-                v-if="
-                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                    scoped.row.answerNum == 0) &&
-                  scoped.row.arecordStatus == 0
-                "
-              >
+              ? "-"
+              : scoped.row.lowestScore
+          }}</template></el-table-column>
+          <el-table-column prop="excellenRate" label="优秀数(率)" sortable align="center" width="110"
+            class-name="p0"><template slot-scope="scoped">
+              <p v-if="(scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+            scoped.row.answerNum == 0) &&
+          scoped.row.arecordStatus == 0
+          ">
                 "-"
               </p>
               <template v-else>
@@ -177,23 +96,13 @@
                   {{ `（${scoped.row.excellenRate}%）` }}
                 </p>
               </template>
-            </template></el-table-column
-          >
-          <el-table-column
-            prop="goodRate"
-            label="良好数(率)"
-            sortable
-            align="center"
-            width="110"
-            class-name="p0"
-            ><template slot-scope="scoped">
-              <p
-                v-if="
-                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                    scoped.row.answerNum == 0) &&
-                  scoped.row.arecordStatus == 0
-                "
-              >
+            </template></el-table-column>
+          <el-table-column prop="goodRate" label="良好数(率)" sortable align="center" width="110" class-name="p0"><template
+              slot-scope="scoped">
+              <p v-if="(scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+            scoped.row.answerNum == 0) &&
+          scoped.row.arecordStatus == 0
+          ">
                 "-"
               </p>
               <template v-else>
@@ -202,23 +111,13 @@
                   {{ `（${scoped.row.goodRate}%）` }}
                 </p>
               </template>
-            </template></el-table-column
-          >
-          <el-table-column
-            prop="passRate"
-            label="及格数(率)"
-            sortable
-            align="center"
-            width="110"
-            class-name="p0"
-            ><template slot-scope="scoped">
-              <p
-                v-if="
-                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                    scoped.row.answerNum == 0) &&
-                  scoped.row.arecordStatus == 0
-                "
-              >
+            </template></el-table-column>
+          <el-table-column prop="passRate" label="及格数(率)" sortable align="center" width="110" class-name="p0"><template
+              slot-scope="scoped">
+              <p v-if="(scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+            scoped.row.answerNum == 0) &&
+          scoped.row.arecordStatus == 0
+          ">
                 "-"
               </p>
               <template v-else>
@@ -227,23 +126,13 @@
                   {{ `（${scoped.row.passRate}%）` }}
                 </p>
               </template>
-            </template></el-table-column
-          >
-          <el-table-column
-            prop="failedRate"
-            label="不及格数(率)"
-            sortable
-            align="center"
-            width="130"
-            class-name="p0"
-            ><template slot-scope="scoped">
-              <p
-                v-if="
-                  (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
-                    scoped.row.answerNum == 0) &&
-                  scoped.row.arecordStatus == 0
-                "
-              >
+            </template></el-table-column>
+          <el-table-column prop="failedRate" label="不及格数(率)" sortable align="center" width="130"
+            class-name="p0"><template slot-scope="scoped">
+              <p v-if="(scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+            scoped.row.answerNum == 0) &&
+          scoped.row.arecordStatus == 0
+          ">
                 "-"
               </p>
               <template v-else>
@@ -252,155 +141,59 @@
                   {{ `（${scoped.row.failedRate}%）` }}
                 </p>
               </template>
-            </template></el-table-column
-          >
+            </template></el-table-column>
           <el-table-column label="操作" align="center">
             <template slot-scope="scoped">
               <el-tooltip effect="dark" content="详情" placement="top">
-                <el-button
-                  type="primary"
-                  circle
-                  size="mini"
-                  icon="fa fa-arrow-right"
-                  @click="linkTo(scoped.row)"
-                ></el-button>
+                <el-button type="primary" circle size="mini" icon="fa fa-arrow-right"
+                  @click="linkTo(scoped.row)"></el-button>
               </el-tooltip>
             </template>
           </el-table-column>
         </el-table>
         <div class="pagination-box">
-          <el-pagination
-            small=""
-            layout="total,prev, pager, next"
-            :hide-on-single-page="true"
-            :total="total"
-            @current-change="changePage"
-            :current-page="page"
-            :page-size="size"
-          >
+          <el-pagination small="" layout="total,prev, pager, next" :hide-on-single-page="true" :total="total"
+            @current-change="changePage" :current-page="page" :page-size="size">
           </el-pagination>
         </div>
       </div>
       <div v-show="tabIndex == 2" v-loading="loading">
-        <el-empty
-          :image-size="100"
-          v-if="!tableData.length && loading == false"
-          description="没有更多数据"
-        ></el-empty>
+        <el-empty :image-size="100" v-if="!tableData.length && loading == false" description="没有更多数据"></el-empty>
         <template v-if="tableData.length && loading == false">
           <div id="print-content">
-            <el-table
-              :max-height="tableMaxHeight"
-              v-if="role == 'ROLE_JIAOSHI'"
-              :data="tableData"
-              border
-              style="width: 100%"
-            >
-              <el-table-column
-                prop="studentCode"
-                label="学号"
-                align="center"
-                fixed
-              ></el-table-column>
-              <el-table-column
-                prop="studentName"
-                label="姓名"
-                fixed
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                v-for="(item, index) in answerList"
-                :key="index"
-                :label="item.title"
-              >
-                <el-table-column
-                  :prop="'score' + index"
-                  :label="index == 0 ? '总分' : '成绩'"
-                  align="center"
-                  :class-name="index % 2 == 0 ? 'bg' : ''"
-                ></el-table-column>
-                <el-table-column
-                  :prop="'classRank' + index"
-                  label="班名"
-                  align="center"
-                  :class-name="index % 2 == 0 ? 'bg' : ''"
-                ></el-table-column>
+            <el-table :max-height="tableMaxHeight" v-if="role == 'ROLE_JIAOSHI'" :data="tableData" border
+              style="width: 100%">
+              <el-table-column prop="studentCode" label="学号" align="center" fixed></el-table-column>
+              <el-table-column prop="studentName" label="姓名" fixed align="center"></el-table-column>
+              <el-table-column align="center" v-for="(item, index) in answerList" :key="index" :label="item.title">
+                <el-table-column :prop="'score' + index" :label="index == 0 ? '总分' : '成绩'" align="center"
+                  :class-name="index % 2 == 0 ? 'bg' : ''"></el-table-column>
+                <el-table-column :prop="'classRank' + index" label="班名" align="center"
+                  :class-name="index % 2 == 0 ? 'bg' : ''"></el-table-column>
               </el-table-column>
             </el-table>
-            <el-table
-              v-else
-              :data="tableData"
-              :max-height="tableMaxHeight"
-              border
-              style="width: 100%"
-            >
-              <el-table-column
-                prop="studentCode"
-                label="学号"
-                align="center"
-                fixed
-              ></el-table-column>
+            <el-table v-else :data="tableData" :max-height="tableMaxHeight" border style="width: 100%">
+              <el-table-column prop="studentCode" label="学号" align="center" fixed></el-table-column>
 
-              <el-table-column
-                prop="studentName"
-                label="姓名"
-                fixed
-                align="center"
-              ></el-table-column>
-              <el-table-column
-                align="center"
-                v-for="(item, index) in answerList"
-                :key="index"
-                :label="item"
-              >
-                <el-table-column
-                  :prop="'examCount' + item"
-                  label="测练数"
-                  align="center"
-                  :class-name="index % 2 == 0 ? 'bg' : ''"
-                ></el-table-column>
-                <el-table-column
-                  :prop="'participationCount' + item"
-                  label="参与数"
-                  align="center"
-                  :class-name="index % 2 == 0 ? 'bg' : ''"
-                ></el-table-column>
-                <el-table-column
-                  :prop="'score' + item"
-                  label="总分"
-                  align="center"
-                  :class-name="index % 2 == 0 ? 'bg' : ''"
-                ></el-table-column>
-                <el-table-column
-                  :prop="'classRank' + item"
-                  label="班名"
-                  align="center"
-                  :class-name="index % 2 == 0 ? 'bg' : ''"
-                ></el-table-column>
+              <el-table-column prop="studentName" label="姓名" fixed align="center"></el-table-column>
+              <el-table-column align="center" v-for="(item, index) in answerList" :key="index" :label="item">
+                <el-table-column :prop="'examCount' + item" label="测练数" align="center"
+                  :class-name="index % 2 == 0 ? 'bg' : ''"></el-table-column>
+                <el-table-column :prop="'participationCount' + item" label="参与数" align="center"
+                  :class-name="index % 2 == 0 ? 'bg' : ''"></el-table-column>
+                <el-table-column :prop="'score' + item" label="总分" align="center"
+                  :class-name="index % 2 == 0 ? 'bg' : ''"></el-table-column>
+                <el-table-column :prop="'classRank' + item" label="班名" align="center"
+                  :class-name="index % 2 == 0 ? 'bg' : ''"></el-table-column>
               </el-table-column>
             </el-table>
           </div>
         </template>
       </div>
       <p class="down" v-if="tabIndex == 2 && tableData.length">
-        <el-button
-          type="primary"
-          plain
-          round
-          icon="fa fa-cloud-download"
-          @click="downExl"
-          >导出报表</el-button
-        >
-        <el-button
-          v-if="!this.$store.getters.code"
-          @click="print"
-          type="primary"
-          plain
-          round
-          icon="el-icon-printer"
-          >打印</el-button
-        >
+        <el-button type="primary" plain round icon="fa fa-cloud-download" @click="downExl">导出报表</el-button>
+        <el-button v-if="!this.$store.getters.code" @click="print" type="primary" plain round
+          icon="el-icon-printer">打印</el-button>
       </p>
     </div>
   </div>
@@ -462,7 +255,10 @@ export default {
   },
   methods: {
     print() {
-      tablePrint("print-content", "即时测-" + this.tabList[this.tabIndex - 1]);
+      tablePrint({
+        id: "print-content",
+        title: "即时测-" + this.tabList[this.tabIndex - 1]
+      }); 
     },
     changeSub(val) {
       //科目改变触发事件
@@ -832,6 +628,7 @@ div::-webkit-scrollbar {
   width: 3px;
   height: 10px;
 }
+
 div::-webkit-scrollbar-thumb {
   border-radius: 10px;
   background-color: #ccc;
@@ -841,25 +638,31 @@ div::-webkit-scrollbar-thumb {
 .page-container {
   position: relative;
   height: 100%;
+
   &.active {
     overflow: hidden;
   }
 }
+
 .table-box {
   margin: 0 20px;
   padding: 16px;
   background: #f8f8f8;
   border-radius: 5px;
+
   :deep(.fa-arrow-right) {
     padding-left: 2px;
   }
+
   :deep(.fa-file-text) {
     padding-left: 2px;
   }
 }
+
 .down {
   padding-top: 16px;
 }
+
 .click-b {
   cursor: pointer;
   color: #409eff;
diff --git a/src/views/basic/test/components/contrast.vue b/src/views/basic/test/components/contrast.vue
index 5a2a9a0..05ec54e 100644
--- a/src/views/basic/test/components/contrast.vue
+++ b/src/views/basic/test/components/contrast.vue
@@ -47,7 +47,8 @@
         </div>
       </div>
 
-      <el-dialog :append-to-body="true" :close-on-click-modal="false" title="等级设置" :visible.sync="diaLogBox" width="800px" @closed="closeDia">
+      <el-dialog :append-to-body="true" :close-on-click-modal="false" title="等级设置" :visible.sync="diaLogBox"
+        width="800px" @closed="closeDia">
         <el-form class="use-form">
           <el-form-item class="use-form-item-box">
             <el-form-item label="等级名称：" class="use-form-item">
@@ -87,8 +88,8 @@
                   <template v-if="fromData.levelType == 0">
                     ({{ index != 0 ? "不含" : ""
                     }}{{
-  Number(((item[1] / 100) * examPaperScore).toFixed(1))
-}}分)
+            Number(((item[1] / 100) * examPaperScore).toFixed(1))
+          }}分)
                   </template>
                   <template v-else>{{ index != 0 ? "不含" : "" }}</template>
                 </p>
@@ -99,8 +100,8 @@
                   %
                   <template v-if="fromData.levelType == 0">
                     ({{
-                      Number(((item[2] / 100) * examPaperScore).toFixed(1))
-                    }}分)
+            Number(((item[2] / 100) * examPaperScore).toFixed(1))
+          }}分)
                   </template>
                 </p>
                 <p class="item">
@@ -177,10 +178,10 @@ export default {
       }
     },
     print() {
-      tablePrint(
-        "print-content",
-        `多班_${this.subjectName}_${this.title}_测练成绩对比分析`
-      );
+      tablePrint({
+        id: "print-content",
+        title: `多班_${this.subjectName}_${this.title}_测练成绩对比分析`
+      }) 
     },
     setType(type) {
       this.tableMaxHeight = this.$refs.main.offsetHeight;
diff --git a/src/views/basic/test/components/multipleSubTest.vue b/src/views/basic/test/components/multipleSubTest.vue
index 89c3903..e155f57 100644
--- a/src/views/basic/test/components/multipleSubTest.vue
+++ b/src/views/basic/test/components/multipleSubTest.vue
@@ -2,135 +2,71 @@
   <div class="table-box" ref="main" v-loading="loading">
     <div id="print-content">
       <!-- 多科多卷 -->
-      <el-table
-        :data="tableData"
-        :max-height="tableMaxHeight"
-        border
-        style="width: 100%"
-      >
-        <el-table-column
-          prop="studentCode"
-          label="学号"
-          align="center"
-          fixed
-        ></el-table-column>
+      <el-table :data="tableData" :max-height="tableMaxHeight" border style="width: 100%">
+        <el-table-column prop="studentCode" label="学号" align="center" fixed></el-table-column>
 
         <el-table-column prop="studentName" label="姓名" fixed align="center">
-          <template slot-scope="scoped"
-            ><span class="click-b" @click="toPortrait(scoped.row)">
+          <template slot-scope="scoped"><span class="click-b" @click="toPortrait(scoped.row)">
               {{ scoped.row.studentName }}
-            </span></template
-          >
+            </span></template>
         </el-table-column>
-        <el-table-column
-          align="center"
-          v-for="(item, index) in answerList"
-          :key="index"
-          :label="item"
-        >
-          <el-table-column
-            :prop="'examCount' + item"
-            label="测练数"
-            align="center"
-            :class-name="index % 2 == 0 ? 'bg' : ''"
-          >
+        <el-table-column 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' : ''">
             <template slot-scope="scoped">{{
-              scoped.row["examCount" + item] ||
-              Number(scoped.row["examCount" + item]) === 0
-                ? scoped.row["examCount" + item]
-                : "-"
-            }}</template>
+    scoped.row["examCount" + item] ||
+      Number(scoped.row["examCount" + item]) === 0
+      ? scoped.row["examCount" + item]
+      : "-"
+  }}</template>
           </el-table-column>
-          <el-table-column
-            :prop="'participationCount' + item"
-            label="参与数"
-            align="center"
-            :class-name="index % 2 == 0 ? 'bg' : ''"
-          >
+          <el-table-column :prop="'participationCount' + item" label="参与数" align="center"
+            :class-name="index % 2 == 0 ? 'bg' : ''">
             <template slot-scope="scoped">{{
-              scoped.row["participationCount" + item] ||
-              Number(scoped.row["participationCount" + item]) === 0
-                ? scoped.row["participationCount" + item]
-                : "-"
-            }}</template>
+    scoped.row["participationCount" + item] ||
+      Number(scoped.row["participationCount" + item]) === 0
+      ? scoped.row["participationCount" + item]
+      : "-"
+  }}</template>
           </el-table-column>
-          <el-table-column
-            :prop="'score' + item"
-            label="总分"
-            align="center"
-            :class-name="index % 2 == 0 ? 'bg' : ''"
-          >
+          <el-table-column :prop="'score' + item" label="总分" align="center" :class-name="index % 2 == 0 ? 'bg' : ''">
             <template slot-scope="scoped">{{
-              scoped.row["score" + item] ||
-              Number(scoped.row["score" + item]) === 0
-                ? scoped.row["score" + item]
-                : "-"
-            }}</template>
+    scoped.row["score" + item] ||
+      Number(scoped.row["score" + item]) === 0
+      ? scoped.row["score" + item]
+      : "-"
+  }}</template>
           </el-table-column>
-          <el-table-column
-            :prop="'classRank' + item"
-            label="班名"
-            align="center"
-            :class-name="index % 2 == 0 ? 'bg' : ''"
-          >
+          <el-table-column :prop="'classRank' + item" label="班名" align="center"
+            :class-name="index % 2 == 0 ? 'bg' : ''">
             <template slot-scope="scoped">{{
-              scoped.row["classRank" + item] ||
-              Number(scoped.row["classRank" + item]) === 0
-                ? scoped.row["classRank" + item]
-                : "-"
-            }}</template>
+    scoped.row["classRank" + item] ||
+      Number(scoped.row["classRank" + item]) === 0
+      ? scoped.row["classRank" + item]
+      : "-"
+  }}</template>
           </el-table-column>
         </el-table-column>
         <el-table-column label="查看雷达图" align="center">
           <template slot-scope="scoped">
-            <el-button
-              @click="openChart(scoped.row)"
-              type="primary"
-              size="mini"
-              circle
-              icon="el-icon-arrow-right"
-            ></el-button>
+            <el-button @click="openChart(scoped.row)" type="primary" size="mini" circle
+              icon="el-icon-arrow-right"></el-button>
           </template>
         </el-table-column>
       </el-table>
     </div>
     <div class="down">
-      <el-button
-        @click="openDown"
-        type="primary"
-        plain
-        round
-        icon="fa fa-cloud-download"
-        >导出报表</el-button
-      >
-      <el-button
-        v-if="!this.$store.getters.code"
-        @click="print"
-        type="primary"
-        plain
-        round
-        icon="el-icon-printer"
-        >打印</el-button
-      >
+      <el-button @click="openDown" type="primary" plain round icon="fa fa-cloud-download">导出报表</el-button>
+      <el-button v-if="!this.$store.getters.code" @click="print" type="primary" plain round
+        icon="el-icon-printer">打印</el-button>
     </div>
-    <el-dialog :append-to-body="true"
-      class="chart-dia"
-      :visible.sync="chartDia"
-      :title="chartTitle"
-      width="800"
-    >
+    <el-dialog :append-to-body="true" class="chart-dia" :visible.sync="chartDia" :title="chartTitle" width="800">
       <div class="chart-box">
         <RadarChart id="radarChart" :params="chartData" />
       </div>
     </el-dialog>
-    <ExportDia
-      :exportStudent="exportStudent"
-      :diaShow="diaShow"
-      @cancel="cancel"
-      @exportData="exportData"
-      lastLabel="总分"
-      type="雷达图"
-    />
+    <ExportDia :exportStudent="exportStudent" :diaShow="diaShow" @cancel="cancel" @exportData="exportData"
+      lastLabel="总分" type="雷达图" />
   </div>
 </template>
 <script>
@@ -188,7 +124,10 @@ export default {
   },
   methods: {
     print() {
-      tablePrint("print-content", this.subjectName + "汇总报表");
+      tablePrint({
+        id: "print-content",
+        title: this.subjectName + "汇总报表"
+      }) 
     },
     toPortrait(obj) {
       //暂时不上线
diff --git a/src/views/basic/test/components/multipleTest.vue b/src/views/basic/test/components/multipleTest.vue
index a4305de..a91d6ab 100644
--- a/src/views/basic/test/components/multipleTest.vue
+++ b/src/views/basic/test/components/multipleTest.vue
@@ -91,7 +91,10 @@ export default {
   },
   methods: {
     print() {
-      tablePrint("print-content", this.subjectName + "汇总报表");
+      tablePrint({
+        id: "print-content",
+        title: this.subjectName + "汇总报表"
+      }) 
     },
     //查看折线图
     openChart(obj) {
diff --git a/src/views/basic/test/components/scoreSet.vue b/src/views/basic/test/components/scoreSet.vue
index 836f4f1..beb8769 100644
--- a/src/views/basic/test/components/scoreSet.vue
+++ b/src/views/basic/test/components/scoreSet.vue
@@ -43,7 +43,7 @@
           </template>
         </el-table-column>
         <!-- <el-table-column v-for="(item, index) in questionList" :key="index" :label="'第' + cNum[index] + '大题'" -->
-        <el-table-column v-for="(question, index) in questionList" :key="index" :label="'Q' + question.questionId"
+        <el-table-column v-for="(question, index) in questionList" :key="index" :label="'Q' + question.questionIndex"
           align="center">
           <template slot-scope="scoped">
             <el-input v-if="showSetScore" type="number" :min="0" :max="question.questionScore" @input="setScore(
@@ -174,11 +174,13 @@ export default {
       this.tableMaxHeight = this.$refs.scoreSet.offsetHeight - 135;
     },
     async _QueryData() {
+    
       this.loading = true;
       const { data, status, info } =
         await this.$request.listStudentsAndQuestions({
           examId: this.id,
         });
+     
       this.loading = false;
       if (status === 0) {
         this.dataReponse = data;
@@ -186,14 +188,18 @@ export default {
         this.questionList = this.dataReponse?.questionList || [];
         if (this.questionList.length == 0) {
           this.questionList = Object.keys(studentList[0].scoreMap).map(
-            (item) => {
+            (item) => { 
+              var splitItem = item.split('='); 
               return {
-                questionId: item,
+                questionIndex: splitItem.length >= 1 ? splitItem[0] : null,
+                questionId: splitItem.length >= 1 ? splitItem[1] : null,
+                // questionId: item,
                 questionScore: 20,
               };
             }
-          );
+          ); 
         }
+ 
         this.tableData =
           studentList.map((item) => {
             item.all = item.all || 0; //总分
@@ -249,8 +255,7 @@ export default {
       } else {
         this.$message.error(info);
       }
-    },
-
+    }, 
     //导入成功
     upSuccess(res) {
 
@@ -265,30 +270,30 @@ export default {
           item.object = 0; //客观题分数
           item.subject = 0; //主观题分数 
           var detail = JSON.parse(res.data[item.studentId]);
-         
+
           var scoreMap = {};
-      
+
           if (detail) {
             detail.forEach(item => {
               scoreMap[item.id] = item.score
             })
-          } 
+          }
 
           item.scoreMap = scoreMap;
-        
+
           this.questionList.map((question) => {
-              let keys = question.questionId;
-              if (!item.scoreMap[keys]) {
-                if (item.scoreMap[keys] == 0) {
-                  item.scoreMap[keys] = 0;
-                } else {
-                  item.scoreMap[keys] = "";
-                }
+            let keys = question.questionId;
+            if (!item.scoreMap[keys]) {
+              if (item.scoreMap[keys] == 0) {
+                item.scoreMap[keys] = 0;
               } else {
-                let num = Number(item.scoreMap[keys]);
-                item.scoreMap[keys] = num;
+                item.scoreMap[keys] = "";
               }
-            }); 
+            } else {
+              let num = Number(item.scoreMap[keys]);
+              item.scoreMap[keys] = num;
+            }
+          });
 
           return item;
         }) || [];
diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue
index 31c78c4..aca9083 100644
--- a/src/views/examinationPaper/add.vue
+++ b/src/views/examinationPaper/add.vue
@@ -9,25 +9,26 @@
     <div class="content">
       <el-dialog :close-on-click-modal="false" title="选择班级分享" :visible.sync="classSharingType" width="800"
         :modal-append-to-body="false" :append-to-body="true">
-        <div>
+        <div :key="classSharingType">
           <el-row class="row-subfix">
             <div class="row-line">
               <span class="line-subfix">年级：</span>
               <span class="line-value">{{ gradeName }}</span>
             </div>
           </el-row>
-          <el-row class="row-subfix" style="margin-top: 20px;">
+          <el-row v-if="shareClass.length >= 1" class="row-subfix" style="margin-top: 20px;">
             <span class="line-subfix" style="float: left;">班级：</span>
             <div class="row-line" style="float: left;
               background:rgb(245,247,250);padding:15px 10px;width: calc(100% - 80px);border-radius:5px;">
               <span class="line-value" style="min-height: 300px;border-radius: 4px; background: rgb(247,247,250);">
                 <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
                   @change="handleCheckAllChange">全选</el-checkbox>
-                <el-checkbox-group v-model="checkedClass" style="margin-top: 15px;" @change="handleCheckedClassChange">
-                  <el-checkbox v-for="(item, index) in shareClass" :label="item.id" :key="item.id">
+                <div>
+                  <el-checkbox @change="handleCheckedClassChange" v-model="item.isChecked" :key="index"
+                    v-for="(item, index) in shareClass" :label="item.id">
                     {{ item.className }}
                   </el-checkbox>
-                </el-checkbox-group>
+                </div>
               </span>
             </div>
           </el-row>
@@ -252,7 +253,7 @@
           <el-dialog :close-on-click-modal="false" title="添加大题" :append-to-body="true"
             :visible.sync="addQuestionVisible" width="600px">
             <div class="dia-content">
-              <el-form ref="form" :model="questionForm" :rules="questionFormRules" label-width="100px">
+              <el-form ref="form" :model="questionForm" :rules="questionFormRules" label-width="150px">
                 <el-form-item label="标题：">
                   <el-col :span="20">
                     <el-input v-model.trim="questionForm.questionTitle" maxlength="30" placeholder="输入大题名称"></el-input>
@@ -354,7 +355,7 @@
           <p class="name">{{ form.title }}</p>
           <p class="totals">卷面总分：{{ allScore }}分</p>
         </div>
-        <div class="question-box" v-for="(question, index) in form.questionList" :key="index">
+        <div   class="question-box flex-content" v-for="(question, index) in form.questionList" :key="index">
           <p class="question-title">
             <span>{{ setBigNum(index) }}、</span>
             <span class="title-txt">{{ question.questionTitle }}</span>
@@ -374,7 +375,7 @@
               <div class="qs-options qs-options2">选项设置</div>
               <div class="qs-upload" v-if="isUpload">题干</div>
               <div class="qs-upload" v-if="isUpload">题目解析</div>
-              <div class="qs-upload" v-if="isUpload">知识点</div>
+              <div class="qs-upload">知识点</div>
               <div class="qs-set">操作</div>
             </li>
             <li v-for="(subQuestions, indexs) in question.subQuestions" :key="indexs">
@@ -446,11 +447,11 @@
                     <el-button slot="reference" class="icon-tickets" type="primary" circle size="mini"
                       icon="el-icon-tickets" @click="openStem(subQuestions, index, indexs, 2)"></el-button>
                   </div>
-                  <div class="qs-upload">
-                    <el-button type="primary" circle size="mini" icon="el-icon-price-tag"
-                      @click="openKnowledge(subQuestions, index, indexs)"></el-button>
-                  </div>
                 </template>
+                <div class="qs-upload">
+                  <el-button type="primary" circle size="mini" icon="el-icon-price-tag"
+                    @click="openKnowledge(subQuestions, index, indexs)"></el-button>
+                </div>
                 <div class="qs-set">
                   <el-popconfirm title="确定删除这道题吗？" @confirm="delTabData(indexs, index)">
                     <el-button slot="reference" class="delete" type="danger" size="mini" circle
@@ -508,16 +509,26 @@
             <el-button @click="diaSetAns = false">取 消</el-button>
           </div>
         </el-dialog>
-        <div class="btn-box">
-          <el-button type="danger" plain round @click="linkBack">取消</el-button>
-          <template v-if="!isUpload">
-            <el-button round @click="toStep(1)">上一步</el-button>
-            <el-button type="primary" round @click="save">保存</el-button>
-          </template>
-          <template v-else>
-            <el-button round @click="step = 0">上一步</el-button>
-            <el-button type="primary" round @click="toStep(3)">下一步</el-button>
-          </template>
+        <div class="btn-box flex-btn" style="text-align: center; ">
+          <div style="display: inline-block;line-height: 45px;">
+            <label>请仔细核对
+              <label style="color:red;">“题型” </label>
+              和
+              <label style="color:red;">“答案”</label>
+              等是否识别正确
+            </label>
+          </div>
+          <div style="display: inline;;float: right">
+            <el-button type="danger" plain round @click="linkBack">取消</el-button>
+            <template v-if="!isUpload">
+              <el-button round @click="toStep(1)">上一步</el-button>
+              <el-button type="primary" round @click="save">保存</el-button>
+            </template>
+            <template v-else>
+              <el-button round @click="step = 0">上一步</el-button>
+              <el-button type="primary" round @click="toStep(3)">下一步</el-button>
+            </template>
+          </div> 
         </div>
       </div>
       <div v-if="step == 3">
@@ -525,7 +536,7 @@
           <p class="name">{{ form.title }}</p>
           <p class="totals">卷面总分：{{ allScore }}分</p>
         </div>
-        <div class="question-box">
+        <div class="question-box flex-content"  >
           <template v-for="(question, index) in form.questionList">
             <p class="question-title">
               <span>{{ setBigNum(index) }}、</span>
@@ -540,7 +551,7 @@
             </div>
           </template>
         </div>
-        <div class="btn-box">
+        <div class="btn-box flex-btn">
           <el-button type="danger" plain round @click="linkBack">取消</el-button>
           <el-button round @click="toStep(2)">上一步</el-button>
           <el-button type="primary" round @click="save">保存</el-button>
@@ -569,20 +580,9 @@
         </div>
       </el-dialog>
       <el-dialog :close-on-click-modal="false" :append-to-body="true" title="知识点" :visible.sync="dialogKnowledge"
-        width="1200px">
-        <div>
-          <el-form ref="form" :model="stem" label-width="160px">
-            <el-form-item label="知识点：">
-              <el-cascader size="small" filterable :show-all-levels="false" collapse clearable placeholder="选择知识点"
-                v-model="stem.knowledge" :options="knowledgeData"
-                :props="{ expandTrigger: 'hover', multiple: true }"></el-cascader>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div slot="footer">
-          <el-button @click="dialogKnowledge = false">取 消</el-button>
-          <el-button type="primary" @click="setKnowledge">确 定</el-button>
-        </div>
+        width="60%">
+        <knowledgePoints :key="dialogKnowledge" @opration="knowledgeOpration" :sectionName="stem.sectionName"
+          :subjectName="stem.subjectName" :knowledges="stem.knowledge" />
       </el-dialog>
     </div>
   </div>
@@ -590,6 +590,7 @@
 
 <script>
 import { deepClone, checkAnswer, cNum } from "utils";
+import conf from "@/config/index";
 const questionForm = {
   questionTitle: "",
   questionType: 2,
@@ -619,31 +620,22 @@ export default {
       }, 0);
       return Number(score).toFixed(2);
     },
-    // 知识点列表 根据学段-科目筛选
-    knowledgeData: function () {
-      let jsons = [];
-      if (this.form.gradeName && this.form.subjectName) {
-        let sectionName = "";
-        this.gradeClassList.map((item) => {
-          if (this.form.gradeName == item.gradeName) {
-            sectionName = item.sectionName;
-          }
-        });
-        if (
-          sectionName &&
-          Object.keys(this.knowledgeList).includes(sectionName)
-        ) {
-          if (
-            Object.keys(this.knowledgeList[sectionName]).includes(
-              this.form.subjectName
-            )
-          ) {
-            jsons = this.knowledgeList[sectionName][this.form.subjectName];
-          }
-        }
+    uploadUrl: function () {
+      var requestUrl = '';
+
+      var ogrinUrl = '/file/uploadImgToHtml';
+
+      var baseUrl = conf.baseURL;
+
+      if (baseUrl == '/' && ogrinUrl.indexOf('/') == 0) {
+        requestUrl = ogrinUrl;
       }
-      return jsons;
-    },
+      else {
+        requestUrl = baseUrl + ogrinUrl
+      }
+
+      return requestUrl;
+    }
   },
   watch: {
     step: function () {
@@ -748,7 +740,7 @@ export default {
       //返回列表页参数记录
       listType: 1,
       listShare: 0,
-      uploadUrl: "/file/uploadImgToHtml",
+      // uploadUrl: "/file/uploadImgToHtml",
       iframeLoading: false,
     };
   },
@@ -785,18 +777,47 @@ export default {
     }
   },
   methods: {
+    openKnowledge(obj, index, indexs) {
+      this.stem.index = index;
+      this.stem.indexs = indexs || 0;
+      this.stem.knowledge = obj.knowledge;
+      if (this.form.gradeName && this.form.subjectName) {
+        var matchClass = this.gradeClassList.find((item) => {
+          if (this.form.gradeName == item.gradeName) {
+            return item.sectionName;
+          }
+        });
+        this.stem.sectionName = matchClass?.sectionName ?? "";
+        this.stem.subjectName = this.form.subjectName ?? "";
+      }
+      this.dialogKnowledge = true;
+    },
+    knowledgeOpration(target) {
+      if (target.opration == 'confirm') {
+        this.form.questionList[this.stem.index].
+          subQuestions[this.stem.indexs].knowledge = target.knowledges.join(",");
+        this.dialogKnowledge = false;
+      }
+      else {
+        this.dialogKnowledge = false;
+      }
+    },
     _checkedClass() {
+      this.checkedClass = this.shareClass.filter(item => item.isChecked).map(imap => imap.id);
       this.classSharingType = false;
     },
     handleCheckAllChange(val) {
-      this.checkedClass = val ? this.shareClass?.map(item => item.id) : [];
+      this.shareClass.forEach(item => {
+        item.isChecked = val;
+      })
       this.isIndeterminate = false;
     },
     handleCheckedClassChange(value) {
+      var value = this.shareClass.filter(item => item.isChecked);
       let checkedCount = value.length;
-      this.checkAll = checkedCount === this.checkedClass.length;
-      this.isIndeterminate = checkedCount > 0 && checkedCount < this.checkedClass.length;
-    }, 
+      this.checkAll = checkedCount === this.shareClass.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.shareClass.length;
+    },
     // v1.5
     //上传截图
     openStem(obj, index, indexs, type) {
@@ -843,21 +864,6 @@ export default {
     upError(res) {
       this.$message.error("上传失败");
     },
-    // 打开知识点
-    openKnowledge(obj, index, indexs) {
-      this.stem.index = index;
-      this.stem.indexs = indexs;
-      this.stem.knowledge = (obj.knowledge && obj.knowledge.split("#")) || [];
-      this.dialogKnowledge = true;
-    },
-    // 选择知识点
-    setKnowledge() {
-      this.form.questionList[this.stem.index].subQuestions[
-        this.stem.indexs
-      ].knowledge = this.stem.knowledge.join("#");
-      this.dialogKnowledge = false;
-    },
-    //end
 
     //取消创建
     linkBack() {
@@ -1252,19 +1258,26 @@ export default {
 
       this.classSharingType = true;
 
+      this.shareClass = [];
+
       var grade = this.gradeClassList.find(item => item.gradeName == this.form.gradeName);
 
-      var classResponse = await this.$request.tClassGrade(grade?.grade,this.form.subjectName);
+      var classResponse = await this.$request.tClassGrade(grade?.grade, this.form.subjectName);
 
       if (classResponse.status != 0) {
         this.$message.error(classResponse.info);
+        return;
       }
-     
+
       this.gradeName = grade.gradeName;
-    
-      this.shareClass = classResponse.data;
- 
 
+      this.shareClass = [...classResponse.data.map(item => {
+        return {
+          isChecked: this.checkedClass.includes(item.id),
+          id: item.id,
+          className: item.className
+        }
+      })];
     },
     openQuestion() {
       this.questionForm = { ...questionForm };
@@ -1520,28 +1533,28 @@ export default {
     },
     async save() {
       if (this.saveLoading) return;
-   
+
       this.saveLoading = true;
-     
+
       this.formatQuestionList();
-     
+
       let formDatas = deepClone(this.form);
-      
+
       formDatas.questionList = formDatas.questionList.filter(item => {
         return item.subQuestions?.length >= 1;
       });
-     
+
       for (let i = 0; i < formDatas.questionList.length; i++) {
         delete formDatas.questionList[i].show;
       }
-     
+
       let addPaper =
         this.role == "ROLE_PERSONAL"
           ? this.$request.pAddPaper
           : this.$request.addPaper;
 
       formDatas.classIds = this.checkedClass.join(",");
-   
+
       const { data, status, info } = await addPaper({
         ...formDatas,
       });
diff --git a/src/views/examinationPaper/addQs.vue b/src/views/examinationPaper/addQs.vue
index 2d063e8..0eb475e 100644
--- a/src/views/examinationPaper/addQs.vue
+++ b/src/views/examinationPaper/addQs.vue
@@ -7,27 +7,28 @@
       </template>
     </back-box>
     <div class="content">
-
       <el-dialog :close-on-click-modal="false" title="选择班级分享" :visible.sync="classSharingType" width="800"
         :modal-append-to-body="false" :append-to-body="true">
-        <div>
+        <div :key="classSharingType">
           <el-row class="row-subfix">
             <div class="row-line">
               <span class="line-subfix">年级：</span>
               <span class="line-value">{{ gradeName }}</span>
             </div>
           </el-row>
-          <el-row class="row-subfix" style="margin-top: 20px;">
+          <el-row v-if="shareClass.length >= 1" class="row-subfix" style="margin-top: 20px;">
             <span class="line-subfix" style="float: left;">班级：</span>
             <div class="row-line" style="float: left;
               background:rgb(245,247,250);padding:15px 10px;width: calc(100% - 80px);border-radius:5px;">
               <span class="line-value" style="min-height: 300px;border-radius: 4px; background: rgb(247,247,250);">
                 <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
                   @change="handleCheckAllChange">全选</el-checkbox>
-                <el-checkbox-group v-model="checkedClass" style="margin-top: 15px;" @change="handleCheckedClassChange">
-                  <el-checkbox v-for="(item, index) in shareClass" :label="item.id" :key="item.id">{{
-        item.className }}</el-checkbox>
-                </el-checkbox-group>
+                <div>
+                  <el-checkbox @change="handleCheckedClassChange" v-model="item.isChecked" :key="index"
+                    v-for="(item, index) in shareClass" :label="item.id">
+                    {{ item.className }}
+                  </el-checkbox>
+                </div>
               </span>
             </div>
           </el-row>
@@ -81,7 +82,7 @@
         <div class="answer-title">
           <p class="name">{{ form.title }}</p>
         </div>
-        <div class="question-box">
+        <div class="question-box flex-content"  >
           <ul class="questions-ul">
             <li class="sub-questions">
               <div class="qs-num">题号</div>
@@ -91,7 +92,7 @@
               <div class="qs-options qs-options2">选项设置</div>
               <div class="qs-upload">题干</div>
               <div class="qs-upload">题目解析</div>
-              <div class="qs-upload"  >知识点</div>
+              <div class="qs-upload">知识点</div>
               <div class="qs-set">操作</div>
             </li>
           </ul>
@@ -157,7 +158,7 @@
                       <el-button class="icon-tickets" type="primary" circle size="mini" icon="el-icon-tickets"
                         @click="openStem(question, 2, index)"></el-button>
                     </div>
-                    <div class="qs-upload"  >
+                    <div class="qs-upload">
                       <el-button type="primary" circle size="mini" icon="el-icon-price-tag"
                         @click="openKnowledge(question, index)"></el-button>
                     </div>
@@ -239,7 +240,7 @@
                       <el-button class="icon-tickets" type="primary" circle size="mini" icon="el-icon-tickets"
                         @click="openStem(subQuestions, 2, index, indexs)"></el-button>
                     </div>
-                    <div class="qs-upload"  >
+                    <div class="qs-upload">
                       <el-button type="primary" circle size="mini" icon="el-icon-price-tag"
                         @click="openKnowledge(subQuestions, index, indexs)"></el-button>
                     </div>
@@ -302,10 +303,19 @@
             <el-button @click="diaSetAns = false">取 消</el-button>
           </div>
         </el-dialog>
-        <div class="btn-box">
-          <el-button type="danger" plain round @click="linkBack">取消</el-button>
-          <el-button round @click="step = 0">上一步</el-button>
-          <el-button type="primary" round @click="toStep(2)">下一步</el-button>
+        <div class="btn-box flex-btn" style="text-align: center; ">
+          <div style="display: inline-block;line-height: 45px;">
+            <label>请仔细核对
+              <label style="color:red;">“题型” </label>
+              和
+              <label style="color:red;">“答案”</label>等是否识别正确
+            </label>
+          </div>
+          <div style="display: inline;;float: right">
+            <el-button type="danger" plain round @click="linkBack">取消</el-button>
+            <el-button round @click="step = 0">上一步</el-button>
+            <el-button type="primary" round @click="toStep(2)">下一步</el-button>
+          </div> 
         </div>
         <el-dialog :close-on-click-modal="false" :modal-append-to-body="false"
           :title="stem.type == 1 ? '上传题干' : '上传题目解析'" :visible.sync="dialogStem" v-if="dialogStem" width="800px">
@@ -329,22 +339,17 @@
             <el-button @click="dialogStem = false">保存</el-button>
           </div>
         </el-dialog>
-        <el-dialog :close-on-click-modal="false" :modal-append-to-body="false" title="知识点"
-          :visible.sync="dialogKnowledge" width="60%"  >
-          <div>
-            <knowledgePoints :sectionName="stem.sectionName" :subjectName="stem.subjectName" :knowledges="stem.knowledge" @points="_points" /> 
-          </div>
-          <div slot="footer">
-            <el-button @click="dialogKnowledge = false">取 消</el-button>
-            <el-button type="primary" @click="setKnowledge">确 定</el-button>
-          </div>
+        <el-dialog :append-to-body="true" :destroy-on-close="true" title="知识点" :visible.sync="dialogKnowledge"
+          width="60%">
+          <knowledgePoints :key="dialogKnowledge" @opration="knowledgeOpration" :sectionName="stem.sectionName"
+            :subjectName="stem.subjectName" :knowledges="stem.knowledge" />
         </el-dialog>
       </div>
       <div v-if="step == 2">
         <div class="answer-title">
           <p class="name">{{ form.title }}</p>
         </div>
-        <div class="question-box">
+        <div class="question-box flex-content" >
           <template v-for="question in form.questionList">
             <template v-if="!question.subQuestions">
               <div class="screenshot-box" v-if="question.screenshot">
@@ -360,7 +365,7 @@
             </template>
           </template>
         </div>
-        <div class="btn-box">
+        <div class="btn-box flex-btn">
           <el-button type="danger" plain round @click="linkBack">取消</el-button>
           <el-button round @click="toStep(1)">上一步</el-button>
           <el-button type="primary" round @click="save">保存</el-button>
@@ -371,6 +376,7 @@
 </template>
 
 <script>
+import conf from "@/config/index";
 import { deepClone, checkAnswer } from "utils";
 import knowledgeList from "assets/js/knowledgeList.js";
 import knowledgePoints from "@/components/knowledgePoints"
@@ -449,38 +455,11 @@ export default {
       //返回列表页参数记录
       listType: 1,
       listShare: 0,
-      uploadUrl: "/file/uploadImgToHtml",
+      // uploadUrl: "/file/uploadImgToHtml",
       iframeLoading: false,
       subjectName: "",
     };
   },
-  // computed: {
-  //   // 知识点列表 根据学段-科目筛选
-  //   knowledgeData: function () {
-  //     let jsons = [];
-  //     if (this.form.gradeName && this.form.subjectName) {
-  //       let sectionName = "";
-  //       this.gradeClassList.map((item) => {
-  //         if (this.form.gradeName == item.gradeName) {
-  //           sectionName = item.sectionName;
-  //         }
-  //       });
-  //       if (
-  //         sectionName &&
-  //         Object.keys(this.knowledgeList).includes(sectionName)
-  //       ) {
-  //         if (
-  //           Object.keys(this.knowledgeList[sectionName]).includes(
-  //             this.form.subjectName
-  //           )
-  //         ) {
-  //           jsons = this.knowledgeList[sectionName][this.form.subjectName];
-  //         }
-  //       }
-  //     }
-  //     return jsons;
-  //   },
-  // },
   watch: {
     step: function () {
       this.$nextTick(function () {
@@ -488,6 +467,24 @@ export default {
       });
     },
   },
+  computed: {
+    uploadUrl: function () {
+      var requestUrl = '';
+
+      var ogrinUrl = '/file/uploadImgToHtml';
+
+      var baseUrl = conf.baseURL;
+
+      if (baseUrl == '/' && ogrinUrl.indexOf('/') == 0) {
+        requestUrl = ogrinUrl;
+      }
+      else {
+        requestUrl = baseUrl + ogrinUrl
+      }
+
+      return requestUrl;
+    }
+  },
   async created() {
     this.listType = this.$route.query.listType ? this.$route.query.listType : 1;
     this.listShare = this.$route.query.listShare
@@ -519,30 +516,65 @@ export default {
     }
   },
   methods: {
-    _points(point) {
-
+    // 知识点
+    openKnowledge(obj, index, indexs) {
+      this.stem.index = index;
+      this.stem.indexs = indexs;
+      this.stem.knowledge = obj.knowledge;
+      if (this.form.gradeName && this.form.subjectName) {
+        var matchClass = this.gradeClassList.find((item) => {
+          if (this.form.gradeName == item.gradeName) {
+            return item.sectionName;
+          }
+        });
+        this.stem.sectionName = matchClass?.sectionName ?? "";
+        this.stem.subjectName = this.form.subjectName ?? "";
+      }
+      this.dialogKnowledge = true;
+    },
+    knowledgeOpration(target) {
+      if (target.opration == 'confirm') {
+        this.form.questionList[this.stem.index].
+          subQuestions[this.stem.indexs].knowledge = target.knowledges.join(",");
+        this.dialogKnowledge = false;
+      }
+      else {
+        this.dialogKnowledge = false;
+      }
     },
     _checkedClass() {
+      this.checkedClass = this.shareClass.filter(item => item.isChecked).map(imap => imap.id);
       this.classSharingType = false;
     },
     handleCheckAllChange(val) {
-      this.checkedClass = val ? this.shareClass?.map(item => item.id) : [];
+      this.shareClass.forEach(item => {
+        item.isChecked = val;
+      })
       this.isIndeterminate = false;
     },
     handleCheckedClassChange(value) {
+      var value = this.shareClass.filter(item => item.isChecked);
       let checkedCount = value.length;
-      this.checkAll = checkedCount === this.checkedClass.length;
-      this.isIndeterminate = checkedCount > 0 && checkedCount < this.checkedClass.length;
+      this.checkAll = checkedCount === this.shareClass.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.shareClass.length;
     },
     async _selectClassSharingType() {
       this.classSharingType = true;
-      var findGrade = this.gradeClassList.find(item => item.gradeName == this.form.gradeName);
-      this.gradeName = findGrade.gradeName;
-      var classResponse = await this.$request.tClassGrade(findGrade.grade, this.form.subjectName);
+      this.shareClass = [];
+      var grade = this.gradeClassList.find(item => item.gradeName == this.form.gradeName);
+      var classResponse = await this.$request.tClassGrade(grade?.grade, this.form.subjectName);
       if (classResponse.status != 0) {
         this.$message.error(classResponse.info);
+        return;
       }
-      this.shareClass = classResponse.data;
+      this.gradeName = grade.gradeName;
+      this.shareClass = [...classResponse.data.map(item => {
+        return {
+          isChecked: this.checkedClass.includes(item.id),
+          id: item.id,
+          className: item.className
+        }
+      })];
     },
     // v1.5
     //上传截图
@@ -601,31 +633,6 @@ export default {
     upError(res) {
       this.$message.error("上传失败");
     },
-    // 知识点
-    openKnowledge(obj, index, indexs) {
-      this.stem.index = index;
-      this.stem.indexs = indexs;
-      this.stem.knowledge = (obj.knowledge && obj.knowledge.split("#")) || [];
-      if (this.form.gradeName && this.form.subjectName) {
-        var matchClass = this.gradeClassList.find((item) => {
-          if (this.form.gradeName == item.gradeName) {
-            return item.sectionName;
-          }
-        });
-        this.stem.sectionName = matchClass?.sectionName ?? "";
-        this.stem.subjectName = this.form.subjectName ?? "";
-      }
-      // this.stem.sectionName = 
-      this.dialogKnowledge = true;
-    },
-    // 知识点
-    setKnowledge() {
-      this.form.questionList[this.stem.index].subQuestions[
-        this.stem.indexs
-      ].knowledge = this.stem.knowledge.join("#");
-      this.dialogKnowledge = false;
-    },
-
     //end
     linkBack() {
       this.$confirm(
diff --git a/src/views/examinationPaper/edit.vue b/src/views/examinationPaper/edit.vue
index fc054f4..fdc0521 100644
--- a/src/views/examinationPaper/edit.vue
+++ b/src/views/examinationPaper/edit.vue
@@ -56,9 +56,7 @@
                 <div class="qs-set">知识点</div>
               </div>
               <div v-for="(subQuestions, indexs) in question.subQuestions" :key="indexs">
-                <p class="set-ans-btn" v-if="subQuestions.qusType &&
-          subQuestions.subNum &&
-          subQuestions.subNum > 4
+                <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>
@@ -88,8 +86,8 @@
                     <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'
-            : ''
+          ? 'active'
+          : ''
           " :key="option" @click="changAnswer(subQuestions, option)">{{ option }}</span>
                       </template>
                     </p>
@@ -175,8 +173,8 @@
         <el-button type="danger" plain round @click="linkBack">取消</el-button>
         <el-button type="primary" round @click="save">保存</el-button>
       </div>
-      <el-dialog :append-to-body="true" :close-on-click-modal="false" title="批量设置答案" :visible.sync="diaSetAns" width="400"
-        :modal-append-to-body="false">
+      <el-dialog :append-to-body="true" :close-on-click-modal="false" title="批量设置答案" :visible.sync="diaSetAns"
+        width="400" :modal-append-to-body="false">
         <div class="qs-options set-questions">
           <p class="dia-tips">
             请点击选项按钮设置答案,多选题题目之间用“,”隔开，若添加5道题：“AC,AD,BD,AC,CD”
@@ -222,18 +220,13 @@
           <el-button @click="diaSetAns = false">取 消</el-button>
         </div>
       </el-dialog>
-      <el-dialog :append-to-body="true" :close-on-click-modal="false" :title="stem.type == 1 ? '上传题干' : '上传题目解析'" :visible.sync="dialogStem"
-        v-if="dialogStem" width="800px">
+      <el-dialog :append-to-body="true" :close-on-click-modal="false" :title="stem.type == 1 ? '上传题干' : '上传题目解析'"
+        :visible.sync="dialogStem" v-if="dialogStem" width="800">
         <div class="upload-box">
-          <div v-loading="iframeLoading">
-            <template v-if="stem.type == 1">
-              <iframe ref="screenshot" class="screenshot" v-if="stem.screenshot" :src="stem.screenshot"
-                @load="iframeLoading = false"></iframe>
-            </template>
-            <template v-else>
-              <iframe ref="screenshot" class="screenshot" v-if="stem.answerScreenshot" :src="stem.answerScreenshot"
-                @load="iframeLoading = false"></iframe>
-            </template>
+          <div>
+            <Preview ref="screenshot" class="screenshot"
+              :src="stem.type == 1 ? stem.screenshot : stem.answerScreenshot">
+            </Preview>
           </div>
           <el-upload class="upload-demo" :action="uploadUrl" :limit="1" :on-success="upSuccess" :on-error="upError"
             accept="image/*">
@@ -244,31 +237,19 @@
           <el-button @click="dialogStem = false">确定</el-button>
         </div>
       </el-dialog>
-      <el-dialog :append-to-body="true" :close-on-click-modal="false" title="知识点" :visible.sync="dialogKnowledge" width="500px">
-        <div>
-          <el-form ref="form" :model="stem" label-width="160px">
-            <el-form-item label="知识点：">
-              <el-cascader size="small" filterable :show-all-levels="false" clearable placeholder="选择知识点"
-                v-model="stem.knowledge" :options="knowledgeData" :props="{
-          expandTrigger: 'hover',
-          multiple: true,
-          checkStrictly: true,
-        }"></el-cascader>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div slot="footer">
-          <el-button @click="dialogKnowledge = false">取 消</el-button>
-          <el-button type="primary" @click="setKnowledge">确 定</el-button>
-        </div>
+      <el-dialog :append-to-body="true" :close-on-click-modal="false" title="知识点" :visible.sync="dialogKnowledge"
+        width="60%">
+        <knowledgePoints :key="dialogKnowledge" @opration="knowledgeOpration" :sectionName="stem.sectionName"
+          :subjectName="stem.subjectName" :knowledges="stem.knowledge" />
       </el-dialog>
     </div>
   </div>
 </template>
 
 <script>
+import Preview from "@/components/preview";
 import { deepClone, checkAnswer } from "utils";
-import knowledgeList from "assets/js/knowledgeList.js";
+import conf from "@/config/index";
 export default {
   data() {
     return {
@@ -306,8 +287,7 @@ export default {
 
       //v1.5
       dialogStem: false, //截图开关
-      dialogKnowledge: false, //知识点开关
-      knowledgeList: { ...knowledgeList },
+      dialogKnowledge: false, //知识点开关 
       stem: {
         type: 1,
         index: 0, //大题位置
@@ -315,14 +295,32 @@ export default {
         screenshot: "", //题干图片地址
         answerScreenshot: "", //题目解析图片地址
         knowledge: [], //知识点
+        sectionName: "", //题目解析图片地址
+        subjectName: "" //知识点
       },
       gradeClassList: [], //学段列表
-      uploadUrl: "/file/uploadImgToHtml",
+      // uploadUrl: "/file/uploadImgToHtml",
       iframeLoading: false,
       examType: 2,
     };
   },
   computed: {
+    uploadUrl: function () {
+      var requestUrl = '';
+
+      var ogrinUrl = '/file/uploadImgToHtml';
+
+      var baseUrl = conf.baseURL;
+
+      if (baseUrl == '/' && ogrinUrl.indexOf('/') == 0) {
+        requestUrl = ogrinUrl;
+      }
+      else {
+        requestUrl = baseUrl + ogrinUrl
+      }
+
+      return requestUrl;
+    },
     allScore: function () {
       let score = 0;
       this.questionList?.map((item) => {
@@ -335,32 +333,7 @@ export default {
         }
       }, 0);
       return Number(score).toFixed(2);
-    },
-    // 知识点列表 根据学段-科目筛选
-    knowledgeData: function () {
-      let jsons = [];
-      if (this.form.gradeName && this.form.subjectName) {
-        let sectionName = "";
-        this.gradeClassList?.map((item) => {
-          if (this.form.gradeName == item.gradeName) {
-            sectionName = item.sectionName;
-          }
-        });
-        if (
-          sectionName &&
-          Object.keys(this.knowledgeList).includes(sectionName)
-        ) {
-          if (
-            Object.keys(this.knowledgeList[sectionName]).includes(
-              this.form.subjectName
-            )
-          ) {
-            jsons = this.knowledgeList[sectionName][this.form.subjectName];
-          }
-        }
-      }
-      return jsons;
-    },
+    }
   },
   created() {
     this.role =
@@ -370,10 +343,27 @@ export default {
     this.examType = this.$route.query.examType || 2;
     this.paperType = this.$route.query.paperType || 2;
     this.form.title = this.$route.query.title || "";
+    this.stem.sectionName = this.$route.query.sectionName || "";
+    this.stem.subjectName = this.$route.query.subjectName || "";
     this._QueryDetail();
     this._GradeList();
   },
   methods: {
+    knowledgeOpration(target) {
+      if (target.opration == 'confirm') {
+        if (this.questionList[0]?.subQuestions) {
+          this.questionList[this.stem.index].subQuestions[
+            this.stem.indexs
+          ].knowledge = target.knowledges.join(",");
+        } else {
+          this.questionList[this.stem.index].knowledge = target.knowledges.join(",");
+        }
+        this.dialogKnowledge = false;
+      }
+      else {
+        this.dialogKnowledge = false;
+      }
+    },
     // v1.5
     //上传截图
     openStem(obj, type, index, indexs) {
@@ -394,7 +384,6 @@ export default {
         this.stem.answerScreenshot = obj.answerScreenshot || "";
         this.stem.screenshot = "";
       }
-
       this.dialogStem = true;
     },
     //图片上传成功
@@ -421,7 +410,6 @@ export default {
               this.stem.answerScreenshot;
           }
         }
-
         this.$message.success("上传成功");
       } else {
         this.$message.error(res.info);
@@ -446,24 +434,10 @@ export default {
     // 打开知识点
     openKnowledge(obj, index, indexs) {
       this.stem.index = index;
-      this.stem.indexs = indexs || 0;
-      this.stem.knowledge = (obj.knowledge && obj.knowledge.split("#")) || [];
+      this.stem.indexs = indexs || 0; 
+      this.stem.knowledge = obj?.knowledge ?? ""; 
       this.dialogKnowledge = true;
     },
-    // 选择知识点
-    setKnowledge() {
-      if (this.questionList[0]?.subQuestions) {
-        this.questionList[this.stem.index].subQuestions[
-          this.stem.indexs
-        ].knowledge = this.stem.knowledge.join("#");
-      } else {
-        this.questionList[this.stem.index].knowledge =
-          this.stem.knowledge.join("#");
-      }
-      this.dialogKnowledge = false;
-    },
-    //end
-
     linkBack() {
       this.$router.go(-1);
     },
@@ -884,6 +858,7 @@ export default {
               types[i].answerList = types[i].answerList.slice(0, -1);
             }
             if (types[i].subNum >= 5) {
+              if (!item.subQuestions) continue;
               item.subQuestions.splice(
                 types[i].index + i + 1,
                 0,
@@ -969,7 +944,6 @@ export default {
   width: 100%;
   box-shadow: none;
   border: none;
-  height: 400px;
 }
 
 .screenshot-img {
@@ -991,7 +965,7 @@ export default {
   }
 
   .btn-box {
-    width: calc(100% - 240px);
+    width: calc(100% - 300px);
     position: fixed;
     right: 40px;
     bottom: 20px;
diff --git a/src/views/examinationPaper/edit_Old.vue b/src/views/examinationPaper/edit_Old.vue
index 0a2bb8a..9544e33 100644
--- a/src/views/examinationPaper/edit_Old.vue
+++ b/src/views/examinationPaper/edit_Old.vue
@@ -414,7 +414,7 @@
           />
           <el-upload
             class="upload-demo"
-            action="http://121.40.127.171/file/uploadImg"
+            :action="uploadUrl"
             :limit="1"
             :on-success="upSuccess"
             :on-error="upError"
@@ -471,6 +471,7 @@
 </template>
 
 <script>
+import conf from "@/config/index";
 import { deepClone, checkAnswer } from "utils";
 export default {
   data() {
@@ -519,6 +520,22 @@ export default {
     };
   },
   computed: {
+    uploadUrl: function () {
+      var requestUrl = '';
+
+      var ogrinUrl = '/file/uploadImg';
+
+      var baseUrl = conf.baseURL;
+
+      if (baseUrl == '/' && ogrinUrl.indexOf('/') == 0) {
+        requestUrl = ogrinUrl;
+      }
+      else {
+        requestUrl = baseUrl + ogrinUrl
+      }
+
+      return requestUrl;
+    },
     allScore: function () {
       let score = 0;
       this.questionList?.map((item) => {
diff --git a/src/views/index/mainIndex.vue b/src/views/index/mainIndex.vue
index b1ae268..bf3b36f 100644
--- a/src/views/index/mainIndex.vue
+++ b/src/views/index/mainIndex.vue
@@ -108,8 +108,16 @@
         </li>
       </template>
     </ul>
-    <ul class="nav-list" v-if="type == 'ROLE_JIAOSHI' || type == 'ROLE_BANZHUREN'">
-      <template v-for="item in navList">
+    <ul  v-if="type == 'ROLE_JIAOSHI' || type == 'ROLE_BANZHUREN' || type == 'ROLE_NIANJI'">
+      <template>
+        <div style="margin: auto;">
+          <el-image :src="logo" />
+        </div>
+        <div style="margin: auto;text-align: center;">
+          <h1 style="font-size: 26px;">欢迎使用中天易教</h1>
+        </div> 
+      </template>
+      <!-- <template v-for="item in navList">
         <li v-if="!item.path.includes('dataSync')" :key="item.path" class="nav-item item4" @click="links(item.path)">
           <img class="icon" :src="getImgs(item.path)" alt="" />
           <div class="text" v-if="item.path == '/examinationPaper'">
@@ -118,10 +126,10 @@
               {{ dataInfo.paperCount }}套答题卡。
             </p>
           </div>
-          <!-- <div class="text" v-else-if="item.path == '/portrait'">
+          <div class="text" v-else-if="item.path == '/portrait'">
             <p class="p1">学生画像</p>
             <p class="p2">共分析{{ dataInfo.imagesCount }}名学生成绩。</p>
-          </div> -->
+          </div>
           <div class="text" v-else-if="item.path == '/ask'">
             <p class="p1">随堂问报表</p>
             <p class="p2" v-if="dataInfo.classPeriodCount">
@@ -138,7 +146,7 @@
             <p class="p1">软件下载</p>
           </div>
         </li>
-      </template>
+      </template> -->
     </ul>
     <ul class="nav-list" v-if="type == 'ROLE_PERSONAL'">
       <li class="nav-item item1" @click="links('/examinationPaper')">
@@ -216,10 +224,13 @@
 </template>
 
 <script>
+import logo from "@/assets/images/EasyQuiz.png";
+
 export default {
   name: "mainIndex",
   data() {
     return {
+      logo: logo,
       type: "",
       navList: [],
       dataInfo: {},
diff --git a/src/views/layout/header/header.vue b/src/views/layout/header/header.vue
index e9330cd..03913a0 100644
--- a/src/views/layout/header/header.vue
+++ b/src/views/layout/header/header.vue
@@ -1,18 +1,22 @@
 <template>
   <div>
     <el-header id="header">
-      <span class="hideAside" @click="collapse"
-        ><i class="el-icon-s-fold" v-show="!isCollapse"></i>
-        <i class="el-icon-s-unfold" v-show="isCollapse"></i
-      ></span>
+      <span class="hideAside" @click="collapse">
+        <i class="el-icon-s-fold" style="font-size: 24px !important;" v-show="!isCollapse"></i>
+        <i class="el-icon-s-unfold" style="font-size: 24px !important;" v-show="isCollapse"></i>
+        <i class="routeMap">
+          <!-- <el-breadcrumb separator="/">
+            <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+            <el-breadcrumb-item><a href="/">活动管理</a></el-breadcrumb-item>
+            <el-breadcrumb-item>活动列表</el-breadcrumb-item>
+          </el-breadcrumb> -->
+        </i>
+      </span> 
       <ul class="personal">
         <!-- <li>
           <langSelect></langSelect>
         </li> -->
-        <li
-          class="dropdown-box"
-          v-if="role != 'ROLE_PERSONAL' && role != 'ROLE_PINGTAI'"
-        >
+        <li class="dropdown-box" v-if="role != 'ROLE_PERSONAL' && role != 'ROLE_PINGTAI'">
           <div class="userInfo">
             <img :src="avatar" />
             <div class="txt">
@@ -21,19 +25,11 @@
             </div>
             <i class="el-icon-arrow-down"></i>
           </div>
-          <el-dropdown
-            class="dropdown"
-            @command="handleCommand"
-            trigger="click"
-          >
+          <el-dropdown class="dropdown" @command="handleCommand" trigger="click">
             <div class="el-dropdown-link dropdown-link"></div>
             <el-dropdown-menu slot="dropdown" v-if="permissions.length">
-              <el-dropdown-item
-                v-for="item in permissions"
-                :key="item.role"
-                :command="item.role"
-                >{{ item.roleName }}</el-dropdown-item
-              >
+              <el-dropdown-item v-for="item in permissions" :key="item.role" :command="item.role">{{ item.roleName
+                }}</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </li>
@@ -45,11 +41,7 @@
             </div>
           </div>
         </li>
-        <li
-          class="dropdown-box"
-          v-if="role == 'ROLE_PERSONAL'"
-          @click="linkToUserInfo"
-        >
+        <li class="dropdown-box" v-if="role == 'ROLE_PERSONAL'" @click="linkToUserInfo">
           <div class="userInfo">
             <img :src="avatar" />
             <div class="txt">
@@ -59,87 +51,34 @@
           </div>
         </li>
 
-        <li
-          class="fullScreen"
-          v-if="role != 'ROLE_PERSONAL' && !code"
-          @click="openPwd"
-        >
-          <el-tooltip
-            class="item"
-            effect="dark"
-            content="修改密码"
-            placement="bottom"
-            ><i class="el-icon el-icon-key"></i
-          ></el-tooltip>
+        <li class="fullScreen" v-if="role != 'ROLE_PERSONAL' && !code" @click="openPwd">
+          <el-tooltip class="item" effect="dark" content="修改密码" placement="bottom"><i
+              class="el-icon el-icon-key"></i></el-tooltip>
         </li>
         <li class="fullScreen" @click="fullScreen">
-          <el-tooltip
-            class="item"
-            effect="dark"
-            content="全屏"
-            placement="bottom"
-            ><i class="el-icon el-icon-full-screen"></i
-          ></el-tooltip>
+          <el-tooltip class="item" effect="dark" content="全屏" placement="bottom"><i
+              class="el-icon el-icon-full-screen"></i></el-tooltip>
         </li>
         <li v-if="code && (role == 'ROLE_BANZHUREN' || role == 'ROLE_JIAOSHI')">
-          <el-tooltip
-            class="item"
-            effect="dark"
-            content="老平台入口"
-            placement="bottom"
-          >
-            <i @click="_LinkOld" class="el-icon el-icon-guide"></i
-          ></el-tooltip>
+          <el-tooltip class="item" effect="dark" content="老平台入口" placement="bottom">
+            <i @click="_LinkOld" class="el-icon el-icon-guide"></i></el-tooltip>
         </li>
         <li>
-          <el-tooltip
-            class="item"
-            effect="dark"
-            content="退出"
-            placement="bottom"
-          >
-            <i @click="logOut" class="el-icon el-icon-switch-button"></i
-          ></el-tooltip>
+          <el-tooltip class="item" effect="dark" content="退出" placement="bottom">
+            <i @click="logOut" class="el-icon el-icon-switch-button"></i></el-tooltip>
         </li>
       </ul>
     </el-header>
     <!-- <tabNav></tabNav> -->
     <el-dialog :append-to-body="true" :close-on-click-modal="false" title="修改密码" :visible.sync="diaPass" width="400">
-      <el-form
-        v-loading="loading"
-        ref="formPass"
-        class="form-box"
-        :model="password"
-        :rules="rulesPassword"
-        label-width="160px"
-      >
-        <el-form-item label="旧密码：" prop="oldPassword"
-          ><el-col :span="10"
-            ><el-input
-              maxlength="30"
-              v-model="password.oldPassword"
-              placeholder="请输入密码"
-              show-password
-            ></el-input></el-col
-        ></el-form-item>
-        <el-form-item label="新密码：" prop="password"
-          ><el-col :span="10"
-            ><el-input
-              maxlength="30"
-              v-model="password.password"
-              placeholder="请输入新密码"
-              show-password
-            ></el-input></el-col
-        ></el-form-item>
-        <el-form-item label="确认密码：" prop="resetPassword"
-          ><el-col :span="10"
-            ><el-input
-              maxlength="30"
-              v-model="password.resetPassword"
-              placeholder="请输入新密码"
-              show-password
-            ></el-input></el-col
-        ></el-form-item>
+      <el-form v-loading="loading" ref="formPass" class="form-box" :model="password" :rules="rulesPassword"
+        label-width="160px">
+        <el-form-item label="旧密码：" prop="oldPassword"><el-col :span="10"><el-input maxlength="30"
+              v-model="password.oldPassword" placeholder="请输入密码" show-password></el-input></el-col></el-form-item>
+        <el-form-item label="新密码：" prop="password"><el-col :span="10"><el-input maxlength="30"
+              v-model="password.password" placeholder="请输入新密码" show-password></el-input></el-col></el-form-item>
+        <el-form-item label="确认密码：" prop="resetPassword"><el-col :span="10"><el-input maxlength="30"
+              v-model="password.resetPassword" placeholder="请输入新密码" show-password></el-input></el-col></el-form-item>
       </el-form>
       <div class="dialog-footer" slot="footer">
         <el-button @click="editPass">确 定</el-button>
@@ -307,7 +246,7 @@ export default {
           window.location.href = data;
         } else {
           localStorage.setItem("token", "");
-          sessionStorage.setItem("addTab","")
+          sessionStorage.setItem("addTab", "")
           this.$store.commit("setToken", "");
           this.$store.commit("setInfo", "");
           this.$store.commit("setRouters", "");
@@ -331,7 +270,11 @@ $top: top;
 $bottom: bottom;
 $left: left;
 $right: right;
-$leftright: ($left, $right);
+$leftright: (
+  $left,
+  $right
+);
+
 %w100 {
   width: 100%;
 }
@@ -368,16 +311,24 @@ ul.el-menu {
   justify-content: space-between;
   color: #fff;
   padding: 0 20px 0 10px;
+
+  .routeMap { 
+    display: inline-block;
+  }
+
   .hideAside {
     @extend %cursor;
+
     i {
       font-size: 24px;
       line-height: 70px;
     }
   }
+
   .personal {
     display: flex;
     flex-direction: row;
+
     li {
       @include set-value(margin, 8px);
       font-size: 12px;
@@ -386,40 +337,48 @@ ul.el-menu {
       line-height: 70px;
     }
   }
+
   .userInfo {
     display: flex;
     align-items: center;
     height: 70px;
     @extend %cursor;
+
     .txt {
       display: flex;
       flex-direction: column;
       justify-content: center;
       margin: 0 5px;
+
       p {
         line-height: 20px;
         font-size: 12px;
       }
     }
+
     img {
       border-radius: 5px;
       width: 28px;
       height: 28px;
     }
   }
+
   .el-icon {
     font-size: 20px;
     line-height: 50px;
   }
+
   .fa-lg {
     color: #fff;
   }
+
   .dropdown {
     position: absolute;
     top: 0;
     right: 0;
     bottom: 0;
     left: 0;
+
     .dropdown-link {
       height: 70px;
     }
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 2f95b3d..806f9cb 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -171,9 +171,9 @@ $cursor: #000;
 }
 .login-container {
   width: 100%;
-  height: 150vh;
+  height: 100%;
   background: url("../../assets/images/login-bg.png") no-repeat;
-  background-size: cover;
+  background-size: 100% 100%;
   overflow: hidden;
   display: flex;
   justify-content: center;
diff --git a/vue.config.js b/vue.config.js
index fdc9339..26ea643 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -24,7 +24,8 @@ module.exports = {
       "/": {
         // target:"http://ezquiz.sunvotecloud.cn",
         // target:"http://192.168.1.151:8089",
-        target: "http://121.40.127.171:8089",
+        target: "http://121.40.127.171:8090",
+        // target: "http://121.40.127.171",
         // target:"http://127.0.0.1:8089",
         changeOrigin: true,
         ws: true,
@@ -49,6 +50,7 @@ module.exports = {
       .set("utils", resolve("src/utils"))
       .set("store", resolve("src/store"))
       .set("views", resolve("src/views"))
+      .set("config", resolve("src/config"))
       .set("api", resolve("src/api"));
     if (IS_PROD) {
       config.plugin("webpack-report").use(BundleAnalyzerPlugin, [