diff --git a/.vs/Ezquiz_Platform/FileContentIndex/55df62fa-5432-4cfd-bb10-cbdb5e263ba4.vsidx b/.vs/Ezquiz_Platform/FileContentIndex/55df62fa-5432-4cfd-bb10-cbdb5e263ba4.vsidx
deleted file mode 100644
index 1ebcfd8..0000000
--- a/.vs/Ezquiz_Platform/FileContentIndex/55df62fa-5432-4cfd-bb10-cbdb5e263ba4.vsidx
+++ /dev/null
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
index 9c27876..de16a4e 100644
--- a/.vs/slnx.sqlite
+++ b/.vs/slnx.sqlite
diff --git a/src/App.vue b/src/App.vue
index b47af19..5aef7fe 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -18,70 +18,73 @@ export default {
 			const $app = this.$refs.app;
 			// 设置 屏幕 百分比 尺寸 适配
 			const standardScale = "100%" / "100%";
-			var minHeight = 1080;
 			window.addEventListener(
 				"resize",
 				_.debounce(function () {
+
 					const docHeight = document.body.clientHeight;
+
 					const docWidth = document.body.clientWidth;
-			 
+
 					if (docWidth < 1700) {
+
 						const currentScale = docHeight / docWidth;
+
 						let [scale, translate] = [0, 0];
+
 						if (currentScale < standardScale) {
 							// 以高度计算
 							scale = docHeight / 1080;
+
 							const shouleWidth = 1920 * scale;
 
 							const offsetWidth = docWidth - shouleWidth;
+
 							translate =
 								offsetWidth > 0 ? `translate(${offsetWidth / 2}px, 0)` : "";
+								
 						} else {
 							// 以宽度计算
 							scale = docWidth / 1920;
+
 							const shouleHeight = 1080 * scale;
+
 							const offsetHeight = docHeight - shouleHeight;
+
 							translate =
 								offsetHeight > 0 ? `translate(0, ${offsetHeight / 2}px)` : "";
-						}
-				
-						if (docHeight <= 600) {
-							$app.style.cssText = `
-							transform: scale(${scale}) ${translate};
-							transform-origin: top left;
-							min-width: 1920px;
-							min-height:500px;
-          				`;
-						}
+						} 
+			
 						if (docHeight <= 700) {
+
 							$app.style.cssText = `
-							transform: scale(${scale}) ${translate};
-							transform-origin: top left;
-							min-width: 1920px;
-							min-height:900px;
-          				`;
+								transform: scale(${scale}) ${translate};
+								transform-origin: top left;
+								min-width: 1920px;
+								min-height: 850px; 
+          					`; 
 						}
 						else if (docHeight <= 750) {
+							
 							$app.style.cssText = `
-							transform: scale(${scale}) ${translate};
-							transform-origin: top left;
-							min-width: 1920px;
-							min-height:920px;
-          				`;
+								transform: scale(${scale}) ${translate};
+								transform-origin: top left;
+								min-width: 1920px;
+								min-height:920px; 
+          					`; 
 						}
 						else {
 							$app.style.cssText = `
-							transform: scale(${scale}) ${translate};
-							transform-origin: top left;
-							min-width: 1920px;
-							min-height:1080px;
-          				`;
+								transform: scale(${scale}) ${translate};
+								transform-origin: top left;
+								min-width: 1920px;
+								min-height:1080px; 
+          					`; 
 						}
 
 					} else {
 						$app.style.cssText = '';
 					}
-
 				}),
 				300
 			);
@@ -103,8 +106,7 @@ export default {
 body {
 	margin: 0px;
 	padding: 0px;
-	font-family: Microsoft YaHei, Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, SimSun, sans-serif;
-	font-size: 14px;
+	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 21ce772..9507ba0 100644
--- a/src/api/apis/apis.js
+++ b/src/api/apis/apis.js
@@ -23,8 +23,14 @@ const downService = (url, data) => {
     responseType: 'arraybuffer',
   });
 }
-export default {
-  //  年级组长-成绩测验单
+export default { 
+  // 知识点
+  gKnowledge(section, subject) {
+    return defaltService(setUpUrls.gtestExamReport, {
+      ...subject, ...section
+    })
+  },
+  // 年级组长-成绩测验单
   gTestExamReport(data) {
     return defaltService(setUpUrls.gtestExamReport, data)
   },
@@ -60,7 +66,7 @@ export default {
   gExportPhaseInteractiveReport(data) {
     return downService(setUpUrls.gExportPhaseInteractiveReport, data)
   },
- 
+
   // 年级组长-首页统计数据
   gIndex(data) {
     return defaltService(setUpUrls.gIndex, data)
@@ -146,8 +152,27 @@ export default {
     return defaltService(setUpUrls.tClassList, data)
   },
   //任课老师-查询管理的班级
-  tClassFromGrade(data) {
-    return defaltGetService(setUpUrls.tClassFromGrade + "?classId=" + data)
+  tClassFromGrade(classId = null, subjectName = null) {
+    var requestParams = [];
+    if (classId) {
+      requestParams.push("classId=" + classId);
+    }
+    if (subjectName) {
+      requestParams.push("subjectName=" + subjectName);
+    }
+    var requestUrl = setUpUrls.tClassFromGrade + (requestParams.length >= 1 ? "?" + requestParams.join("&") : "");
+    return defaltGetService(requestUrl)
+  },
+  tClassGrade(grade = null, subjectName = null) {
+    var requestParams = [];
+    if (grade) {
+      requestParams.push("grade=" + grade);
+    }
+    if (subjectName) {
+      requestParams.push("subjectName=" + subjectName);
+    }
+    var requestUrl = setUpUrls.tClassGrade + (requestParams.length >= 1 ? "?" + requestParams.join("&") : "");
+    return defaltGetService(requestUrl)
   },
   tPaperDetail(data) {
     return defaltService(setUpUrls.tPaperDetail, data)
@@ -168,6 +193,18 @@ export default {
   tClassdiffExamReport(data) {
     return defaltService(setUpUrls.tclassdiffExamReport, data)
   },
+  tgexportPhaseExamReport(data) {
+    return downService(setUpUrls.gExportPhaseExamReport, data)
+  },
+  tgexportPhaseExamReport2(data) {
+    return downService(setUpUrls.gexportPhaseExamReport2, data)
+  },
+  tgexportPhaseExamReport3(data) {
+    return downService(setUpUrls.gexportPhaseExamReport3, data)
+  },
+  tgexportPhaseExamReport4(data) {
+    return downService(setUpUrls.gexportPhaseExamReport4, data)
+  },
   //任课老师-查询管理班级授课科目
   tListExamReport(data) {
     return defaltService(setUpUrls.tListExamReport, data)
@@ -926,8 +963,12 @@ export default {
   // 查询即时测多班默认等级列表
   defaultLevels(data) {
     return defaltService(setUpUrls.defaultLevels, data)
+  },  // 查询即时测多班默认等级列表
+  gdefaultLevels(data) {
+    return defaltService(setUpUrls.gdefaultLevels, data)
   },
 
+
   // 删除随堂问报表
   deletePaperReport(data) {
     return defaltService(setUpUrls.deletePaperReport, data)
diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js
index 5f68a86..85e46ef 100644
--- a/src/api/urls/apis.js
+++ b/src/api/urls/apis.js
@@ -1,5 +1,7 @@
 
 export default {
+   // 年级组长-查询报表列表
+  gKnowledge: "/api_html/knowledge/list",
   // 年级组长-查询报表列表
   gListExamReport: "/api_html/grade/manager/listExamReport",
   // 年级组长-查询管理的班级
@@ -8,6 +10,9 @@ export default {
   gExportPhaseAnswerReport: "/api_html/grade/manager/exportPhaseAnswerReport",
   // 年级组长-导出阶段测练
   gExportPhaseExamReport: "/api_html/grade/manager/exportPhaseExamReport",
+  gexportPhaseExamReport2: "/api_html/grade/manager/exportPhaseExamReport2",
+  gexportPhaseExamReport3: "/api_html/grade/manager/exportPhaseExamReport3",
+  gexportPhaseExamReport4: "/api_html/grade/manager/exportPhaseExamReport4",
   // 年级组长-导出阶段问答
   gExportPhaseInteractiveReport: "/api_html/grade/manager/exportPhaseInteractiveReport",
   // 年级组长-成绩测验单
@@ -63,19 +68,21 @@ export default {
   // 任课老师-班级情况对比
   tclassdiffExamReport: "/api_html/teaching/classdiffExamReport",
   tClassFromGrade: "/api_html/teaching/grade/classList",
+  tClassGrade:'/api_html/teaching/grade',
   //任课老师-测验成绩单
   tTestExamReport: "/api_html/teaching/testExamReport",
   //任课老师-查询答题卡详情
   tPaperDetail: "/api_html/teaching/paperDetail",
   //任课老师-查询管理班级授课科目
   tSubjectList: "/api_html/teaching/subjectList",
-  tListExamReport: "/api_html/teaching/listExamReport", 
+  tListExamReport: "/api_html/teaching/listExamReport",
   //任课老师-分页查询课时报表列表
   periodReportList: "/api_html/teaching/periodReportList",
   //任课老师-查询阶段问答报表
   phaseAnswerReport: "/api_html/teaching/phaseAnswerReport",
   //任课老师-查询阶段互动报表
   phaseInteractiveReport: "/api_html/teaching/phaseInteractiveReport",
+  exportPhaseExamReport: "/api_html/teaching/exportPhaseExamReport",  
   //任课老师-查询课时题目列表
   periodQuestionList: "/api_html/teaching/periodQuestionList",
   //任课老师-设置课时报表答案
@@ -116,8 +123,7 @@ export default {
   exportPhaseInteractiveReport: "/api_html/teaching/exportPhaseInteractiveReport",
   //任课老师-导出单课时报表
   exportPeriodReport: "/api_html/teaching/exportPeriodReport",
-  //任课老师-导出阶段测练报表
-  exportPhaseExamReport: "/api_html/teaching/exportPhaseExamReport",
+
   //任课老师-导出单卷测练报表
   exportExamReport: "/api_html/teaching/exportExamReport",
   //任课老师-查询学生列表
@@ -475,6 +481,7 @@ export default {
   exportExamMultiReport: "/api_html/teaching/exportExamMultiReport",
   //查询即时测多班默认等级列表
   defaultLevels: "/api_html/teaching/defaultLevels",
+  gdefaultLevels: "/api_html/grade/manager/defaultLevels",
   //教学班模版下载
   tClassAndStudentTemplate: "/api_html/school/manager/tClassAndStudentTemplate",
   //教学班导出
diff --git a/src/assets/css/index.scss b/src/assets/css/index.scss
index a41a380..62f2730 100644
--- a/src/assets/css/index.scss
+++ b/src/assets/css/index.scss
@@ -27,12 +27,29 @@
   }
 }
 
+.lowLevelClass {
+  color: white;
+  background: #FFA41C;
+  background-size: 200% 200%;
+  height: 100%;
+  width: 100%;
+}
+
+.overflowText {
+  white-space: nowrap;
+  width: calc(100% - 5px); //文字宽度
+  overflow: hidden; //超出宽度隐藏
+  white-space: nowrap; //强制文字在一行
+  text-overflow: ellipsis; //文字溢出显示省略号
+}
+
 .green-el-button {
   background-color: rgba(65, 204, 149, 1);
   color: white;
   border-color: rgba(65, 204, 149, 1);
 
-   :focus,:hover {
+  :focus,
+  :hover {
     background-color: rgba(65, 204, 149, 1);
     color: white;
     border-color: rgba(65, 204, 149, 1);
@@ -56,7 +73,7 @@
     flex-wrap: nowrap;
 
     .sel {
-      width: 8%;
+      width: 10%;
       min-width: 160px;
       margin-right: 20px;
     }
@@ -78,7 +95,7 @@
     }
 
     .input-with-select {
-      width: 200px;
+      width: 230px;
       height: 36px;
       margin-right: 50px;
       border-radius: 20px;
@@ -290,6 +307,31 @@ ul {
   }
 }
 
+
+.parent-number {
+  position: relative;
+}
+
+.parent-number::after {
+  content: '%';
+  display: inline-block;
+  height: 20px;
+  line-height: 20px;
+  width: 20px;
+  text-align: center;
+  position: absolute;
+  right: 52px;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+.parent-number .el-input__inner {
+  // 不加这行的话，当文本框里数值很大时，会和单位重叠
+  padding-left: 30px;
+  padding-right: 48px;
+}
+
+
 // 默认标题
 .default-title {
   height: 36px;
@@ -302,6 +344,7 @@ ul {
   text-transform: none;
 }
 
+
 // 默认实体
 .default-body {
   font-size: 14px;
@@ -329,6 +372,9 @@ ul {
     padding: 0px !important;
 
     .default-table {
+      width: 100% !important;
+      height: 100% !important;
+
       th {
         font-weight: 400;
         font-size: 14px;
@@ -336,11 +382,14 @@ ul {
         text-align: left;
         font-style: normal;
         text-transform: none;
-        border:1px solid #ebeef5;
+        border: 1px solid #ebeef5;
       }
 
-      tr,td {
-        height: 40px; border:1px solid #ebeef5;
+      tr,
+      td {
+        height: 40px;
+        padding: 5px 0px !important;
+        border: 1px solid #ebeef5;
       }
     }
 
@@ -379,8 +428,8 @@ ul {
     padding: 14px 20px !important;
 
     * {
-      height: 32px;
-      line-height: 32px;
+      height: 40px;
+      line-height: 40px;
     }
 
     .filter-input,
@@ -395,10 +444,14 @@ ul {
 
       input {
         // border: 1px solid #DCDFE6;
-        height: 31px;
+        height: calc(100% - 10px);
       }
     }
 
+    .el-select__tags .el-tag {
+      height: 24px !important;
+    }
+
     .el-button {
       width: auto;
       line-height: 0px;
@@ -409,4 +462,59 @@ ul {
       background-color: rgb(107, 126, 245);
     }
   }
+}
+
+@media screen and (max-width: 1921px) and (max-height: 1081px) {
+  * :not(.p1, .fa, .el-button, .el-icon-upload, h1, h2, h3, h4, h5, h6) {
+    font-size: 18px !important;
+
+    .default-title {
+      font-size: 24px !important;
+    }
+
+    .el-button * {
+      font-size: 16px !important;
+    }
+
+    .el-select-dropdown__item * {
+      font-size: 16px !important;
+    }
+
+    .el-form :not(h1, h2, h3, h4, h5, h6),
+    .el-dropdown-menu__item,
+    .el-cascader-node__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) {
+
+    font-size: 14px !important;
+
+    .default-body .default-filter * {
+      line-height: 38px !important;
+    }
+
+    .card-content {
+      width: 48% !important;
+    }
+
+    .default-title {
+      font-size: 24px !important;
+    }
+
+    .el-select-dropdown__item * {
+      font-size: 12px !important;
+    }
+
+    .el-form :not(h1, h2, h3, h4, h5, h6),
+    .el-dropdown-menu__item,
+    .el-cascader-node__label {
+      font-size: 12px !important;
+    }
+
+  }
 }
\ No newline at end of file
diff --git a/src/assets/images/example.jpg b/src/assets/images/example.jpg
deleted file mode 100644
index 996cf9e..0000000
--- a/src/assets/images/example.jpg
+++ /dev/null
diff --git a/src/components/backBox.vue b/src/components/backBox.vue
index 4c427de..66a0f50 100644
--- a/src/components/backBox.vue
+++ b/src/components/backBox.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="back">
+  <div class="back default-title">
     <div class="back-l" @click="back">
-      <i class="fa fa-mail-reply-all"></i>
+      <i class="fa fa-mail-reply-all "></i>
       <slot name="title"></slot>
     </div>
     <div class="back-r">
@@ -55,7 +55,6 @@ export default {
     align-items: center;
     cursor: pointer;
     flex-shrink: 0;
-    font-size: 18px;
     font-weight: 500;
   }
 
@@ -66,7 +65,6 @@ export default {
   }
 
   .fa-mail-reply-all {
-    font-size: 28px;
     color: #b3b3b3;
     margin-right: 12px;
   }
diff --git a/src/components/charts/lineChart.vue b/src/components/charts/lineChart.vue
index 15bdb53..9158412 100644
--- a/src/components/charts/lineChart.vue
+++ b/src/components/charts/lineChart.vue
@@ -3,6 +3,7 @@
 </template>
 
 <script>
+import 'echarts/lib/component/dataZoom'
 export default {
   name: "lineChart",
   props: {
@@ -11,7 +12,7 @@ export default {
     xAxis: Array,
     colors: Array,
     formatterYAxis: true,
-    tooltipFormatter:false
+    tooltipFormatter: false
   },
   watch: {
     params: {
@@ -19,6 +20,7 @@ export default {
         if (val.length) {
           this.initData();
         }
+        console.log(val)
       },
       deep: true,
     },
@@ -33,6 +35,43 @@ export default {
     this.initData();
   },
   methods: {
+    extension(chart) {
+      // 注意这里，是以X轴显示内容过长为例，如果是y轴的话，需要把params.componentType == 'xAxis'改为yAxis
+      // 判断是否创建过div框,如果创建过就不再创建了
+      // 该div用来盛放文本显示内容的，方便对其悬浮位置进行处理
+      var elementDiv = document.getElementById('extension')
+      if (!elementDiv) {
+        var div = document.createElement('div')
+        div.setAttribute('id', 'extension')
+        div.style.display = 'block'
+        document.querySelector('html').appendChild(div)
+      }
+      chart.on('mouseover', function (params) {
+        if (params.componentType == 'xAxis') {
+          var elementDiv = document.querySelector('#extension')
+          //设置悬浮文本的位置以及样式
+          var elementStyle =
+            'position: absolute;z-index: 99999;color: #fff;padding: 5px;display: inline;border-radius: 4px;background-color: #303133;box-shadow: rgba(0, 0, 0, 0.3) 2px 2px 8px'
+          elementDiv.style.cssText = elementStyle
+          elementDiv.innerHTML = params.value
+          document.querySelector('html').onmousemove = function (event) {
+            var elementDiv = document.querySelector('#extension')
+            var xx = event.pageX - 10
+            var yy = event.pageY + 15
+            elementDiv.style.top = yy + 'px'
+            elementDiv.style.left = xx + 'px'
+          }
+        }
+      })
+      chart.on('mouseout', function (params) {
+        //注意这里，我是以X轴显示内容过长为例，如果是y轴的话，需要改为yAxis
+        if (params.componentType == 'xAxis') {
+          var elementDiv = document.querySelector('#extension')
+
+          elementDiv.style.cssText = 'display:none'
+        }
+      })
+    },
     setOption() {
       const that = this;
       const options = {
@@ -43,10 +82,27 @@ export default {
           confine: true,
           formatter(v) {
             let html = `<p>${v.seriesName}</p>`
-            html += `${v.marker} ${v.name}：${Number(v.value)}${that.tooltipFormatter?'%':''}`
+            html += `${v.marker} ${v.name}：${Number(v.value)}${that.tooltipFormatter ? '%' : ''}`
             return html
           },
         },
+        dataZoom: [{
+          type: 'slider',//给x轴设置滚动条
+          show: true, //flase直接隐藏图形
+          xAxisIndex: [0],
+          bottom: 0,
+          height: 20,
+          showDetail: false,
+          startValue: 0,//滚动条的起始位置
+          endValue: 9 //滚动条的截止位置（按比例分割你的柱状图x轴长度）
+        },
+        {
+          type: 'inside',//设置鼠标滚轮缩放
+          show: true,
+          xAxisIndex: [0],
+          startValue: 0,
+          endValue: 9
+        }],
         legend: {
           show: true,
           top: 0,
@@ -54,18 +110,37 @@ export default {
           itemHeight: 15,
           icon: "circle"
         },
+        grid: {
+          top: '3%',
+          right: '3%',
+          bottom: '3%',
+          left: '0%',
+          // 包含文本
+          containLabel: true,
+          // 是否显示网格线
+          show: true,
+          // 边框颜色
+          borderColor: 'rgba(0, 240, 255, 0.3)',
+        },
         xAxis: {
           type: "category",
           data: this.xAxis,
           axisLine: { show: true, lineStyle: { color: "#e2e2e2" } },
           axisTick: {
+            alignWithLabel: false,
             show: false,
           },
+          triggerEvent: true,
           axisLabel: {
             color: "#333",
             interval: 0,
             width: Math.ceil(600 / this.xAxis.length),
-            overflow: "breakAll"
+            formatter: function (value) {
+              if (value.length > 3) {
+                return `${value.slice(0, 3)}...`
+              }
+              return value
+            }
           },
         },
         yAxis: {
@@ -100,7 +175,7 @@ export default {
             data: item.value,
           };
         }),
-      };
+      };  
       return options;
     },
     initData() {
@@ -112,6 +187,7 @@ export default {
       this.chart?.clear();
       this.chart.setOption(options, true);
       this.chart.off("click");
+      this.extension(this.chart)
       this.chart.on("click", "series", (params) => {
         // this.$emit("clickPieChart", params);
       });
diff --git a/src/components/charts/pieChart.vue b/src/components/charts/pieChart.vue
index 3761ff0..37f6d04 100644
--- a/src/components/charts/pieChart.vue
+++ b/src/components/charts/pieChart.vue
@@ -99,7 +99,7 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped>
+<style scoped>
 .chart {
   height: 100%;
 }
diff --git a/src/components/lang/langSelect.vue b/src/components/lang/langSelect.vue
index 7cd2d7c..19537b7 100644
--- a/src/components/lang/langSelect.vue
+++ b/src/components/lang/langSelect.vue
@@ -40,12 +40,12 @@ export default {
 }
 </script>
 <style>
-  .international .el-dropdown-link {  cursor: pointer;  color: #666666;  font-size: 14px;  }
-  .el-icon-arrow-down {  font-size: 14px;  }
+  .international .el-dropdown-link {  cursor: pointer;  color: #666666;   }
+ 
 </style>
 <style scoped>
   .international-icon {
-    font-size: 20px;
+ 
     cursor: pointer;
     vertical-align: -5px !important;
   }
diff --git a/src/components/setAnswer.vue b/src/components/setAnswer.vue
index 6c83837..e64cb3e 100644
--- a/src/components/setAnswer.vue
+++ b/src/components/setAnswer.vue
@@ -82,8 +82,7 @@
     <el-dialog :close-on-click-modal="false"
       title="批量设置答案" 
       :visible.sync="diaSetAns"
-      width="400" :append-to-body="true"
-      :modal-append-to-body="false"
+      width="400" :append-to-body="true" 
     >
       <div class="qs-options set-questions">
         <p>{{ setSubPro(formAns.qusType) }}：</p>
diff --git a/src/config/index.js b/src/config/index.js
index 5815dbc..082ae1d 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -7,6 +7,7 @@ const modeUrl = {
   },
   // 生产环境
   production: {
+    baseURL: "/api/",
     authBaseURL: "",
     $cdn:""
   },
diff --git a/src/store/index.js b/src/store/index.js
index 4b7c831..59780ff 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -56,7 +56,7 @@ const store = new Vuex.Store({
       }
 
       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;
@@ -66,9 +66,9 @@ const store = new Vuex.Store({
             return itemFilter.demoRoles?.includes(state.info.showRole) == true
           });
           if (item.children.length >= 1) return item;
-        } 
-        return null; 
-      });  
+        }
+        return null;
+      });
       state.addRouters = aRouters; // 保存动态路由用来addRouter
       state.routers = defaultRouter.concat(aRouters); // 所有有权限的路由表，用来生成菜单列表
       localStorage.setItem("addRouters", JSON.stringify(routers));
@@ -85,7 +85,8 @@ const store = new Vuex.Store({
     },
     setClasses(state, data) {
       state.classes = data;
-      localStorage.setItem("classes", data);
+      console.log(state)
+      localStorage.setItem('store', "classes", data);
     },
     setRefreshTestList(state, data) {
       state.refreshTestList = data;
diff --git a/src/utils/index.js b/src/utils/index.js
index 512e885..afe7a11 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -106,6 +106,32 @@ export function deepClone(obj) {
   return result;
 }
 
+export function getKnowledge(knowledge) {
+
+  if (!knowledge) return "";
+
+  var splitPoints = s.Split(',');
+
+  var result = "";
+
+  splitPoints.forEach(split => {
+
+    var ss = split.Split('#').filter(dd => dd.length >= 1);
+
+    if (ss.length > 0) {
+      result += ss[ss.Length - 1] + "；";
+    }
+  })
+
+  if (result.length > 1) result = result.substring(0, result.length - 1);
+
+  if (result.length == 1) {
+    return "";
+  }
+
+  return result;
+}
+
 // // 3DES加密
 // export function desEncrypt (str, key = encryptKey, iv = encryptIV) {
 //   var cryptoKey = CryptoJS.enc.Utf8.parse(key)
@@ -840,6 +866,7 @@ export function tablePrint(id, title, type = null) {
     .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}
diff --git a/src/views/basic/askTestQuestion/components/askBzrMulti.vue b/src/views/basic/askTestQuestion/components/askBzrMulti.vue
index 8724954..50329b0 100644
--- a/src/views/basic/askTestQuestion/components/askBzrMulti.vue
+++ b/src/views/basic/askTestQuestion/components/askBzrMulti.vue
@@ -50,7 +50,7 @@
             }}</template>
                             </el-table-column>
                         </el-table-column>
-                        <el-table-column label="查看雷达图">
+                        <el-table-column label="查看雷达图" fixed="right" width="100" align="center">
                             <template slot-scope="scoped">
                                 <el-button type="text" @click="openRandarChart(scoped.row)">查看</el-button>
                             </template>
@@ -63,32 +63,27 @@
                     <el-table class="default-table" :data="interactionList">
                         <el-table-column prop="studentCode" label="学号"></el-table-column>
                         <el-table-column prop="studentName" label="姓名"></el-table-column>
+                        <el-table-column prop="interactionsNum全部科目" label="参与分"></el-table-column>
+                        <el-table-column prop="interactionsCorrectNum全部科目" label="对错分"></el-table-column>
                         <el-table-column v-for="(item, index) in interactionOptions" :key="index" :label="item">
-                            <el-table-column v-if="index == 0" label="参与分" :prop="'interactionsNum' + item">
+
+                            <el-table-column label="互动数" :prop="'answerTimes' + item">
                                 <template slot-scope="scoped">{{
-                scoped.row["interactionsNum" + item] ||
-                    Number(scoped.row["interactionsNum" + item]) === 0
-                    ? scoped.row["interactionsNum" + item]
+                scoped.row["answerTimes" + item] ||
+                    Number(scoped.row["answerTimes" + item]) === 0
+                    ? scoped.row["answerTimes" + item]
                     : "-"
             }}</template>
                             </el-table-column>
-                            <el-table-column v-else label="互动数" :prop="'interactionsNum' + item">
+                            <el-table-column label="参与数" :prop="'interactionsNum' + item">
                                 <template slot-scope="scoped">{{
                 scoped.row["interactionsNum" + item] ||
                     Number(scoped.row["interactionsNum" + item]) === 0
                     ? scoped.row["interactionsNum" + item]
                     : "-"
-            }}</template>
-                            </el-table-column>
-                            <el-table-column v-if="index == 0" label="对错分" :prop="'interactionsCorrectNum' + item">
-                                <template slot-scope="scoped">{{
-                scoped.row["interactionsCorrectNum" + item] ||
-                    Number(scoped.row["interactionsCorrectNum" + item]) === 0
-                    ? scoped.row["interactionsCorrectNum" + item]
-                    : "-"
                                     }}</template>
                             </el-table-column>
-                            <el-table-column v-else label="参与数" :prop="'interactionsCorrectNum' + item">
+                            <el-table-column label="答对数" :prop="'interactionsCorrectNum' + item">
                                 <template slot-scope="scoped">{{
                                     scoped.row["interactionsCorrectNum" + item] ||
                                     Number(scoped.row["interactionsCorrectNum" + item]) === 0
@@ -101,18 +96,16 @@
                 </el-row>
             </div>
         </div>
-
-        <el-dialog :append-to-body="true" class="chart-dia" @close="radarChart.visible=false" :visible="radarChart.visible"
-            :title="radarChart.title" width="800"  >
+        <el-dialog :append-to-body="true" class="chart-dia" :visible.sync="redarVisible" :title="radarChart.title"
+            width="800">
             <div class="chart-box">
-                <RadarChart id="askRadarChart" :params="radarChart" :tooltipFormatter="true" />
+                <RadarChart id="radarChart" :params="radarChart" />
             </div>
         </el-dialog>
     </div>
 </template>
 <script>
-import { formatDate } from "utils";
-import { downloadFile, tablePrint } from "@/utils";
+import { downloadFile, tablePrint, formatDate } from "@/utils";
 import RadarChart from "@/components/charts/radarChart";
 export default {
     name: "askbzrMutli",
@@ -148,6 +141,7 @@ export default {
             interactionList: [],
             interactionOptions: [],
             interactionSubjects: [],
+            redarVisible: false,
             radarChart: {
                 title: "",
                 indicator: [
@@ -174,7 +168,25 @@ export default {
         await this._changeType();
     },
     methods: {
-        _import() { },
+        async _import() {
+
+            var importReport = this.currentType == '学生多科互动表现' ? this.$request.cTExportPhaseInteractiveReport : this.$request.cTExportPhaseAnswerReport;
+
+            const data = await importReport({
+                periodIds: this.$props.askReportIds,
+                classIds: [this.$props.queryParams.class],
+                subjectNames: [...this.$props.queryParams.subjects],
+            });
+
+            if (data) {
+                let blob = new Blob([data], {
+                    type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+                });
+                downloadFile(`随堂问-多科汇总分析报表.xlsx`, blob);
+            } else {
+                this.$message.error("下载失败");
+            }
+        },
         _print() {
 
             tablePrint("print-content", this.currentType);
@@ -227,7 +239,6 @@ export default {
             return aTime;
         },
         async _multipleSubjectAnswers() {
-
             const answersRequest =
                 this.role == "ROLE_PERSONAL"
                     ? this.$request.pPhaseAnswerReport
@@ -236,10 +247,9 @@ export default {
             let query = {
                 periodIds: this.$props.askReportIds,
                 classIds: [this.$props.queryParams.class],
-                subjectNames: [this.$props.queryParams.subjectNames],
+                subjectNames: [...this.$props.queryParams.subjects],
             };
 
-
             let answersResponse = await answersRequest({
                 ...query
             });
@@ -297,6 +307,7 @@ export default {
             let query = {
                 periodIds: this.$props.askReportIds,
                 classIds: [this.$props.queryParams.class],
+                subjectNames: [...this.$props.queryParams.subjects],
             };
 
             let interactionReponse = await interactionRequest({
@@ -312,23 +323,25 @@ export default {
 
             this.interactionList = interactionReponse.data?.list?.map((item) => {
                 let params = {};
-                item.dataList?.map((items, index) => {
-                    if (!subjectName.includes(items.subjectName)) {
+                item.dataList?.filter((items, index) => { 
+                    if (!subjectName.includes(items.subjectName) && items.subjectName != '全部科目') {
                         subjectName.push(items.subjectName);
                     }
+                    params["answerTimes" + items.subjectName] =
+                        items.answerTimes;
                     params["interactionsNum" + items.subjectName] =
                         items.interactionsNum;
                     params["interactionsCorrectNum" + items.subjectName] =
                         items.interactionsCorrectNum;
                 });
+
                 return {
                     ...item,
                     ...params,
                 };
             });
-
+            console.log(this.interactionList)
             this.interactionOptions = [...subjectName];
-            console.log(this.interactionOptions)
         },
         openRandarChart(obj) {
             this.radarChart = {
@@ -345,7 +358,7 @@ export default {
                 ],
                 seriesData: [],
             };
-            this.radarChart.title = obj.studentName + "-多科-多课时作答表现图";
+            this.radarChart.title = obj.studentName + "-多科阶段作答表现图";
             let dataList = obj.dataList.slice(1, obj.dataList.length);
             let subjectList = dataList.map((item) => item.subjectName);
             subjectList.map((item, index) => {
@@ -377,7 +390,7 @@ export default {
                 },
             ];
 
-            this.radarChart.visible = true;
+            this.redarVisible = true;
         }
     }
 };
diff --git a/src/views/basic/askTestQuestion/components/askListReport.vue b/src/views/basic/askTestQuestion/components/askListReport.vue
index 8068354..7d2d14d 100644
--- a/src/views/basic/askTestQuestion/components/askListReport.vue
+++ b/src/views/basic/askTestQuestion/components/askListReport.vue
@@ -3,11 +3,23 @@
         <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="answerCorrectRate" label="已答正确率" width="180" />
-            <el-table-column prop="classCorrectRate" 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" >
+                <template slot-scope="scoped">
+                    {{ scoped.row.answerCorrectRate }}%
+                </template>
+            </el-table-column>
+            <el-table-column prop="classCorrectRate" label="班级正确率" width="180" >
+                <template slot-scope="scoped">
+                {{ scoped.row.classCorrectRate }}%
+            </template>
+            </el-table-column>
             <el-table-column prop="questionNum" label="题目总数" width="180" />
-            <el-table-column prop="startTime" 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">
@@ -42,9 +54,10 @@ export default {
                 id: dataRow.id,
             });
             if (status != 0) {
+                this.$message.success("删除成功！");
                 this.$message.error(info);
             }
-            this.$emit("resfer");
+            this.$emit("opration");
         },
         _linkToDetail(dataRow) {
             this.$router.push({
diff --git a/src/views/basic/askTestQuestion/components/askSummaryReport.vue b/src/views/basic/askTestQuestion/components/askSummaryReport.vue
index 64a1358..87fdb5e 100644
--- a/src/views/basic/askTestQuestion/components/askSummaryReport.vue
+++ b/src/views/basic/askTestQuestion/components/askSummaryReport.vue
@@ -63,15 +63,15 @@
                     </div>
                     <div class="row-line">
                         <span class="line-subfix">总参与度：</span>
-                        <span class="line-value">{{ detail.participationRate }}</span>
+                        <span class="line-value">{{ detail.participationRate ? detail.participationRate : 0 }}%</span>
                     </div>
                     <div class="row-line">
                         <span class="line-subfix">班级正确率：</span>
-                        <span class="line-value">{{ detail.classCorrectRate }}</span>
+                        <span class="line-value">{{ detail.classCorrectRate ? detail.classCorrectRate : 0 }}%</span>
                     </div>
                     <div class="row-line">
                         <span class="line-subfix">已达正确率：</span>
-                        <span class="line-value">{{ detail.answerCorrectRate }}</span>
+                        <span class="line-value">{{ detail.answerCorrectRate ? detail.answerCorrectRate : 0 }}%</span>
                     </div>
                     <div class="row-line">
                         <span class="line-subfix">反馈时长：</span>
@@ -81,7 +81,7 @@
                 <el-row class="row-table">
                     <el-table class="default-table" :data="singleSubjectSummary" border>
                         <el-table-column prop="title" label="课时-题号" />
-                        <el-table-column label="题干" width="120">
+                        <el-table-column label="题干" width="80">
                             <template slot-scope="scoped">
                                 <el-button type="text" @click="openStem(scoped.row)">查看</el-button>
                             </template>
@@ -91,18 +91,26 @@
                         </el-table-column>
                         <el-table-column prop="answeredNum" label="答题人数" width="100" />
                         <el-table-column prop="correctAnswerNum" label="答对人数" width="100" />
-                        <el-table-column prop="participationRate" label="班级参与度(单题)" width="150">
+                        <el-table-column prop="participationRate" label="班级参与度(单题)" width="170">
                             <template slot-scope="scoped">{{ scoped.row.participationRate }}%</template>
                         </el-table-column>
-                        <el-table-column prop="classCorrectRate" label="班级正确率(单题)" width="150">
+                        <el-table-column prop="classCorrectRate" label="班级正确率(单题)" width="170">
                             <template slot-scope="scoped">{{ scoped.row.classCorrectRate }}%</template>
                         </el-table-column>
 
-                        <el-table-column prop="answerCorrectRate" label="已答正确率(单题)" width="150">
+                        <el-table-column prop="answerCorrectRate" label="已答正确率(单题)" width="170">
                             <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="scoped.row.knowledge" placement="left">
+                                    <span class="overflowText">
+                                        {{  scoped.row.knowledge }}
+                                    </span>
+                                </el-tooltip>
+                            </template>
+                        </el-table-column>
                         <el-table-column prop="correctAnswer" label="正确答案(单题)" width="150">
                             <template slot-scope="scoped">
                                 {{
@@ -182,7 +190,7 @@
                         <el-table-column prop="correctRate" label="总正确率" width="120">
                             <template slot-scope="scoped">{{ scoped.row.correctRate }}%</template>
                         </el-table-column>
-                        <el-table-column prop="correctRateRank" label="总正确率排名" width="120" />
+                        <el-table-column prop="correctRateRank" label="总正确率排名" width="140" />
                         <el-table-column prop="answerCorrectRate" label="已答正确率" width="120">
                             <template slot-scope="scoped">{{ scoped.row.answerCorrectRate }}%</template>
                         </el-table-column>
@@ -203,20 +211,20 @@
                         <el-table-column prop="interactionsCorrectNum" label="对错得分" width="210" />
                         <el-table-column prop="rushAnswerTimes" label="抢答成功次数" width="210" />
                         <el-table-column prop="rushAnswerCorrectTimes" label="抢答答对次数" width="210" />
-                        <el-table-column prop="checkAnswerTimes" label="被抽打次数" width="210" />
-                        <el-table-column prop="checkAnswerCorrectTimes" label="抽打答对次数" width="210" />
+                        <el-table-column prop="checkAnswerTimes" label="被抽答次数" width="210" />
+                        <el-table-column prop="checkAnswerCorrectTimes" label="抽答答对次数" width="210" />
                     </el-table>
                 </el-row>
             </div>
         </div>
-        <el-dialog :append-to-body="true" class="chart-dia" :visible.sync="lineChart.visible" :title="lineChart.title" width="800"
-           >
+        <el-dialog :append-to-body="true" class="chart-dia" :visible.sync="lineChart.visible" :title="lineChart.title"
+            width="800">
             <div class="chart-box">
                 <LineChart id="askLineChart" :params="lineChart.data" :xAxis="lineChart.xAxis"
                     :tooltipFormatter="true" />
             </div>
         </el-dialog>
-        <el-dialog :append-to-body="true" class="stem" :visible.sync="stem.visible" :title="'题干'" width="800"  >
+        <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;" />
         </el-dialog>
         <ExportDia :exportStudent="exportStudent" :diaShow="diaShow" @cancel="cancel" @exportData="_exportData"
@@ -224,7 +232,7 @@
     </div>
 </template>
 <script>
-import { formatDate } from "utils";
+import { formatDate,getKnowledge } from "utils";
 import { downloadFile, tablePrint } from "@/utils";
 import LineChart from "@/components/charts/lineChart";
 export default {
@@ -234,7 +242,8 @@ export default {
     },
     props: {
         askReportIds: Array,
-        queryParams: Object
+        queryParams: Object,
+            role: "",
     },
 
     watch: {
@@ -287,9 +296,9 @@ export default {
             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("print-content", title + "_" + this.currentType);
         },
         cancel() {
             this.diaShow = false;
@@ -333,7 +342,7 @@ export default {
             } else {
                 this.$message.error("下载失败");
             }
-        }, 
+        },
         async refresh() {
             await this._changeType();
             await this._detail();
@@ -366,21 +375,30 @@ export default {
             return tit;
         },
         setDuration(times) {
+
+            if (!Number(times)) return "0分0秒";
             let m = parseInt(times / 1000 / 60);
             let s = parseInt((times / 1000) % 60);
             let ms = times;
             let aTime;
+
             if (times == 0) {
                 aTime = `0`;
             } else {
                 if (m == 0 && s == 0) {
                     aTime = `${ms}毫秒`;
-                } else if (m == 0 && s != 0) {
+                } else if (m == 0) {
                     aTime = `${s}秒`;
-                } else if (m != 0 && s != 0) {
-                    aTime = `${m}分${s}秒`;
+                } else {
+                    if (s == 0) {
+                        aTime = `${m}分`;
+                    }
+                    else {
+                        aTime = `${m}分${s}秒`;
+                    }
                 }
             }
+            // c=(aTime);
             return aTime;
         },
         async _detail() {
@@ -495,7 +513,8 @@ export default {
             this.total = interactiveListReponse.data.count;
         },
         openLineChart(chartRow) {
-            this.lineChart.title = `${chartRow.studentName}-${this.currentType}`;
+            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;
             let participationRate = [];
             let correctRate = [];
@@ -519,8 +538,7 @@ export default {
                     name: "已答正确率",
                     value: answerCorrectRate,
                 },
-            ];
-            console.log(this.lineChart)
+            ]; 
         },
         openStem(stemRow) {
             this.stem.src = stemRow.screenshot ?? "";
@@ -553,7 +571,7 @@ export default {
 }
 
 .row-line {
-    width: calc(20% - 2px);
+    width: calc(20% - 4px);
     border: 1px solid #ebeef5;
     background: #f5f7fa;
     display: inline-block;
diff --git a/src/views/basic/askTestQuestion/components/testBzrMulti.vue b/src/views/basic/askTestQuestion/components/testBzrMulti.vue
index f3df400..0ee0a9e 100644
--- a/src/views/basic/askTestQuestion/components/testBzrMulti.vue
+++ b/src/views/basic/askTestQuestion/components/testBzrMulti.vue
@@ -9,21 +9,14 @@
                 </div>
             </el-row>
             <el-row class="row-table">
-                <el-table class="default-table" :data="$props.list">
-                    <el-table-column width="48">
-                        <template slot="header">
-                            <el-checkbox v-model="checkedAll" @change="_checkAll"></el-checkbox>
-                        </template>
-                        <template slot-scope="scope">
-                            <el-checkbox v-model="multipleSelection" :label="scope.row.id"
-                                :disabled="_checkboxDisabled(scope.row)"><span></span></el-checkbox>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="subjectName" label="科目"></el-table-column>
-                    <el-table-column prop="className" label="班级"></el-table-column>
+                <el-table class="default-table" :data="$props.list" @selection-change="_tableSelectedChange">
+                    <el-table-column type="selection" width="48" :selectable="_checkboxDisabled" />
+
+                    <el-table-column prop="subjectName" label="科目" width="100"></el-table-column>
+                    <el-table-column prop="className" label="班级" width="100"></el-table-column>
                     <el-table-column prop="title" label="试卷名称"></el-table-column>
-                    <el-table-column prop="examPaperScore" label="卷面分"></el-table-column>
-                    <el-table-column label="测验人数/班级人数">
+                    <el-table-column prop="examPaperScore" label="卷面分" width="100"></el-table-column>
+                    <el-table-column label="测验人数/班级人数" width="200">
                         <template slot-scope="scoped">
                             {{ `${scoped.row.answeredNum}/${scoped.row.classPersonNum}` }}
                         </template>
@@ -44,7 +37,7 @@
                         </div>
                     </el-row>
                     <el-row class="row-table">
-                        <el-table :maxHeight="660" :data="selectedList" style="width: 100%" class="default-table">
+                        <el-table :data="selectedList" style="width: 100%" class="default-table">
                             <el-table-column prop="studentCode" label="学号" fixed></el-table-column>
 
                             <el-table-column prop="studentName" label="姓名" fixed>
@@ -106,10 +99,10 @@
             </el-container>
 
         </div>
-        <el-dialog class="chart-dia" :visible.sync="radarChart.visible" :title="radarChart.title" width="800"
+        <el-dialog class="chart-dia" :visible.sync="redarVisible" :title="radarChart.title" width="800"
             :append-to-body="true">
             <div class="chart-box">
-                <RadarChart id="askRadarChart" :params="radarChart" :tooltipFormatter="true" />
+                <RadarChart id="testRadarChart" :params="radarChart"  />
             </div>
         </el-dialog>
     </div>
@@ -151,6 +144,7 @@ export default {
             answerList: [],
             multipleSelection: [],
             multipleSelectionObj: {},
+            redarVisible: false,
             radarChart: {
                 title: "",
                 indicator: [
@@ -177,16 +171,53 @@ export default {
     },
     methods: {
         _print() {
+            tablePrint("print-content", this.currentType);
+        },
+        _checkAll() {
+            // this.multipleSelection = [...] 
+        },
+        _tableSelectedChange(values) {
 
+            this.multipleSelection = values.map(items => items.id);
+        },
+        async _import() {
 
-            tablePrint("print-content", this.currentType);
+            var testReport = this.$request.cTExportPhaseExamReport;
+
+            var classIds = [];
+            var subjects = [];
+            var ids = [];
+
+            this.$props.list?.map((item) => {
+                if (this.multipleSelection.includes(item.id)) {
+                    subjects.push(item.subjectName);
+                    classIds.push(item.classId);
+                }
+            });
+
+            ids = [...this.multipleSelection];
+
+
+            const data = await testReport({
+                classIds: classIds,
+                examIds: ids,
+                subjectNames: subjects
+            });
+
+            if (data) {
+                let blob = new Blob([data], {
+                    type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+                });
+                downloadFile(`即时测-多科汇总分析报表.xlsx`, blob);
+            } else {
+                this.$message.error("下载失败");
+            }
         },
-        _checkAll() { },
         _checkboxDisabled(obj) {
             if (obj.examStartTime) {
-                return false;
-            } else {
                 return true;
+            } else {
+                return false;
             }
         },
         async refresh() {
@@ -245,28 +276,36 @@ 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);
+                max = score > max ? score : max;
+                return item.subjectName;
+            });
+            max += 10;
+            max = max > 150 ? 150 : max;
             this.radarChart = {
                 indicator: [
                     {
                         name: "",
-                        max: 100,
+                        max: max,
                         axisLabel: {
                             show: true,
                             showMaxLabel: true,
-                            formatter: "{value}%",
                         },
                     },
                 ],
                 seriesData: [],
             };
-            this.radarChart.title = obj.studentName + "-多科-多课时作答表现图";
-            let dataList = obj.dataList.slice(1, obj.dataList.length);
-            let subjectList = dataList.map((item) => item.subjectName);
             subjectList.map((item, index) => {
                 if (index < 1) {
                     this.radarChart.indicator[index].name = item;
+                    this.radarChart.indicator[index].max = max;
                 } else {
-                    this.radarChart.indicator.push({ name: item, max: 100 });
+                    this.radarChart.indicator.push({ name: item, max: max });
                 }
             });
             // 为了美观
@@ -274,31 +313,36 @@ export default {
                 let num = this.radarChart.indicator.length;
                 for (let i = 0; i < 6; i++) {
                     if (i >= num) {
-                        this.radarChart.indicator.push({ name: "", max: 100 });
+                        this.radarChart.indicator.push({ name: "", max: max });
                     }
                 }
             }
-            let participationRate = dataList.map((item) => item.participationRate);
-            let correctRate = dataList.map((item) => item.correctRate);
             this.radarChart.seriesData = [
                 {
-                    value: participationRate,
-                    name: "参与度",
+                    value: dataList.map((item) => item.highestScore),
+                    name: "班级最高分",
                 },
                 {
-                    value: correctRate,
-                    name: "正确率",
+                    value: dataList.map((item) => item.avgScore),
+                    name: "班平均分",
                 },
-            ];
+                {
+                    value: dataList.map((item) => item.score),
+                    name: "本人得分",
+                },
+            ]; 
 
-            this.radarChart.visible = true;
+            this.radarChart.title = obj.studentName + "-多科阶段作答表现图";
+            console.log(this.radarChart)
+            this.redarVisible = true;
         },
         async _loadData() {
+
             var classIds = [];
             var subjects = [];
             var ids = [];
-
             this.$props.list?.map((item) => {
+
                 if (this.multipleSelection.includes(item.id)) {
                     subjects.push(item.subjectName);
                     classIds.push(item.classId);
@@ -326,6 +370,7 @@ export default {
                     if (!subjectName.includes(items.subjectName)) {
                         subjectName.push(items.subjectName);
                     }
+                    console.log(items)
                     params["examCount" + items.subjectName] = items.examCount;
                     params["participationCount" + items.subjectName] =
                         items.participationCount;
diff --git a/src/views/basic/askTestQuestion/components/testListReport.vue b/src/views/basic/askTestQuestion/components/testListReport.vue
index 6cc548d..08229b2 100644
--- a/src/views/basic/askTestQuestion/components/testListReport.vue
+++ b/src/views/basic/askTestQuestion/components/testListReport.vue
@@ -1,50 +1,41 @@
 <template>
     <div ref="main">
-        <el-table class="default-table" :data="tableData">
+        <el-table v-if="$props.datas" class="default-table" :data="$props.datas">
             <el-table-column prop="subjectName" label="科目" width="180" />
-            <el-table-column prop="className" label="班级" width="180" />
+            <el-table-column prop="className" label="班级" width="130" />
             <el-table-column prop="title" label="报表名称" />
-            <el-table-column prop="examPaperScore" label="卷面分" width="180" />
+            <el-table-column prop="examPaperScore" label="卷面分" width="130" />
             <el-table-column prop="classCorrectRate" label="测验人数/班级人数" width="180">
                 <template slot-scope="scoped">{{ `${scoped.row.answeredNum}/${scoped.row.classPersonNum}` }}</template>
             </el-table-column>
-            <el-table-column prop="questionNum" label="测验时长" width="180" />
-            <el-table-column prop="createdTime" label="测验开始时间" width="180" />
+            <el-table-column prop="questionNum" label="测验时长" width="130" />
+            <el-table-column prop="createdTime" label="测验开始时间" width="210" />
             <el-table-column label="操作" width="240">
                 <template slot-scope="scoped">
-                    <el-tooltip v-if="scoped.row.answerNum != 0 ||
+                    <el-button style="margin-right: 10px;" v-if="scoped.row.answerNum != 0 ||
             (scoped.row.recordStatus != 0 &&
                 scoped.row.subjectiveScore == scoped.row.examPaperScore)
-            " effect="dark" content="详情" style="margin-right: 10px;" placement="top">
-                        <el-button type="text" @click="_linkToDetail(scoped.row)">查看</el-button>
-                    </el-tooltip>
-                    <el-popconfirm style="margin-right: 10px;" title="确定删除这张答题卡吗？" @confirm="_removeReport(scoped.row)">
+            " type="text" @click="_linkToDetail(scoped.row)">查看</el-button>
+                    <el-popconfirm style="margin-right: 10px;" title="确定删除这次记录吗？" @confirm="_removeReport(scoped.row)">
                         <el-button style="color:red; " slot="reference" class="delete" type="text">
                             删除
                         </el-button>
                     </el-popconfirm>
-                    <template v-if="scoped.row.answerNum == 0 &&
-            scoped.row.subjectiveScore != scoped.row.examPaperScore
-            ">
-                        <el-tooltip v-if="role != 'ROLE_BANZHUREN'" effect="dark" content="设置答案" placement="top">
-                            <el-button type="text" icon="fa fa-file-text" @click="edit(scoped.row)"></el-button>
-                        </el-tooltip>
-                        <template v-else>未设置答案</template>
+                    <template
+                        v-if="scoped.row.answerNum == 0 && scoped.row.subjectiveScore != scoped.row.examPaperScore">
+                        <el-button style="margin-right: 10px;" v-if="role != 'ROLE_BANZHUREN'" type="text"
+                            @click="edit(scoped.row)">设置答案</el-button>
+                        <template v-else> <span style="margin-right: 10px;">未设置答案</span> </template>
                     </template>
                     <template v-if="role != 'ROLE_BANZHUREN' && scoped.row.examPaperId != 0">
                         <template>
                             <el-popover placement="bottom" ref="popoverRef">
-                                <div style="display: flex" v-loading="scoped.row.showSelect == 0 ||
-            scoped.row.showSelect == 1
-            ? false
-            : true
-            ">
-                                    <el-button v-if="scoped.row.showSelect == 0" size="mini"
+                                <div style="display: flex">
+                                    <el-button v-if="scoped.row.showSelect == 0"
                                         @click="openScoreSet(scoped.row, 1)">录入总得分</el-button>
-                                    <el-button type="primary" size="mini"
-                                        @click="openScoreSet(scoped.row, 2)">录入小题分</el-button>
+                                    <el-button type="primary" @click="openScoreSet(scoped.row, 2)">录入小题分</el-button>
                                 </div>
-                                <el-button slot="reference" type="text"
+                                <el-button style="margin-right: 10px;" slot="reference" type="text"
                                     @click="queryStatus(scoped.row)">录入分数</el-button>
                             </el-popover>
                         </template>
@@ -62,12 +53,17 @@ import ScoreSet from "../../test/components/scoreSet.vue";
 export default {
     name: "testListReport",
     props: {
-        datas: Array,
+        datas: Array || null,
     },
     components: {
         ScoreSet
     },
     watch: {
+        'diaScoreSet'(value) {
+            if (value == false) {
+                // this.$emit('opration');
+            }
+        },
         '$props.datas'(value) {
             if (this.role == "ROLE_BANZHUREN") {
                 this.isMultipleClass = false;
@@ -84,12 +80,13 @@ export default {
                         return item;
                     }) || [];
             }
-        },
+        }
     },
     created() {
         this.role =
             this.$store.getters.info.showRole ||
             this.$store.getters.info.permissions[0].role;
+
     },
     methods: {
         _linkToDetail(dataRow) {
@@ -113,13 +110,12 @@ export default {
             this.diaScoreSet = true;
         },
         async _removeReport(obj, index) {
-            this.tableData[index].loading = true;
             const { data, status, info } = await this.$request.deleteReport({
                 id: obj.id,
             });
             if (status === 0) {
                 this.$message.success("删除成功！");
-                this._QueryData();
+                this.$emit('opration');
             } else {
                 this.$message.error(info);
             }
@@ -143,7 +139,7 @@ export default {
         },
         //修改分数成功
         SuccessScoreSet() {
-            this._QueryData();
+            this.$emit('opration');
             this.closeScoreSet();
         },
         //修改答案
diff --git a/src/views/basic/askTestQuestion/components/testMultiClassReport.vue b/src/views/basic/askTestQuestion/components/testMultiClassReport.vue
index a36ed30..7e883e9 100644
--- a/src/views/basic/askTestQuestion/components/testMultiClassReport.vue
+++ b/src/views/basic/askTestQuestion/components/testMultiClassReport.vue
@@ -8,19 +8,19 @@
         </el-row>
         <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="180" />
-                <el-table-column prop="paperName" label="试卷名称" width="240" />
+                <el-table-column prop="subjectName" label="科目" width="100" />
+                <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 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>
                     </template>
                 </el-table-column>
-                <el-table-column prop="score" label="卷面分" width="180" />
-                <el-table-column label="操作" width="240">
+                <el-table-column prop="score" label="卷面分" width="100" />
+                <el-table-column label="操作" width="100">
                     <template slot-scope="scoped">
                         <el-button type="text" @click="_linkToDetail(scoped.row)">查看</el-button>
                     </template>
@@ -48,9 +48,7 @@ export default {
         }
     },
     methods: {
-        _linkToDetail(dataRow) {
-
-            console.log(dataRow)
+        _linkToDetail(dataRow) { 
             this.$router.push({
                 path: "/testReportDetail",
                 query: {
@@ -59,15 +57,16 @@ export default {
                     id: dataRow.paperId,
                     title: dataRow.paperName,
                     subjectName: dataRow.subjectName,
+                    diffType: this.currentType,
                 },
             });
         },
         async _loadDatas() {
-
+     
             var dataRequestParams = {
                 classIds: this.$props.params.class ? [this.$props.params.class] :
                     this.$props.params.classIds ? [...this.$props.params.classIds] : null,
-                diffType: this.currentType == "任课班级对比" ? "0" : "1",
+                diffType: this.currentType == "任课班级对比" ? "1" : "0",
                 end: this.$props.params.dataRange ? this.$props.params.dataRange[1] : null,
                 start: this.$props.params.dataRange ? this.$props.params.dataRange[0] : null,
                 subjects: this.$props.params.subject ? [this.$props.params.subject] :
diff --git a/src/views/basic/askTestQuestion/components/testSummaryReport.vue b/src/views/basic/askTestQuestion/components/testSummaryReport.vue
index d86a91a..ef38bb2 100644
--- a/src/views/basic/askTestQuestion/components/testSummaryReport.vue
+++ b/src/views/basic/askTestQuestion/components/testSummaryReport.vue
@@ -9,14 +9,28 @@
         <div id="print-content">
             <el-row class="row-table">
                 <el-table border class="default-table" :data="stageReport" 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 prop="studentCode" label="学号" fixed></el-table-column>
+                    <el-table-column prop="studentName" label="姓名" fixed>
                         <template slot-scope="scoped">
                             {{ scoped.row.studentName }}
-                        </template></el-table-column>
-                    <el-table-column v-if="answerList" align="center" v-for="(item, index) in answerList" :key="index"
+                        </template>
+                    </el-table-column>
+                    <el-table-column v-if="answerList" v-for="(item, index) in answerList" :key="index"
                         :label="item.title">
-                        <el-table-column :prop="'score' + index" :label="index == 0 ? '总分' : '总分'" align="center"
+                        <template slot='header' slot-scope="scope" label="use show-overflow-tooltip"
+                            show-overflow-tooltip>
+                            <el-tooltip v-if="item.title != '阶段汇总'" effect="dark" :content="item.title"
+                                placement="left">
+                                <span class="overflowText overClick" @click="_headerClick(item)"
+                                    style="color:rgb(121,138,245);width: 100%;height: 100%;">
+                                    {{ item.title }}
+                                </span>
+                            </el-tooltip>
+                            <span v-else>
+                                {{ item.title }}
+                            </span>
+                        </template>
+                        <el-table-column :prop="'score' + index" :label="index == 0 ? '总分' : '总分'"
                             :class-name="index % 2 == 0 ? 'bg' : ''">
                             <template slot-scope="scoped">
                                 {{
@@ -27,7 +41,7 @@
                 }}
                             </template>
                         </el-table-column>
-                        <el-table-column :prop="'classRank' + index" label="排名" align="center"
+                        <el-table-column :prop="'classRank' + index" label="排名"
                             :class-name="index % 2 == 0 ? 'bg' : ''">
                             <template slot-scope="scoped">{{
                     scoped.row["classRank" + index] ||
@@ -37,7 +51,7 @@
                 }}</template>
                         </el-table-column>
                     </el-table-column>
-                    <el-table-column label="查看折线图" align="center">
+                    <el-table-column label="查看折线图" fixed="right" align="center" width="120">
                         <template slot-scope="scoped">
                             <el-button type="text" @click="_openLineChart(scoped.row)">查看</el-button>
                         </template>
@@ -49,8 +63,7 @@
         <el-dialog class="chart-dia" :visible.sync="lineChart.visible" :title="lineChart.title" width="800"
             :append-to-body="true">
             <div class="chart-box">
-                <LineChart id="askLineChart" :params="lineChart.data" :xAxis="lineChart.xAxis"
-                    :tooltipFormatter="true" />
+                <LineChart id="askLineChart" :params="lineChart.data" :xAxis="lineChart.xAxis" />
             </div>
         </el-dialog>
         <ExportDia :exportStudent="exportStudent" :diaShow="diaShow" @cancel="cancel" @exportData="exportData"
@@ -68,7 +81,8 @@ export default {
     },
     props: {
         testReportIds: Array,
-        queryParams: Object
+        queryParams: Object,
+        role: "",
     },
     async created() {
         await this._phaseExamReport();
@@ -101,6 +115,9 @@ export default {
         };
     },
     methods: {
+        _headerClick(currentItem) {
+            this.$emit("headerClick", currentItem);
+        },
         async _export() {
             this.diaShow = true;
         },
@@ -116,7 +133,9 @@ export default {
             let query = {
                 examIds: this.$props.testReportIds,
                 classIds: [this.$props.queryParams.class],
-                subjectName: [this.$props.queryParams.subject]
+                subjectName: [this.$props.queryParams.subject],
+                startDay: this.$props.queryParams.dateRange[0] ?? null,
+                endDay: this.$props.queryParams.dateRange[1] ?? null,
             };
 
             const { data, status, info } = await phaseExamReport({
@@ -139,6 +158,7 @@ export default {
                     }
                 });
             });
+            console.log('lsit', data?.list)
             this.stageReport = data?.list.map((item) => {
                 let params = {};
                 dataIdsList.map((ids, index) => {
@@ -177,21 +197,26 @@ export default {
                     ? this.$request.pExportPhaseExamReport
                     : this.$request.exportPhaseExamReport;
 
+
             const data = await exportPhaseExamReport({
                 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,
                 ...query
             });
 
+
             if (data) {
+
                 this.cancel();
 
                 let blob = new Blob([data], {
                     type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
                 });
 
-                let name = `即时测-单科多卷报表.xlsx`;
+                let name = `即时测-${this.$props.queryParams.subject}-单科多卷报表.xlsx`;
 
                 downloadFile(this.status ? "即时测-已归档单课时报表.xlsx" : name, blob);
             } else {
@@ -202,8 +227,9 @@ export default {
             tablePrint("print-content", "即时测-已归档单课时报表");
         },
         _titleClick() { },
-        _openLineChart(chartRow) {
-            this.lineChart.title = `${chartRow.studentName}-${chartRow.subjectName}-多课时作答表现图`;
+        _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;
             let score = [];
             let classRank = [];
@@ -262,7 +288,6 @@ export default {
 
 .chart-dia {
     .chart-box {
-        width: 100%;
         height: 300px;
     }
 
@@ -270,4 +295,8 @@ export default {
         padding: 0 0 20px 0;
     }
 }
+
+.overClick:hover {
+    cursor: pointer;
+}
 </style>
diff --git a/src/views/basic/askTestQuestion/detail.vue b/src/views/basic/askTestQuestion/detail.vue
index 00af719..9ec3873 100644
--- a/src/views/basic/askTestQuestion/detail.vue
+++ b/src/views/basic/askTestQuestion/detail.vue
@@ -17,7 +17,20 @@
                     <el-option v-for="(item, index) in types" :lable="item.name" :key="index" :value="item.name" />
                 </el-select>
                 <div style="float: right;">
-                    <el-button type="primary" @click="_export" class="opration-btn"
+                    <span v-if="(dataType == '2' && currentType == '测验成绩单') ||
+                            (dataType == '2' && 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"
+                        class="green-el-button">
+                        设置学生成绩等级
+                    </el-button>
+                    <el-button type="primary" style="margin-left:10px;" @click="_export" class="opration-btn"
                         icon="el-icon-upload2">导出报表</el-button>
                     <el-button type="primary" @click="_print" class="opration-btn"
                         icon="el-icon-printer">打印报表</el-button>
@@ -26,6 +39,16 @@
         </div>
         <el-main>
             <div style=" padding: 20px;" id="print-content">
+                <div style="margin-bottom:20px;background:#ffb3b3;padding:10px 20px;" class="tips"
+                    v-if="paperModifyLog.modifiedTime && !status">
+                    <p class="tips-p">
+                        <i class="fa fa-bell-o"></i>
+                        {{ `${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>
+                    </p>
+                </div>
                 <div v-if="dataType == '1' && currentType == '试题分析'">
                     <el-row class="row-subfix">
                         <div class="row-line">
@@ -78,15 +101,15 @@
                         </div>
                         <div class="row-line">
                             <span class="line-subfix">总参与度：</span>
-                            <span class="line-value">{{ detail.participationRate }}</span>
+                            <span class="line-value">{{ detail.participationRate }}%</span>
                         </div>
                         <div class="row-line">
                             <span class="line-subfix">班级正确率：</span>
-                            <span class="line-value">{{ detail.classCorrectRate }}</span>
+                            <span class="line-value">{{ detail.classCorrectRate }}%</span>
                         </div>
                         <div class="row-line">
                             <span class="line-subfix">已达正确率：</span>
-                            <span class="line-value">{{ detail.answerCorrectRate }}</span>
+                            <span class="line-value">{{ detail.answerCorrectRate }}%</span>
                         </div>
                         <div class="row-line">
                             <span class="line-subfix">反馈时长：</span>
@@ -96,7 +119,7 @@
                     <el-row class="row-table">
                         <el-table class="default-table" :data="askItemAnalysis">
                             <el-table-column prop="title" label="课时-题号" />
-                            <el-table-column label="题干" width="120">
+                            <el-table-column label="题干" width="80">
                                 <template slot-scope="scoped">
                                     <el-button type="text" size="mini" @click="openStem(scoped.row)">查看</el-button>
                                 </template>
@@ -106,14 +129,14 @@
                             </el-table-column>
                             <el-table-column prop="answeredNum" label="答题人数" width="100" />
                             <el-table-column prop="correctAnswerNum" label="答对人数" width="100" />
-                            <el-table-column prop="participationRate" label="班级参与度(单题)" width="150">
+                            <el-table-column prop="participationRate" label="班级参与度(单题)" width="170">
                                 <template slot-scope="scoped">{{ scoped.row.participationRate }}%</template>
                             </el-table-column>
-                            <el-table-column prop="classCorrectRate" label="班级正确率(单题)" width="150">
+                            <el-table-column prop="classCorrectRate" label="班级正确率(单题)" width="170">
                                 <template slot-scope="scoped">{{ scoped.row.classCorrectRate }}%</template>
                             </el-table-column>
 
-                            <el-table-column prop="answerCorrectRate" label="已答正确率(单题)" width="150">
+                            <el-table-column prop="answerCorrectRate" label="已答正确率(单题)" width="170">
                                 <template slot-scope="scoped">{{ scoped.row.answerCorrectRate }}%</template>
                             </el-table-column>
 
@@ -142,6 +165,8 @@
                 <div v-if="dataType == '1' && currentType == '学生作答表现'">
                     <el-row class="row-table" style="margin-top:0px;">
                         <el-table class="default-table" :data="askPeriodQuestionItems">
+                            <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)
@@ -259,16 +284,109 @@
                                 :key="index" v-for="(item, index) in studentHeader" />
                         </el-table>
                     </el-row>
-                    <el-row class="row-subfix">
-                        <el-table class="default-table" style="margin-top: 10px" :data="questionList">
-                            <el-table-column :width="item.label == '题号&答案' ? 80 : 0" :prop="item.prop"
-                                :label="item.label" :key="index" v-for="(item, index) in questionHeaders" />
+                    <el-row class="row-subfix" style="margin-top:10px">
+                        <el-table class="default-table" v-if="question4List && question4List.length >= 1"
+                            :data="question4List">
+                            <el-table-column prop="column0" width="100" label="题号&答案" />
+                            <el-table-column prop="column1" label="得分率">
+                                <template slot-scope="scoped">
+                                    <div
+                                        :class="Number(scoped.row.column1?.replace('%', '')) <= lowLevel ? 'lowLevelClass' : ''">
+                                        {{ scoped.row.column1 }}
+                                    </div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="column2" label="选项1" />
+                            <el-table-column prop="column3" label="选项2" />
+                            <el-table-column prop="column4" label="选项3" />
+                            <el-table-column prop="column5" label="选项4" />
+                            <el-table-column prop="column6" width="100" label="题号&答案" />
+                            <el-table-column prop="column7" label="得分率">
+                                <template slot-scope="scoped">
+                                    <div
+                                        :class="Number(scoped.row.column7?.replace('%', '')) <= lowLevel ? 'lowLevelClass' : ''">
+                                        {{ scoped.row.column7 }}
+                                    </div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="column8" label="选项1" />
+                            <el-table-column prop="column9" label="选项2" />
+                            <el-table-column prop="column10" label="选项3" />
+                            <el-table-column prop="column11" label="选项4" />
+                            <el-table-column prop="column12" width="100" label="题号&答案" />
+                            <el-table-column prop="column13" label="得分率">
+                                <template slot-scope="scoped">
+                                    <div
+                                        :class="Number(scoped.row.column13?.replace('%', '')) <= lowLevel ? 'lowLevelClass' : ''">
+                                        {{ scoped.row.column13 }}
+                                    </div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="column14" label="选项1" />
+                            <el-table-column prop="column15" label="选项2" />
+                            <el-table-column prop="column16" label="选项3" />
+                            <el-table-column prop="column17" label="选项4" />
                         </el-table>
                     </el-row>
-                    <el-row class="row-subfix" v-if="questionOtherList && questionOtherList.length >= 1">
-                        <el-table class="default-table" style="margin-top: 10px" :data="questionOtherList">
-                            <el-table-column :prop="item.prop" :label="item.label" :key="index"
-                                v-for="(item, index) in questionOtherHeaders" />
+                    <el-row class="row-subfix" style="margin-top:10px">
+                        <el-table class="default-table" v-if="question7List && question7List.length >= 1"
+                            :data="question7List">
+                            <el-table-column prop="column0" width="100" label="题号&答案" />
+                            <el-table-column prop="column1" label="得分率">
+                                <template slot-scope="scoped">
+                                    <div
+                                        :class="Number(scoped.row.column1?.replace('%', '')) <= lowLevel ? 'lowLevelClass' : ''">
+                                        {{ scoped.row?.column1 }}
+                                    </div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="column2" label="选项1" />
+                            <el-table-column prop="column3" label="选项2" />
+                            <el-table-column prop="column4" label="选项3" />
+                            <el-table-column prop="column5" label="选项4" />
+                            <el-table-column prop="column6" label="选项5" />
+                            <el-table-column prop="column7" label="选项6" />
+                            <el-table-column prop="column8" label="选项7" />
+                            <el-table-column prop="column9" width="100" label="题号&答案" />
+                            <el-table-column prop="column10" label="得分率">
+                                <template slot-scope="scoped">
+                                    <div
+                                        :class="Number(scoped.row.column10?.replace('%', '')) <= lowLevel ? 'lowLevelClass' : ''">
+                                        {{ scoped.row?.column10 }}
+                                    </div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="column11" label="选项1" />
+                            <el-table-column prop="column12" label="选项2" />
+                            <el-table-column prop="column13" label="选项3" />
+                            <el-table-column prop="column14" label="选项4" />
+                            <el-table-column prop="column15" label="选项5" />
+                            <el-table-column prop="column16" label="选项6" />
+                            <el-table-column prop="column17" label="选项7" />
+                        </el-table>
+                    </el-row>
+                    <el-row class="row-subfix">
+                        <el-table class="default-table" v-if="question10List && question10List.length >= 1"
+                            :data="question10List">
+                            <el-table-column prop="column0" width="100" label="题号&答案" />
+                            <el-table-column prop="column1" label="得分率">
+                                <template slot-scope="scoped">
+                                    <div
+                                        :class="Number(scoped.row.column1?.replace('%', '')) <= lowLevel ? 'lowLevelClass' : ''">
+                                        {{ scoped.row?.column1 }}
+                                    </div>
+                                </template>
+                            </el-table-column>
+                            <el-table-column prop="column2" label="选项1" />
+                            <el-table-column prop="column3" label="选项2" />
+                            <el-table-column prop="column4" label="选项3" />
+                            <el-table-column prop="column5" label="选项4" />
+                            <el-table-column prop="column6" label="选项5" />
+                            <el-table-column prop="column7" label="选项6" />
+                            <el-table-column prop="column8" label="选项7" />
+                            <el-table-column prop="column9" label="选项8" />
+                            <el-table-column prop="column10" label="选项9" />
+                            <el-table-column prop="column11" label="选项10" />
                         </el-table>
                     </el-row>
                     <el-row class="row-subfix">
@@ -278,10 +396,10 @@
                             <el-table-column prop="student" label="答错学生">
                                 <template slot-scope="scoped">
                                     <span>总计 <span style="color:red;">
-                                            {{ scoped.row.details.filter(item => !item.isRight).length }}</span> 人
+                                            {{ scoped.row.missPeopleNumber }}</span> 人
                                     </span>
                                     <span style="margin: 10px 0;"
-                                        v-for="(item, index) in scoped.row.details.filter(item => !item.isRight)">
+                                        v-for="(item, index) in scoped.row.details.filter(item => !item.right)">
                                         选{{ item.option }}：{{ item.students.join("/") }}
                                     </span>
                                     <span></span>
@@ -291,21 +409,37 @@
                     </el-row>
                 </div>
                 <div v-if="dataType == '2' && currentType == '试题分析'">
-                    <el-table class="default-table" :data="testQuestions">
+                    <el-table class="default-table" :data="testQuestions" :span-method="singgleSpanMethod">
                         <el-table-column prop="questionIndex" label="题号" width="60"></el-table-column>
                         <el-table-column prop="questionType" label="题型" width="100">
                             <template slot-scope="scope">
                                 {{ setSubPro(scope.row.questionType) }}
                             </template>
                         </el-table-column>
-                        <el-table-column prop="score" width="100" label="知识点"></el-table-column>
+                        <el-table-column prop="knowledge" width="100" label="知识点"></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>
-                        <el-table-column width="110" prop="avgScore" label="班平均分"></el-table-column>
-                        <el-table-column prop="classScoringRate" width="120" label="班级得分率"><template
-                                slot-scope="scoped">{{ scoped.row.classScoringRate
-                                }}%</template></el-table-column>
+                        <el-table-column width="110" prop="avgScore" label="班平均分">
+                            <template slot-scope="scoped">
+                                <div v-if="scoped.row.type != 'colspan'">
+                                    {{ scoped.row.avgScore }}
+                                </div>
+                                <div :class="scoped.row.avgScore <= lowLevel ? 'lowLevelClass' : ''" v-else>
+                                    {{ Number(scoped.row.avgScore).toFixed(2) }}%
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="classScoringRate" width="120" label="已考得分率">
+                            <template slot-scope="scoped">
+                                <div v-if="scoped.row.type == 'colspan'">
+                                    {{ scoped.row.classScoringRate }}
+                                </div>
+                                <div :class="scoped.row.classScoringRate <= lowLevel ? 'lowLevelClass' : ''" v-else>
+                                    {{ Number(scoped.row.classScoringRate).toFixed(2) }}%
+                                </div>
+                            </template>
+                        </el-table-column>
                         <el-table-column prop="correctAnswer" label="答案"><template slot-scope="scoped">{{
                             scoped.row.correctAnswer == 1
                                 ? "✓"
@@ -318,20 +452,18 @@
                             :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.questionType == "5" ? "" :
+                                scope.row["option" + index]
                                     ? `${scope.row["option" + index]}(${scope.row["persent" + index]
                                     })`
-                                    : ""
-                        }}
+                                    : "" }}
                                 </p>
                             </template>
                         </el-table-column>
                     </el-table>
                 </div>
-                <div v-if="dataType == '2' && currentType == '成绩排名'">
-                    <el-table class="default-table" :data="testStudents">
+                <div v-if="dataType == '2' && currentType == '成绩排名'" ref="studentRank">
+                    <el-table :key="studentRank.length" class="default-table" :data="studentRank">
                         <el-table-column prop="studentCode" label="学号" width="120"></el-table-column>
                         <el-table-column prop="studentName" label="姓名"></el-table-column>
                         <el-table-column prop="examScore" label="总分"></el-table-column>
@@ -359,8 +491,8 @@
                         </el-table-column>
                     </el-table>
                 </div>
-                <div v-if="dataType == '2' && currentType == '小题分报表'">
-                    <el-table class="default-table" :data="testStudents">
+                <div v-if="dataType == '2' && currentType == '小题分报表'" ref="studentQuestions">
+                    <el-table :key="studentQuestions.length" class="default-table" :data="studentQuestions">
                         <el-table-column prop="studentCode" label="学号" width="120"></el-table-column>
                         <el-table-column prop="studentName" label="姓名"></el-table-column>
                         <el-table-column prop="examScore" label="总分"></el-table-column>
@@ -368,21 +500,21 @@
                             <el-table-column prop="objectiveExamScore" label="客观题分"></el-table-column>
                             <el-table-column prop="subjectiveExamScore" label="主观题分"></el-table-column>
                         </el-table-column>
-                        <el-table-column v-for="(item, index) in testStudentOptions" :key="index" :label="'Q' + item.id"
-                            :prop="'score' + item.id">
+                        <el-table-column v-for="(item, index) in studentQuestionOptions" :key="index"
+                            :label="'Q' + item.id" :prop="'score' + item.id">
                         </el-table-column>
                     </el-table>
                 </div>
-                <div v-if="dataType == '2' && currentType == '作答明细'">
-                    <el-table class="default-table" :data="testStudents">
+                <div v-if="dataType == '2' && currentType == '作答明细'" ref="studentAnsered">
+                    <el-table :key="studentAnsered.length" class="default-table" :data="studentAnsered">
                         <el-table-column prop="studentCode" width="120" label="学号"></el-table-column>
                         <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 testStudentOptions" :key="index"
+                        <el-table-column v-for="(item, index) in studentAnseredOptions" :key="index"
                             :label="'Q' + item.id">
                             <template slot-scope="scope">
-                                <span v-if="testStudents[index]?.questionType == 5">*</span>
+                                <span v-if="studentAnsered[index]?.questionType == 5">*</span>
                                 <span v-else-if="scope.row['answer' + item.id]"
                                     :class="scope.row['isRight' + item.id] ? '' : 'error'">
                                     {{ scope.row["answer" + item.id] }}
@@ -403,7 +535,8 @@
                         </el-table-column>
                         <el-table-column prop="title" label="参与度" width="120">
                             <template slot-scope="scoped">
-                                {{ scoped.row.testCount / scoped.row.classCount }}
+                                {{ Number(scoped.row.testCount   * 100 / scoped.row.classCount).toFixed(2) }}%
+                              
                             </template>
                         </el-table-column>
                         <el-table-column prop="avg" label="班平均分" width="120" />
@@ -411,40 +544,54 @@
                         <el-table-column prop="low" label="班最低分" width="120" />
                         <el-table-column prop="front20" label="前20名均分" width="120" />
                         <el-table-column prop="last20" label="后20名均分" width="120" />
-                        <el-table-column prop="excellenRate" label="优秀数(率)" width="120">
+                        <el-table-column v-for="(item, index) in defaultLevels.levels" :key="index"
+                            :label="item[0] ? item[0] + '数(率)' : ''">
                             <template slot-scope="scoped">
-                                {{ scoped.row.excellenRate }}%
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="goodRate" label="良好数(率)" width="120">
-                            <template slot-scope="scoped">
-                                {{ scoped.row.goodRate }}%
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="passRate" label="合格数(率)" width="120">
-                            <template slot-scope="scoped">
-                                {{ scoped.row.passRate }}%
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="failedRate" label="不合格数(率)" width="120">
-                            <template slot-scope="scoped">
-                                {{ scoped.row.passRate }}%
+                                {{ scoped.row.leverValues[item[0]] }}
                             </template>
                         </el-table-column>
                     </el-table>
                 </div>
                 <div v-if="dataType == '3' && currentType == '试题分析'">
-                    <el-table class="default-table" :data="testPaperExamReport">
+                    <el-table class="default-table" :data="testPaperExamReport" :span-method="arraySpanMethod">
                         <el-table-column prop="questionIndex" label="题号" width="120" />
                         <el-table-column prop="questionType" label="题型" width="100">
                             <template slot-scope="scope">
                                 {{ setSubPro(scope.row.questionType) }}
                             </template>
                         </el-table-column>
-                        <el-table-column prop="score" label="知识点" />
+                        <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>
+                            </template>
+                        </el-table-column>
                         <el-table-column prop="score" label="满分值" width="120" />
-                        <el-table-column prop="avgScore" label="年级平均分" width="120" />
-                        <el-table-column prop="gradeScoringRate" 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' : ''">
+                                    {{ Number(scoped.row.avgScore).toFixed(2) }} %
+                                </div>
+                                <div v-else>
+                                    {{ scoped.row.avgScore }}
+                                </div>
+                            </template>
+                        </el-table-column>
+                        <el-table-column prop="gradeScoringRate" label="年级得分率" width="120">
+                            <template slot-scope="scoped">
+                                <div v-if="scoped.row.type == 'colspan'">
+                                    {{ scoped.row.gradeScoringRate }}
+                                </div>
+                                <div v-else="scoped.row.gradeScoringRate"
+                                    :class="scoped.row.gradeScoringRate <= lowLevel ? 'lowLevelClass' : ''">
+                                    {{ Number(scoped.row.gradeScoringRate).toFixed(2) }} %
+                                </div>
+                            </template>
+                        </el-table-column>
                         <el-table-column prop="correctAnswer" label="答案" width="120" />
                         <el-table-column v-for="(item, index) in testPaperExamReportOptions" :key="index"
                             :label="item.title" :prop="'count' + index" width="120">
@@ -470,13 +617,89 @@
                         <el-table-column prop="name" label="姓名" />
                         <el-table-column prop="className" label="班级" />
                         <el-table-column prop="exam" label="分数" />
-                        <el-table-column prop="title" label="成绩等级" />
+                        <el-table-column prop="lever" label="成绩等级" />
                     </el-table>
                 </div>
             </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;" />
+            <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">
+            <el-container class="default-body" style="background: transparent !important;">
+                <el-main>
+                    <div class="default-main">
+                        <el-form class="use-form">
+                            <el-form-item class="use-form-item-box">
+                                <el-form-item label="等级设置模式" class="use-form-item">
+                                    <el-select size="small" v-model="fromData.levelType">
+                                        <el-option label="按分数比例" :value="0"></el-option>
+                                        <el-option label="按已考人数比例" :value="1"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </el-form-item>
+                            <el-form-item>
+                                <div class="dia-tab-box">
+                                    <p class="dia-tab-tit">
+                                        <span class="item1 boxitem">序号</span>
+                                        <span class="item2 boxitem"><i>*</i>等级名称</span>
+                                        <span class="item3 boxitem"><i>*</i>等级最高</span>
+                                        <span class="item3 boxitem"><i>*</i>等级最低</span>
+                                        <span class="item boxitem">操作</span>
+                                    </p>
+                                    <div class="dia-tab-item" v-for="(item, index) in fromData.levels" :key="index">
+                                        <span class="item1 boxitem">{{ index + 1 }}</span>
+                                        <p class="item2 boxitem">
+                                            <el-input class="score-ipt" v-model="item[0]" :maxlength="12"
+                                                @keydown.native="keydownRange($event)"></el-input>
+                                        </p>
+                                        <p class="item3 boxitem">
+                                            <el-input class="score-ipt" type="number" v-model="item[1]" :min="item[2]"
+                                                :max="index == 0 ? 100 : fromData.levels[index - 1][2]"
+                                                @keydown.native="keydownRange($event)"></el-input>
+                                            <span class="descption">
+                                                %
+                                                <template v-if="fromData.levelType == 0">
+                                                    (
+                                                    {{ index != 0 ? "不含" : "" }}
+                                                    {{ Number(((item[1] / 100) * examPaperScore).toFixed(1)) }}分
+                                                    )
+                                                </template>
+                                                <template v-else>{{ index != 0 ? "不含" : "" }}</template>
+                                            </span>
+                                        </p>
+                                        <p class="item3 boxitem">
+                                            <el-input class="score-ipt" type="number" v-model="item[2]" :min="0"
+                                                :max="item[1]" @keydown.native="keydownRange($event)"></el-input>
+                                            <span class="descption">
+                                                %
+                                                <template v-if="fromData.levelType == 0">
+                                                    ({{ Number(((item[2] / 100) * examPaperScore).toFixed(1)) }}分)
+                                                </template>
+                                            </span>
+                                        </p>
+                                        <p class="item boxitem">
+                                            <el-link type="danger" :underline="false"
+                                                @click="fromData.levels.splice(index, 1)">删除</el-link>
+                                        </p>
+                                    </div>
+                                    <div class="add">
+                                        <p @click="fromData.levels.push(['', '', ''])">
+                                            <el-button size="mini" icon="el-icon-plus" circle
+                                                type="primary"></el-button>添加一行
+                                        </p>
+                                    </div>
+                                </div>
+                            </el-form-item>
+                        </el-form>
+                    </div>
+                </el-main>
+            </el-container>
+            <div class="dialog-footer" slot="footer" align="right">
+                <el-button type="info" :size="'small'" @click="studentLevelDialog = false">取 消</el-button>
+                <el-button type="primary" class="green-el-button" :size="'small'" @click="_savefrom">保存</el-button>
+            </div>
         </el-dialog>
     </el-container>
 </template>
@@ -484,6 +707,7 @@
 import { formatDate, downloadFile, tablePrint } from "utils";
 export default {
     name: "reportDetail",
+    components: { testScoreSet: () => import("./components/testScoreSet.vue"), },
     async created() {
         this.role =
 
@@ -506,9 +730,36 @@ export default {
         this.currentType = this.types[0]?.name ?? ""
 
         await this._changeType();
+
+        await this._queryDefaultLevels();
+
+        if (this.dataType == '2') {
+            await this._examDetail();
+        }
     },
     data() {
         return {
+            status: 0,
+            //导出相关
+            paperModifyLog: {},
+            diaShow: false,
+            exportStudent: [],
+            showSelect: true, //是否显示录总分
+            showAllSetScore: false, //当前操作试卷可录总分分状态
+            showSetScore: false, //当前操作试卷可录小题分状态 
+            lowLevel: 20,
+            defaultLevels: [],
+            examPaperScore: 100, //卷面最高分
+            fromData: {
+                levelType: 0,
+                levels: [
+                    ["优秀", 100, 90],
+                    ["良好", 89.9, 70],
+                    ["合格", 69.9, 60],
+                    ["不合格", 59.9, 0],
+                ],
+            },
+            studentLevelDialog: false,
             titleInfo: [],
             studentList: [],
             studentHeader: [],
@@ -538,10 +789,9 @@ export default {
                     label: "主观分",
                 },
             ],
-            questionList: [],
-            questionHeaders: [],
-            questionOtherList: [],
-            questionOtherHeaders: [],
+            question4List: [],
+            question7List: [],
+            question10List: [],
             questionTotal: [],
             dataType: null,
             classIds: [],
@@ -579,6 +829,11 @@ export default {
             testStudents: [],
             // 报表学生选项
             testStudentOptions: [],
+            studentAnsered: [],
+            studentAnseredOptions: [],
+            studentRank: [],
+            studentQuestions: [],
+            studentQuestionOptions: [],
             // 报表题目详情
             testQuestions: [],
             // 报表题目选项
@@ -599,7 +854,7 @@ export default {
                         tit = "主观题";
                         break;
                     default:
-                        tit = "其他";
+                        tit = type;
                 }
                 return tit;
             },
@@ -662,9 +917,11 @@ export default {
             detail: {},
             currentType: null,
             classdiffExamReport: [],
+            classdiffLevelOptions: [],
             testPaperExamReport: [],
             testStudentExamReport: [],
             testPaperExamReportOptions: [],
+            diffType: 0,
             //题干数据对象
             stem: {
                 visible: false,
@@ -673,12 +930,171 @@ export default {
         }
     },
     methods: {
+        async _examDetail() {
+            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 };
+                }
+            } else {
+                this.$message.error(info);
+            }
+        },
+        async _reScore() {
+            //重新记分 
+            let { data, info, status } = await this.$request.reScore({
+                examId: this.ids[0],
+            });
+            if (status === 0) {
+                this.$message.success(info);
+                await this._changeType();
+                this.paperModifyLog.modifiedTime = "";
+                this.paperModifyLog.realName = "";
+            } else {
+                this.$message.error(info);
+            }
+        },
+        _closeScoreSet() {
+            this.scoreSet.diaScoreSet = false;
+        },
+        _successScoreSet() {
+            this._changeType();
+            this._closeScoreSet();
+        },
+        async _queryDefaultLevels() {
+
+            const { data, info, status } = await this.$request.defaultLevels();
+
+            if (status != 0) {
+                this.$message.error(info);
+                return;
+            }
+
+            this.defaultLevels = { ...data } || {
+                levelType: 0,
+                levels: [
+                    ["优秀", 100, 90],
+                    ["良好", 89.9, 70],
+                    ["合格", 69.9, 60],
+                    ["不合格", 59.9, 0],
+                ],
+            };
+
+            this.defaultLevels.type = 0
+
+            this.fromData.levelType = this.defaultLevels.levelType;
+
+            this.fromData.levels = [...this.defaultLevels.levels];
+
+            sessionStorage.setItem(
+                "levelFromData",
+                JSON.stringify(this.defaultLevels)
+            );
+        },
+        singgleSpanMethod({ row, column, rowIndex, columnIndex }) {
+            if (rowIndex == this.testQuestions?.length - 3) {
+                if (columnIndex == 0) {
+                    return [3, 1];
+                }
+                // else if (columnIndex == 6) {
+                //     return [3, 1];
+                // }
+                // else if (columnIndex == 7) {
+                //     return [3, 5];
+                // }
+                else {
+                    return [1, 1]
+                }
+            }
+            else {
+                return [1, 1]
+            }
+        },
+        arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+            if (rowIndex == this.testPaperExamReport?.length - 3) {
+                if (columnIndex == 0) {
+                    return [3, 1];
+                }
+                else if (columnIndex == 6) {
+                    return [3, 1];
+                }
+                else if (columnIndex == 7) {
+                    return [3, 5];
+                }
+                else {
+                    return [1, 1]
+                }
+            }
+            else {
+                return [1, 1]
+            }
+
+        },
+        async _savefrom() {
+            for (let i = 0; i < this.fromData.levels.length; i++) {
+                if (this.fromData.levels[i].includes("")) {
+                    this.$message.warning("请补全编号" + (i + 1) + "设置信息！");
+                    return;
+                }
+            }
+            if (this.fromData.levels.length == 0) {
+                this.$message.warning("请添加等级设置！");
+                return;
+            }
+            let nums = [];
+            let ERR_OK = false;
+            this.fromData.levels.map((item) => {
+                nums.push(Number(item[1]));
+                nums.push(Number(item[2]));
+            });
+            for (let i = 0; i < nums.length; i++) {
+                if (nums[i + 1] && nums[i + 1] > nums[i]) {
+                    ERR_OK = true;
+                    this.$message.warning("高等级比例不能低于低等级比例！请检查");
+                    break;
+                }
+            }
+            if (ERR_OK) return;
+            this.tableData = [];
+            this.tableData2 = [];
+            this.defaultLevels.type = this.fromData.type;
+            this.defaultLevels.levelType = this.fromData.levelType;
+            this.defaultLevels.levels = [...this.fromData.levels];
+            sessionStorage.setItem("levelFromData", JSON.stringify(this.fromData));
+            this.studentLevelDialog = false;
+            await this._changeType();
+        },
+        _studentLevelClose() {
+            let levelFromData = sessionStorage.getItem("levelFromData");
+            if (levelFromData) {
+                levelFromData = JSON.parse(levelFromData);
+                this.fromData.type = levelFromData.type;
+                this.fromData.levelType = levelFromData.levelType;
+                this.fromData.levels = [...levelFromData.levels];
+            } else {
+                this.fromData.type = 0;
+                this.fromData.levelType = this.defaultLevels.levelType;
+                this.fromData.levels = [...this.defaultLevels.levels];
+            }
+        },
+        _studentLevelSet() {
+            this.studentLevelDialog = true;
+        },
         async _export() {
             if (this.dataType == "1") {
 
                 let exportPeriodReport = "";
 
                 var query = {};
+
                 query.periodId = this.ids[0];
 
                 exportPeriodReport =
@@ -701,7 +1117,6 @@ export default {
                 }
             }
             else if (this.dataType == "2") {
-
                 const exportExamReport =
                     this.role == "ROLE_PERSONAL"
                         ? this.$request.pExportExamReport
@@ -711,8 +1126,6 @@ export default {
                     examId: this.ids[0]
                 });
 
-                this.exportLoading = false;
-
                 if (!data.status) {
                     let blob = new Blob([data], {
                         type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
@@ -727,6 +1140,37 @@ export default {
                     this.$message.error(data.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;
+                    });
+                }
+
+                const data = await this.$request.exportExamMultiReport({
+                    examIds: this.classdiffExamReport?.map(item => item.examId) ?? [],
+                    levels: paramObj.levels,
+                    levelType: paramObj.levelType,
+                });
+
+
+                if (!data.status) {
+                    let blob = new Blob([data], {
+                        type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+                    });
+                    downloadFile(
+                        '多班对比.xlsx',
+                        blob
+                    );
+                } else {
+                    this.$message.error(data.info);
+                }
+            }
 
         },
         _print() {
@@ -778,6 +1222,30 @@ export default {
             }
         },
         async _testPaperExamReport() {
+            //主观
+            var subjective = {
+                sum: 0.0,
+                avg: 0.0,
+                rate: 0.0,
+                number: 0
+            };
+
+            //客观
+            var objective = {
+                sum: 0.0,
+                avg: 0.0,
+                rate: 0.0,
+                number: 0
+            };
+
+            //汇总
+            var summary = {
+                sum: 0.0,
+                avg: 0.0,
+                rate: 0.0,
+                number: 0
+            };
+
             const request = this.$request.tPaperExamReport;
 
             let response = await request({
@@ -789,10 +1257,45 @@ export default {
                 this.$message.error(response.info);
                 return;
             }
+            
+            var  maxOption  = 0;
+            response.data.forEach((item) =>{   
+                if(item.details){ 
+                    if(maxOption < item.details.length)
+                    {
+                        maxOption = item.details.length;
+                    }   
+                }
+             
+          })
+          
+            let optionsList = []; 
 
-            let optionsList = [{}, {}, {}, {}, {}];
+            for(var io=0;io<maxOption;io++){
+                optionsList.push({})
+            }
+
+            // let optionsList = [{}, {}, {}, {}, {}, {}, {}, {}, {}, {}];
 
             let tableData = response.data?.map((item) => {
+
+                summary.sum += parseFloat(item.score);
+                summary.avg += parseFloat(item.avgScore);
+                summary.rate += parseFloat(item.gradeScoringRate);
+                summary.number += 1;
+                if (item.questionType == 5) {
+                    subjective.sum += parseFloat(item.score);
+                    subjective.rate += parseFloat(item.gradeScoringRate);
+                    subjective.avg += parseFloat(item.avgScore);
+                    subjective.number += 1;
+                }
+                else {
+                    objective.sum += parseFloat(item.score);
+                    objective.rate += parseFloat(item.gradeScoringRate);
+                    objective.avg += parseFloat(item.avgScore);
+                    objective.number += 1;
+                }
+
                 let params = {};
 
                 const detail = item?.details ?? [];
@@ -803,6 +1306,7 @@ export default {
                 let defaultArr = detail?.filter((item) => {
                     return item.option != "未答";
                 });
+
                 optionsList.map((items, index) => {
                     if (index != 4) {
                         params["count" + index] =
@@ -830,6 +1334,8 @@ export default {
                     }
                 });
 
+
+
                 return {
                     ...item,
                     ...params,
@@ -842,13 +1348,48 @@ 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),
+                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)
+            })
+
+            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)
+            })
         },
         async _testStudentExamReport() {
             const request = this.$request.tgStudentExamReport;
 
+            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 response = await request({
                 paperId: this.ids[0],
                 classIds: this.classIds,
+                reportRange: paramObj
             });
 
             if (response.status != 0) {
@@ -859,25 +1400,45 @@ export default {
             this.testStudentExamReport = response.data;
         },
         async _classdiffExamReport() {
-
+            this.classdiffExamReport = [];
+            this.classdiffLevelOptions = [];
             const classDiffRequest = this.$request.tClassdiffExamReport;
 
+            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 classDiffResponse = await classDiffRequest({
                 paperId: this.ids[0],
                 classIds: this.classIds,
+                reportRange: paramObj
             });
 
             if (classDiffResponse.status != 0) {
                 this.$message.error(classDiffResponse.info);
                 return;
             }
+
             var index = 0;
 
             this.classdiffExamReport = classDiffResponse.data.map((item) => {
                 item.index = index + 1;
                 index += 1;
+                var cols = 0;
+                item.keys.forEach(toam => {
+                    this.classdiffLevelOptions.push(toam);
+                    item[toam] = item.leverValues[cols];
+                    cols += 1;
+                })
                 return item;
             });
+
+            console.log(this.fromData)
         },
         openStem(stemRow) {
             this.stem.src = stemRow.screenshot ?? "";
@@ -890,8 +1451,8 @@ export default {
             const request = this.$request.tTestExamReport;
 
             let response = await request({
-                paperId: this.ids[0],
-                classIds: this.classIds,
+                examIds: [this.ids[0]],
+                classIds: this.classIds
             });
 
             if (response.status != 0) {
@@ -951,202 +1512,241 @@ export default {
 
             this.studentList = [...studentResults];
 
-            var otherDatas = [];
+            var show4Area = true;  //显示4选项区域
 
-            var questionHeaders = [];
+            var show7Area = true;  //显示7选项区域
 
-            var questionResults = [];
+            var show10Area = true;  //显示10选项区域
 
-            var questionOtherHeaders = [];
+            var optionNumList = [];
 
-            var questionOtherResults = [];
+            var maxOptions = 4;
 
-            var defaultQuestion = 6;
+            var minOptions = 10;  //最多10个选项
 
-            var defaultCount = 3;
+            var questionList = response.data.questionInfos;
 
-            var defaultQuestionCount = 4;
+            questionList = questionList.sort((prev, next) => { return prev.questionIndex - next.questionIndex });
 
-            var maxQuestionCount = 4;
+            for (var i = 0; i < questionList.length; i++) {
 
-            var optionSt = 1;
+                var correctAnswerValue = questionList[i].correctAnswer == "1" ? "✓" : questionList[i].correctAnswer == 2 ? "✗" : questionList[i].correctAnswer;
 
-            for (var qheader = 0; qheader < defaultQuestion * defaultCount; qheader++) {
-                if (qheader == 0 || qheader % 6 == 0) {
-                    questionHeaders.push({
-                        prop: "column_" + qheader,
-                        label: "题号&答案",
-                    });
-                    continue;
-                } else if (qheader == 1 || (qheader - 1) % 6 == 0) {
-                    questionHeaders.push({
-                        prop: "column_" + qheader,
-                        label: "得分率",
-                    });
-                    optionSt = 1;
-                    continue;
-                } else {
-                    questionHeaders.push({
-                        prop: "column_" + qheader,
-                        label: "选项" + optionSt,
-                    });
-                    optionSt += 1;
+                var missCount = 0;
+
+                var missI = questionList[i].details.filter(item => !item.right);
+
+                missI.forEach(itemsa => {
+                    missCount = Number(missCount) + Number(itemsa.students?.length ?? 0)
+                });
+                this.questionTotal.push({
+                    quesion: "Q" + (questionList[i].questionIndex),
+                    anwser: correctAnswerValue ?? "-----",
+                    details: questionList[i].details,
+                    missPeopleNumber: missCount
+                })
+                if ((questionList[i].questionType == 2)) {
+                    //单选题可能有超过4个选项，多选题是固定的
+                    if (questionList[i].details?.length > maxOptions) {
+                        maxOptions = questionList[i].details.filter(iam => { return iam.option.indexOf('未答') < 0 })?.length;
+                    }
+                    //单选题可能有超过4个选项，多选题是固定的
+                    if (questionList[i].details?.length < minOptions) {
+                        minOptions = questionList[i].details.filter(iam => { return iam.option.indexOf('未答') < 0 })?.length;
+                    }
+
+                    optionNumList.push(questionList[i].details.filter(iam => { return iam.option.indexOf('未答') < 0 })?.length);
+                }
+
+                if (questionList[i].questionType == 4) {
+                    minOptions = 2;
+                    optionNumList.push(2);
                 }
             }
 
-            var noPassIndex = 0;
+            show4Area = minOptions <= 4;
 
-            this.questionHeaders = questionHeaders;
+            show7Area = optionNumList.filter(o => o > 4 && o <= 7);
 
-            var itema = null;
+            show10Area = optionNumList.filter(o => o > 7);
 
-            response.data.questionInfos = [...response.data.questionInfos]
 
-            for (var qIndex = 0; qIndex < response.data.questionInfos.length; qIndex++) {
+            var currentRow = {};
 
-                var currentData = response.data.questionInfos[qIndex];
+            if (show4Area) {
 
-                var filterDetail = currentData.details.filter(fl => fl.option != '未答');
+                var areaList = [];
 
-                var correctAnswerValue = currentData.correctAnswer == "1" ? "✓" : currentData.correctAnswer == 2 ? "✗" : currentData.correctAnswer;
+                var quesRow = Math.ceil(questionList?.length * 1.00 / 3);
 
-                this.questionTotal.push({
-                    quesion: "Q" + (qIndex + 1),
-                    anwser: correctAnswerValue ?? "-----",
-                    details: currentData.details
-                })
-
-                if (filterDetail.length > defaultQuestionCount || filterDetail.length > maxQuestionCount) {
-                    currentData.index = qIndex;
-                    otherDatas.push(currentData);
-                    if (filterDetail.length > maxQuestionCount) {
-                        maxQuestionCount = filterDetail.length;
-                    }
-                    continue;
+                for (var irow = 0; irow < quesRow; irow++) {
+                    areaList.push({});
                 }
-                else {
-                    if (noPassIndex > defaultCount) {
-                        questionResults.push(itema)
-                        itema = null;
-                        noPassIndex = 0;
-                    }
-                    var stPass = noPassIndex * defaultQuestion;
-                    if (!itema) itema = {}
 
-                    var correctAnswerValue = currentData.correctAnswer == "1" ? "✓" : currentData.correctAnswer == 2 ? "✗" : currentData.correctAnswer;
+                for (var i = 0; i < questionList?.length; i++) {
+
+                    var col = parseInt(i / quesRow);
 
-                    itema["column_" + (stPass)] = (qIndex + 1) + "" + correctAnswerValue;
-                    itema["column_" + (stPass + 1)] = (currentData.gradeScoringRate * 100) + "%";
+                    var row = parseInt(i % quesRow);
 
-                    var value = "------";
+                    var question = questionList[i];
 
-                    for (var iOption = 0; iOption < defaultQuestion - 2; iOption++) {
-                        var currentOption = filterDetail[iOption];
-                        if (currentOption) {
-                            var optionValue = currentOption.option == "1" ? "✓" : currentOption.option == 2 ? "✗" : currentOption.option;
+                    var currentRow = areaList[row];
 
-                            itema["column_" + (stPass + iOption + 2)] = optionValue + "(" + (currentOption.persent ?? "0%") + ")";
+                    var correctAnswerValue = question.correctAnswer == "1" ? "✓" : question.correctAnswer == "2" ? "✗" : question.correctAnswer;
+
+                    var details = question.details.filter(fl => {
+                        return fl.option.indexOf('未答') < 0;
+                    });
+
+
+                    for (var ilr = 0; ilr < 6; ilr++) {
+
+                        if (ilr == 0) {
+                            currentRow['column' + Number(6 * col + ilr)] = question.questionIndex + correctAnswerValue;
+                        }
+                        else if (ilr == 1) {
+                            currentRow['column' + Number(6 * col + ilr)] = (question.gradeScoringRate * 100).toFixed(2) + '%';
                         }
                         else {
-                            itema["column_" + (stPass + iOption + 2)] = value
+
+                            var questionDetail = details[ilr - 2];
+
+                            var questionColumn = 'column' + Number(6 * col + ilr);
+
+                            if (details.length <= 4) {
+
+                                var questionOption = questionDetail ? (questionDetail.option == "1" ? "✓" : questionDetail.option == "2" ? "✗" : questionDetail.option) : "- -"
+
+                                if (questionOption != "- -") questionOption += "(" + questionDetail.persent + ")";
+
+                                currentRow[questionColumn] = questionOption;
+                            }
+                            else {
+                                currentRow[questionColumn] = "--";
+                            }
                         }
                     }
-
-                    noPassIndex += 1
                 }
 
-                if (qIndex >= response.data.questionInfos.length - 1 && noPassIndex != 0) {
-                    questionResults.push(itema)
-                    itema = null;
-                }
+                this.question4List = [...areaList]
+
             }
 
-            optionSt = 1;
 
-            maxQuestionCount += 2;
+            if (show7Area && show7Area.length > -1) {
 
-            this.questionList = [...questionResults]
+                var areaList = [];
 
-            var otherCount = parseInt(defaultQuestion * defaultCount / maxQuestionCount);
+                var quesRow = Math.ceil(show7Area.length * 1.00 / 2);
 
-            itema = null;
+                var num = 0;
 
-            for (var qOHeader = 0; qOHeader < maxQuestionCount * otherCount; qOHeader++) {
-                if (qOHeader == 0 || qOHeader % (maxQuestionCount) == 0) {
-                    questionOtherHeaders.push({
-                        prop: "column_" + qOHeader,
-                        label: "题号&答案",
-                    });
-                    continue;
-                } else if (qOHeader == 1 || (qOHeader - 1) % (maxQuestionCount) == 0) {
-                    questionOtherHeaders.push({
-                        prop: "column_" + qOHeader,
-                        label: "得分率",
-                    });
-                    optionSt = 1;
-                    continue;
-                } else {
-                    questionOtherHeaders.push({
-                        prop: "column_" + qOHeader,
-                        label: "选项" + optionSt,
+                for (var irow = 0; irow < quesRow; irow++) {
+                    areaList.push({});
+                }
+
+                for (var i = 0; i < questionList?.length; i++) {
+
+                    var question = questionList[i];
+
+                    var details = question.details.filter(fl => {
+                        return fl.option.indexOf('未答') < 0;
                     });
-                    optionSt += 1;
+
+                    if (question.questionType == 2 && details.length > 4 && details.length <= 7) {
+
+                        var col = parseInt(num / quesRow);
+
+                        var row = parseInt(num % quesRow);
+
+                        var currentRow = areaList[row];
+
+                        var correctAnswerValue = question.correctAnswer == "1" ? "✓" : question.correctAnswer == 2 ? "✗" : question.correctAnswer;
+
+                        for (var ilr = 0; ilr < 9; ilr++) {
+
+                            if (ilr == 0) {
+                                currentRow['column' + Number(9 * col + ilr)] = question.questionIndex + correctAnswerValue;
+                            }
+                            else if (ilr == 1) {
+
+                                currentRow['column' + Number(9 * col + ilr)] = (question.gradeScoringRate * 100).toFixed(2) + '%';
+                            }
+                            else {
+
+                                var questionDetail = details[ilr - 2];
+
+                                var questionColumn = 'column' + Number(9 * col + ilr);
+
+                                currentRow[questionColumn] = questionDetail ? questionDetail.option + "(" + questionDetail.persent + ")" : "- -";
+                            }
+                        }
+
+                        num = num + 1;
+                    }
+
                 }
+
+                this.question7List = [...areaList]
             }
 
-            this.questionOtherHeaders = questionOtherHeaders;
 
-            noPassIndex = 0;
+            if (show10Area && show10Area.length > -1) {
 
-            for (var qOIndex = 0; qOIndex < otherDatas.length; qOIndex++) {
+                var areaList = [];
 
-                var currentData = otherDatas[qOIndex];
+                var quesRow = show10Area.length;
 
-                var filterDetail = currentData.details.filter(fl => fl.option != '未答');
+                var num = 0;
 
-                if (noPassIndex >= otherCount) {
-                    questionOtherResults.push(itema)
-                    itema = null;
-                    noPassIndex = 0;
+                for (var irow = 0; irow < quesRow; irow++) {
+                    areaList.push({});
                 }
 
-                var stPass = noPassIndex * maxQuestionCount;
+                for (var i = 0; i < questionList?.length; i++) {
 
-                if (!itema) itema = {}
+                    var question = questionList[i];
 
-                var correctAnswerValue = currentData.correctAnswer == "1" ? "✓" : currentData.correctAnswer == 2 ? "✗" : currentData.correctAnswer;
+                    var details = question.details.filter(fl => {
+                        return fl.option.indexOf('未答') < 0;
+                    });
 
-                itema["column_" + (stPass)] = (Number(currentData.index) + 1) + "" + correctAnswerValue;
+                    if (question.questionType == 2 && details.length > 7) {
+                        var col = parseInt(num / quesRow);
 
-                itema["column_" + (stPass + 1)] = (currentData.gradeScoringRate * 100) + "%";
+                        var row = num;
 
-                var value = "------";
+                        var currentRow = areaList[row];
 
-                for (var iOption = 0; iOption < maxQuestionCount - 2; iOption++) {
+                        var correctAnswerValue = question.correctAnswer == "1" ? "✓" : question.correctAnswer == 2 ? "✗" : question.correctAnswer;
 
-                    var currentOption = filterDetail[iOption];
+                        for (var ilr = 0; ilr < 12; ilr++) {
 
-                    if (currentOption) {
+                            if (ilr == 0) {
+                                currentRow['column' + Number(12 * col + ilr)] = question.questionIndex + correctAnswerValue;
+                            }
+                            else if (ilr == 1) {
+                                currentRow['column' + Number(12 * col + ilr)] = (question.gradeScoringRate * 100).toFixed(2) + '%';
+                            }
+                            else {
 
-                        var optionValue = currentOption.option == "1" ? "✓" : currentOption.option == 2 ? "✗" : currentOption.option;
+                                var questionDetail = details[ilr - 2];
 
-                        itema["column_" + (stPass + iOption + 2)] = optionValue + "(" + (currentOption.persent ?? "0%") + ")";
-                    }
-                    else {
-                        itema["column_" + (stPass + iOption + 2)] = value
-                    }
-                }
+                                var questionColumn = 'column' + Number(12 * col + ilr);
 
-                noPassIndex += 1
+                                currentRow[questionColumn] = questionDetail ? questionDetail.option + "(" + questionDetail.persent + ")" : "- -";
+                            }
+                        }
 
-                if (qOIndex >= otherDatas.length - 1 && noPassIndex != 0) {
+                        num = num + 1;
+                    }
 
-                    questionOtherResults.push(itema)
-                    itema = null;
                 }
+
+                this.question10List = [...areaList]
             }
 
-            this.questionOtherList = [...questionOtherResults]
 
         },
         async _loadAskInteractives() {
@@ -1301,6 +1901,14 @@ export default {
         },
         async _loadTestStudentReport() {
 
+            this.testStudents = [];
+            this.testStudentOptions = [];
+            this.studentAnsered = [];
+            this.studentAnseredOptions = [];
+            this.studentRank = [];
+            this.studentQuestions = [];
+            this.studentQuestionOptions = [];
+
             const examStudentReport =
                 this.role == "ROLE_PERSONAL"
                     ? this.$request.pExamStudentReport
@@ -1317,7 +1925,7 @@ export default {
 
             let optionsList = [];
 
-            this.testStudents = data?.list.map((item) => {
+            let rTestStudents = data?.list.map((item) => {
                 let params = {};
                 const detail = JSON.parse(item.detail);
                 if (detail.length) {
@@ -1342,9 +1950,21 @@ export default {
                 };
             });
 
-            this.testStudentOptions = optionsList.sort((a, b) => {
+            let rtestStudentOptions = optionsList.sort((a, b) => {
                 return a.id - b.id;
             });
+
+            if (this.currentType == "成绩排名") {
+                this.studentRank = [...rTestStudents]
+            }
+            else if (this.currentType == "小题分报表") {
+                this.studentQuestions = [...rTestStudents]
+                this.studentQuestionOptions = [...rtestStudentOptions]
+            }
+            else if (this.currentType == "作答明细") {
+                this.studentAnsered = [...rTestStudents]
+                this.studentAnseredOptions = [...rtestStudentOptions]
+            }
         },
         async _loadTestQuestionReport() {
             //试题分析
@@ -1365,11 +1985,62 @@ export default {
                 return;
             }
 
-            let optionsList = [{}, {}, {}, {}, {}];
+            //主观
+            var subjective = {
+                sum: 0.0,
+                avg: 0.0,
+                rate: 0.0,
+                number: 0,
+                max: 0,
+                min: 9999,
+                answeredRate: 0
+            };
+
+            //客观
+            var objective = {
+                sum: 0.0,
+                avg: 0.0,
+                rate: 0.0,
+                number: 0,
+                max: 0,
+                min: 9999,
+                answeredRate: 0
+            };
+
+            //汇总
+            var summary = {
+                sum: 0.0,
+                avg: 0.0,
+                rate: 0.0,
+                number: 0,
+                max: 0,
+                min: 9999,
+                answeredRate: 0
+            };
+ 
+            var maxOption = 0;
+            
+            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++){
+                optionsList.push({})
+            }
 
             let tableData = data?.list?.map((item) => {
                 let params = {};
+
                 const detail = JSON.parse(item.detail);
+
                 let lastOPtion = detail?.find((item) => {
                     return item.option == "未答";
                 });
@@ -1378,31 +2049,58 @@ export default {
                 });
 
                 optionsList.map((items, index) => {
-                    if (index != 4) {
-                        params["count" + index] =
-                            defaultArr[index]?.option != "未答"
-                                ? defaultArr[index]?.count
-                                : "";
-                        params["persent" + index] =
-                            defaultArr[index]?.option != "未答"
-                                ? defaultArr[index]?.persent
-                                : "";
-                        params["option" + index] =
-                            defaultArr[index]?.option != "未答"
-                                ? defaultArr[index]?.option == 1
-                                    ? "✓"
-                                    : defaultArr[index]?.option == 2
-                                        ? "✗"
-                                        : defaultArr[index]?.option
-                                : "";
-                        items["title"] = "选项" + (index + 1);
-                    } else {
-                        items["title"] = "未答";
-                        params["count" + index] = lastOPtion.count;
-                        params["persent" + index] = lastOPtion.persent;
-                        params["option" + index] = "?";
-                    }
+                    params["count" + index] =
+                        defaultArr[index]?.option != "未答"
+                            ? defaultArr[index]?.count
+                            : "";
+                    params["persent" + index] =
+                        defaultArr[index]?.option != "未答"
+                            ? defaultArr[index]?.persent
+                            : "";
+                    params["option" + index] =
+                        defaultArr[index]?.option != "未答"
+                            ? defaultArr[index]?.option == 1
+                                ? "✓"
+                                : defaultArr[index]?.option == 2
+                                    ? "✗"
+                                    : defaultArr[index]?.option
+                            : "";
+                    items["title"] = "选项" + (index + 1);
+                    // if (index != 4) {
+
+                    // } else {
+                    //     items["title"] = "未答";
+                    //     params["count" + index] = lastOPtion.count;
+                    //     params["persent" + index] = lastOPtion.persent;
+                    //     params["option" + index] = "?";
+                    // }
                 });
+
+                summary.sum += parseFloat(item.score);
+                summary.avg += parseFloat(item.avgScore);
+                summary.rate += parseFloat(item.classScoringRate);
+                summary.number += 1;
+                summary.max = item.highestScore > summary.max ? item.highestScore : summary.max;
+                summary.min = item.lowestScore < summary.min ? item.lowestScore : summary.min;
+
+                if (item.questionType == 5) {
+                    subjective.sum += parseFloat(item.score);
+                    subjective.avg += parseFloat(item.avgScore);
+                    subjective.rate += parseFloat(item.classScoringRate);
+                    subjective.number += 1;
+                    subjective.max = item.highestScore > summary.max ? item.highestScore : summary.max;
+                    subjective.min = item.lowestScore < summary.min ? item.lowestScore : summary.min;
+                }
+
+                else {
+                    objective.sum += parseFloat(item.score);
+                    objective.avg += parseFloat(item.avgScore);
+                    objective.rate += parseFloat(item.classScoringRate);
+                    objective.number += 1;
+                    objective.max = item.highestScore > summary.max ? item.highestScore : summary.max;
+                    objective.min = item.lowestScore < summary.min ? item.lowestScore : summary.min;
+                }
+
                 return {
                     ...item,
                     ...params,
@@ -1414,6 +2112,58 @@ export default {
             });
 
             this.testQuestionOptions = [...optionsList];
+
+            this.testQuestions.push({
+                questionIndex: "汇总",
+                questionType: "主观题",
+                //满分值
+                score: subjective.sum,
+                //最高分
+                highestScore: subjective.max,
+                //最低分
+                lowestScore: subjective.min == 9999 ? 0 : subjective.min,
+                //平均分
+                avgScore: subjective.avg == 0 ? 0 : Number(subjective.avg).toFixed(2),
+                //已考得分率
+                classScoringRate: subjective.sum == 0 ? 0 : Number(subjective.avg * 100 / subjective.sum).toFixed(2)
+            })
+
+            this.testQuestions.push({
+                questionIndex: "客观题",
+                type: "colspan",
+                //满分值
+                knowledge: objective.sum,
+                //最高分
+                score: objective.max,
+                //最低分
+                highestScore: objective.min == 9999 ? 0 : objective.min,
+                //平均分
+                lowestScore: objective.avg == 0 ? 0 : Number(objective.avg).toFixed(2),
+                //已考得分率
+                avgScore: objective.sum == 0 ? 0 : Number(objective.avg * 100 / objective.sum).toFixed(2)
+            })
+
+
+
+            this.testQuestions.push({
+                questionIndex: "合计",
+                type: "colspan",
+                //满分值
+                knowledge: summary.sum,
+                //最高分
+                score: summary.max,
+                //最低分
+                highestScore: summary.min == 9999 ? 0 : summary.min,
+                //平均分
+                lowestScore: summary.avg == 0 ? 0 : Number(summary.avg).toFixed(2),
+                //已考得分率
+                avgScore: summary.sum == 0 ? 0 : Number(summary.avg / summary.sum * 100).toFixed(2)
+            })
+        },
+        keydownRange(event) {
+            if (event.key == "-" || event.key == "e") {
+                event.returnValue = "";
+            }
         }
     }
 }
@@ -1425,7 +2175,7 @@ export default {
 
 .row-line {
     overflow: hidden;
-    width: calc(20% - 2px);
+    width: calc(20% - 4px);
     border: 1px solid #ebeef5;
     background: #f5f7fa;
     display: inline-block;
@@ -1445,4 +2195,69 @@ export default {
 .red {
     color: #f30;
 }
+
+.dia-tab-box {
+    font-size: 14px;
+
+    .boxitem {
+        border: 1px solid #DCDFE6;
+        margin: 0px !important;
+
+        * {
+            border: none;
+        }
+    }
+
+    .dia-tab-tit,
+    .dia-tab-item {
+
+
+        i {
+            color: #f30;
+            padding-right: 5px;
+        }
+
+        display: flex;
+
+        .item {
+            width: 80px;
+        }
+
+        .item1 {
+            padding-left: 10px;
+            width: 10%;
+        }
+
+        .item2 {
+            width: 18%;
+        }
+
+        .item3 {
+            padding-left: 12px;
+            flex: 1;
+        }
+
+        .score-ipt {
+            width: 100px;
+        }
+    }
+
+    .dia-tab-tit {
+        background: rgb(245, 247, 250) !important
+    }
+
+    .add {
+        display: flex;
+        justify-content: center;
+        margin: 0 auto;
+
+        p {
+            cursor: pointer;
+        }
+
+        .el-button {
+            margin-right: 6px;
+        }
+    }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/basic/askTestQuestion/gradeAnalysis.vue b/src/views/basic/askTestQuestion/gradeAnalysis.vue
index 9beb3ab..8203af4 100644
--- a/src/views/basic/askTestQuestion/gradeAnalysis.vue
+++ b/src/views/basic/askTestQuestion/gradeAnalysis.vue
@@ -4,8 +4,8 @@
             <div class="default-title">即时测报表</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-input v-model="query.paper" placeholder="搜索试卷" suffix-icon="el-icon-search" class="filter-input"
+                type="number" clearable /> -->
             <el-select v-model="query.grade" class="filter-select" placeholder="选择年级">
                 <el-option v-for="item in classList" :key="item.grade" :label="item.gradeName" :value="item.grade" />
             </el-select>
@@ -107,16 +107,19 @@ export default {
                 this.$message.error('选择对象考试班级为空，请刷新列表');
                 return;
             }
- 
+
             var classListStr = JSON.stringify(currentRow.classInfos);
 
             var paperId = currentRow.paperId;
 
             var title = currentRow.paperName;
- 
+
             let routerItem = {
                 path: "/testGradeReportDetail",
-                query: { classListStr: classListStr, paperId: paperId, title: title },
+                query: {
+                    classListStr: classListStr, paperId: paperId, title: title,
+                    examIds: currentRow.examIds.join(",")
+                },
             };
 
             this.$router.push(routerItem);
diff --git a/src/views/basic/askTestQuestion/gradeAnalysisDetail.vue b/src/views/basic/askTestQuestion/gradeAnalysisDetail.vue
index 74906a8..7de18f4 100644
--- a/src/views/basic/askTestQuestion/gradeAnalysisDetail.vue
+++ b/src/views/basic/askTestQuestion/gradeAnalysisDetail.vue
@@ -11,33 +11,41 @@
     </el-header>
     <div class="default-filter">
       已考班级:
+      <el-checkbox style="margin-right:15px;" class="_el-checkbox" :checked="checkAll"
+        @change="_handleCheckAllChange">全选</el-checkbox>
       <el-checkbox-group style="display: inline-block" v-model="checkedClassInfos" @change="_handleCheckedClassChange">
-        <el-checkbox class="_el-checkbox" v-model="checkAll" @change="_handleCheckAllChange">全选</el-checkbox>
         <el-checkbox class="_el-checkbox" v-for="classItem in classInfos" :key="classItem.classId"
-          :label="classItem.className">
+          :label="classItem.classId">
           {{ classItem.className }}
         </el-checkbox>
       </el-checkbox-group>
+      <el-button type="primary" style='float: right;' @click="_anys">分析</el-button>
     </div>
     <el-main>
-      <div style="position: relative">
+      <div style="position: relative" Id="print-content">
         <el-tabs v-model="tabType" v-loading="queryLoading" type="card" class="default-tabs">
           <el-tab-pane :name="'成绩测验单'" :label="`成绩测验单`" style="padding: 0 20px">
             <div style="height: calc(100% - 80px);">
-              <el-row class="row-subfix">
+              <el-row class="row-subfix print-hidden">
                 <div style="float: right;margin-bottom: 20px;">
-                  <el-button type="primary" class="opration-btn" icon="el-icon-upload2">导出报表</el-button>
-                  <el-button type="primary" class="opration-btn" icon="el-icon-printer">打印报表</el-button>
+                  单题低分率：
+                  <el-input-number class="parent-number" v-model="lowLevel" :min="1" :max="100" label="低分率">
+                  </el-input-number>
+                  <el-button style="margin-left:10px;" @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>
               </el-row>
-              <el-row class="row-subfix" :key="index" v-for="(item, index) in titleInfo">
+              <el-row class="row-subfix" :key="index" v-for="(item, index) in testTranscript.titleInfo || []">
                 <div class="row-line">
                   <span class="line-subfix">班级：</span>
                   <span class="line-value">{{ item.className }}</span>
                 </div>
                 <div class="row-line">
                   <span class="line-subfix">试卷名称：</span>
-                  <span class="line-value">{{ item.paperName }}</span>
+                  <el-tooltip effect="dark" :content="item.paperName" placement="left">
+                    <span class="line-value">{{ item.paperName }}</span>
+                  </el-tooltip> 
                 </div>
                 <div class="row-line">
                   <span class="line-subfix">测验时间：</span>
@@ -45,7 +53,7 @@
                 </div>
               </el-row>
               <el-row class="row-subfix">
-                <el-table class="default-table" style="margin-top: 10px" :data="titleInfo">
+                <el-table class="default-table" style="margin-top: 10px" :data="testTranscript.titleInfo || []">
                   <el-table-column prop="testCount" label="测验人数" width="120" />
                   <el-table-column prop="avg" label="平均分" width="120" />
                   <el-table-column prop="hight" label="最高分" width="120" />
@@ -58,34 +66,124 @@
                 </el-table>
               </el-row>
               <el-row class="row-subfix">
-                <el-table class="default-table" style="margin-top: 10px" :data="studentList">
+                <el-table class="default-table" style="margin-top: 10px" :data="testTranscript.studentList || []">
                   <el-table-column :width="item.label == '学号' ? 120 : 0" :prop="item.prop" :label="item.label"
-                    :key="index" v-for="(item, index) in studentHeader" />
+                    :key="index" v-for="(item, index) in testTranscript.studentHeader || []" />
                 </el-table>
               </el-row>
-              <el-row class="row-subfix">
-                <el-table class="default-table" style="margin-top: 10px" :data="questionList">
-                  <el-table-column :width="item.label == '题号&答案' ? 80 : 0" :prop="item.prop" :label="item.label"
-                    :key="index" v-for="(item, index) in questionHeaders" />
+              <el-row class="row-subfix" style="margin-top:10px">
+                <el-table class="default-table"
+                  v-if="testTranscript && testTranscript.question4List && testTranscript.question4List.length >= 1"
+                  :data="testTranscript.question4List">
+                  <el-table-column prop="column0" label="题号&答案" />
+                  <el-table-column prop="column1" label="得分率">
+                    <template slot-scope="scoped">
+                      <div :class="Number(scoped.row.column1?.replace('%', '')) <= lowLevel ? 'lowLevelClass' : ''">
+                        {{ scoped.row.column1 }}
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="column2" label="选项1" />
+                  <el-table-column prop="column3" label="选项2" />
+                  <el-table-column prop="column4" label="选项3" />
+                  <el-table-column prop="column5" label="选项4" />
+                  <el-table-column prop="column6" label="题号&答案" />
+                  <el-table-column prop="column7" label="得分率">
+                    <template slot-scope="scoped">
+                      <div :class="Number(scoped.row.column7?.replace('%', '')) <= lowLevel ? 'lowLevelClass' : ''">
+                        {{ scoped.row.column7 }}
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="column8" label="选项1" />
+                  <el-table-column prop="column9" label="选项2" />
+                  <el-table-column prop="column10" label="选项3" />
+                  <el-table-column prop="column11" label="选项4" />
+                  <el-table-column prop="column12" label="题号&答案" />
+                  <el-table-column prop="column13" label="得分率">
+                    <template slot-scope="scoped">
+                      <div :class="Number(scoped.row.column13?.replace('%', '')) <= lowLevel ? 'lowLevelClass' : ''">
+                        {{ scoped.row.column13 }}
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="column14" label="选项1" />
+                  <el-table-column prop="column15" label="选项2" />
+                  <el-table-column prop="column16" label="选项3" />
+                  <el-table-column prop="column17" label="选项4" />
+                </el-table>
+              </el-row>
+              <el-row class="row-subfix" style="margin-top:10px">
+                <el-table class="default-table"
+                  v-if="testTranscript && testTranscript.question7List && testTranscript.question7List.length >= 1"
+                  :data="testTranscript.question7List">
+                  <el-table-column prop="column0" label="题号&答案" />
+                  <el-table-column prop="column1" label="得分率">
+                    <template slot-scope="scoped">
+                      <div :class="Number(scoped.row.column1?.replace('%', '')) <= lowLevel ? 'lowLevelClass' : ''">
+                        {{ scoped.row?.column1 }}
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="column2" label="选项1" />
+                  <el-table-column prop="column3" label="选项2" />
+                  <el-table-column prop="column4" label="选项3" />
+                  <el-table-column prop="column5" label="选项4" />
+                  <el-table-column prop="column6" label="选项5" />
+                  <el-table-column prop="column7" label="选项6" />
+                  <el-table-column prop="column8" label="选项7" />
+                  <el-table-column prop="column9" label="题号&答案" />
+                  <el-table-column prop="column10" label="得分率">
+                    <template slot-scope="scoped">
+                      <div :class="Number(scoped.row.column10?.replace('%', '')) <= lowLevel ? 'lowLevelClass' : ''">
+                        {{ scoped.row?.column10 }}
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="column11" label="选项1" />
+                  <el-table-column prop="column12" label="选项2" />
+                  <el-table-column prop="column13" label="选项3" />
+                  <el-table-column prop="column14" label="选项4" />
+                  <el-table-column prop="column15" label="选项5" />
+                  <el-table-column prop="column16" label="选项6" />
+                  <el-table-column prop="column17" label="选项7" />
                 </el-table>
               </el-row>
-              <el-row class="row-subfix" v-if="questionOtherList && questionOtherList.length >= 1">
-                <el-table class="default-table" style="margin-top: 10px" :data="questionOtherList">
-                  <el-table-column :prop="item.prop" :label="item.label" :key="index"
-                    v-for="(item, index) in questionOtherHeaders" />
+              <el-row class="row-subfix">
+                <el-table class="default-table"
+                  v-if="testTranscript && testTranscript.question10List && testTranscript.question10List.length >= 1"
+                  :data="testTranscript.question10List">
+                  <el-table-column prop="column0" label="题号&答案" />
+                  <el-table-column prop="column1" label="得分率">
+                    <template slot-scope="scoped">
+                      <div :class="Number(scoped.row.column1?.replace('%', '')) <= lowLevel ? 'lowLevelClass' : ''">
+                        {{ scoped.row?.column1 }}
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="column2" label="选项1" />
+                  <el-table-column prop="column3" label="选项2" />
+                  <el-table-column prop="column4" label="选项3" />
+                  <el-table-column prop="column5" label="选项4" />
+                  <el-table-column prop="column6" label="选项5" />
+                  <el-table-column prop="column7" label="选项6" />
+                  <el-table-column prop="column8" label="选项7" />
+                  <el-table-column prop="column9" label="选项8" />
+                  <el-table-column prop="column10" label="选项9" />
+                  <el-table-column prop="column11" label="选项10" />
                 </el-table>
               </el-row>
               <el-row class="row-subfix">
-                <el-table class="default-table" style="margin-top: 10px" :data="questionTotal">
+                <el-table class="default-table" style="margin-top: 10px" :data="testTranscript.questionTotal || []">
                   <el-table-column prop="quesion" label="题号" width="120" />
                   <el-table-column prop="anwser" label="答案" width="120" />
                   <el-table-column prop="student" label="答错学生">
                     <template slot-scope="scoped">
                       <span>总计 <span style="color:red;">
-                          {{ scoped.row.details.filter(item => !item.isRight).length }}</span> 人
+                          {{ scoped.row.missPeopleNumber }}</span> 人
                       </span>
                       <span style="margin: 10px 0;"
-                        v-for="(item, index) in scoped.row.details.filter(item => !item.isRight)">
+                        v-for="(item, index) in scoped.row.details.filter(item => !item.right)">
                         选{{ item.option }}：{{ item.students.join("/") }}
                       </span>
                       <span></span>
@@ -94,35 +192,174 @@
                 </el-table>
               </el-row>
             </div>
-            <div style="height: 80px;">
-              <el-pagination background layout="prev, pager, next" :total="testTranscriptCount">
-              </el-pagination>
-            </div> 
+            <div style="height: 80px; width:240px;margin:20px auto;" class="print-hidden">
+              <el-button type="default" :size="'small'" @click="_changePage('prev')">
+                上一页</el-button>
+              {{ currentPage || 0 }}/{{ totalPage || 0 }}
+              <el-button type="default" style="margin-left:0px" :size="'small'"
+                @click="_changePage('next')">下一页</el-button>
+            </div>
+            <div style="display: none;">
+              <div id="test-print">
+                <div v-for="(testTranscript, index) in testTranscriptDatas">
+                  <div style="margin-top:20px">
+                    <el-row class="row-subfix" :key="index" v-for="(item, index) in testTranscript.titleInfo || []">
+                      <div class="row-line">
+                        <span class="line-subfix">班级：</span>
+                        <span class="line-value">{{ item.className }}</span>
+                      </div>
+                      <div class="row-line">
+                        <span class="line-subfix">试卷名称：</span>
+                        <span class="line-value">{{ item.paperName }}</span>
+                      </div>
+                      <div class="row-line">
+                        <span class="line-subfix">测验时间：</span>
+                        <span class="line-value">{{ item.testTime }}</span>
+                      </div>
+                    </el-row>
+                    <el-row class="row-subfix">
+                      <el-table class="default-table" style="margin-top: 10px" :data="testTranscript.titleInfo || []">
+                        <el-table-column prop="testCount" label="测验人数" width="120" />
+                        <el-table-column prop="avg" label="平均分" width="120" />
+                        <el-table-column prop="hight" label="最高分" width="120" />
+                        <el-table-column prop="low" label="最低分" width="120" />
+                        <el-table-column prop="title" label="缺考名单">
+                          <template slot-scope="scoped">
+                            {{ scoped.row.miss.join("/") }}
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                    </el-row>
+                    <el-row class="row-subfix">
+                      <el-table class="default-table" style="margin-top: 10px" :data="testTranscript.studentList || []">
+                        <el-table-column :width="item.label == '学号' ? 120 : 0" :prop="item.prop" :label="item.label"
+                          :key="index" v-for="(item, index) in testTranscript.studentHeader || []" />
+                      </el-table>
+                    </el-row>
+                    <el-row class="row-subfix" style="margin-top:10px">
+                      <el-table class="default-table"
+                        v-if="testTranscript && testTranscript.question4List && testTranscript.question4List.length >= 1"
+                        :data="testTranscript.question4List">
+                        <el-table-column prop="column0" label="题号&答案" />
+                        <el-table-column prop="column1" label="得分率" />
+                        <el-table-column prop="column2" label="选项1" />
+                        <el-table-column prop="column3" label="选项2" />
+                        <el-table-column prop="column4" label="选项3" />
+                        <el-table-column prop="column5" label="选项4" />
+                        <el-table-column prop="column6" label="题号&答案" />
+                        <el-table-column prop="column7" label="得分率" />
+                        <el-table-column prop="column8" label="选项1" />
+                        <el-table-column prop="column9" label="选项2" />
+                        <el-table-column prop="column10" label="选项3" />
+                        <el-table-column prop="column11" label="选项4" />
+                        <el-table-column prop="column12" label="题号&答案" />
+                        <el-table-column prop="column13" label="得分率" />
+                        <el-table-column prop="column14" label="选项1" />
+                        <el-table-column prop="column15" label="选项2" />
+                        <el-table-column prop="column16" label="选项3" />
+                        <el-table-column prop="column17" label="选项4" />
+                      </el-table>
+                    </el-row>
+                    <el-row class="row-subfix" style="margin-top:10px">
+                      <el-table class="default-table"
+                        v-if="testTranscript && testTranscript.question7List && testTranscript.question7List.length >= 1"
+                        :data="testTranscript.question7List">
+                        <el-table-column prop="column0" label="题号&答案" />
+                        <el-table-column prop="column1" label="得分率" />
+                        <el-table-column prop="column2" label="选项1" />
+                        <el-table-column prop="column3" label="选项2" />
+                        <el-table-column prop="column4" label="选项3" />
+                        <el-table-column prop="column5" label="选项4" />
+                        <el-table-column prop="column6" label="选项5" />
+                        <el-table-column prop="column7" label="选项6" />
+                        <el-table-column prop="column8" label="选项7" />
+                        <el-table-column prop="column9" label="题号&答案" />
+                        <el-table-column prop="column10" label="得分率" />
+                        <el-table-column prop="column11" label="选项1" />
+                        <el-table-column prop="column12" label="选项2" />
+                        <el-table-column prop="column13" label="选项3" />
+                        <el-table-column prop="column14" label="选项4" />
+                        <el-table-column prop="column15" label="选项5" />
+                        <el-table-column prop="column16" label="选项6" />
+                        <el-table-column prop="column17" label="选项7" />
+                      </el-table>
+                    </el-row>
+                    <el-row class="row-subfix">
+                      <el-table class="default-table"
+                        v-if="testTranscript && testTranscript.question10List && testTranscript.question10List.length >= 1"
+                        :data="testTranscript.question10List">
+                        <el-table-column prop="column0" label="题号&答案" />
+                        <el-table-column prop="column1" label="得分率" />
+                        <el-table-column prop="column2" label="选项1" />
+                        <el-table-column prop="column3" label="选项2" />
+                        <el-table-column prop="column4" label="选项3" />
+                        <el-table-column prop="column5" label="选项4" />
+                        <el-table-column prop="column6" label="选项5" />
+                        <el-table-column prop="column7" label="选项6" />
+                        <el-table-column prop="column8" label="选项7" />
+                        <el-table-column prop="column9" label="选项8" />
+                        <el-table-column prop="column10" label="选项9" />
+                        <el-table-column prop="column11" label="选项10" />
+                      </el-table>
+                    </el-row>
+                    <el-row class="row-subfix">
+                      <el-table class="default-table" style="margin-top: 10px"
+                        :data="testTranscript.questionTotal || []">
+                        <el-table-column prop="quesion" label="题号" width="120" />
+                        <el-table-column prop="anwser" label="答案" width="120" />
+                        <el-table-column prop="student" label="答错学生">
+                          <template slot-scope="scoped">
+                            <span>总计 <span style="color:red;">
+                                {{ scoped.row.missPeopleNumber }}</span> 人
+                            </span>
+                            <span style="margin: 10px 0;"
+                              v-for="(item, index) in scoped.row.details.filter(item => !item.right)">
+                              选{{ item.option }}：{{ item.students.join("/") }}
+                            </span>
+                            <span></span>
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                    </el-row>
+                  </div>
+                </div>
+              </div>
+            </div>
+
           </el-tab-pane>
           <el-tab-pane :name="'班级对比情况'" :label="`班级对比情况`" style="padding: 0 20px">
             <div style="float: right;margin-bottom: 20px;">
-              <el-button type="primary" class="opration-btn" icon="el-icon-upload2">导出报表</el-button>
-              <el-button type="primary" class="opration-btn" icon="el-icon-printer">打印报表</el-button>
+              <el-button @click="_studentLevelSet" class="green-el-button" type="primary">
+                设置学生成绩等级
+              </el-button>
+              <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>
             <el-table class="default-table" :data="classdiffExamReport">
-              <el-table-column prop="index" label="序号" width="120" />
-              <el-table-column prop="className" label="班级" width="120" />
-              <el-table-column label="测验人数/班级人数">
+              <el-table-column prop="index" label="序号" width="60" />
+              <el-table-column prop="className" label="班级" width="80" />
+              <el-table-column label="测验人数/班级人数" width="180">
                 <template slot-scope="scoped">
                   {{ scoped.row.testCount }} / {{ scoped.row.classCount }}
                 </template>
               </el-table-column>
-              <el-table-column prop="title" label="参与度" width="120">
+              <el-table-column prop="title" label="参与度" width="100">
                 <template slot-scope="scoped">
-                  {{ scoped.row.testCount / scoped.row.classCount }}
+                  {{ Number(scoped.row.testCount * 100 / scoped.row.classCount).toFixed(2) }}%
                 </template>
               </el-table-column>
-              <el-table-column prop="avg" label="班平均分" width="120" />
-              <el-table-column prop="hight" label="班最高分" width="120" />
-              <el-table-column prop="low" label="班最低分" width="120" />
+              <el-table-column prop="avg" label="班平均分" width="100" />
+              <el-table-column prop="hight" label="班最高分" width="100" />
+              <el-table-column prop="low" label="班最低分" width="100" />
               <el-table-column prop="front20" label="前20名均分" width="120" />
               <el-table-column prop="last20" label="后20名均分" width="120" />
-              <el-table-column prop="excellenRate" label="优秀数(率)" width="120">
+              <el-table-column v-for="(item, index) in defaultLevels.levels" :key="index"
+                :label="item[0] ? item[0] + '数(率)' : ''">
+                <template slot-scope="scoped">
+                  {{ scoped.row.leverValues[item[0]] }}
+                </template>
+              </el-table-column>
+              <!-- <el-table-column prop="excellenRate" label="优秀数(率)" width="120">
                 <template slot-scope="scoped">
                   {{ scoped.row.excellenRate }}%
                 </template>
@@ -141,35 +378,77 @@
                 <template slot-scope="scoped">
                   {{ scoped.row.passRate }}%
                 </template>
-              </el-table-column>
+              </el-table-column> -->
             </el-table>
           </el-tab-pane>
           <el-tab-pane :name="'试题分析表'" :label="`试题分析表`" style="padding: 0 20px">
             <div style="float: right;margin-bottom: 20px;">
-              <el-button type="primary" class="opration-btn" icon="el-icon-upload2">导出报表</el-button>
-              <el-button type="primary" class="opration-btn" icon="el-icon-printer">打印报表</el-button>
+              单题低分率
+              <el-input-number class="parent-number" v-model="lowLevel" :min="1" :max="100" label="低分率">
+              </el-input-number>
+              <el-button @click="_import" type="primary" style="margin-left:10px" 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>
-            <el-table class="default-table" :data="testPaperExamReport">
+            <el-table class="default-table" :data="testPaperExamReport" :span-method="arraySpanMethod">
               <el-table-column prop="questionIndex" label="题号" width="120" />
               <el-table-column prop="questionType" label="题型" width="100">
                 <template slot-scope="scope">
                   {{ setSubPro(scope.row.questionType) }}
                 </template>
               </el-table-column>
-              <el-table-column prop="score" label="知识点" />
-              <el-table-column prop="score" label="满分值" width="120" />
-              <el-table-column prop="avgScore" label="年级平均分" width="120" />
-              <el-table-column prop="gradeScoringRate" label="年级得分率" width="120" />
+              <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>
+                </template>
+              </el-table-column>
+              <el-table-column prop="score" label="满分值" width="120">
+                <template slot-scope="scoped">
+                  <div v-if="scoped.row.type == 'colspan'">
+                    {{ Number(scoped.row.score).toFixed(2) }}
+                  </div>
+                  <div v-else>
+                    {{ scoped.row.score }}
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column prop="avgScore" label="年级平均分" width="120">
+                <template slot-scope="scoped">
+                  <div v-if="scoped.row.type == 'colspan' && scoped.row.questionType != '客观题'"
+                    :class="Number(scoped.row.avgScore) < lowLevel ? 'lowLevelClass' : ''">
+                    {{ Number(scoped.row.avgScore).toFixed(2) }} %
+                  </div>
+                  <div v-else>
+                    {{ scoped.row.avgScore }}
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column prop="gradeScoringRate" label="年级得分率" width="120">
+                <template slot-scope="scoped">
+                  <div v-if="scoped.row.type == 'colspan'"
+                    :class="scoped.row.gradeScoringRate < lowLevel ? 'lowLevelClass' : ''">
+                    {{ scoped.row.gradeScoringRate }} %
+                  </div>
+                  <div v-else="scoped.row.gradeScoringRate"
+                    :class="Number(scoped.row.gradeScoringRate * 100) < lowLevel ? 'lowLevelClass' : ''">
+                    {{ Number(scoped.row.gradeScoringRate * 100).toFixed(2) }} %
+                  </div>
+                </template>
+              </el-table-column>
               <el-table-column prop="correctAnswer" label="答案" width="120" />
-              <el-table-column v-for="(item, index) in testPaperExamReportOptions" :key="index" :label="item.title"
+              <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.questionType == "5"
                 ? ""
                 : scope.row["option" + index]
-                  ? `${scope.row["option" + index]}(${scope.row["persent" + index] ?? "0"
+                  ? `${scope.row["option" + index]} (${scope.row["persent" + index] ?? "0"
                   })`
                   : ""
             }}
@@ -180,40 +459,139 @@
           </el-tab-pane>
           <el-tab-pane :name="'学生成绩排行'" :label="`学生成绩排行`" style="padding: 0 20px">
             <div style="float: right;margin-bottom: 20px;">
-              <el-button type="primary" class="opration-btn" icon="el-icon-upload2">导出报表</el-button>
-              <el-button type="primary" class="opration-btn" icon="el-icon-printer">打印报表</el-button>
+              <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>
             <el-table class="default-table" style="margin-top: 10px" :data="testStudentExamReport">
-              <el-table-column prop="gradeRank" label="年级排行" />
+              <el-table-column prop="gradeRank" label="年级排名" />
               <el-table-column prop="code" label="学号" />
               <el-table-column prop="name" label="姓名" />
               <el-table-column prop="className" label="班级" />
               <el-table-column prop="exam" label="分数" />
-              <el-table-column prop="title" label="成绩等级" />
+              <el-table-column prop="lever" label="成绩等级" />
             </el-table>
           </el-tab-pane>
+
         </el-tabs>
       </div>
     </el-main>
+    <el-dialog :append-to-body="true" :close-on-click-modal="false" title="学生等级设置" :visible.sync="studentLevelDialog"
+      width="900px" @closed="_studentLevelClose">
+      <el-container class="default-body" style="background: transparent !important;">
+        <el-main>
+          <div class="default-main">
+            <el-form class="use-form">
+              <el-form-item class="use-form-item-box">
+                <el-form-item label="等级设置模式" class="use-form-item">
+                  <el-select size="small" v-model="fromData.levelType">
+                    <el-option label="按分数比例" :value="0"></el-option>
+                    <el-option label="按已考人数比例" :value="1"></el-option>
+                  </el-select>
+                </el-form-item>
+              </el-form-item>
+              <el-form-item>
+                <div class="dia-tab-box">
+                  <p class="dia-tab-tit">
+                    <span class="item1 boxitem">序号</span>
+                    <span class="item2 boxitem"><i>*</i>等级名称</span>
+                    <span class="item3 boxitem"><i>*</i>等级最高</span>
+                    <span class="item3 boxitem"><i>*</i>等级最低</span>
+                    <span class="item boxitem">操作</span>
+                  </p>
+                  <div class="dia-tab-item" v-for="(item, index) in fromData.levels" :key="index">
+                    <span class="item1 boxitem">{{ index + 1 }}</span>
+                    <p class="item2 boxitem">
+                      <el-input class="score-ipt" v-model="item[0]" :maxlength="12"
+                        @keydown.native="keydownRange($event)"></el-input>
+                    </p>
+                    <p class="item3 boxitem">
+                      <el-input class="score-ipt" type="number" v-model="item[1]" :min="item[2]"
+                        :max="index == 0 ? 100 : fromData.levels[index - 1][2]"
+                        @keydown.native="keydownRange($event)"></el-input>
+                      <span class="descption">
+                        %
+                        <template v-if="fromData.levelType == 0">
+                          (
+                          {{ index != 0 ? "不含" : "" }}
+                          {{ Number(((item[1] / 100) * examPaperScore).toFixed(1)) }}分
+                          )
+                        </template>
+                        <template v-else>{{ index != 0 ? "不含" : "" }}</template>
+                      </span>
+                    </p>
+                    <p class="item3 boxitem">
+                      <el-input class="score-ipt" type="number" v-model="item[2]" :min="0" :max="item[1]"
+                        @keydown.native="keydownRange($event)"></el-input>
+                      <span class="descption">
+                        %
+                        <template v-if="fromData.levelType == 0">
+                          ({{ Number(((item[2] / 100) * examPaperScore).toFixed(1)) }}分)
+                        </template>
+                      </span>
+                    </p>
+                    <p class="item boxitem">
+                      <el-link type="danger" :underline="false" @click="fromData.levels.splice(index, 1)">删除</el-link>
+                    </p>
+                  </div>
+                  <div class="add">
+                    <p @click="fromData.levels.push(['', '', ''])">
+                      <el-button size="mini" icon="el-icon-plus" circle type="primary"></el-button>添加一行
+                    </p>
+                  </div>
+                </div>
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-main>
+      </el-container>
+      <div class="dialog-footer" slot="footer" align="right">
+        <el-button type="info" :size="'small'" @click="studentLevelDialog = false">取 消</el-button>
+        <el-button type="primary" class="green-el-button" :size="'small'" @click="_savefrom">保存</el-button>
+      </div>
+    </el-dialog>
   </el-container>
 </template>
 
 <script>
+import { formatDate, downloadFile, tablePrint } from "utils";
 export default {
   data() {
     return {
+      studentLevelDialog: false,
       checkAll: true,
       isIndeterminate: true,
       title: "",
+      defaultLevels: [],
       paperId: null,
+      lowLevel: 20,
+      anyLowLevel: 20,
       classInfos: [],
+      examIds: [],
+      testTranscriptDatas: [],
+      testTranscript: {
+        titleInfo: [],
+        studentList: [],
+        studentHeader: [],
+        question4List: [],
+        question7List: [],
+        question10List: [],
+        questionTotal: [],
+      },
+      currentPage: 0,
+      totalPage: 0,
       checkedClassInfos: [],
       queryLoading: false,
       tabType: "0",
-      testTranscriptCount: 0,
-      titleInfo: [],
-      studentList: [],
-      studentHeader: [],
+      examPaperScore: 100, //卷面最高分
+      fromData: {
+        levelType: 0,
+        levels: [
+          ["优秀", 100, 90],
+          ["良好", 89.9, 70],
+          ["合格", 69.9, 60],
+          ["不合格", 59.9, 0],
+        ],
+      },
       studentMapping: [
         {
           key: "code",
@@ -240,11 +618,6 @@ export default {
           label: "主观分",
         },
       ],
-      questionList: [],
-      questionHeaders: [],
-      questionOtherList: [],
-      questionOtherHeaders: [],
-      questionTotal: [],
       testPaperExamReport: [],
       testPaperExamReportOptions: [],
       testStudentExamReport: [],
@@ -252,12 +625,40 @@ export default {
     };
   },
   watch: {
-    async tabType(value) {
-      console.log(value);
-      this.checkedClassInfos = this.classInfos;
-      switch (value) {
+    async tabType() {
+      await this._anys();
+    },
+    async checkedClassInfos(value) {
+      if (value?.length >= 1) {
+        this.currentPage = 1;
+        this.totalPage = value.length;
+      } else {
+        this.currentPage = 0;
+        this.totalPage = 0;
+      }
+      this.tabType = '成绩测验单';
+      this.checkAll = value.length >= this.classInfos.length;
+      await this._anys();
+    },
+    async currentPage(value) {
+      await this._testExamReport(value - 1);
+    }
+  },
+  async created() {
+    this.title = this.$route.query.title || "";
+    this.paperId = this.$route.query.paperId;
+    this.classInfos = JSON.parse(this.$route.query.classListStr);
+    this.examIds = this.$route.query.examIds.split(',') || [];
+    this.checkedClassInfos = this.classInfos?.map(item => item.classId);
+    this.tabType = "成绩测验单";
+    await this._queryDefaultLevels();
+  },
+  methods: {
+    async _anys() {
+      this.queryLoading = true;
+      switch (this.tabType) {
         case "成绩测验单":
-          await this._testExamReport();
+          await this._testExamReport(0);
           break;
         case "班级对比情况":
           await this._classdiffExamReport();
@@ -269,28 +670,200 @@ export default {
           await this._testStudentExamReport();
           break;
       }
+      this.queryLoading = false;
     },
-  },
-  async created() {
-    this.title = this.$route.query.title || "";
+    async _queryDefaultLevels() {
 
-    this.paperId = this.$route.query.paperId;
+      const { data, info, status } = await this.$request.gdefaultLevels();
 
-    this.classInfos = JSON.parse(this.$route.query.classListStr);
+      if (status != 0) {
+        this.$message.error(info);
+        return;
+      }
 
-    this.checkedClassInfos = this.classInfos;
+      this.defaultLevels = { ...data } || {
+        levelType: 0,
+        levels: [
+          ["优秀", 100, 90],
+          ["良好", 89.9, 70],
+          ["合格", 69.9, 60],
+          ["不合格", 59.9, 0],
+        ],
+      };
 
-    this.tabType = "成绩测验单";
-  },
-  methods: {
+      this.defaultLevels.type = 0
+
+      this.fromData.levelType = this.defaultLevels.levelType;
+
+      this.fromData.levels = [...this.defaultLevels.levels];
+
+      sessionStorage.setItem(
+        "levelFromData",
+        JSON.stringify(this.defaultLevels)
+      );
+    },
+    async _savefrom() {
+      for (let i = 0; i < this.fromData.levels.length; i++) {
+        if (this.fromData.levels[i].includes("")) {
+          this.$message.warning("请补全编号" + (i + 1) + "设置信息！");
+          return;
+        }
+      }
+      if (this.fromData.levels.length == 0) {
+        this.$message.warning("请添加等级设置！");
+        return;
+      }
+      let nums = [];
+      let ERR_OK = false;
+      this.fromData.levels.map((item) => {
+        nums.push(Number(item[1]));
+        nums.push(Number(item[2]));
+      });
+      for (let i = 0; i < nums.length; i++) {
+        if (nums[i + 1] && nums[i + 1] > nums[i]) {
+          ERR_OK = true;
+          this.$message.warning("高等级比例不能低于低等级比例！请检查");
+          break;
+        }
+      }
+      if (ERR_OK) return;
+      this.tableData = [];
+      this.tableData2 = [];
+      this.defaultLevels.type = this.fromData.type;
+      this.defaultLevels.levelType = this.fromData.levelType;
+      this.defaultLevels.levels = [...this.fromData.levels];
+      sessionStorage.setItem("levelFromData", JSON.stringify(this.fromData));
+      this.studentLevelDialog = false;
+      await this._anys();
+      // await this._classdiffExamReport();
+    },
+    _studentLevelSet() {
+      this.studentLevelDialog = true;
+    },
+    _studentLevelClose() {
+      let levelFromData = sessionStorage.getItem("levelFromData");
+      if (levelFromData) {
+        levelFromData = JSON.parse(levelFromData);
+        this.fromData.type = levelFromData.type;
+        this.fromData.levelType = levelFromData.levelType;
+        this.fromData.levels = [...levelFromData.levels];
+      } else {
+        this.fromData.type = 0;
+        this.fromData.levelType = this.defaultLevels.levelType;
+        this.fromData.levels = [...this.defaultLevels.levels];
+      }
+    },
+    arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+      if (rowIndex == this.testPaperExamReport?.length - 3) {
+        if (columnIndex == 0) {
+          return [3, 1];
+        }
+        else if (columnIndex == 6) {
+          return [3, 1];
+        }
+        else if (columnIndex == 7) {
+          return [3, 5];
+        }
+        else {
+          return [1, 1]
+        }
+      }
+      else {
+        return [1, 1]
+      }
+
+    },
+    keydownRange(event) {
+      if (event.key == "-" || event.key == "e") {
+        event.returnValue = "";
+      }
+    },
+    _changePage(status) {
+      if (status == "next") {
+        if (this.currentPage < this.checkedClassInfos.length) {
+          this.currentPage += 1;
+        }
+      }
+      else if (status == "prev") {
+        if (this.currentPage > 1) {
+          this.currentPage -= 1;
+        }
+      }
+      else {
+        this.$message.error('异常操作');
+      }
+    },
     _handleCheckAllChange(val) {
-      // this.checkedClassInfos = val ? this.classInfos : [];
-      // this.isIndeterminate = false;
+      this.checkAll = val;
+      if (val) this.checkedClassInfos = this.classInfos.map(item => item.classId);
+      else this.checkedClassInfos = [];
     },
     _handleCheckedClassChange(value) {
-      // let checkedCount = value.length;
-      // this.checkAll = checkedCount === this.cities.length;
-      // this.isIndeterminate = checkedCount > 0 && checkedCount < this.cities.length;
+
+    },
+    async _print() {
+      if (this.tabType == '成绩测验单') {
+        if (this.checkedClassInfos.length <= 0) {
+          this.$message.error('请选中班级');
+          return;
+        }
+
+        this.testTranscriptDatas = [];
+        for (var page = 0; page < this.checkedClassInfos.length; page++) {
+          this.testTranscriptDatas.push(await this._testExamReport(page));
+        }
+        setTimeout(() => {
+          tablePrint("test-print", this.tabType);
+        }, 500);
+      }
+      else {
+        tablePrint("print-content", this.tabType);
+      }
+    },
+    async _import() {
+      let importRequest;
+      switch (this.tabType) {
+        case "成绩测验单": {
+          importRequest = this.$request.tgexportPhaseExamReport;
+        } break;
+        case "班级对比情况": {
+          importRequest = this.$request.tgexportPhaseExamReport2;
+        } break;
+        case "试题分析表": {
+          importRequest = this.$request.tgexportPhaseExamReport3;
+        } break;
+        case "学生成绩排行": {
+          importRequest = this.$request.tgexportPhaseExamReport4;
+        } break;
+      }
+
+      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;
+        });
+      }
+      var data = await importRequest({
+        paperId: this.paperId,
+        classIds: this.checkedClassInfos ?? [],
+        examIds: this.classInfos.
+          filter(item =>
+            this.checkedClassInfos.includes(item.classId)).map(ida => ida.examId),
+        reportRange: paramObj
+      })
+
+      if (data) {
+        let blob = new Blob([data], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+
+        downloadFile(this.tabType + ".xlsx", blob);
+      } else {
+        this.$message.error("下载失败");
+      }
     },
     _detailQ(id) { },
     setSubPro(type) {
@@ -309,19 +882,33 @@ export default {
           tit = "主观题";
           break;
         default:
-          tit = "其他";
+          tit = type;
       }
       return tit;
     },
-    async _testExamReport() {
+    async _testExamReport(page, type) {
+      let demoTestTranscript = {
+        titleInfo: [],
+        studentList: [],
+        studentHeader: [],
+        question4List: [],
+        question7List: [],
+        question10List: [],
+        questionTotal: [],
+      };
+
+      if (type != 1) {
+        this.testTranscript = demoTestTranscript;
+      }
 
-      this.questionTotal = [];
+
+      if (!this.checkedClassInfos || this.checkedClassInfos?.length <= 0) return;
 
       const request = this.$request.gTestExamReport;
 
       let response = await request({
         paperId: this.paperId,
-        classIds: this.checkedClassInfos.map((item) => item.classId),
+        classIds: [this.checkedClassInfos[page]],
       });
 
       if (response.status != 0) {
@@ -329,8 +916,8 @@ export default {
         return;
       }
 
-      this.titleInfo = response.data.titleInfos;
-      console.log(this.titleInfo)
+      demoTestTranscript.titleInfo = response.data.titleInfos;
+
       var studentHeaders = [];
 
       var studentResults = [];
@@ -349,7 +936,7 @@ export default {
         }
       }
 
-      this.studentHeader = [...studentHeaders];
+      demoTestTranscript.studentHeader = [...studentHeaders];
 
       for (var isp = 0; isp < response.data.gradeExamStudentReports.length; isp++) {
 
@@ -379,230 +966,321 @@ export default {
         studentResults.push(item);
       }
 
-      this.studentList = [...studentResults];
+      demoTestTranscript.studentList = [...studentResults];
 
-      var otherDatas = [];
+      var show4Area = true;  //显示4选项区域
 
-      var questionHeaders = [];
+      var show7Area = true;  //显示7选项区域
 
-      var questionResults = [];
+      var show10Area = true;  //显示10选项区域
 
-      var questionOtherHeaders = [];
+      var optionNumList = [];
 
-      var questionOtherResults = [];
+      var maxOptions = 4;
 
-      var defaultQuestion = 6;
+      var minOptions = 10;  //最多10个选项
 
-      var defaultCount = 3;
+      var questionList = response.data.questionInfos;
 
-      var defaultQuestionCount = 4;
+      questionList = questionList.sort((prev, next) => { return prev.questionIndex - next.questionIndex });
 
-      var maxQuestionCount = 4;
+      for (var i = 0; i < questionList.length; i++) {
 
-      var optionSt = 1;
+        var correctAnswerValue = questionList[i].correctAnswer == "1" ? "✓" : questionList[i].correctAnswer == 2 ? "✗" : questionList[i].correctAnswer;
 
-      for (var qheader = 0; qheader < defaultQuestion * defaultCount; qheader++) {
-        if (qheader == 0 || qheader % 6 == 0) {
-          questionHeaders.push({
-            prop: "column_" + qheader,
-            label: "题号&答案",
-          });
-          continue;
-        } else if (qheader == 1 || (qheader - 1) % 6 == 0) {
-          questionHeaders.push({
-            prop: "column_" + qheader,
-            label: "得分率",
-          });
-          optionSt = 1;
-          continue;
-        } else {
-          questionHeaders.push({
-            prop: "column_" + qheader,
-            label: "选项" + optionSt,
-          });
-          optionSt += 1;
+        var missCount = 0;
+
+        var missI = questionList[i].details.filter(item => !item.right);
+
+        missI.forEach(itemsa => {
+          missCount = Number(missCount) + Number(itemsa.students?.length ?? 0)
+        });
+
+        demoTestTranscript.questionTotal.push({
+          quesion: "Q" + (questionList[i].questionIndex),
+          anwser: correctAnswerValue ?? "-----",
+          details: questionList[i].details,
+          missPeopleNumber: missCount
+        })
+        if ((questionList[i].questionType == 2)) {
+          //单选题可能有超过4个选项，多选题是固定的
+          if (questionList[i].details?.length > maxOptions) {
+            maxOptions = questionList[i].details.filter(iam => { return iam.option.indexOf('未答') < 0 })?.length;
+          }
+          //单选题可能有超过4个选项，多选题是固定的
+          if (questionList[i].details?.length < minOptions) {
+            minOptions = questionList[i].details.filter(iam => { return iam.option.indexOf('未答') < 0 })?.length;
+          }
+
+          optionNumList.push(questionList[i].details.filter(iam => { return iam.option.indexOf('未答') < 0 })?.length);
+        }
+
+        if (questionList[i].questionType == 4) {
+          minOptions = 2;
+          optionNumList.push(2);
         }
       }
 
-      var noPassIndex = 0;
+      console.log(demoTestTranscript.questionTotal)
 
-      this.questionHeaders = questionHeaders;
+      show4Area = minOptions <= 4;
 
-      var itema = null;
+      show7Area = optionNumList.filter(o => o > 4 && o <= 7);
 
-      response.data.questionInfos = [...response.data.questionInfos]
+      show10Area = optionNumList.filter(o => o > 7);
 
-      for (var qIndex = 0; qIndex < response.data.questionInfos.length; qIndex++) {
 
-        var currentData = response.data.questionInfos[qIndex];
+      var currentRow = {};
 
-        var filterDetail = currentData.details.filter(fl => fl.option != '未答');
+      if (show4Area) {
 
-        var correctAnswerValue = currentData.correctAnswer == "1" ? "✓" : currentData.correctAnswer == 2 ? "✗" : currentData.correctAnswer;
+        var areaList = [];
 
-        this.questionTotal.push({
-          quesion: "Q" + (qIndex + 1),
-          anwser: correctAnswerValue ?? "-----",
-          details: currentData.details
-        })
+        var quesRow = Math.ceil(questionList?.length * 1.00 / 3);
 
-        if (filterDetail.length > defaultQuestionCount || filterDetail.length > maxQuestionCount) {
-          currentData.index = qIndex;
-          otherDatas.push(currentData);
-          if (filterDetail.length > maxQuestionCount) {
-            maxQuestionCount = filterDetail.length;
-          }
-          continue;
+        for (var irow = 0; irow < quesRow; irow++) {
+          areaList.push({});
         }
-        else {
-          if (noPassIndex > defaultCount) {
-            questionResults.push(itema)
-            itema = null;
-            noPassIndex = 0;
-          }
-          var stPass = noPassIndex * defaultQuestion;
-          if (!itema) itema = {}
 
-          var correctAnswerValue = currentData.correctAnswer == "1" ? "✓" : currentData.correctAnswer == 2 ? "✗" : currentData.correctAnswer;
+        for (var i = 0; i < questionList?.length; i++) {
 
-          itema["column_" + (stPass)] = (qIndex + 1) + "" + correctAnswerValue;
-          itema["column_" + (stPass + 1)] = (currentData.gradeScoringRate * 100) + "%";
+          var col = parseInt(i / quesRow);
 
-          var value = "------";
+          var row = parseInt(i % quesRow);
 
-          for (var iOption = 0; iOption < defaultQuestion - 2; iOption++) {
-            var currentOption = filterDetail[iOption];
-            if (currentOption) {
-              var optionValue = currentOption.option == "1" ? "✓" : currentOption.option == 2 ? "✗" : currentOption.option;
+          var question = questionList[i];
 
-              itema["column_" + (stPass + iOption + 2)] = optionValue + "(" + (currentOption.persent ?? "0%") + ")";
+          var currentRow = areaList[row];
+
+          var correctAnswerValue = question.correctAnswer == "1" ? "✓" : question.correctAnswer == 2 ? "✗" : question.correctAnswer;
+
+          var details = question.details.filter(fl => {
+            return fl.option.indexOf('未答') < 0;
+          });
+
+
+          for (var ilr = 0; ilr < 6; ilr++) {
+
+            if (ilr == 0) {
+              currentRow['column' + Number(6 * col + ilr)] = question.questionIndex + correctAnswerValue;
+            }
+            else if (ilr == 1) {
+              currentRow['column' + Number(6 * col + ilr)] = (question.gradeScoringRate * 100).toFixed(2) + '%';
             }
             else {
-              itema["column_" + (stPass + iOption + 2)] = value
+
+              var questionDetail = details[ilr - 2];
+
+              var questionColumn = 'column' + Number(6 * col + ilr);
+
+              if (details.length <= 4) {
+
+                var questionOption = questionDetail ? (questionDetail.option == "1" ? "✓" : questionDetail.option == "2" ? "✗" : questionDetail.option) : "- -"
+
+                if (questionOption != "- -") questionOption += "(" + questionDetail.persent + ")";
+
+                currentRow[questionColumn] = questionOption;
+              }
+              else {
+                currentRow[questionColumn] = "--";
+              }
             }
           }
-
-          noPassIndex += 1
         }
 
-        if (qIndex >= response.data.questionInfos.length - 1 && noPassIndex != 0) {
-          questionResults.push(itema)
-          itema = null;
-        }
+        demoTestTranscript.question4List = [...areaList]
+
       }
 
-      optionSt = 1;
 
-      maxQuestionCount += 2;
+      if (show7Area && show7Area.length > -1) {
 
-      this.questionList = [...questionResults]
+        var areaList = [];
 
-      var otherCount = parseInt(defaultQuestion * defaultCount / maxQuestionCount);
+        var quesRow = Math.ceil(show7Area.length * 1.00 / 2);
 
-      itema = null;
+        var num = 0;
 
-      for (var qOHeader = 0; qOHeader < maxQuestionCount * otherCount; qOHeader++) {
-        if (qOHeader == 0 || qOHeader % (maxQuestionCount) == 0) {
-          questionOtherHeaders.push({
-            prop: "column_" + qOHeader,
-            label: "题号&答案",
-          });
-          continue;
-        } else if (qOHeader == 1 || (qOHeader - 1) % (maxQuestionCount) == 0) {
-          questionOtherHeaders.push({
-            prop: "column_" + qOHeader,
-            label: "得分率",
-          });
-          optionSt = 1;
-          continue;
-        } else {
-          questionOtherHeaders.push({
-            prop: "column_" + qOHeader,
-            label: "选项" + optionSt,
+        for (var irow = 0; irow < quesRow; irow++) {
+          areaList.push({});
+        }
+
+        for (var i = 0; i < questionList?.length; i++) {
+
+          var question = questionList[i];
+
+          var details = question.details.filter(fl => {
+            return fl.option.indexOf('未答') < 0;
           });
-          optionSt += 1;
+
+          if (question.questionType == 2 && details.length > 4 && details.length <= 7) {
+
+            var col = parseInt(num / quesRow);
+
+            var row = parseInt(num % quesRow);
+
+            var currentRow = areaList[row];
+
+            var correctAnswerValue = question.correctAnswer == "1" ? "✓" : question.correctAnswer == 2 ? "✗" : question.correctAnswer;
+
+            for (var ilr = 0; ilr < 9; ilr++) {
+
+              if (ilr == 0) {
+                currentRow['column' + Number(9 * col + ilr)] = question.questionIndex + correctAnswerValue;
+              }
+              else if (ilr == 1) {
+                currentRow['column' + Number(9 * col + ilr)] = (question.gradeScoringRate * 100).toFixed(2) + '%';
+              }
+              else {
+
+                var questionDetail = details[ilr - 2];
+
+                var questionColumn = 'column' + Number(9 * col + ilr);
+
+                currentRow[questionColumn] = questionDetail ? questionDetail.option + "(" + questionDetail.persent + ")" : "- -";
+              }
+            }
+
+            num = num + 1;
+          }
+
         }
+
+        demoTestTranscript.question7List = [...areaList]
       }
 
-      this.questionOtherHeaders = questionOtherHeaders;
 
-      noPassIndex = 0;
+      if (show10Area && show10Area.length > -1) {
 
-      for (var qOIndex = 0; qOIndex < otherDatas.length; qOIndex++) {
+        var areaList = [];
 
-        var currentData = otherDatas[qOIndex];
+        var quesRow = show10Area.length;
 
-        var filterDetail = currentData.details.filter(fl => fl.option != '未答');
+        var num = 0;
 
-        if (noPassIndex >= otherCount) {
-          questionOtherResults.push(itema)
-          itema = null;
-          noPassIndex = 0;
+        for (var irow = 0; irow < quesRow; irow++) {
+          areaList.push({});
         }
 
-        var stPass = noPassIndex * maxQuestionCount;
+        for (var i = 0; i < questionList?.length; i++) {
 
-        if (!itema) itema = {}
+          var question = questionList[i];
 
-        var correctAnswerValue = currentData.correctAnswer == "1" ? "✓" : currentData.correctAnswer == 2 ? "✗" : currentData.correctAnswer;
+          var details = question.details.filter(fl => {
+            return fl.option.indexOf('未答') < 0;
+          });
 
-        itema["column_" + (stPass)] = (Number(currentData.index) + 1) + "" + correctAnswerValue;
+          if (question.questionType == 2 && details.length > 7) {
+            var col = parseInt(num / quesRow);
 
-        itema["column_" + (stPass + 1)] = (currentData.gradeScoringRate * 100) + "%";
+            var row = num;
 
-        var value = "------";
+            var currentRow = areaList[row];
 
-        for (var iOption = 0; iOption < maxQuestionCount - 2; iOption++) {
+            var correctAnswerValue = question.correctAnswer == "1" ? "✓" : question.correctAnswer == 2 ? "✗" : question.correctAnswer;
 
-          var currentOption = filterDetail[iOption];
+            for (var ilr = 0; ilr < 12; ilr++) {
 
-          if (currentOption) {
+              if (ilr == 0) {
+                currentRow['column' + Number(12 * col + ilr)] = question.questionIndex + correctAnswerValue;
+              }
+              else if (ilr == 1) {
+                currentRow['column' + Number(12 * col + ilr)] = (question.gradeScoringRate * 100).toFixed(2) + '%';
+              }
+              else {
 
-            var optionValue = currentOption.option == "1" ? "✓" : currentOption.option == 2 ? "✗" : currentOption.option;
+                var questionDetail = details[ilr - 2];
 
-            itema["column_" + (stPass + iOption + 2)] = optionValue + "(" + (currentOption.persent ?? "0%") + ")";
-          }
-          else {
-            itema["column_" + (stPass + iOption + 2)] = value
-          }
-        }
+                var questionColumn = 'column' + Number(12 * col + ilr);
 
-        noPassIndex += 1
+                currentRow[questionColumn] = questionDetail ? questionDetail.option + "(" + questionDetail.persent + ")" : "- -";
+              }
+            }
 
-        if (qOIndex >= otherDatas.length - 1 && noPassIndex != 0) {
+            num = num + 1;
+          }
 
-          questionOtherResults.push(itema)
-          itema = null;
         }
+
+        demoTestTranscript.question10List = [...areaList]
       }
 
-      this.questionOtherList = [...questionOtherResults]
+
+      return demoTestTranscript;
 
     },
     async _testPaperExamReport() {
+
+      this.testPaperExamReport = [];
+
+      this.testPaperExamReportOptions = [];
+
+      if (!this.checkedClassInfos || this.checkedClassInfos?.length <= 0) return;
+
       const request = this.$request.gPaperExamReport;
 
       let response = await request({
         paperId: this.paperId,
-        classIds: this.checkedClassInfos.map((item) => item.classId),
+        classIds: this.checkedClassInfos,
       });
 
       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) {
+            maxOption = item.details.length;
+          }
+        }
+
+      })
 
-      let optionsList = [{}, {}, {}, {}, {}];
+      let optionsList = [];
+
+      for (var io = 0; io < maxOption; io++) {
+        optionsList.push({})
+      }
+      //主观
+      var subjective = {
+        sum: 0.0,
+        avg: 0.0,
+        rate: 0.0,
+        number: 0
+      };
+
+      //客观
+      var objective = {
+        sum: 0.0,
+        avg: 0.0,
+        rate: 0.0,
+        number: 0
+      };
+
+      //汇总
+      var summary = {
+        sum: 0.0,
+        avg: 0.0,
+        rate: 0.0,
+        number: 0
+      };
 
       let tableData = response.data?.map((item) => {
+
         let params = {};
+
         const detail = item.details;
+
         let lastOPtion = detail?.find((item) => {
           return item.option == "未答";
         });
+
         let defaultArr = detail?.filter((item) => {
           return item.option != "未答";
         });
+
         optionsList.map((items, index) => {
           if (index != 4) {
             params["count" + index] =
@@ -624,12 +1302,28 @@ export default {
             items["title"] = "选项" + (index + 1);
           } else {
             items["title"] = "未答";
-            params["count" + index] = lastOPtion.count;
-            params["persent" + index] = lastOPtion.persent;
+            params["count" + index] = lastOPtion?.count ?? "";
+            params["persent" + index] = lastOPtion?.persent ?? "";
             params["option" + index] = "?";
           }
         });
 
+        summary.sum += parseFloat(item.score);
+        summary.avg += parseFloat(item.avgScore);
+        summary.rate += parseFloat(item.gradeScoringRate);
+        summary.number += 1;
+        if (item.questionType == 5) {
+          subjective.sum += parseFloat(item.score);
+          subjective.rate += parseFloat(item.gradeScoringRate);
+          subjective.avg += parseFloat(item.avgScore);
+          subjective.number += 1;
+        }
+        else {
+          objective.sum += parseFloat(item.score);
+          objective.rate += parseFloat(item.gradeScoringRate);
+          objective.avg += parseFloat(item.avgScore);
+          objective.number += 1;
+        }
         return {
           ...item,
           ...params,
@@ -637,18 +1331,57 @@ export default {
       });
 
       this.testPaperExamReport = tableData?.sort((a, b) => {
-        return a.questionIndex - b.questionIndex;
+        return Number(a.questionIndex) - Number(b.questionIndex);
       });
 
       this.testPaperExamReportOptions = [...optionsList];
 
+      console.log(objective, subjective, summary, Number(objective.avg / objective.sum))
+      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),
+        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)
+      })
+
+      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)
+      })
     },
     async _testStudentExamReport() {
+      this.testStudentExamReport = [];
+      if (!this.checkedClassInfos || this.checkedClassInfos?.length <= 0) return;
+
       const request = this.$request.gStudentExamReport;
 
+      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 response = await request({
         paperId: this.paperId,
-        classIds: this.checkedClassInfos.map((item) => item.classId),
+        classIds: this.checkedClassInfos,
+        reportRange: paramObj
       });
 
       if (response.status != 0) {
@@ -659,11 +1392,26 @@ export default {
       this.testStudentExamReport = response.data;
     },
     async _classdiffExamReport() {
+
+      this.classdiffExamReport = [];
+
+      if (!this.checkedClassInfos || this.checkedClassInfos?.length <= 0) return;
+
       const request = this.$request.gClassdiffExamReport;
 
+      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 response = await request({
         paperId: this.paperId,
-        classIds: this.checkedClassInfos.map((item) => item.classId),
+        classIds: this.checkedClassInfos,
+        reportRange: paramObj
       });
 
       if (response.status != 0) {
@@ -675,6 +1423,7 @@ export default {
       this.classdiffExamReport = response.data.map((item) => {
         item.index = index + 1;
         index += 1;
+
         return item;
       });
     },
@@ -694,7 +1443,11 @@ export default {
   padding: 10px !important;
 }
 
+
 .row-line {
+  overflow: hidden; //超出宽度隐藏
+  white-space: nowrap; //强制文字在一行
+  text-overflow: ellipsis; //文字溢出显示省略号
   width: calc(33% - 2px);
   border: 1px solid #ebeef5;
   background: #f5f7fa;
@@ -705,5 +1458,71 @@ export default {
   .line-subfix {
     margin-left: 10px;
   }
+
+}
+
+.dia-tab-box {
+  font-size: 14px;
+
+  .boxitem {
+    border: 1px solid #DCDFE6;
+    margin: 0px !important;
+
+    * {
+      border: none;
+    }
+  }
+
+  .dia-tab-tit,
+  .dia-tab-item {
+
+
+    i {
+      color: #f30;
+      padding-right: 5px;
+    }
+
+    display: flex;
+
+    .item {
+      width: 80px;
+    }
+
+    .item1 {
+      padding-left: 10px;
+      width: 10%;
+    }
+
+    .item2 {
+      width: 18%;
+    }
+
+    .item3 {
+      padding-left: 12px;
+      flex: 1;
+    }
+
+    .score-ipt {
+      width: 100px;
+    }
+  }
+
+  .dia-tab-tit {
+    background: rgb(245, 247, 250) !important
+  }
+
+  .add {
+    display: flex;
+    justify-content: center;
+    margin: 0 auto;
+
+    p {
+      cursor: pointer;
+    }
+
+    .el-button {
+      margin-right: 6px;
+    }
+  }
 }
 </style>
diff --git a/src/views/basic/askTestQuestion/index.vue b/src/views/basic/askTestQuestion/index.vue
index 7867ecf..34e02f2 100644
--- a/src/views/basic/askTestQuestion/index.vue
+++ b/src/views/basic/askTestQuestion/index.vue
@@ -7,16 +7,16 @@
             <el-dropdown v-if="this.dataType == '2'" :hide-on-click="true" style="float: right;margin-right: 50px;">
                 <el-button :size="'small'" :icon="'el-icon-plus'" class="green-el-button">添加试卷</el-button>
                 <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item @click.native="import(1)">导入试卷</el-dropdown-item>
+                    <el-dropdown-item @click.native="importQuestion(1)">导入试卷</el-dropdown-item>
                     <el-dropdown-item @click.native="createAnwseredCard()">创建答题卡</el-dropdown-item>
                 </el-dropdown-menu>
             </el-dropdown>
             <el-button style="float: right;margin-right: 50px;" :size="'small'" :icon="'el-icon-plus'"
-                class="green-el-button" @click.native="import(2)" v-if="this.dataType == '1'">添加课件</el-button>
+                class="green-el-button" @click.native="importQuestion(2)" v-if="this.dataType == '1'">添加课件</el-button>
         </el-header>
         <div class="default-filter">
-            <el-input v-model="query.paper" :placeholder="dataType == '1' ? '搜索课件' : '搜索试卷'"
-                suffix-icon="el-icon-search" class="filter-input" type="number" clearable />
+            <!-- <el-input v-model="query.paper" :placeholder="dataType == '1' ? '搜索课件' : '搜索试卷'"
+                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" />
@@ -34,7 +34,7 @@
                 筛选
             </el-button>
             <el-radio-group v-model="dateStatus" class="default-date-radio-group">
-                <el-radio-button label="onDay">当天</el-radio-button>
+                <el-radio-button label="onDay">今天</el-radio-button>
                 <el-radio-button label="onWeek">本周</el-radio-button>
                 <el-radio-button label="onMonth">本月</el-radio-button>
             </el-radio-group>
@@ -42,192 +42,206 @@
         <el-main>
             <div style='position: relative;'>
                 <el-tabs v-model="tabType" v-loading="queryLoading" type="card" class="default-tabs">
-                    <el-tab-pane :name="'0'" :label="`自编课件(${createdCount})`">
-                        <el-row>
-                            <el-col :key="index" v-for="( item, index ) in  defaultList " :span="12">
-                                <div class="card-content">
-                                    <el-row>
-                                        <el-col :span="6" class="left">
-                                            <div class="left-icon">
-                                                <div class="icon">
-                                                    <img src="../../../assets/images/shuben.png" />
-                                                </div>
-                                                <div class="text">
-                                                    {{ item.id }}
-                                                </div>
-                                            </div>
-                                        </el-col>
-                                        <el-col :span="18" class="content">
-                                            <div class="title-text">
+                    <el-tab-pane :name="'0'" :label="`我自编的(${createdCount})`">
+                        <div class="card-content" :key="index" v-for="( item, index ) in defaultList ">
+                            <el-row>
+                                <el-col :span="6" class="left">
+                                    <div class="left-icon">
+                                        <div class="icon">
+                                            <img src="../../../assets/images/shuben.png" />
+                                        </div>
+                                        <div class="text">
+                                            {{ item.id }}
+                                        </div>
+                                    </div>
+                                </el-col>
+                                <el-col :span="18" class="content">
+                                    <div class="title-text">
+                                        <el-tooltip effect="dark" :content="item.title" placement="left">
+                                            <div class="title-label overflowText">
                                                 {{ item.title }}
-                                                <el-dropdown class="dropdown-button" :hide-on-click="false">
-                                                    <el-button>操作</el-button>
-                                                    <el-dropdown-menu slot="dropdown">
-                                                        <el-dropdown-item
-                                                            @click.native="_detailQ(item.id)">查看</el-dropdown-item>
-                                                        <el-dropdown-item
-                                                            @click.native="_updateQ(item)">修改</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="这是一段内容确定删除吗？">
-                                                                <el-button style="color:#606266 !important;"
-                                                                    @click.native="_delete(item.id)" type="text"
-                                                                    slot="reference">删除</el-button>
-                                                            </el-popconfirm>
-                                                        </el-dropdown-item>
-                                                    </el-dropdown-menu>
-                                                </el-dropdown>
-                                            </div>
-                                            <div class="descption-tag-text" v-if="role != 'ROLE_PERSONAL'">
-                                                <template>
-                                                    授课端同步：
-                                                    <span class="descption-tag"
-                                                        v-for="( clazzChild, indexs ) in  item.classList "
-                                                        :key="clazzChild.classId"
-                                                        :class="clazzChild.keepStatus == 1 ? 'active' : ''">
-                                                        {{ clazzChild.className }}
-                                                        <i v-if="clazzChild.keepStatus == 1"
-                                                            class="el-icon-success"></i>
-                                                    </span>
-                                                    <el-tooltip effect="dark" content="刷新同步状态">
-                                                        <img @click="_loadQueryDatas" height="18px" width="18px"
-                                                            src="../../../assets/images/shuaxin.png" />
-                                                    </el-tooltip>
-                                                </template>
                                             </div>
-                                            <div class="descption-text">
-                                                <span class="descption-text-block">
-                                                    <div class="pic">
-                                                        <img src="../../../assets/images/tishu.png" />
-                                                    </div>
-                                                    <div class="text"> 总题数：</div>
-                                                    <div class="value">{{ item.questionNum }}</div>
-                                                    <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="value" v-if="dataType == 2">{{ item.examsDuration }}
-                                                        分钟
-                                                    </div>
-                                                    <div class="pic" style="margin-left: 44px;">
-                                                        <img src="../../../assets/images/tishu.png" />
-                                                    </div>
-                                                    <div class="text"> 创建人：</div>
-                                                    <div class="value">{{ item.realName }}</div>
+                                        </el-tooltip>
+                                        <el-dropdown class="dropdown-button" :hide-on-click="false">
+                                            <el-button>操作</el-button>
+                                            <el-dropdown-menu slot="dropdown">
+                                                <el-dropdown-item
+                                                    @click.native="_detailQ(item.id)">查看</el-dropdown-item>
+                                                <el-dropdown-item @click.native="_updateQ(item)">修改</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;"
+                                                            @click.native="_delete(item.id)" type="text"
+                                                            slot="reference">删除</el-button>
+                                                    </el-popconfirm>
+                                                </el-dropdown-item>
+                                            </el-dropdown-menu>
+                                        </el-dropdown>
+                                    </div>
+                                    <div class="descption-tag-text" v-if="role != 'ROLE_PERSONAL'">
+                                        <template>
+                                            <span class="descption-label"> 授课端同步：</span>
+                                            <div class="descption-box">
+                                                <span class="descption-tag"
+                                                    v-for="( clazzChild, indexs ) in  item.classList "
+                                                    :key="clazzChild.classId"
+                                                    :class="clazzChild.keepStatus == 1 ? 'active' : ''">
+                                                    {{ clazzChild.className }}
+                                                    <i v-if="clazzChild.keepStatus == 1" class="el-icon-success"></i>
                                                 </span>
+                                                <el-tooltip effect="dark" content="刷新同步状态">
+                                                    <img @click="_serach" height="18px" width="18px"
+                                                        src="../../../assets/images/shuaxin.png" />
+                                                </el-tooltip>
                                             </div>
-                                            <div class="descption-text">
-                                                <span class="descption-text-block">
-                                                    <div class="pic"><img src="../../../assets/images/rili.png"></img>
-                                                    </div>
-                                                    <div class="text"> 更新时间：</div>
-                                                    <div class="value">{{ item.modifiedTime }}</div>
-                                                    <span class="sharing-descption"
-                                                        v-if="item.sharingType == 1">已分享到非任课班级</span>
-                                                </span>
+                                        </template>
+                                    </div>
+                                    <div class="descption-text">
+                                        <span class="descption-text-block">
+                                            <div class="pic">
+                                                <img src="../../../assets/images/tishu.png" />
                                             </div>
-                                        </el-col>
-                                    </el-row>
-                                </div>
-                            </el-col>
-                        </el-row>
-                    </el-tab-pane>
-                    <el-tab-pane :name="'1'" :label="`共享课件(${sharedCount})`">
-                        <el-row>
-                            <el-col :key="index" v-for="( item, index ) in  sharedList " :span="12">
-                                <div class="card-content">
-                                    <el-row>
-                                        <el-col :span="6" class="left">
-                                            <div class="left-icon">
-                                                <div class="icon">
-                                                    <img src="../../../assets/images/shuben.png" />
-                                                </div>
-                                                <div class="text">
-                                                    {{ item.id }}
-                                                </div>
+                                            <div class="text"> 总题数：</div>
+                                            <div class="value">{{ item.questionNum }}</div>
+                                            <div class="pic" v-if="dataType == 2" style="margin-left: 44px;">
+                                                <img src="../../../assets/images/tishu.png" />
                                             </div>
-                                        </el-col>
-                                        <el-col :span="15" class="content">
-                                            <div class="title-text">
-                                                {{ item.title }}
+                                            <div class="text" v-if="dataType == 2"> 预计时长：</div>
+                                            <div class="value" v-if="dataType == 2">{{ item.examsDuration }}
+                                                分钟
                                             </div>
-                                            <div class="descption-tag-text" v-if="role != 'ROLE_PERSONAL'">
-                                                <template>
-                                                    授课端同步：
-                                                    <span class="descption-tag"
-                                                        v-for="( clazzChild, indexs ) in  item.classList "
-                                                        :key="clazzChild.classId"
-                                                        :class="clazzChild.keepStatus == 1 ? 'active' : ''">
-                                                        {{ clazzChild.className }}
-                                                        <i v-if="clazzChild.keepStatus == 1"
-                                                            class="el-icon-success"></i>
-                                                    </span>
-                                                    <el-tooltip effect="dark" content="刷新同步状态">
-                                                        <img @click="_loadQueryDatas" height="18px" width="18px"
-                                                            src="../../../assets/images/shuaxin.png" />
-                                                    </el-tooltip>
-                                                </template>
+                                            <div class="pic" style="margin-left: 44px;">
+                                                <img src="../../../assets/images/tishu.png" />
                                             </div>
-                                            <div class="descption-text">
-                                                <span class="descption-text-block">
-                                                    <div class="pic"><img src="../../../assets/images/tishu.png"></img>
-                                                    </div>
-                                                    <div class="text"> 总题数：</div>
-                                                    <div class="value">{{ item.questionNum }}</div>
-
-                                                    <div class="pic" style="margin-left: 44px;"><img
-                                                            src="../../../assets/images/tishu.png"></img>
-                                                    </div>
-                                                    <div class="text"> 创建人：</div>
-                                                    <div class="value">{{ item.realName }}</div>
-                                                </span>
+                                            <div class="text"> 创建人：</div>
+                                            <div class="value">{{ item.realName }}</div>
+                                        </span>
+                                    </div>
+                                    <div class="descption-text">
+                                        <span class="descption-text-block">
+                                            <div class="pic"><img src="../../../assets/images/rili.png"></img>
                                             </div>
-                                            <div class="descption-text">
-                                                <span class="descption-text-block">
-                                                    <div class="pic"><img src="../../../assets/images/rili.png"></img>
-                                                    </div>
-                                                    <div class="text"> 更新时间：</div>
-                                                    <div class="value">{{ item.createdTime }}</div>
+                                            <div class="text"> 更新时间：</div>
+                                            <div class="value">{{ item.modifiedTime }}</div>
+                                            <span class="sharing-descption"
+                                                v-if="item.sharingType == 1">已分享到非任课班级</span>
+                                        </span>
+                                    </div>
+                                </el-col>
+                            </el-row>
+                        </div>
+                    </el-tab-pane>
+                    <el-tab-pane :name="'1'" :label="`被共享的(${sharedCount})`">
+                        <div class="card-content" :key="index" v-for="( item, index ) in sharedList ">
+                            <el-row>
+                                <el-col :span="6" class="left">
+                                    <div class="left-icon">
+                                        <div class="icon">
+                                            <img src="../../../assets/images/shuben.png" />
+                                        </div>
+                                        <div class="text">
+                                            {{ item.id }}
+                                        </div>
+                                    </div>
+                                </el-col>
+                                <el-col :span="18" class="content">
+                                    <div class="title-text">
+                                        <el-tooltip effect="dark" :content="item.title" placement="left">
+                                            <div class="title-label overflowText">
+                                                {{ item.title }}
+                                            </div>
+                                        </el-tooltip>
+                                        <el-dropdown class="dropdown-button" :hide-on-click="false">
+                                            <el-button>操作</el-button>
+                                            <el-dropdown-menu slot="dropdown">
+                                                <el-dropdown-item
+                                                    @click.native="_detailQ(item.id)">查看</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;"
+                                                            @click.native="_delete(item.id)" type="text"
+                                                            slot="reference">删除</el-button>
+                                                    </el-popconfirm>
+                                                </el-dropdown-item>
+                                            </el-dropdown-menu>
+                                        </el-dropdown>
+                                    </div>
+                                    <div class="descption-tag-text" v-if="role != 'ROLE_PERSONAL'">
+                                        <template>
+                                            <span class="descption-label"> 授课端同步：</span>
+                                            <div class="descption-box">
+                                                <span class="descption-tag"
+                                                    v-for="( clazzChild, indexs ) in  item.classList "
+                                                    :key="clazzChild.classId"
+                                                    :class="clazzChild.keepStatus == 1 ? 'active' : ''">
+                                                    {{ clazzChild.className }}
+                                                    <i v-if="clazzChild.keepStatus == 1" class="el-icon-success"></i>
                                                 </span>
+                                                <el-tooltip effect="dark" content="刷新同步状态">
+                                                    <img @click="_serach" height="18px" width="18px"
+                                                        src="../../../assets/images/shuaxin.png" />
+                                                </el-tooltip>
+                                            </div>
+                                        </template>
+                                    </div>
+                                    <div class="descption-text">
+                                        <span class="descption-text-block">
+                                            <div class="pic">
+                                                <img src="../../../assets/images/tishu.png" />
+                                            </div>
+                                            <div class="text"> 总题数：</div>
+                                            <div class="value">{{ item.questionNum }}</div>
+                                            <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="value" v-if="dataType == 2">{{ item.examsDuration }}
+                                                分钟
+                                            </div>
+                                            <div class="pic" style="margin-left: 44px;">
+                                                <img src="../../../assets/images/tishu.png" />
                                             </div>
-                                        </el-col>
-                                        <el-col :span="3" class="right">
-                                            <el-dropdown :hide-on-click="true">
-                                                <el-button>操作</el-button>
-                                                <el-dropdown-menu slot="dropdown">
-                                                    <el-dropdown-item>查看</el-dropdown-item>
-                                                    <el-dropdown-item>删除</el-dropdown-item>
-                                                </el-dropdown-menu>
-                                            </el-dropdown>
-                                        </el-col>
-                                    </el-row>
-                                </div>
-                            </el-col>
-                        </el-row>
+                                            <div class="text"> 创建人：</div>
+                                            <div class="value">{{ item.realName }}</div>
+                                        </span>
+                                    </div>
+                                    <div class="descption-text">
+                                        <span class="descption-text-block">
+                                            <div class="pic"><img src="../../../assets/images/rili.png"></img>
+                                            </div>
+                                            <div class="text"> 更新时间：</div>
+                                            <div class="value">{{ item.modifiedTime }}</div>
+                                        </span>
+                                    </div>
+                                </el-col>
+                            </el-row>
+                        </div>
                     </el-tab-pane>
                     <div slot="tab-bar">
                         <el-button type="primary" icon="el-icon-plus">新增</el-button>
                     </div>
                 </el-tabs>
                 <el-button size='mini' v-if="role == 'ROLE_PERSONAL' || role == 'ROLE_JIAOSHI'" @click="recycle"
-                    style='position: absolute;right:40px;top:5px;'>查看回收站</el-button>
+                    style='position: absolute;right:40px;top:2.5px;'>查看回收站</el-button>
             </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" :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">
+        <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>
+                        <!-- <el-link type="primary" @click="downExcel">下载模板,</el-link> -->
                         <span>或者导出菁优网试卷/组卷网(学科网)试卷；
                             为保证第三方试卷导入成功，请注意参考导出示例：</span>
                         <span class="img-box">
@@ -241,7 +255,9 @@
                         </span>
                     </p>
                     <p class="down-head" v-if="importType == 2">
-                        <span>第一步：导出菁优网试卷/组卷网(学科网)试卷；为保证第三方试卷导入成功，请注意参考导出示例：</span>
+                        <span>第一步：
+                            <el-link type="primary" @click="downExcel">下载模板,</el-link>
+                            导出菁优网试卷/组卷网(学科网)试卷；为保证第三方试卷导入成功，请注意参考导出示例：</span>
                         <span class="img-box">
                             <el-image class="img" :src="examplePic" :preview-src-list="examplePicList">
                             </el-image>
@@ -266,10 +282,10 @@
 </template>
 
 <script>
-import { setDateRules } from "@/utils";
-import example from "@/assets/images/example.jpg";
+import { setDateRules, downloadFile } from "@/utils";
+import example from "@/assets/images/example.png";
 import example2 from "@/assets/images/example2.png";
-
+import axios from "axios";
 
 export default {
     data() {
@@ -309,7 +325,7 @@ export default {
             sharedCount: 0
         };
     },
-    watch: { 
+    watch: {
         '$route'() {
             this.dataType = location.href.endsWith("askPreparationQuestions") ? "1" : "2";
             this._serach();
@@ -323,16 +339,37 @@ export default {
             this.query.dateRange = [dateRange.startDay, dateRange.endDay];
         }
     },
-    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._loadQueryDatas();
+        this.dateStatus = "onWeek";
+        await this._loadQueryDatas();
     },
     methods: {
-        async pageSizeChange(value){
+        async downExcel() {
+            let url;
+            let that = this;
+            if (that.dataType == 1) {
+                url = "static/课件模板.docx";
+            } else {
+                url = "static/试卷模板.docx";
+            }
+            axios(url, {
+                responseType: "arraybuffer",
+            }).then((res) => {
+                let blob = new Blob([res.data], {
+                    type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+                });
+                downloadFile(
+                    that.dataType == 1 ? "课件模板.docx" : "试卷模板.docx",
+                    blob
+                );
+            });
+        },
+        async pageSizeChange(value) {
             this.listPage.page = value;
             await this._serach();
         },
@@ -345,7 +382,7 @@ export default {
             }
             this.$router.push(routerItem);
         },
-        createAnwseredCard() {
+        createAnwseredCard(params) {
             let routerItem = {
                 path: "/testPaperAdd",
                 query: {
@@ -356,7 +393,7 @@ export default {
             };
             this.$router.push(routerItem);
         },
-        import(type) {
+        importQuestion(type) {
             this.importType = type;
             this.diaUp = true;
         },
@@ -373,13 +410,48 @@ export default {
                 });
                 this.diaUp = false;
                 let params = JSON.stringify(res.data);
-                if (this.query.type == 2) {
-                    this.toAdd({ params, isUpload: 1 });
+                if (this.dataType == 1) {
+                    this.toAdd({ params, isUpload: true });
                 } else {
-                    this.toAddQs({ params });
+                    this.toAddQs({ params, isUpload: true });
                 }
             }
         },
+        toAdd(query) {
+            if (!this.query.class) {
+                this.$message.warning("没有任课班级，请先设置。");
+                return;
+            }
+            let routerItem = {
+                path: "/askPreparationQuestionsAdd",
+                query: {
+                    ...query,
+                    classId: this.query.class,
+                    listType: 2,
+                    listShare: 0,
+                    subjectName: this.query.subject,
+                },
+            };
+            this.$router.push(routerItem);
+        },
+        //去备题
+        toAddQs(query) {
+            if (!this.query.class) {
+                this.$message.warning("没有任课班级，请先设置。");
+                return;
+            }
+            let routerItem = {
+                path: "/testPaperAdd",
+                query: {
+                    ...query,
+                    classId: this.query.class,
+                    listType: 2,
+                    listShare: 0,
+                    subjectName: this.query.subject,
+                },
+            };
+            this.$router.push(routerItem);
+        },
         async _changeClass() {
             await this._loadSubjectData();
         },
@@ -488,7 +560,7 @@ export default {
             this.createdCount = data?.myCount || 0;
             this.sharedCount = data?.gradeCount || 0;
             this.listPage.total = data.total;
-         
+
             if (this.tabType == "0") {
                 this.defaultList = [];
                 if (data?.list) this.defaultList = [...data?.list];
@@ -504,11 +576,18 @@ export default {
                 query: { id: id },
             };
             if (this.dataType == '2') {
-                routerItem.path = "/testPaperQuestionsDetail";
+                var currentClass = this.classList.find(item => item.classId == this.query.class);
+                routerItem.query.paperId = routerItem.query.id;
+                routerItem.query.classId = currentClass.classId;
+                routerItem.query.isViewer = true;
+                routerItem.query.gradeName = currentClass.gradeName;
+                routerItem.query.paperType = 2;
+                routerItem.path = '/testPaperQuestionsUpdate';
+                // routerItem.path = "/testPaperQuestionsDetail";
             }
             this.$router.push(routerItem);
         },
-        _copy(currentRow) { 
+        _copy(currentRow) {
             let routerItem = {
                 path: "/askPreparationQuestionsAdd",
                 query: {
@@ -530,19 +609,21 @@ export default {
 
         },
         _updateQ(item) {
-            console.log(item)
+
             var currentClass = this.classList.find(item => item.classId == this.query.class);
 
             let routerItem = {
                 path: "/askPreparationQuestionsUpdate",
                 query: {
-                    paperId: item.id, paperType: 1,
+                    paperId: item.id,
+                    paperType: 1,
                     classId: currentClass.classId,
                     gradeName: currentClass.gradeName
                 },
             };
 
             if (this.dataType == '2') {
+                routerItem.query.paperType = 2;
                 routerItem.path = "/testPaperQuestionsUpdate";
             }
 
@@ -610,12 +691,15 @@ export default {
         color: #667FFD;
         line-height: 32px;
         padding: 0 10px;
-        height: 32px;
         margin-right: 10px;
+        height: 32px;
+        margin-top: 3px;
     }
 
+    width: 48.5%;
+    display: inline-block;
     margin-bottom: 10px;
-    height: 180px;
+    min-height: 190px;
     border: 1px solid #E6E9F4;
     border-radius: 10px 10px 10px 10px;
     box-shadow: 0px 4px 14px 0px rgba(0, 0, 0, 0.08);
@@ -628,13 +712,20 @@ export default {
         font-size: 14px;
         font-weight: 400;
 
+        .descption-label {
+            min-width: 120px;
+        }
+
         .descption-tag-text {
             margin-bottom: 20px;
             display: flex;
             justify-content: flex-start;
             align-items: center;
+            width: calc(100% - 5px);
         }
 
+
+
         .descption-text {
             height: 30px;
             margin-top: 10px;
@@ -660,13 +751,17 @@ export default {
         }
 
         .title-text {
-            font-weight: bold;
-            font-size: 20px;
-            color: #303133;
-            line-height: 28px;
-            height: 28px;
-            text-transform: none;
-            padding-bottom: 10px !important;
+            .title-label {
+                font-weight: bold;
+                font-size: 24px !important;
+                color: #303133;
+                line-height: 28px;
+                display: inline-block;
+                width: calc(100% - 100px);
+                height: 28px;
+                text-transform: none;
+                padding-bottom: 10px !important;
+            }
 
             .dropdown-button {
                 .el-button {
@@ -682,7 +777,7 @@ export default {
     }
 
     .left {
-        height: 180px;
+        height: 190px;
         background-color: #41CC95;
         vertical-align: middle;
         border-radius: 10px 0px 0px 10px;
diff --git a/src/views/basic/askTestQuestion/recycle.vue b/src/views/basic/askTestQuestion/recycle.vue
index 3d8bbd8..4779ec1 100644
--- a/src/views/basic/askTestQuestion/recycle.vue
+++ b/src/views/basic/askTestQuestion/recycle.vue
@@ -32,7 +32,7 @@
         <el-main>
             <div style='position: relative;'>
                 <el-tabs v-model="tabType" v-loading="queryLoading" type="card" class="default-tabs">
-                    <el-tab-pane :name="'0'" :label="`自编课件(${createdCount})`">
+                    <el-tab-pane :name="'0'" :label="`我自编的(${createdCount})`">
                         <el-table class="default-table" :data="defaultList">
                             <el-table-column prop="id" label="试卷ID" width="100"></el-table-column>
                             <el-table-column prop="title" label="试卷名称"></el-table-column>
@@ -56,7 +56,7 @@
                             </el-table-column>
                         </el-table>
                     </el-tab-pane>
-                    <el-tab-pane :name="'1'" :label="`共享课件(${sharedCount})`">
+                    <el-tab-pane :name="'1'" :label="`被共享的(${sharedCount})`">
                         <el-table class="default-table" :data="sharedList">
                             <el-table-column prop="id" label="试卷ID" width="100"></el-table-column>
                             <el-table-column prop="title" label="试卷名称"></el-table-column>
@@ -66,11 +66,11 @@
                             <el-table-column prop="createdTime" label="创建时间"></el-table-column>
                             <el-table-column prop="modifiedTime" label="删除时间"></el-table-column>
                             <el-table-column prop="createdTime" label="操作">
-                                <template>
-                                    <el-button class="edit" type="text" size="mini" @click="modify(item)">
+                                <template slot-scope="scoped">
+                                    <el-button class="edit" type="text" size="mini" @click="modify(scoped.row)">
                                         恢复
                                     </el-button>
-                                    <el-popconfirm title="确定删除这张答题卡吗？" @confirm="remove(item)">
+                                    <el-popconfirm title="确定删除这张答题卡吗？" @confirm="remove(scoped.row)">
                                         <el-button style="color:red;margin-left: 10px;" slot="reference" class="delete"
                                             type="text" size="mini">
                                             删除
@@ -96,6 +96,7 @@
     </el-container>
 </template>
 <script>
+import { setDateRules } from "utils";
 export default {
     data() {
         return {
@@ -139,12 +140,21 @@ export default {
             this.$store.getters.info.showRole ||
             this.$store.getters.info.permissions[0].role;
 
+        var dateRange = setDateRules('onDay');
+        console.log(dateRange)
+        this.query.dateRange = [dateRange.startDay, dateRange.endDay];
         await this._loadQueryDatas();
         await this._serach();
 
     },
+    watch: {
+        'tabType'() {
+            this.listPage.page = 1;
+            this._serach();
+        }
+    },
     methods: {
-        async modify(obj) { 
+        async modify(obj) {
             //恢复答题卡
             let modifyPaper =
                 this.role == "ROLE_PERSONAL"
@@ -152,10 +162,12 @@ export default {
                     : this.$request.modifyPaper;
             const { data, status, info } = await modifyPaper({
                 paperId: obj.id,
-                status: 1,
+                share: this.tabType == '0' ? "0" : "1",
+                status: 1
             });
             if (status == 0) {
                 let type = this.query.title ? 1 : 0;
+                this.$message.success(info);
                 this._serach(type);
             } else {
                 this.$message.error(info);
@@ -169,9 +181,13 @@ export default {
                     : this.$request.delPaper;
             const { data, status, info } = await delPaper({
                 paperId: obj.id,
+                share: this.tabType == '0' ? "0" : "1",
+                status: 2
+
             });
             if (status == 0) {
                 let type = this.query.title ? 1 : 0;
+                this.$message.success(info);
                 this._serach(type);
             } else {
                 this.$message.error(info);
@@ -284,7 +300,7 @@ export default {
             }
             this.queryLoading = false;
             this.createdCount = data?.myCount || 0;
-            this.sharedCount = data?.gradeCount || 0;
+            this.sharedCount = data?.delShare || 0;
             this.listPage.total = data.total;
             if (this.tabType == "0") {
                 this.defaultList = [];
diff --git a/src/views/basic/askTestQuestion/report.vue b/src/views/basic/askTestQuestion/report.vue
index 37576c7..7394ec0 100644
--- a/src/views/basic/askTestQuestion/report.vue
+++ b/src/views/basic/askTestQuestion/report.vue
@@ -4,24 +4,29 @@
       <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-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-select>
-      <el-select v-model="query.subjects" collapse-tags v-if="role == 'ROLE_BANZHUREN'" multiple placeholder="选择科目"
+      <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-option>
       </el-select>
-      <el-date-picker class="filter-datePicker" v-model="query.dateRange" type="daterange" range-separator="-"
-        value-format="yyyy-MM-dd">
+      <el-date-picker class="filter-datePicker" @change="_dateChange" v-model="query.dateRange" type="daterange"
+        range-separator="-" value-format="yyyy-MM-dd">
       </el-date-picker>
       <el-button type="primary" @click="_serach"> 筛选 </el-button>
+      <el-radio-group v-model="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>
+      </el-radio-group>
     </div>
     <el-main>
       <div style="position: relative">
@@ -31,37 +36,43 @@
               :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" />
+            <askListReport v-if="apiDatas.askReportList" :datas="apiDatas.askReportList" @opration="_serach" />
           </el-tab-pane>
-          <el-tab-pane v-if="dataType == 1 && role == 'ROLE_BANZHUREN'" :name="'0'" :label="`多科表现`"
-            :queryParams="query">
+          <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" />
-            <!-- <askSummaryReport v-else-if="query.status == 'single'" :testReportIds="apiDatas.testReportIds"
-              :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" />
           </el-tab-pane>
           <el-tab-pane v-if="dataType == 2 && role == 'ROLE_JIAOSHI'" :name="'0'" :label="`阶段报表`">
             <testSummaryReport v-if="apiDatas.testReportIds" :testReportIds="apiDatas.testReportIds"
-              :queryParams="query" />
+              @headerClick="_headerClick" :queryParams="query" />
           </el-tab-pane>
           <el-tab-pane v-if="dataType == 2 && role == 'ROLE_JIAOSHI'" :name="'1'" :label="`单卷报表`">
-            <testListReport :datas="apiDatas.testReportList" />
+            <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>
-          <el-tab-pane v-if="dataType == 2 && role == 'ROLE_BANZHUREN'" :name="'0'" :label="`多科表现`">
+          <el-tab-pane v-if="dataType == 2 && role == 'ROLE_BANZHUREN' && query.status == 'multi'" :name="'0'"
+            :label="`多科表现`">
             <testBzrMulti v-if="apiDatas.testReportIds" :list="apiDatas.testReportList"
               :testReportIds="apiDatas.testReportIds" :queryParams="query" />
-
-            <!-- <testSummaryReport v-else-if="apiDatas.testReportIds" :testReportIds="apiDatas.testReportIds"
-              :queryParams="query" /> -->
+          </el-tab-pane>
+          <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" />
           </el-tab-pane>
           <div slot="tab-bar">
             <el-button type="primary" icon="el-icon-plus">新增</el-button>
           </div>
         </el-tabs>
-        <el-button size='mini' v-if="role == 'ROLE_PERSONAL' || role == 'ROLE_JIAOSHI'" @click="_recycle"
-          style='position: absolute;right:40px;top:5px;'>查看回收站</el-button>
+        <!-- <el-button size='mini' v-if="role == 'ROLE_PERSONAL' || role == 'ROLE_JIAOSHI'" @click="_recycle"
+          style='position: absolute;right:40px;top:5px;'>查看回收站</el-button> -->
 
       </div>
     </el-main>
@@ -69,6 +80,7 @@
 </template>
 
 <script>
+import { setDateRules } from "@/utils";
 export default {
   name: "repo",
   components: {
@@ -111,9 +123,15 @@ export default {
         testReportList: null,
       },
       queryLoading: false,
+      dateStatus: "0"
     };
   },
   watch: {
+    'dateStatus'(val) {
+      if (val == -1) return;
+      var dateRange = setDateRules(val);
+      this.query.dateRange = [dateRange.startDay, dateRange.endDay];
+    },
     '$route'() {
       this.dataType = location.href.endsWith("askReport") ? "1" : "2";
       this._loadQueryDatas();
@@ -127,14 +145,16 @@ export default {
       }
     },
     async 'query.subjects'(value) {
-      console.log(value)
       if (this.role == "ROLE_BANZHUREN") {
         if (value.length == 1 && value[0] != '全部科目') {
           this.query.status = 'single';
+          this.tabType = '1';
           await this._serach();
         }
         else {
-
+          this.query.status = 'multi';
+          this.tabType = '0';
+          await this._serach();
         }
       }
 
@@ -146,9 +166,30 @@ export default {
     this.role =
       this.$store.getters.info.showRole ||
       this.$store.getters.info.permissions[0].role;
+    this.dateStatus = "onWeek";
     await this._loadQueryDatas();
   },
   methods: {
+    _opr() {
+      alert('opr');
+    },
+    _dateChange() {
+      this.dateStatus = -1;
+    },
+    async _ReScore() {
+      //重新记分 
+      let { data, info, status } = await this.$request.reScore({
+        examId: this.id,
+      });
+      if (status === 0) {
+        this.$message.success(info);
+        this._serach();
+        this.paperModifyLog.modifiedTime = "";
+        this.paperModifyLog.realName = "";
+      } else {
+        this.$message.error(info);
+      }
+    },
     async _changeClass() {
       await this._loadSubjectData();
     },
@@ -202,7 +243,7 @@ export default {
     },
     _recycle() { },
     async _serach() {
-   
+
       this.queryLoading = true;
       var queryParams = {
         classId: "",
@@ -214,12 +255,15 @@ export default {
 
       queryParams.classId = this.query.class;
       queryParams.classIds = [this.query.class];
-      if (this.query.subjects) {
+
+      if (this.query.subjects && this.role == 'ROLE_BANZHUREN') {
         queryParams.subjectNames = this.query.subjects;
+        queryParams.subject = queryParams.subjectNames[0];
       }
       else {
         queryParams.subjectNames = [this.query.subject];
       }
+      console.log(queryParams, this.query.subject)
 
       queryParams.startDay = this.query.dateRange
         ? this.query.dateRange[0]
@@ -266,10 +310,15 @@ export default {
           this.$message.error(testReportResponse.info);
           return;
         }
+
         this.apiDatas.testReportList = [...testReportResponse?.data?.list ?? []];
+
         this.apiDatas.testReportIds = [...this.apiDatas.testReportList?.map((item) => item.id) ?? []];
+
       }
+
       this.tabIndexs += 1;
+
       this.queryLoading = false;
 
     },
@@ -288,6 +337,17 @@ export default {
       };
       this.$router.push(routerItem);
     },
+    _headerClick(row) {
+      this.$router.push({
+        path: "/testReportDetail",
+        query: {
+          dataType: 2,
+          classIds: this.query.class,
+          id: row.examId,
+          title: row.title
+        },
+      });
+    },
     async _deleteDetermineQ(id) {
       let modifyPaper =
         this.role == "ROLE_PERSONAL"
diff --git a/src/views/basic/askTestQuestion/update.vue b/src/views/basic/askTestQuestion/update.vue
index 12d933d..61d3e1d 100644
--- a/src/views/basic/askTestQuestion/update.vue
+++ b/src/views/basic/askTestQuestion/update.vue
@@ -4,7 +4,7 @@
       <back-box class="detailBack">
         <template slot="title">
           <span class="default-title">
-            {{ type == 1 ? "修改试卷" : "修改答案" }}</span>
+            {{ isViewer ? "详情" : type == 1 ? paperType == 1 ? "修改课件" : "修改试卷" : "修改答案" }}</span>
         </template>
       </back-box>
     </el-header>
@@ -21,103 +21,207 @@
         <div class="answer-title" :class="type == 1 ? 't-left' : ''">
           <p class="name-box">
             <span>试卷名称：</span>
-            <el-input class="ipt-name" v-model="form.title"></el-input>
+            <el-input :disabled="isViewer" class="ipt-name" v-model="form.title"></el-input>
           </p>
           <p class="name-box">
             <span>分享范围：</span>
-            <el-radio class="name-radio" v-model="form.sharingType" :label="0">任课班级分享</el-radio>
-            <el-radio class="name-radio" @click.native="_selectClassSharingType" v-model="form.sharingType"
-              :label="1">自定义分享班级</el-radio>
+            <el-radio :disabled="isViewer" class="name-radio" v-model="form.sharingType" :label="0">任课班级分享</el-radio>
+            <el-radio :disabled="isViewer" class="name-radio" @click.native="_selectClassSharingType"
+              v-model="form.sharingType" :label="1">自定义分享班级</el-radio>
           </p>
         </div>
         <div class="question-box">
-          <div v-if="paperType == 1">
-            <div class="courseware">
-              <div class="courseware-title sub-questions">
-                <div class="qs-num">题号</div>
-                <div class="qs-stem">题干</div>
-                <div class="qs-type">题型</div>
-                <div class="qs-score">分数</div>
-                <div class="qs-partScore">漏选得分</div>
-                <div class="qs-options">选项设置</div>
-                <div class="qs-oprations">操作</div>
-              </div>
-              <div v-for="(question, index) in questionList">
-                <div class="courseware-content sub-questions" v-for="(subQuestion, subIndex) in question.subQuestions">
-                  <div class="qs-num">{{ subQuestion.questionId }}</div>
-                  <div class="qs-stem">
-                    <iframe style="height: 100% !important" class="screenshot" :src="subQuestion.screenshot"></iframe>
-                  </div>
-                  <div class="qs-type">
-                    <el-select v-model="subQuestion.questionType">
-                      <el-option v-for="item in questionOption" :key="item.Key" :label="item.Text" :value="item.Key" />
-                    </el-select>
+          <div class="question-content">
+            <div v-if="paperType == 1" class="courseware-title sub-questions">
+              <div class="qs-num">题号</div>
+              <div class="qs-stem">题干</div>
+              <div class="qs-type">题型</div>
+              <div class="qs-score">分数</div>
+              <div class="qs-partScore">漏选得分</div>
+              <div class="qs-options">选项设置</div>
+              <div v-if="!isViewer" class="qs-oprations">操作</div>
+            </div>
+            <div>
+              <div class="question-contents" v-for="(question, index) in questionList">
+                <div :class="paperType != 1 ? 'bigQuestion' : ''">
+                  <div class="bigQuestionTitle" v-if="paperType != 1">
+                    {{ question.questionTitle }}
+                    (共{{ question.subQuestions.filter(subQuestion => subQuestion &&
+              subQuestion.questionId && subQuestion.questionType).length }}小题，
+                    共{{ question.score }}分)
                   </div>
-                  <div class="qs-score">
-                    <el-input-number class="number-ipt" size="medium" :min="1" :max="200" :precision="2" :step="1"
-                      v-model="subQuestion.score" label="单题分值" />
+                  <div v-if="paperType == 2 && index == 0" class="courseware-title sub-questions">
+                    <div class="qs-num">题号</div>
+                    <div class="qs-stem">题干</div>
+                    <div class="qs-type">题型</div>
+                    <div class="qs-score">分数</div>
+                    <div class="qs-partScore">漏选得分</div>
+                    <div class="qs-options">选项设置</div>
+                    <div v-if="!isViewer" class="qs-oprations">操作</div>
                   </div>
-                  <div class="qs-partScore">
-                    <p v-if="subQuestion.questionType != 3">------</p>
-                    <el-input-number class="number-ipt" v-else size="medium" :min="0" :precision="2"
-                      :max="subQuestion.score" :step="0.5" v-model="subQuestion.partScore" label="漏选得分" />
+
+                  <div class="courseware-content sub-questions" v-if="subQuestion &&
+              subQuestion.questionId && subQuestion.questionType && question.subQuestions"
+                    v-for="(subQuestion, subIndex) in question.subQuestions">
+                    <div class="qs-num">{{ subQuestion.questionId }}</div>
+                    <div class="qs-stem">
+                      <iframe style="height: 100% !important" class="screenshot" :src="subQuestion.screenshot"></iframe>
+                    </div>
+                    <div class="qs-type">
+                      <el-select :disabled="isViewer" v-model="subQuestion.questionType">
+                        <el-option v-for="item in questionOption" :key="item.Key" :label="item.Text"
+                          :value="item.Key" />
+                      </el-select>
+                    </div>
+                    <div class="qs-score">
+                      <el-input-number :disabled="isViewer" class="number-ipt" size="medium" :min="1" :max="200"
+                        :precision="2" :step="1" v-model="subQuestion.score" label="单题分值" />
+                    </div>
+                    <div class="qs-partScore">
+                      <p v-if="subQuestion.questionType != 3">------</p>
+                      <el-input-number class="number-ipt" v-else size="medium" :min="0" :precision="2"
+                        :max="subQuestion.score" :step="0.5" v-model="subQuestion.partScore" label="漏选得分" />
+                    </div>
+                    <div class="qs-options">
+                      <p v-if="subQuestion.questionType == 5">--</p>
+                      <p v-if="subQuestion.questionType == 4" class="answer-box">
+                        <span class="answer-s" v-if="!isViewer"
+                          :class="subQuestion.correctAnswer == 1 ? 'answer-active' : ''"
+                          @click="subQuestion.correctAnswer = 1">✓</span>
+                        <span class="answer-s" v-if="!isViewer"
+                          :class="subQuestion.correctAnswer == 2 ? 'answer-active' : ''"
+                          @click="subQuestion.correctAnswer = 2">✗</span>
+                        <span class="answer-s" v-if="isViewer"
+                          :class="subQuestion.correctAnswer == 1 ? 'answer-active' : ''">✓</span>
+                        <span class="answer-s" v-if="isViewer"
+                          :class="subQuestion.correctAnswer == 2 ? 'answer-active' : ''">✗</span>
+                      </p>
+                      <p v-if="subQuestion.questionType == 3" class="answer-box">
+                        <template :disabled="isViewer" v-for="option in subQuestion.answerOptions.split(',')">
+                          <span v-if="option && !isViewer" class="answer-s"
+                            :class="subQuestion.correctAnswer.includes(option) ? 'answer-active' : ''" :key="option"
+                            @click="changAnswer(subQuestion, option)">{{ option }}</span>
+                          <span v-if="option && isViewer" class="answer-s"
+                            :class="subQuestion.correctAnswer.includes(option) ? 'answer-active' : ''" :key="option">{{
+              option }}</span>
+                        </template>
+                        <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>
+                      </p>
+                      <p v-if="subQuestion.questionType == 2" class="answer-box">
+                        <template :disabled="isViewer" v-for="option in subQuestion.answerOptions.split(',')">
+                          <span class="answer-s" v-if="option && !isViewer"
+                            :class="subQuestion.correctAnswer == option ? 'answer-active' : ''" :key="option"
+                            @click="subQuestion.correctAnswer = option">{{ option }}</span>
+                          <span v-if="option && isViewer" class="answer-s"
+                            :class="subQuestion.correctAnswer.includes(option) ? 'answer-active' : ''" :key="option">{{
+              option }}</span>
+                        </template>
+                        <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, 5, index, subIndex)">-</span>
+                      </p>
+                    </div>
+                    <div class="qs-oprations" v-if="!isViewer">
+                      <div class="qs-set">
+                        <el-button class="icon-tickets" type="text"
+                          @click="openStem(subQuestion, 1, index, subIndex)">修改题干</el-button>
+                      </div>
+                      <div class="qs-set">
+                        <el-button class="icon-tickets" type="text"
+                          @click="openStem(subQuestion, 2, index, subIndex)">修改解析</el-button>
+                      </div>
+                      <div class="qs-set" v-if="false">
+                        <el-button type="text" @click="openKnowledge(subQuestion, index, subIndex)">修改知识点</el-button>
+                      </div>
+                      <div class="qs-set" style="margin-left:10px">
+                        <el-popconfirm @confirm="_deleteDetermineQ(subIndex, index)" title="这是一小题确定删除吗？">
+                          <!-- <el-button style="color:red" type="text" slot="reference">删除</el-button> -->
+                        </el-popconfirm>
+                      </div>
+                    </div>
                   </div>
-                  <div class="qs-options">
-                    <p v-if="subQuestion.questionType == 5">--</p>
-                    <p v-if="subQuestion.questionType == 4" class="answer-box">
-                      <span class="answer-s" :class="subQuestion.correctAnswer == 1 ? 'answer-active' : ''
-              " @click="subQuestion.correctAnswer = 1">✓</span>
-                      <span class="answer-s" :class="subQuestion.correctAnswer == 2 ? 'answer-active' : ''
-              " @click="subQuestion.correctAnswer = 2">✗</span>
-                    </p>
-                    <p v-if="subQuestion.questionType == 3" class="answer-box">
-                      <template v-for="option in subQuestion.answerOptions.split(',')">
-                        <span v-if="option" class="answer-s" :class="subQuestion.correctAnswer.includes(option)
+                  <div v-if="!question.subQuestions" class="courseware-content sub-questions">
+                    <div class="qs-num">{{ question.questionId }}</div>
+                    <div class="qs-stem">
+                      <iframe style="height: 100% !important" class="screenshot" :src="question.screenshot"></iframe>
+                    </div>
+                    <div class="qs-type">
+                      <el-select v-model="question.questionType">
+                        <el-option :disabled="isViewer" v-for="item in questionOption" :key="item.Key"
+                          :label="item.Text" :value="item.Key" />
+                      </el-select>
+                    </div>
+                    <div class="qs-score">
+                      <el-input-number :disabled="isViewer" class="number-ipt" size="medium" :min="1" :max="200"
+                        :precision="2" :step="1" v-model="question.score" label="单题分值" />
+                    </div>
+                    <div class="qs-partScore">
+                      <p v-if="question.questionType != 3">------</p>
+                      <el-input-number class="number-ipt" v-else size="medium" :min="0" :precision="2"
+                        :max="question.score" :step="0.5" v-model="question.partScore" label="漏选得分" />
+                    </div>
+                    <div class="qs-options">
+                      <p v-if="question.questionType == 5">--</p>
+                      <p v-if="question.questionType == 4" class="answer-box">
+                        <span class="answer-s" :class="question.correctAnswer == 1 ? 'answer-active' : ''
+              " @click="question.correctAnswer = 1">✓</span>
+                        <span class="answer-s" :class="question.correctAnswer == 2 ? 'answer-active' : ''
+              " @click="question.correctAnswer = 2">✗</span>
+                      </p>
+                      <p v-if="question.questionType == 3" class="answer-box">
+                        <template v-for="option in question.answerOptions.split(',')">
+                          <span v-if="option" class="answer-s" :class="question.correctAnswer.includes(option)
               ? 'answer-active'
               : ''
-              " :key="option" @click="changAnswer(subQuestion, option)">{{ option }}</span>
-                      </template>
-                      <span class="answer-s answer-opration" @click="openStem(subQuestion, 4, index, subIndex)">+</span>
-                      <span class="answer-s answer-opration" @click="openStem(subQuestion, 4, index, subIndex)">-</span>
-                    </p>
-                    <p v-if="subQuestion.questionType == 2" class="answer-box">
-                      <template v-for="option in subQuestion.answerOptions.split(',')">
-                        <span class="answer-s" v-if="option" :class="subQuestion.correctAnswer == option
+              " :key="option" @click="changAnswer(question, option)">{{ option }}</span>
+                        </template>
+                        <span class="answer-s answer-opration" v-if="!isViewer"
+                          @click="openStem(question, 4, index, 0)">+</span>
+                        <span class="answer-s answer-opration" v-if="!isViewer"
+                          @click="openStem(question, 4, index, 0)">-</span>
+                      </p>
+                      <p v-if="question.questionType == 2" class="answer-box">
+                        <template v-for="option in question.answerOptions.split(',')">
+                          <span class="answer-s" v-if="option" :class="question.correctAnswer == option
               ? 'answer-active'
               : ''
-              " :key="option" @click="subQuestion.correctAnswer = option">{{ option }}</span>
-                      </template>
-                      <span class="answer-s answer-opration" @click="openStem(subQuestion, 4, index, subIndex)">+</span>
-                      <span class="answer-s answer-opration" @click="openStem(subQuestion, 5, index, subIndex)">-</span>
-                    </p>
-                  </div>
-                  <div class="qs-oprations">
-                    <div class="qs-set">
-                      <el-button class="icon-tickets" type="text" circle size="mini"
-                        @click="openStem(subQuestion, 1, index, subIndex)">修改题干</el-button>
-                    </div>
-                    <div class="qs-set">
-                      <el-button class="icon-tickets" type="text" circle size="mini"
-                        @click="openStem(subQuestion, 2, index, subIndex)">修改解析</el-button>
+              " :key="option" @click="question.correctAnswer = option">{{ option }}</span>
+                        </template>
+                        <span class="answer-s answer-opration" v-if="!isViewer"
+                          @click="openStem(question, 4, index, 0)">+</span>
+                        <span class="answer-s answer-opration" v-if="!isViewer"
+                          @click="openStem(question, 5, index, 0)">-</span>
+                      </p>
                     </div>
-                    <div class="qs-set">
-                      <el-button type="text" circle size="mini"
-                        @click="openKnowledge(subQuestion, index, subIndex)">修改知识点</el-button>
-                    </div>
-                    <div class="qs-set">
-                      <el-button type="text" circle size="mini"
-                        @click="openStem(subQuestion, 3, index, subIndex)">删除</el-button>
+                    <div class="qs-oprations">
+                      <div class="qs-set">
+                        <el-button class="icon-tickets" type="text"
+                          @click="openStem(question, 1, index, 0)">修改题干</el-button>
+                      </div>
+                      <div class="qs-set">
+                        <el-button class="icon-tickets" type="text"
+                          @click="openStem(question, 2, index, 0)">修改解析</el-button>
+                      </div>
+                      <div class="qs-set" v-if="false">
+                        <el-button type="text" @click="openKnowledge(question, index, 0)">修改知识点</el-button>
+                      </div>
+                      <div class="qs-set" style="margin-left:10px">
+                        <el-popconfirm @confirm="_deleteDetermineQ(0, index)" title="这是一小题确定删除吗？">
+                          <!-- <el-button style="color:red" type="text" slot="reference">删除</el-button> -->
+                        </el-popconfirm>
+                      </div>
                     </div>
                   </div>
                 </div>
               </div>
             </div>
           </div>
-          <div v-if="paperType == 2">
-            <div class="paper"></div>
-          </div>
         </div>
-        <el-dialog :close-on-click-modal="false" title="选择班级分享" :visible.sync="classSharingType" width="400"
+        <el-dialog :close-on-click-modal="false" title="选择班级分享" :visible.sync="classSharingType" width="800"
           :modal-append-to-body="false" :append-to-body="true">
           <div>
             <el-row class="row-subfix">
@@ -126,23 +230,26 @@
                 <span class="line-value">{{ gradeName }}</span>
               </div>
             </el-row>
-            <el-row class="row-subfix">
+            <el-row class="row-subfix" style="margin-top: 20px;">
               <span class="line-subfix" style="float: left;">班级：</span>
-              <div class="row-line" style="float: left;">
-                <span class="line-value" style=" border-radius: 4px; background: rgb(247,247,250);">
+              <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" @change="handleCheckedClassChange">
-                    <el-checkbox v-for="(item, index) in gradeClass" :label="item.id" :key="item.id">{{
-              item.className }}</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">
+                      {{ item.className }}
+                    </el-checkbox>
                   </el-checkbox-group>
                 </span>
               </div>
             </el-row>
-            <el-row class="row-subfix" style="float:right;margin-right: 20px;">
-              <el-button type="danger" @click="() => { classSharingType == false }">取消</el-button>
-              <el-button type="primary" @click="_checkedClass">确定</el-button>
-            </el-row>
+          </div>
+          <div slot="footer">
+            <el-button type="info" :size="'small'" @click="classSharingType = false">取消</el-button>
+            <el-button type="primary" :size="'small'" @click="_checkedClass">确定</el-button>
           </div>
         </el-dialog>
         <el-dialog :close-on-click-modal="false" title="批量设置答案" :visible.sync="diaSetAns" width="400"
@@ -215,8 +322,8 @@
             <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"
-          :append-to-body="true">
+        <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="知识点：">
@@ -236,8 +343,8 @@
         </el-dialog>
       </div>
       <div class="content-fi">
-        <el-button type="danger" @click="linkBack">取消</el-button>
-        <el-button type="primary" @click="save">保存</el-button>
+        <el-button type="info" @click="linkBack">取消</el-button>
+        <el-button class="green-el-button" @click="save">保存</el-button>
       </div>
     </el-main>
   </el-container>
@@ -251,10 +358,13 @@ export default {
     return {
       role: "",
       title: "",
+      classSharingType: false,
       gradeName: "",
       checkAll: false,
       checkedClass: [],
       gradeClass: [],
+      subjectName: "",
+      isViewer: false,
       isIndeterminate: true,
       type: 1, //1:答题卡 2:即时测报表题目列表 3:课时题目列表
       questionList: [],
@@ -362,8 +472,10 @@ export default {
     this.type = this.$route.query.type || 1;
     this.examType = this.$route.query.examType || 2;
     this.paperType = this.$route.query.paperType || 2;
+    this.isViewer = this.$route.query.isViewer || false;
     this.classId = this.$route.query.classId || -1;
     this.gradeName = this.$route.query.gradeName || "";
+    this.subjectName = this.$route.query.subjectName || "";
     this.form.title = this.$route.query.title || "";
     this._QueryDetail();
     this._GradeList();
@@ -373,7 +485,7 @@ export default {
       this.classSharingType = false;
     },
     handleCheckAllChange(val) {
-      this.checkedClass = val ? this.gradeClass : [];
+      this.checkedClass = val ? this.gradeClass?.map(item => item.id) : [];
       this.isIndeterminate = false;
     },
     handleCheckedClassChange(value) {
@@ -382,13 +494,21 @@ export default {
       this.isIndeterminate = checkedCount > 0 && checkedCount < this.checkedClass.length;
     },
     async _selectClassSharingType() {
+
+      if (this.isViewer) return;
+
+      this.gradeClass = [];
+
       this.classSharingType = true;
-      var classResponse = await this.$request.tClassFromGrade(this.classId);
+
+      var classResponse = await this.$request.tClassFromGrade(this.classId, this.form.subjectName);
 
       if (classResponse.status != 0) {
         this.$message.error(classResponse.info);
       }
-      this.gradeClass = classResponse.data;
+
+      this.gradeClass = [...classResponse.data];
+
     },
     // v1.5
     //上传截图
@@ -403,7 +523,7 @@ export default {
         }
         this.stem.screenshot = obj.screenshot || "";
         this.stem.answerScreenshot = "";
-        return;
+        // return;
       } else if (type == 3) {
       } else if (type == 4) {
         var current = this.questionList[index].subQuestions[indexs];
@@ -516,6 +636,16 @@ export default {
       }
       return tit;
     },
+    _deleteDetermineQ(subIndex, index) {
+      if (this.questionList[index].subQuestions) {
+        this.questionList[index].subQuestions.splice(subIndex, 1);
+        if (this.questionList[index].subQuestions?.length == 0) {
+          this.questionList.splice(index, 1);
+        }
+      } else {
+        this.questionList.splice(index, 1);
+      }
+    },
     setBigNum(num) {
       let txt = "";
       let bigNum = [
@@ -759,7 +889,6 @@ export default {
       });
       //更新答题卡
       let modifyPaper, params;
-      console.log(this.type)
       if (this.type == 1) {
         modifyPaper =
           this.role == "ROLE_PERSONAL"
@@ -796,7 +925,16 @@ export default {
         ...params,
       });
       if (status == 0) {
-        this.$router.go(-1);
+        if (this.paperType == 1) {
+          this.$router.push({
+            path: "/askPreparationQuestions",
+          });
+        }
+        else {
+          this.$router.push({
+            path: "/testPaper",
+          });
+        }
       } else {
         this.$message.error(message);
       }
@@ -837,7 +975,7 @@ export default {
             ...this.form.paperModifyLog,
           };
           this.form = deepClone(data);
-          console.log(this.form.sharingType)
+
           questionList = this.form.questionList.map((item) => {
             if (item.subQuestions) {
               item.subQuestions.map((subQuestion) => {
@@ -855,13 +993,17 @@ export default {
             }
             return item;
           });
+
+
         } else {
           questionList = data.list.sort((a, b) => {
             return a.questionIndex - b.questionIndex;
           });
         }
         this.questionList = questionList;
+        console.log(this.questionList)
         this.formateQuestion();
+        this.checkedClass = data.classList?.map(item => item.classId);
       } else {
         this.$message.error(info);
       }
@@ -997,7 +1139,22 @@ export default {
   },
 };
 </script>
-<style>
+<style lang="scss">
+.line-value {
+  color: black;
+}
+
+.question-contents {
+
+  .el-input__inner,
+  .el-input,
+  .el-select,
+  .el-input-number__decrease,
+  .el-input-number__increase {
+    background: white !important;
+  }
+}
+
 .screenshot-box {
   width: 600px;
 }
@@ -1019,7 +1176,7 @@ export default {
 </style>
 <style lang="scss" scoped>
 .content-fi {
-  padding-top: 7px;
+  padding-top: 12px;
   width: 200px;
   margin: 0px auto;
 }
@@ -1308,4 +1465,17 @@ export default {
 .row-subfix {
   margin-bottom: 10px;
 }
+
+.bigQuestion {
+  padding: 20px;
+  box-shadow: 0px 1px 4px 0px rgba(21, 34, 50, 0.08);
+  border: 1px solid #ebeef5;
+  border-radius: 5px;
+  margin-top: 10px;
+
+  .bigQuestionTitle {
+    font-size: 16px;
+    font-weight: bold;
+  }
+}
 </style>
diff --git a/src/views/basic/card/index.vue b/src/views/basic/card/index.vue
index 31a7efe..ace188c 100644
--- a/src/views/basic/card/index.vue
+++ b/src/views/basic/card/index.vue
@@ -36,11 +36,11 @@
             <el-option label="换班" :value="2"></el-option>
           </el-select>
           <div class="d1">
-            <el-date-picker v-model="query.startDay" type="date" @change="handleChangeTimeStart" placeholder="选择日期时间"
+            <el-date-picker style="width: 40%;" 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"
+            <el-date-picker style="width: 40%;" v-model="query.endDay" type="date" placeholder="选择日期时间" @change="handleChangeTimeEnd"
               value-format="yyyy-MM-dd">
             </el-date-picker>
           </div>
diff --git a/src/views/basic/dataSync/index.vue b/src/views/basic/dataSync/index.vue
index f1496a7..2700855 100644
--- a/src/views/basic/dataSync/index.vue
+++ b/src/views/basic/dataSync/index.vue
@@ -162,7 +162,7 @@ export default {
   justify-content: center;
 
   .down-item {
-    width: 400px;
+    width: 450px;
     height: 330px;
     border-radius: 20px;
     margin: 20px;
diff --git a/src/views/basic/device/index.vue b/src/views/basic/device/index.vue
index 0998380..120919f 100644
--- a/src/views/basic/device/index.vue
+++ b/src/views/basic/device/index.vue
@@ -1457,7 +1457,7 @@ export default {
       align-items: center;
 
       .p1 {
-        font-size: 28px;
+        font-size: 28px !important;
       }
     }
 
@@ -1473,7 +1473,7 @@ export default {
     .loading {
       text-align: center;
       line-height: 36px;
-      font-size: 16px;
+      font-size: 16px !important;
       color: #666;
     }
 
diff --git a/src/views/basic/down/index.vue b/src/views/basic/down/index.vue
index 3fa7928..4d8320d 100644
--- a/src/views/basic/down/index.vue
+++ b/src/views/basic/down/index.vue
@@ -31,8 +31,7 @@
         <el-button plan round @click="downCard">发卡软件下载</el-button>
       </div>
       <div class="down-item" v-loading="loading">
-        <p class="txt">
-          电脑缺少.NET Framework环境时，请下载安装.NET Framework
+        <p class="txt">电脑缺少.NET Framework环境时，请下载安装.NET Framework
           4.5.2，以便于授课端可正常使用。
         </p>
         <el-button plan round @click="downNet">.Net环境下载</el-button>
@@ -140,7 +139,7 @@ export default {
   margin-left: 160px;
 
   .down-item {
-    width: 200px;
+    width: 300px;
     padding: 50px 20px;
     border-radius: 20px;
     margin: 20px;
@@ -149,8 +148,7 @@ export default {
     justify-content: center;
     align-items: center;
     background: #f8f8f8;
-    box-shadow: 2px 2px 5px #ccc;
-
+    box-shadow: 2px 2px 5px #ccc; 
     .txt {
       font-size: 16px;
       color: #7f7f7f;
diff --git a/src/views/basic/setUp/archived.vue b/src/views/basic/setUp/archived.vue
index eb5f832..041b4ba 100644
--- a/src/views/basic/setUp/archived.vue
+++ b/src/views/basic/setUp/archived.vue
@@ -7,90 +7,108 @@
     </back-box>
     <div class="page-content">
       <el-steps :active="step" align-center class="step">
-        <el-step title="1 班级归档"></el-step>
-        <el-step title="2 分班后学生名单"></el-step>
+        <el-step title="1 解散班级"></el-step>
+        <el-step title="2 导入班级名单"></el-step>
         <el-step title="3 分班后任课老师"></el-step>
-        <el-step title="4 授课端指引"></el-step>
       </el-steps>
       <ul v-loading="loading">
-        <li v-show="step == 0">
-          <div class="form-item">
-            <span class="s-txt">选择分班年级：</span>
-            <el-select class="sel" v-model="grade" placeholder="选择年级" @change="changeGrade">
-              <el-option v-for="item in gradeList" :key="item.value" :label="item.label" :value="item.value">
-              </el-option>
-            </el-select>
-          </div>
-          <div class="form-item">
-            <span class="s-txt">确定班级：</span>
-            <i class="el-icon-loading" v-show="loadingClass"></i>
-            <div class="check-box" v-if="classList.length && !loadingClass">
-              <!-- <p class="all-check">
-                <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll"
-                  @change="handleCheckAllChange">全选</el-checkbox>
-              </p> -->
-              <el-checkbox-group v-model="classIds" @change="handleCheckedChange">
-                <el-checkbox disabled v-for="item in classList" :key="item.id" :label="item.id">{{
-                  item.className
-                }}</el-checkbox>
-              </el-checkbox-group>
+        <li v-show="step == 0" style="padding:0px 200px;">
+          <el-row class="row-subfix" style="margin-top: 20px;">
+            <el-row class="row-subfix">
+              <div class="row-line">
+                <span class="line-subfix">选择年级：</span>
+                <span class="line-value">
+                  <el-select class="sel" v-model="grade" placeholder="选择年级" @change="changeGrade">
+                    <el-option v-for="item in gradeList" :key="item.value" :label="item.label" :value="item.value">
+                    </el-option>
+                  </el-select>
+                </span>
+              </div>
+            </el-row>
+            <el-row 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;width: calc(100% - 220px);  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;">
+                    <el-checkbox v-for="(item, index) in classList" :label="item.id" :key="item.id">
+                      {{ item.className }}
+                    </el-checkbox>
+                  </el-checkbox-group>
+                </span>
+              </div>
+            </el-row>
+          </el-row>
+          <el-row class="row-subfix form-item" style="margin-top: 20px;">
+            <span class="line-subfix" style="float: left;"> <i class="el-icon-warning" /></span>
+            <div class="row-line" style="float: left; width: calc(100% - 220px);  border-radius:5px;">
+              <div>请谨慎操作，班级归档后，学生解除班级关系且相关老师任课信息将不存在。</div>
+              <div style="margin-top: 10px;opacity: 0.7;">如需保存解散前的班级名单与任课信息，可点击“保存名单”按钮。</div>
             </div>
-          </div>
-          <div class="form-item">
-            <span class="s-txt"></span>
-            <p class="tips">
-              <i class="el-icon-warning"></i>请谨慎操作，班级归档后，学生解除班级关系且相关老师任课信息将不存在。
-            </p>
-          </div>
-          <div class="btn-box">
-            <el-button class="btn" round @click="toClazz">取消</el-button>
-            <el-popconfirm confirm-button-text="确定" cancel-button-text="取消" icon="el-icon-info" icon-color="red"
-              title="确定要将所选班级归档吗？" @confirm="_ClassArchiving">
-              <el-button class="btn" slot="reference" type="primary" round>归档</el-button>
+          </el-row>
+          <div style="margin:0px auto;width: 30%;">
+            <el-button style="background: rgb(218,225,235) ;color:black;border:none !important;"
+              @click="toClazz">取消</el-button>
+            <el-button type="primary" @click="_downNameList">保存名单</el-button>
+            <el-popconfirm confirm-button-text="确定" cancel-button-text="取消" title="确定要将所选班级解散吗吗？"
+              @confirm="_ClassArchiving">
+              <el-button slot="reference" v-loading="loadingDown"
+                style="background: rgb(242,168,65) ;color:white;margin-left: 10px;border:none !important;">确定解散</el-button>
             </el-popconfirm>
           </div>
         </li>
         <li v-show="step == 1">
-          <div class="step-item">
-            <upload id="downTeacher" :url="urlClazz" @upSuccess="upStudentSuccess" fileName="学生名单模板">
+          <el-row class="row-subfix form-item">
+            <div class="row-line" style="float: left;">
+              <div>通过导入EXCEL文件方式添加班级名单，请按需求下载对应班级类型板并填写班级名单信息后，导入系统：</div>
+              <div style="margin-top: 10px;opacity: 0.7;margin-left:20px;">
+                行政班定义：由固定学生、固定教室构成，由专门的班主任进行管理;
+              </div>
+              <div style="margin-top: 5px;opacity: 0.7;margin-left:20px;">
+                教学班定义：由不同行政班的学生临时组成，没有专门的班主任，是在选课制基础上，由于教学的需要而产生的。
+              </div>
+            </div>
+          </el-row>
+          <el-row class="row-subfix form-item" style="margin-top: 20px;">
+            <el-button :icon="'el-icon-document'" @click="_downTemplate(0)">下载行政班名单模板</el-button>
+            <el-button :icon="'el-icon-document'" @click="_downTemplate(1)">下载教学班名单模板</el-button>
+          </el-row>
+          <el-row class="row-subfix form-item" style="margin-top: 20px;">
+            <upload id="downTeacher" drag :url="urlClazz"
+              style="border:rgb(219,226,235) dashed 1px;width: 100%;padding:40px 0px;border-radius: 5px;"
+              @upSuccess="upStudentSuccess" fileName="学生名单模板">
               <p class="down-txt" slot="down">
-                通过Excel名单导入学生名单模板，点击
-                <el-link type="primary" @click="downStudentExcel">导出未分配学生</el-link>
-                。
+                通过Excel名单导入学生名单模板
               </p>
             </upload>
-          </div>
+          </el-row>
         </li>
         <li v-show="step == 2">
-          <div class="step-item">
-            <upload id="downTeacher" :url="urlTeacher" @upSuccess="upTeacherSuccess" fileName="任课老师名单模板">
+          <el-row class="row-subfix form-item">
+            <div class="row-line" style="float: left;">
+              <div>通过导入EXCEL文件方式添加教师任课信息，请按需求下载板并填写任课信息后，导入系统:</div>
+            </div>
+          </el-row>
+          <el-row class="row-subfix form-item" style="margin-top: 20px;">
+            <el-button :icon="'el-icon-document'" @click="_downTemplate(2)">下载任课信息模板</el-button>
+          </el-row>
+          <el-row class="row-subfix form-item" style="margin-top: 20px;">
+            <upload id="downTeacher" drag :url="urlTeacher"
+              style="border:rgb(219,226,235) dashed 1px;width: 100%;padding:40px 0px;border-radius: 5px;"
+              @upSuccess="upTeacherSuccess" fileName="任课老师名单模板">
               <p class="down-txt" slot="down">
-                通过Excel名单导入任课老师名单模板，点击
-                <el-link type="primary" @click="downTeacherExcel">导出未分配教师</el-link>。
+                通过Excel名单导入任课老师名单模板
               </p>
             </upload>
-          </div>
-        </li>
-        <li v-show="step == 3">
-          <div class="step-item2">
-            <p class="p2">
-              <el-button class="btn" type="success" icon="el-icon-check" circle
-                size="small"></el-button>恭喜您，分班已经完成，分班后老师第一次上课时注意事项：
-            </p>
-            <p class="p1">
-              1、点击授课端的设置—应用设置—初始化设置—重新选择绑定班级。
-            </p>
-            <p class="p1">
-              2、点击授课端的设置—班级名册—基站登录—学生完成基站绑定。
-            </p>
-          </div>
+          </el-row>
         </li>
-
         <li v-show="step != 0">
           <div class="btn-box">
             <el-button class="btn" round @click="step -= 1">上一步</el-button>
-            <el-button v-show="step != 3" class="btn" type="primary" round @click="step += 1">下一步</el-button><el-button
-              v-show="step == 3" class="btn" type="primary" round @click="toClazz">完成</el-button>
+            <el-button v-show="step != 2" class="btn" type="primary" round @click="step += 1">下一步</el-button><el-button
+              v-show="step == 2" class="btn" type="primary" round @click="toClazz">完成</el-button>
           </div>
         </li>
       </ul>
@@ -109,31 +127,67 @@ export default {
       step: 0,
       grade: "",
       gradeList: [],
-      classIds: [],
+      checkAll: false,
+      checkedClass: [],
       classList: [],
       urlClazz: "/api_html/school/manager/importClassAndStudent",
       urlTeacher: "/api_html/school/manager/importTeacher",
-      checkAll: true,
-      isIndeterminate: false,
+      isIndeterminate: true
     };
   },
+  watch: {
+    checkedClass(value) {
+      this.checkAll = value.length == this.classList.length;
+      this.isIndeterminate = value.length > 0 && value.length < this.classList.length;
+    }
+  },
   created() {
     this._QueryDataGrade();
   },
   methods: {
+    async _downNameList() {
+      this.loadingDown = true;
+      await this.downStudentExcel();
+      await this.downTeacherExcel();
+      this.loadingDown = false;
+    },
     handleCheckAllChange(val) {
-      this.classIds = val
-        ? this.classList.map((item) => {
-          return item.id;
-        })
-        : [];
-      this.isIndeterminate = false;
+      if (val) this.checkedClass = this.classList.map(item => item.id);
+      else this.checkedClass = [];
     },
-    handleCheckedChange(value) {
-      let checkedCount = value.length;
-      this.checkAll = checkedCount === this.classList.length;
-      this.isIndeterminate =
-        checkedCount > 0 && checkedCount < this.classList.length;
+    async _downTemplate(type) {
+
+      var template = type == 0 ? this.$request.classAndStudentTemplate : this.$request.tClassAndStudentTemplate;
+
+      if (type == 2) template = await this.$request.teacherTemplate;
+      console.log(type)
+      let data = await template();
+
+      if (data && !data.code) {
+
+        let blob = new Blob([data], {
+          type: "application/vnd.ms-excel;charset=utf-8",
+        });
+
+        downloadFile(type == 2 ? "教师任课信息" : type == 0 ? "行政班名单模板" : "教学班名单模板", blob);
+      }
+      else {
+        this.$message.error(data.info);
+      }
+      // const classAndStudentTemplate =
+      //   type == 0
+      //     ? this.$request.classAndStudentTemplate ? type == 2 :
+      //       await this.$request.teacherTemplate()
+      //     : this.$request.tClassAndStudentTemplate;
+      // let data = await classAndStudentTemplate();
+      // if (data && !data.code) {
+      //   let blob = new Blob([data], {
+      //     type: "application/vnd.ms-excel;charset=utf-8",
+      //   });
+      //   downloadFile(type == 0 ? type == 2 ? "教师任课信息模板" : "行政班名单模板" : "教学班名单模板", blob);
+      // } else {
+      //   this.$message.error(data.info);
+      // }
     },
     toClazz() {
       this.$router.push({
@@ -166,41 +220,53 @@ export default {
     },
     //导出学生名单
     async downStudentExcel() {
-      this.loadingDown = true;
-      let data = await this.$request.exportNoClassStudent();
-      this.loadingDown = false;
+
+      const exportClassAndStudent = this.$request.exportClassAndStudent;
+
+      let data = await exportClassAndStudent();
+
       if (data) {
         let blob = new Blob([data], {
-          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+          type: "application/vnd.ms-excel;charset=utf-8",
         });
-        downloadFile("未分配学生名单.xlsx", blob);
+        downloadFile(`班级名单.xlsx`, blob);
       } else {
         this.$message.error("下载失败");
       }
     },
     //导出任课老师名单
     async downTeacherExcel() {
-      this.loadingDown = true;
-      let data = await this.$request.exportNoClassTeacher();
-      this.loadingDown = false;
+
+      let data = await this.$request.exportTeacher();
+
       if (data) {
         let blob = new Blob([data], {
-          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+          type: "application/vnd.ms-excel;charset=utf-8",
         });
-        downloadFile("未分配教师 名单.xlsx", blob);
+        downloadFile(`教师名单.xlsx`, blob);
       } else {
         this.$message.error("下载失败");
       }
+      // let data = await this.$request.exportNoClassTeacher();
+
+      // if (data) {
+      //   let blob = new Blob([data], {
+      //     type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+      //   });
+      //   downloadFile("未分配教师 名单.xlsx", blob);
+      // } else {
+      //   this.$message.error("下载失败");
+      // }
     },
     //班级归档
     async _ClassArchiving() {
-      if (!this.classIds.length) {
+      if (!this.checkedClass.length) {
         this.$message.warning("班级不能为空，请选择班级～");
         return;
       }
       this.loading = true;
       const { status, info } = await this.$request.classArchiving({
-        classIds: [...this.classIds],
+        classIds: [...this.checkedClass],
       });
       this.loading = false;
       if (status === 0) {
@@ -234,14 +300,12 @@ export default {
       this.loadingClass = true;
       const { data, status, info } = await this.$request.schoolClassList({
         grade: this.grade,
+        type: 0
       });
       this.loadingClass = false;
       if (status === 0) {
         this.classList = (data.list && [...data.list]) || [];
-        this.classIds = this.classList.map((item) => {
-          return item.id;
-        });
-        this.checkAll = true;
+        this.checkedClass = this.classList.map(item => item.id);
       } else {
         this.$message.error(info);
       }
diff --git a/src/views/basic/setUp/clazz.vue b/src/views/basic/setUp/clazz.vue
index cd748b9..6bf9396 100644
--- a/src/views/basic/setUp/clazz.vue
+++ b/src/views/basic/setUp/clazz.vue
@@ -6,37 +6,14 @@
       </template>
       <template slot="btns" v-if="!code">
         <el-tooltip effect="dark" content="导入班级名单" placement="bottom">
-          <el-button
-            type="primary"
-            icon="el-icon-upload2"
-            size="mini"
-            plain
-            circle
-            @click="diaUp = true"
-          ></el-button>
+          <el-button type="primary" icon="el-icon-upload2" size="mini" plain circle @click="diaUp = true"></el-button>
         </el-tooltip>
         <el-tooltip effect="dark" content="导出班级名单" placement="bottom">
-          <el-button
-            type="primary"
-            icon="el-icon-download"
-            size="mini"
-            plain
-            circle
-            @click="exportTeacherExl"
-          ></el-button>
+          <el-button type="primary" icon="el-icon-download" size="mini" plain circle
+            @click="exportTeacherExl"></el-button>
         </el-tooltip>
-        <el-tooltip
-          effect="dark"
-          content="分班"
-          placement="bottom"
-          v-show="type == 0"
-        >
-          <img
-            @click="toArchived"
-            src="../../../assets/images/fenban.png"
-            class="fenban"
-            alt=""
-          />
+        <el-tooltip effect="dark" content="分班" placement="bottom" v-show="type == 0">
+          <img @click="toArchived" src="../../../assets/images/fenban.png" class="fenban" alt="" />
         </el-tooltip>
       </template>
     </back-box>
@@ -45,42 +22,23 @@
         <p class="tab-box">
           <el-radio-group v-model="type" @change="_QueryData">
             <el-radio-button :label="0">行政班</el-radio-button>
-            <el-radio-button :label="1">教学班</el-radio-button>
+            <el-radio-button v-if="hasTeachingClass" :label="1">教学班</el-radio-button>
           </el-radio-group>
         </p>
         <div class="grade-item" v-for="(item, index) in dataList">
           <p class="h-title">
             <span>{{ item.gradeName }}</span>
-            <span class="s-num" v-if="item.classList"
-              >（共{{ item.classList.length }}个班）</span
-            >
-            <el-button
-              class="sub-btn"
-              type="info"
-              size="mini"
-              round
-              plain
-              @click="openSubject(item)"
-              >科目管理({{ item.subjectNames.length }})</el-button
-            >
+            <span class="s-num" v-if="item.classList">（共{{ item.classList.length }}个班）</span>
+            <el-button class="sub-btn" type="info" size="mini" round plain @click="openSubject(item)">科目管理({{
+        item.subjectNames.length }})</el-button>
             <span class="txt" v-if="index == 0">拖动班级进行排序</span>
           </p>
-          <draggable
-            tag="ul"
-            class="grade-info"
-            v-model="item.classList"
-            @start="start"
-            @end="end(item)"
-            v-bind="{
-              animation: 300,
-            }"
-          >
+          <draggable tag="ul" class="grade-info" v-model="item.classList" @start="start" @end="end(item)" v-bind="{
+        animation: 300,
+      }">
             <li class="clazz-li" v-for="clazz in item.classList" :key="item.id">
               <div class="clazz-item">
-                <i
-                  class="el-icon-edit"
-                  @click.stop="setClass(clazz, item.gradeName)"
-                ></i>
+                <i class="el-icon-edit" @click.stop="setClass(clazz, item.gradeName)"></i>
                 <p class="clazz-name ellipsis">
                   {{ clazz.className }}
                 </p>
@@ -94,34 +52,48 @@
         </div>
       </div>
     </div>
-    <el-dialog :append-to-body="true"
-      :close-on-click-modal="false"
-      title="导入班级名单"
-      :visible.sync="diaUp"
-      width="600"
-    >
-      <upload :url="url" @upSuccess="upSuccess" fileName="班级名单">
-        <p class="down-txt" slot="down">
-          通过Excel名单导入班级名单，点击
-          <el-link type="danger" @click="downExcel">模板下载</el-link> 。
-        </p>
-      </upload>
+    <el-dialog :append-to-body="true" :close-on-click-modal="false" title="添加班级" width="70%" :visible.sync="diaUp">
+      <div style="width: 90%;margin:0px auto;">
+        <el-row class="row-subfix form-item">
+          <div class="row-line" style="float: left;color:black;">
+            <div>通过导入文件方式添加班级名单</div>
+            <div class="row-line" style="margin-top:10px">
+              <div style="float:left;">第一步：</div>
+              <div style="float:left;">
+                <div style="margin-bottom: 10px;">无需走班，请 <el-link type="primary"
+                    @click="_downTemplate(0)">下载行政班模板名单；</el-link>
+                </div>
+                <div style="margin-bottom: 10px;">需要走班，请按需求
+                  <el-link type="primary" @click="_downTemplate(0)">下载行政班模板名单；</el-link>或者
+                  <el-link type="primary" @click="_downTemplate(1)">教学班名单模板</el-link>
+                </div>
+                <div style="margin-top: 10px;opacity: 0.7;margin-left:20px;">
+                  行政班定义：由固定学生、固定教室构成，由专门的班主任进行管理。
+                </div>
+                <div style="margin-top: 5px;opacity: 0.7;margin-left:20px;">
+                  教学班定义：由不同行政班的学生临时组成，没有专门的班主任，是在选课制基础上，由于教学的需要而产生的。
+                </div>
+              </div>
+            </div>
+            <div style="float:left;margin-top:10px">第二步：<span>上传完成编辑好的名单文件</span></div>
+          </div>
+        </el-row>
+        <el-row class="row-subfix form-item" style="margin-top: 20px;">
+          <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>
+          </upload>
+        </el-row>
+      </div>
       <div class="dialog-footer" slot="footer">
         <el-button @click="diaUp = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog :append-to-body="true"
-      :close-on-click-modal="false"
-      title="修改班级"
-      :visible.sync="diaClass"
-      width="400"
-    >
-      <el-form
-        ref="formClass"
-        :model="formClass"
-        :rules="rulesClass"
-        label-width="160px"
-      >
+    <el-dialog :append-to-body="true" :close-on-click-modal="false" title="修改班级" :visible.sync="diaClass" width="400">
+      <el-form ref="formClass" :model="formClass" :rules="rulesClass" label-width="160px">
         <el-form-item label="所在年级：">
           <span>{{ formClass.gradeName }}</span>
         </el-form-item>
@@ -140,20 +112,14 @@
         </el-form-item>
         <el-form-item label="入学年份：">
           <el-col :span="10">
-            <el-date-picker
-              v-model="formClass.intoSchoolYear"
-              type="year"
-              placeholder="选择年"
-            >
+            <el-date-picker v-model="formClass.intoSchoolYear" type="year" placeholder="选择年">
             </el-date-picker>
           </el-col>
         </el-form-item>
       </el-form>
       <div class="dialog-footer" slot="footer">
         <el-popconfirm title="确定删除该班级吗？" @confirm="_RemoveClass">
-          <el-button class="el-button-del" slot="reference" type="danger"
-            >删 除</el-button
-          >
+          <el-button class="el-button-del" slot="reference" type="danger">删 除</el-button>
         </el-popconfirm>
         <el-button @click="_SaveClass" type="primary">确 定</el-button>
         <el-button @click="diaClass = false">取 消</el-button>
@@ -163,11 +129,7 @@
         </el-popconfirm> -->
       </div>
     </el-dialog>
-    <el-dialog :append-to-body="true"
-      :close-on-click-modal="false"
-      :visible.sync="diaSubject"
-      width="400"
-    >
+    <el-dialog :append-to-body="true" :close-on-click-modal="false" :visible.sync="diaSubject" width="400">
       <p slot="title" class="dia-tit">
         {{ formClass.gradeName }}
         <span class="tips">（默认科目和已经有任课老师的科目不能删除）</span>
@@ -176,54 +138,25 @@
         <el-form-item label="科目：">
           <div class="subject-box">
             <el-checkbox-group v-model="subjectNames">
-              <p
-                class="p1"
-                v-for="(item, index) in subjectList"
-                :key="item.default"
-              >
+              <p class="p1" v-for="(item, index) in subjectList" :key="item.default">
                 <el-checkbox v-if="!item.checked" :label="item.value">{{
-                  item.value
-                }}</el-checkbox>
-                <el-input
-                  class="sub-ipt"
-                  v-else
-                  v-model="item.value"
-                  @keyup.enter.native="_EditSub(item)"
-                ></el-input>
-                <i
-                  class="el-icon el-icon-edit"
-                  v-show="!item.checked"
-                  @click="item.checked = true"
-                ></i>
-                <i
-                  class="el-icon el-icon-check"
-                  v-show="item.checked"
-                  @click="_EditSub(item)"
-                ></i>
+        item.value
+      }}</el-checkbox>
+                <el-input class="sub-ipt" v-else v-model="item.value" @keyup.enter.native="_EditSub(item)"></el-input>
+                <i class="el-icon el-icon-edit" v-show="!item.checked" @click="item.checked = true"></i>
+                <i class="el-icon el-icon-check" v-show="item.checked" @click="_EditSub(item)"></i>
                 <!-- <i
                   class="el-icon el-icon-close"
                   v-show="item.checked"
                   @click="resetSub(item)"
                 ></i> -->
-                <i
-                  v-show="!item.checked"
-                  class="el-icon el-icon-delete"
-                  @click="_DelSubject(item, index)"
-                ></i>
+                <i v-show="!item.checked" class="el-icon el-icon-delete" @click="_DelSubject(item, index)"></i>
               </p>
             </el-checkbox-group>
           </div>
           <el-col :span="8">
-            <el-input
-              placeholder="添加科目"
-              v-model.trim="subjectName"
-              maxlength="30"
-            >
-              <i
-                slot="suffix"
-                class="el-input__icon el-icon-plus"
-                @click="addSubjectName"
-              ></i>
+            <el-input placeholder="添加科目" v-model.trim="subjectName" maxlength="30">
+              <i slot="suffix" class="el-input__icon el-icon-plus" @click="addSubjectName"></i>
             </el-input>
           </el-col>
         </el-form-item>
@@ -255,6 +188,7 @@ export default {
   },
   data() {
     return {
+      hasTeachingClass: false,
       code: "",
       loading: false,
       loadingDown: false,
@@ -355,6 +289,18 @@ export default {
         : "";
       this.diaClass = true;
     },
+    async _downTemplate(type) {
+      const template = type == 0 ? this.$request.classAndStudentTemplate : this.$request.tClassAndStudentTemplate;
+      let data = await template();
+      if (data && !data.code) {
+        let blob = new Blob([data], {
+          type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        });
+        downloadFile(type == 0 ? "行政班名单模板" : "教学班名单模板", blob);
+      } else {
+        this.$message.error(data.info);
+      }
+    },
     async _RemoveClass() {
       const { data, status, info } = await this.$request.deleteClass({
         id: this.formClass.classId,
@@ -485,7 +431,22 @@ export default {
       }
     },
     async _QueryData() {
+
       this.loading = true;
+
+      var loadTeachingClass = await this.$request.classManager({
+        type: 1,
+      });
+      if (loadTeachingClass.status != 0) {
+        this.$message.error(loadTeachingClass.info);
+        return;
+      }
+
+      this.hasTeachingClass = loadTeachingClass.data.list?.find(item => {
+        return item?.classList?.length >= 1;
+      });
+      console.log(loadTeachingClass.data.list, this.hasTeachingClass)
+
       this.dataList = [];
       let { data, status, info } = await this.$request.classManager({
         type: this.type,
@@ -691,7 +652,7 @@ export default {
         }
       }
 
-      .is-checked ~ .el-icon-delete {
+      .is-checked~.el-icon-delete {
         display: none;
       }
     }
diff --git a/src/views/basic/test/components/scoreSet.vue b/src/views/basic/test/components/scoreSet.vue
index fb92422..836f4f1 100644
--- a/src/views/basic/test/components/scoreSet.vue
+++ b/src/views/basic/test/components/scoreSet.vue
@@ -8,51 +8,19 @@
     </div>
     <div class="set-content">
       <div class="test-title">
-        <el-button class="import-btn" round @click="diaUp = true"
-          >从excel文件导入</el-button
-        >
-        <el-button
-          class="save-btn"
-          type="primary"
-          round
-          :loading="loadingSave"
-          @click="_SubmitScore"
-          >保存</el-button
-        >
+        <el-button class="import-btn" round @click="diaUp = true">从excel文件导入</el-button>
+        <el-button class="save-btn" type="primary" round :loading="loadingSave" @click="_SubmitScore">保存</el-button>
         <p class="p1">{{ title }}</p>
         <p class="p2">卷面总分：{{ examScore }}分</p>
       </div>
-      <el-table
-        :data="tableData"
-        border
-        style="width: 100%"
-        :max-height="tableMaxHeight"
-      >
-        <el-table-column
-          prop="studentCode"
-          label="学号"
-          align="center"
-          fixed
-        ></el-table-column>
-        <el-table-column
-          prop="studentName"
-          label="学号"
-          align="center"
-          fixed
-        ></el-table-column>
-        <el-table-column prop="score" label="总得分" align="center" fixed
-          ><template slot-scope="scoped">
-            <el-input
-              v-if="showAllSetScore"
-              type="number"
-              :min="0"
-              v-model="scoped.row.all"
-            ></el-input>
+      <el-table :key="tableDataIndex" :data="tableData" border style="width: 100%" :max-height="tableMaxHeight">
+        <el-table-column prop="studentCode" label="学号" align="center" fixed></el-table-column>
+        <el-table-column prop="studentName" label="学号" align="center" fixed></el-table-column>
+        <el-table-column prop="score" label="总得分" align="center" fixed><template slot-scope="scoped">
+            <el-input v-if="showAllSetScore" type="number" :min="0" v-model="scoped.row.all"></el-input>
             <template v-else>{{ scoped.row.all }}</template>
-          </template></el-table-column
-        >
-        <el-table-column prop="objectiveScore" label="客观题分" align="center"
-          ><template slot-scope="scoped">
+          </template></el-table-column>
+        <el-table-column prop="objectiveScore" label="客观题分" align="center"><template slot-scope="scoped">
             <!-- <el-input
               v-if="scoped.row.showSetScore"
               type="number"
@@ -61,8 +29,7 @@
               @input="setOtherScore($event, scoped.row)"
             ></el-input> -->
             <template>{{ scoped.row.object }}</template>
-          </template></el-table-column
-        >
+          </template></el-table-column>
         <el-table-column prop="subjectiveScore" label="主观题分" align="center">
           <template slot-scope="scoped">
             <!-- <el-input
@@ -76,56 +43,29 @@
           </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"
-          align="center"
-        >
+        <el-table-column v-for="(question, index) in questionList" :key="index" :label="'Q' + question.questionId"
+          align="center">
           <template slot-scope="scoped">
-            <el-input
-              v-if="showSetScore"
-              type="number"
-              :min="0"
-              :max="question.questionScore"
-              @input="
-                setScore(
-                  $event,
-                  question.questionScore,
-                  scoped.row.scoreMap,
-                  question.questionId,
-                  scoped.row
-                )
-              "
-              v-model="scoped.row.scoreMap[question.questionId]"
-            ></el-input>
-            <template v-else>{{
-              scoped.row.scoreMap[question.questionId]
-            }}</template>
+            <el-input v-if="showSetScore" type="number" :min="0" :max="question.questionScore" @input="setScore(
+    $event,
+    question.questionScore,
+    scoped.row.scoreMap,
+    question.questionId,
+    scoped.row
+  )
+    " v-model="scoped.row.scoreMap[question.questionId]"></el-input>
+            <template v-else>{{ scoped.row.scoreMap[question.questionId] }}</template>
           </template>
         </el-table-column>
       </el-table>
     </div>
 
-    <el-dialog
-      :close-on-click-modal="false"
-      :append-to-body="true"
-      title="答卷录分"
-      :visible.sync="diaUp"
-      width="600px"
-      top="120px"
-    >
-      <upload
-        :url="url"
-        :examId="id"
-        @upSuccess="upSuccess"
-        fileName="主观题分数"
-        v-loading="loadingDown"
-      >
+    <el-dialog :close-on-click-modal="false" :append-to-body="true" title="答卷录分" :visible.sync="diaUp" width="600px"
+      top="120px">
+      <upload :url="url" :examId="id" @upSuccess="upSuccess" fileName="主观题分数" v-loading="loadingDown">
         <template slot="down">
           <p class="down-txt">
-            第一步：<el-link type="danger" @click="downExcel">下载模板</el-link
-            >，并编辑完成学生分数。
+            第一步：<el-link type="danger" @click="downExcel">下载模板</el-link>，并编辑完成学生分数。
           </p>
           <p class="down-txt">第二步：上传完成编辑的模板文件并导入。</p>
         </template>
@@ -160,8 +100,11 @@ export default {
       url: "/api_html/teaching/importScore",
       tableData: [],
       questionList: [],
+      dataReponse: [],
+      tableDataIndex: 0,
       cNum: cNum,
       tableMaxHeight: 300,
+      studentList: [],
     };
   },
   watch: {
@@ -209,7 +152,7 @@ export default {
           if (obj.scoreMap[keys] == 0) {
             obj.scoreMap[keys] = 0;
           } else {
-            obj.scoreMap[keys] = "";
+            obj.scoreMap[keys] = 0;
           }
         } else {
           let num = Number(obj.scoreMap[keys]);
@@ -238,8 +181,9 @@ export default {
         });
       this.loading = false;
       if (status === 0) {
-        let studentList = data.students || [];
-        this.questionList = data?.questionList || [];
+        this.dataReponse = data;
+        let studentList = this.dataReponse.students || [];
+        this.questionList = this.dataReponse?.questionList || [];
         if (this.questionList.length == 0) {
           this.questionList = Object.keys(studentList[0].scoreMap).map(
             (item) => {
@@ -269,7 +213,6 @@ export default {
                 item.scoreMap[keys] = num;
               }
             });
-
             return item;
           }) || [];
         this.setTableHeight();
@@ -310,10 +253,68 @@ export default {
 
     //导入成功
     upSuccess(res) {
+
       this.$message.success("导入成功");
+
+      let studentList = this.dataReponse.students || [];
+
+      this.tableData =
+        studentList.map((item) => {
+          // setScore();
+          item.all = 0; //总分
+          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] = "";
+                }
+              } else {
+                let num = Number(item.scoreMap[keys]);
+                item.scoreMap[keys] = num;
+              }
+            }); 
+
+          return item;
+        }) || [];
+
+      this.setTableHeight();
+
+      this.tableDataIndex += 1;
+      // for (let key in res.data) {
+
+      //   var detail = JSON.parse(res.data[key]);
+
+      //   let studentList = this.dataReponse.students || [];
+
+
+
+      //   // if (student) {
+      //   //   for (let scoreMapKey in student?.scoreMap) {
+      //   //     var sDetail = detail.find(dl => dl.id == scoreMapKey);
+      //   //     if (sDetail) {
+      //   //       student.scoreMap[scoreMapKey] = sDetail.score;
+      //   //     }
+      //   //   }
+      //   // }
+      // }
+      // this.setTableHeight();
       this.diaUp = false;
-      // this.closeScoreSet();
-      this.$emit("SuccessScoreSet");
     },
     async downExcel() {
       //模板下载
@@ -338,10 +339,10 @@ export default {
 <style lang="scss" scoped>
 .set-container {
   position: fixed;
-  left: 200px;
-  top: 50px;
-  width: calc(100% - 200px);
-  height: calc(100% - 70px);
+  left: 250px;
+  top: 60px;
+  width: calc(100% - 250px);
+  height: calc(100% - 80px);
   background: #fff;
   z-index: 2000;
   overflow-y: auto;
diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue
index 849f518..31c78c4 100644
--- a/src/views/examinationPaper/add.vue
+++ b/src/views/examinationPaper/add.vue
@@ -3,10 +3,40 @@
   <div ref="content" class="content-box">
     <back-box>
       <template slot="title">
-        <span>{{ "创建答题卡" }}</span>
+        <span>{{ isUpload ? "导入试卷" : "创建答题卡" }}</span>
       </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>
+          <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;">
+            <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>
+              </span>
+            </div>
+          </el-row>
+        </div>
+        <div slot="footer">
+          <el-button type="info" :size="'small'" @click="classSharingType = false">取消</el-button>
+          <el-button type="primary" :size="'small'" @click="_checkedClass">确定</el-button>
+        </div>
+      </el-dialog>
       <el-steps :active="step" finish-status="success" simple style="margin: 20px 0">
         <el-step title="基础信息" icon="el-icon-edit"></el-step>
         <el-step v-if="!isUpload" title="题目编辑" icon="el-icon-tickets"></el-step>
@@ -49,7 +79,8 @@
           <el-form-item v-if="role != 'ROLE_PERSONAL'" label="分享范围：" prop="sharingType">
             <el-radio-group v-model="form.sharingType">
               <el-radio :label="0">任课班级分享</el-radio>
-              <el-radio :label="1">全年级分享</el-radio>
+              <el-radio class="name-radio" @click.native="_selectClassSharingType" v-model="form.sharingType"
+                :label="1">自定义分享班级</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-form>
@@ -57,7 +88,8 @@
           <el-button type="danger" plain round @click="linkBack">取消</el-button>
           <el-button type="primary" round @click="isUpload ? setStep2() : setStep1()">下一步</el-button>
         </div>
-        <el-dialog :close-on-click-modal="false" title="设置测验类型" :visible.sync="dialogVisible" width="500px">
+        <el-dialog :close-on-click-modal="false" title="设置测验类型" :visible.sync="dialogVisible" width="500px"
+          :append-to-body="true">
           <div class="dia-content">
             <p class="add-type" v-for="item in tagList" :key="item.id">
               <el-row :gutter="10">
@@ -217,7 +249,8 @@
             <el-button :type="form.questionList.length == 0 ? 'info' : 'primary'" round
               @click="setStep2">下一步</el-button>
           </div>
-          <el-dialog :close-on-click-modal="false" title="添加大题" :visible.sync="addQuestionVisible" width="600px">
+          <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-item label="标题：">
@@ -514,7 +547,7 @@
         </div>
       </div>
       <el-dialog :close-on-click-modal="false" :title="stem.type == 1 ? '上传题干' : '上传题目解析'" :visible.sync="dialogStem"
-        v-if="dialogStem" width="800px">
+        v-if="dialogStem" width="800px" :append-to-body="true">
         <div class="upload-box">
           <div v-loading="iframeLoading">
             <template v-if="stem.type == 1">
@@ -535,7 +568,8 @@
           <el-button @click="dialogStem = false">确定</el-button>
         </div>
       </el-dialog>
-      <el-dialog :close-on-click-modal="false" title="知识点" :visible.sync="dialogKnowledge" width="500px">
+      <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="知识点：">
@@ -620,6 +654,13 @@ export default {
   },
   data() {
     return {
+      shareClass: [],
+      role: "",
+      checkedClass: [],
+      classSharingType: false,
+      gradeName: "",
+      isIndeterminate: false,
+      checkAll: false,
       role: "",
       step: 0, //步骤
       gradeClassList: [], //年级-班级数据
@@ -744,6 +785,18 @@ export default {
     }
   },
   methods: {
+    _checkedClass() {
+      this.classSharingType = false;
+    },
+    handleCheckAllChange(val) {
+      this.checkedClass = val ? this.shareClass?.map(item => item.id) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedClassChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.checkedClass.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.checkedClass.length;
+    }, 
     // v1.5
     //上传截图
     openStem(obj, index, indexs, type) {
@@ -825,13 +878,25 @@ export default {
       )
         .then(() => { })
         .catch(() => {
-          this.$router.push({
-            path: "/examinationPaper",
-            query: {
-              type: this.listType,
-              share: this.listShare,
-            },
-          });
+          if (location.href.indexOf('askPreparationQuestionsAdd') >= 1) {
+            this.$router.push({
+              path: "/askPreparationQuestions"
+            });
+          }
+          else if (location.href.indexOf('testPaperAdd') >= 1) {
+            this.$router.push({
+              path: "/testPaper"
+            });
+          }
+          else {
+            this.$router.push({
+              path: "/examinationPaper",
+              query: {
+                type: this.listType,
+                share: this.listShare,
+              },
+            });
+          }
         });
     },
     //转换题型显示方式
@@ -1183,6 +1248,24 @@ export default {
         }
       }
     },
+    async _selectClassSharingType() {
+
+      this.classSharingType = true;
+
+      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);
+      }
+     
+      this.gradeName = grade.gradeName;
+    
+      this.shareClass = classResponse.data;
+ 
+
+    },
     openQuestion() {
       this.questionForm = { ...questionForm };
       this.addQuestionVisible = true;
@@ -1437,16 +1520,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 54b23b2..2d063e8 100644
--- a/src/views/examinationPaper/addQs.vue
+++ b/src/views/examinationPaper/addQs.vue
@@ -7,6 +7,37 @@
       </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>
+          <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;">
+            <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>
+              </span>
+            </div>
+          </el-row>
+        </div>
+        <div slot="footer">
+          <el-button type="info" :size="'small'" @click="classSharingType = false">取消</el-button>
+          <el-button type="primary" :size="'small'" @click="_checkedClass">确定</el-button>
+        </div>
+      </el-dialog>
+
       <el-steps :active="step" finish-status="success" simple style="margin: 20px 0">
         <el-step title="基础信息" icon="el-icon-edit"></el-step>
         <el-step title="题目编辑" icon="el-icon-tickets"></el-step>
@@ -36,7 +67,8 @@
           <el-form-item v-if="role != 'ROLE_PERSONAL'" label="分享范围：" prop="sharingType">
             <el-radio-group v-model="form.sharingType">
               <el-radio :label="0">任课班级分享</el-radio>
-              <el-radio :label="1">全年级分享</el-radio>
+              <el-radio class="name-radio" @click.native="_selectClassSharingType" v-model="form.sharingType"
+                :label="1">自定义分享班级</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-form>
@@ -59,7 +91,7 @@
               <div class="qs-options qs-options2">选项设置</div>
               <div class="qs-upload">题干</div>
               <div class="qs-upload">题目解析</div>
-              <div class="qs-upload" v-if="knowledgeData.length">知识点</div>
+              <div class="qs-upload"  >知识点</div>
               <div class="qs-set">操作</div>
             </li>
           </ul>
@@ -99,8 +131,8 @@
                       </p>
                       <p v-if="question.questionType == 3" class="answer-box">
                         <span class="answer-s" v-for="option in question.answerOptions?.split(',')" :class="question.correctAnswer?.includes(option)
-          ? 'active'
-          : ''
+        ? 'active'
+        : ''
         " :key="option" @click="changAnswer(question, option)">{{ option }}</span>
                       </p>
                       <p v-if="question.questionType == 2" class="answer-box">
@@ -125,7 +157,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" v-if="knowledgeData.length">
+                    <div class="qs-upload"  >
                       <el-button type="primary" circle size="mini" icon="el-icon-price-tag"
                         @click="openKnowledge(question, index)"></el-button>
                     </div>
@@ -179,8 +211,8 @@
                         <span class="answer-s" v-for="option in subQuestions.answerOptions?.split(
         ','
       )" :class="subQuestions.correctAnswer?.includes(option)
-          ? 'active'
-          : ''
+        ? 'active'
+        : ''
         " :key="option" @click="changAnswer(subQuestions, option)">{{ option }}</span>
                       </p>
                       <p v-if="subQuestions.questionType == 2" class="answer-box">
@@ -206,17 +238,8 @@
                     <div class="qs-upload">
                       <el-button class="icon-tickets" type="primary" circle size="mini" icon="el-icon-tickets"
                         @click="openStem(subQuestions, 2, index, indexs)"></el-button>
-                    </div> if (location.href.indexOf('askPreparationQuestionsAdd') >= 1) {
-                    this.$router.push({
-                    path: "/askPreparationQuestions"
-                    });
-                    }
-                    else if (location.href.indexOf('testPaperAdd') >= 1) {
-                    this.$router.push({
-                    path: "/testPaper"
-                    });
-                    }
-                    <div class="qs-upload" v-if="knowledgeData.length">
+                    </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>
@@ -233,7 +256,7 @@
           </template>
         </div>
         <el-dialog :close-on-click-modal="false" title="批量设置答案" :visible.sync="diaSetAns" width="400"
-          :modal-append-to-body="true">
+          :modal-append-to-body="false">
           <div class="qs-options">
             <p class="dia-tips">
               请点击选项按钮设置答案,多选题题目之间用“,”隔开，若添加5道题：“AC,AD,BD,AC,CD”
@@ -284,8 +307,8 @@
           <el-button round @click="step = 0">上一步</el-button>
           <el-button type="primary" round @click="toStep(2)">下一步</el-button>
         </div>
-        <el-dialog :close-on-click-modal="false" :title="stem.type == 1 ? '上传题干' : '上传题目解析'" :visible.sync="dialogStem"
-          v-if="dialogStem" width="800px">
+        <el-dialog :close-on-click-modal="false" :modal-append-to-body="false"
+          :title="stem.type == 1 ? '上传题干' : '上传题目解析'" :visible.sync="dialogStem" v-if="dialogStem" width="800px">
           <div class="upload-box">
             <div v-loading="iframeLoading">
               <template v-if="stem.type == 1">
@@ -306,14 +329,10 @@
             <el-button @click="dialogStem = false">保存</el-button>
           </div>
         </el-dialog>
-        <el-dialog :close-on-click-modal="false" title="知识点" :visible.sync="dialogKnowledge" width="500px">
+        <el-dialog :close-on-click-modal="false" :modal-append-to-body="false" title="知识点"
+          :visible.sync="dialogKnowledge" width="60%"  >
           <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' }"></el-cascader>
-              </el-form-item>
-            </el-form>
+            <knowledgePoints :sectionName="stem.sectionName" :subjectName="stem.subjectName" :knowledges="stem.knowledge" @points="_points" /> 
           </div>
           <div slot="footer">
             <el-button @click="dialogKnowledge = false">取 消</el-button>
@@ -354,10 +373,20 @@
 <script>
 import { deepClone, checkAnswer } from "utils";
 import knowledgeList from "assets/js/knowledgeList.js";
+import knowledgePoints from "@/components/knowledgePoints"
 export default {
+  components: {
+    knowledgePoints
+  },
   data() {
     return {
+      shareClass: [],
       role: "",
+      checkedClass: [],
+      classSharingType: false,
+      gradeName: "",
+      isIndeterminate: false,
+      checkAll: false,
       step: 0, //步骤
       gradeClassList: [], //年级-班级数据
       gradeList: [], //年级
@@ -405,6 +434,8 @@ export default {
         screenshot: "", //题干图片地址
         answerScreenshot: "", //题目解析图片地址
         knowledge: [], //知识点
+        subjectName: "",
+        sectionName: "",
       },
       type: 1, //1-创建，2-复制答题卡
       questionOptions: [
@@ -423,33 +454,33 @@ export default {
       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;
-    },
-  },
+  // 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 +519,31 @@ export default {
     }
   },
   methods: {
+    _points(point) {
+
+    },
+    _checkedClass() {
+      this.classSharingType = false;
+    },
+    handleCheckAllChange(val) {
+      this.checkedClass = val ? this.shareClass?.map(item => item.id) : [];
+      this.isIndeterminate = false;
+    },
+    handleCheckedClassChange(value) {
+      let checkedCount = value.length;
+      this.checkAll = checkedCount === this.checkedClass.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < this.checkedClass.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);
+      if (classResponse.status != 0) {
+        this.$message.error(classResponse.info);
+      }
+      this.shareClass = classResponse.data;
+    },
     // v1.5
     //上传截图
     openStem(obj, type, index, indexs) {
@@ -550,6 +606,16 @@ export default {
       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;
     },
     // 知识点
@@ -578,13 +644,25 @@ export default {
       )
         .then(() => { })
         .catch(() => {
-          this.$router.push({
-            path: "/examinationPaper",
-            query: {
-              type: this.listType,
-              share: this.listShare,
-            },
-          });
+          if (location.href.indexOf('askPreparationQuestionsAdd') >= 1) {
+            this.$router.push({
+              path: "/askPreparationQuestions"
+            });
+          }
+          else if (location.href.indexOf('testPaperAdd') >= 1) {
+            this.$router.push({
+              path: "/testPaper"
+            });
+          }
+          else {
+            this.$router.push({
+              path: "/examinationPaper",
+              query: {
+                type: this.listType,
+                share: this.listShare,
+              },
+            });
+          }
         });
     },
     //转换题型显示方式
@@ -1025,6 +1103,13 @@ export default {
       this.saveLoading = true;
       this.formatQuestionList();
       let formDatas = deepClone(this.form);
+
+      formDatas.classIds = this.checkedClass.join(",");
+
+      formDatas.questionList = formDatas.questionList.filter(item => {
+        return item.subQuestions?.length >= 1;
+      });
+
       let addPaper =
         this.role == "ROLE_PERSONAL"
           ? this.$request.pAddPaper
@@ -1046,14 +1131,26 @@ export default {
           });
         }
         else {
-          this.$router.push({
-            path: "/examinationPaper",
-            query: {
-              type: this.listType,
-              share: this.listShare,
-            },
-          });
-        } 
+          if (location.href.indexOf('askPreparationQuestionsAdd') >= 1) {
+            this.$router.push({
+              path: "/askPreparationQuestions"
+            });
+          }
+          else if (location.href.indexOf('testPaperAdd') >= 1) {
+            this.$router.push({
+              path: "/testPaper"
+            });
+          }
+          else {
+            this.$router.push({
+              path: "/examinationPaper",
+              query: {
+                type: this.listType,
+                share: this.listShare,
+              },
+            });
+          }
+        }
       } else {
         this.$message.error(info);
       }
diff --git a/src/views/examinationPaper/index.vue b/src/views/examinationPaper/index.vue
index ca2aee5..c6c0210 100644
--- a/src/views/examinationPaper/index.vue
+++ b/src/views/examinationPaper/index.vue
@@ -181,7 +181,7 @@
 <script>
 import { downloadFile } from "@/utils";
 import axios from "axios";
-import example from "@/assets/images/example.jpg";
+import example from "@/assets/images/example.png";
 import example2 from "@/assets/images/example2.png";
 export default {
   name: "examinationPaper",
diff --git a/src/views/layout/header/header.vue b/src/views/layout/header/header.vue
index ab437e4..e9330cd 100644
--- a/src/views/layout/header/header.vue
+++ b/src/views/layout/header/header.vue
@@ -397,7 +397,7 @@ ul.el-menu {
       justify-content: center;
       margin: 0 5px;
       p {
-        line-height: 16px;
+        line-height: 20px;
         font-size: 12px;
       }
     }
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 8bfaaa0..2f95b3d 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -171,7 +171,7 @@ $cursor: #000;
 }
 .login-container {
   width: 100%;
-  height: 100vh;
+  height: 150vh;
   background: url("../../assets/images/login-bg.png") no-repeat;
   background-size: cover;
   overflow: hidden;
@@ -215,8 +215,7 @@ $cursor: #000;
     padding: 30px 35px 0;
     border-radius: 10px;
     background: #fff;
-    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
-    margin-top: 200px;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1); 
     box-sizing: border-box;
   }
 
diff --git a/vue.config.js b/vue.config.js
index bf84d83..fdc9339 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -11,7 +11,7 @@ module.exports = {
   lintOnSave: false, //是否开启编译时是否不符合eslint提示
   productionSourceMap: false, // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
   devServer: {
-    hot:true,
+    hot: true,
     port: 8081, // 端口
     open: false, // 启动后打开浏览器
     compress: true,
@@ -23,10 +23,11 @@ module.exports = {
     proxy: {
       "/": {
         // target:"http://ezquiz.sunvotecloud.cn",
-        // target:"http://192.168.3.221:8080",
-        target:"http://121.40.127.171",
+        // target:"http://192.168.1.151:8089",
+        target: "http://121.40.127.171:8089",
+        // target:"http://127.0.0.1:8089",
         changeOrigin: true,
-        ws:true,
+        ws: true,
       },
     },
     disableHostCheck: true