diff --git a/src/assets/css/index.scss b/src/assets/css/index.scss
index ddac408..994aaaf 100644
--- a/src/assets/css/index.scss
+++ b/src/assets/css/index.scss
@@ -104,7 +104,9 @@
 .el-table thead th.el-table__cell {
   background: #f5f7fa;
 }
-
+.el-table .el-table__cell.bg{
+  background: #f9f9f9;
+}
 .el-menu--popup {
   min-width: 160px;
 }
diff --git a/src/components/setAnswer.vue b/src/components/setAnswer.vue
index 752ac0a..870e9c4 100644
--- a/src/components/setAnswer.vue
+++ b/src/components/setAnswer.vue
@@ -194,7 +194,7 @@ export default {
         let types = [{}];
         let addndex = 0;
         this.FormQuestionList?.map((sub, index) => {
-          if (!!sub.questionType) {
+          if (!!sub.questionType && sub.questionType!=5) {
             if (sub.questionType == types[addndex].qusType) {
               //同类型批量答案+1
               types[addndex].subNum += 1;
@@ -219,7 +219,7 @@ export default {
                 //不同类型时如果原有类型数量大于等于5，保存批量答案
                 types[addndex].endIndex =
                   this.questionList[index - 1].questionIndex;
-                types[addndex].index = index;
+                types[addndex].index = index-1;
                 addndex += 1;
                 types[addndex] = {};
               }
diff --git a/src/router/index.js b/src/router/index.js
index 0f6fd6b..4b019d8 100755
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -246,22 +246,22 @@ let addrouters = [  //测试用，后续后端获取
       },
     ]
   },
-  // {
-  //   path: "/card",
-  //   iconCls: "fa fa-id-card", // 图标样式class
-  //   name: "发卡记录",
-  //   component: Layout,
-  //   alone: true,
-  //   children: [
-  //     {
-  //       path: "/card",
-  //       iconCls: "fa fa-id-card", // 图标样式class
-  //       name: "",
-  //       component: Card,
-  //       children: []
-  //     }
-  //   ]
-  // },
+  {
+    path: "/card",
+    iconCls: "fa fa-id-card", // 图标样式class
+    name: "发卡记录",
+    component: Layout,
+    alone: true,
+    children: [
+      {
+        path: "/card",
+        iconCls: "fa fa-id-card", // 图标样式class
+        name: "",
+        component: Card,
+        children: []
+      }
+    ]
+  },
   {
     path: "/device",
     iconCls: "fa fa-dashboard", // 图标样式class
diff --git a/src/views/analysis/index.vue b/src/views/analysis/index.vue
index ed65cfb..5590eb2 100644
--- a/src/views/analysis/index.vue
+++ b/src/views/analysis/index.vue
@@ -74,14 +74,20 @@
           <el-button type="primary" round @click="_QueryData">筛选</el-button>
         </div>
       </div>
-      <div class="table-box">
-        <div class="radio-box" v-if="role == 'ROLE_JITUAN'">
-          <el-radio-group v-model="type" @change="changeType">
-            <el-radio-button :label="1">学校使用对比</el-radio-button>
-            <el-radio-button :label="2">学段使用对比</el-radio-button>
-          </el-radio-group>
-        </div>
+      <div class="radio-box" v-if="role == 'ROLE_JITUAN'">
+        <el-radio-group v-model="type" @change="changeType">
+          <el-radio-button :label="1">学校使用对比</el-radio-button>
+          <el-radio-button :label="2">学段使用对比</el-radio-button>
+        </el-radio-group>
+      </div>
+      <div class="table-box" v-loading="loading">
+        <el-empty
+          :image-size="100"
+          v-if="!tableData.length && !loading"
+          description="没有更多数据"
+        ></el-empty>
         <el-table
+          v-else
           :data="tableData"
           :border="false"
           style="width: 100%"
@@ -114,7 +120,7 @@
           </el-table-column>
         </el-table>
         <p class="down" v-if="role != 'ROLE_JITUAN'">
-          <el-button @click="downExc" plain round icon="fa fa-cloud-download"
+          <el-button @click="downExc" type="primary" plain round icon="fa fa-cloud-download"
             >导出报表</el-button
           >
         </p>
@@ -124,10 +130,11 @@
 </template>
 
 <script>
-import { formatDate,downloadFile } from "@/utils";
+import { formatDate, downloadFile } from "@/utils";
 export default {
   data() {
     return {
+      loading: false,
       exportLoading: false,
       role: "",
       date: "", //今天-本周-本月-本季度
@@ -315,7 +322,7 @@ export default {
                   dataIdsList.push(items.grade);
                   dataList.push(items);
                 }
-              } else{
+              } else {
                 if (!dataIdsList.includes(items.classId)) {
                   dataIdsList.push(items.classId);
                   dataList.push(items);
@@ -421,7 +428,7 @@ export default {
   padding: 0 20px;
 }
 .radio-box {
-  padding-bottom: 12px;
+  padding: 0 20px 12px;
 }
 .down {
   padding-top: 20px;
diff --git a/src/views/ask/analysis.vue b/src/views/ask/analysis.vue
index d5fb85e..e6f4559 100644
--- a/src/views/ask/analysis.vue
+++ b/src/views/ask/analysis.vue
@@ -279,7 +279,7 @@
         <p class="down">
           <el-button
             @click="exportData"
-            type="info"
+            type="primary"
             plain
             round
             icon="fa fa-cloud-download"
diff --git a/src/views/ask/index.vue b/src/views/ask/index.vue
index 073634b..fb38230 100644
--- a/src/views/ask/index.vue
+++ b/src/views/ask/index.vue
@@ -442,7 +442,7 @@
         <p class="down" v-if="tabIndex == 3 || tabIndex == 2">
           <el-button
             @click="exportData"
-            type="info"
+            type="primary"
             plain
             round
             icon="fa fa-cloud-download"
diff --git a/src/views/card/index.vue b/src/views/card/index.vue
index 44e5ab9..16a63ac 100644
--- a/src/views/card/index.vue
+++ b/src/views/card/index.vue
@@ -5,7 +5,12 @@
         <span>发卡记录</span>
       </template>
     </back-box>
-    <div class="page-content">
+    <el-empty
+      :image-size="100"
+      v-if="!tableData.length && !loading"
+      description="暂无数据"
+    ></el-empty>
+    <!-- <div class="page-content">
       <div class="answer-header">
         <div class="sel-box">
           <el-cascader size="small"
@@ -85,7 +90,7 @@
           ></el-table-column>
         </el-table>
       </div>
-    </div>
+    </div> -->
   </div>
 </template>
 
@@ -104,7 +109,7 @@ export default {
     };
   },
   created() {
-    this._QueryGradeList();
+    // this._QueryGradeList();
   },
   methods: {
     // 查找班级
@@ -168,7 +173,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.table-box{
-  padding:0 20px;
+.table-box {
+  padding: 0 20px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/dataSync/index.vue b/src/views/dataSync/index.vue
index d7985ae..19a006a 100644
--- a/src/views/dataSync/index.vue
+++ b/src/views/dataSync/index.vue
@@ -7,9 +7,9 @@
     </back-box>
     <div class="page-content">
       <div class="down-item">
-        <p class="h-title">从U盘导入</p>
+        <p class="h-title">从U盘上传</p>
         <p class="txt">
-          本功能帮助无法上网的授课端软件，将本地数据同步到云平台，需要先在数据包放到U盘。
+          本功能帮助无法上网的授课端软件，将本地数据同步到云平台。
         </p>
         <el-upload
           class="upload-demo"
@@ -32,7 +32,7 @@
       <div class="down-item">
         <p class="h-title">数据导出至U盘</p>
         <p class="txt">
-          本功能将云平台的数据导出到U盘。待导出数据包括4套答题卡。
+          本功能将云平台的数据导出到U盘。包括4套答题卡。
         </p>
         <div class="btn-box btn-box2" v-loading="downLoading">
           <i class="fa fa-cloud-download" @click="downloadFile"></i>
@@ -46,7 +46,7 @@
 </template>
 
 <script>
-import { downloadFile } from "@/utils";
+import { formatDate } from "@/utils";
 export default {
   data() {
     return {
@@ -68,7 +68,7 @@ export default {
         const url = URL.createObjectURL(blob);
         const link = document.createElement("a");
         document.body.appendChild(link);
-        link.download = "文件.json";
+        link.download = this.$store.getters.info.name+formatDate(new Date,'yyyy_MM_dd_hh_mm_ss')+"文件.json";
         link.href = url;
         link.click();
         document.body.removeChild(link);
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index baaac23..88182d6 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -512,7 +512,6 @@ export default {
       props: {
         multiple: true,
         checkStrictly: true,
-        lazy: true,
       },
       type: 1,
       query: {
@@ -572,6 +571,7 @@ export default {
     });
     this.role = role ? role : this.$store.getters.info.permissions[0].role;
     if (this.role == "ROLE_JITUAN") {
+      this.props.lazy = true,
       this.props.lazyLoad = function (node, resolve) {
         const { level } = node;
         if (level == 2) {
diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue
index 53d9a79..a10da18 100644
--- a/src/views/examinationPaper/add.vue
+++ b/src/views/examinationPaper/add.vue
@@ -186,8 +186,9 @@
                   class="number-ipt"
                   size="medium"
                   :min="1"
-                  :max="200"
+                  :max="100"
                   :precision="2"
+                  :step="1"
                   v-model="subQuestions.score"
                   label="单题分值"
                 ></el-input-number>
@@ -311,7 +312,7 @@
               :rules="questionFormRules"
               label-width="100px"
             >
-              <el-form-item label="标题：" prop="questionTitle">
+              <el-form-item label="标题：">
                 <el-col :span="20">
                   <el-input
                     v-model.trim="questionForm.questionTitle"
@@ -345,7 +346,7 @@
               <el-form-item
                 label="默认选项："
                 v-show="
-                  questionForm.questionType != 4 ||
+                  questionForm.questionType != 4 &&
                   questionForm.questionType != 5
                 "
               >
@@ -358,22 +359,28 @@
                   label="label"
                 ></el-input-number>
               </el-form-item>
-              <el-form-item
-                label="默认分数："
-                v-show="
-                  questionForm.questionType != 4 ||
-                  questionForm.questionType != 5
-                "
-              >
+              <el-form-item label="默认分数：">
                 <el-input-number
                   v-model="questionForm.score"
                   :min="1"
-                  :max="100"
-                  :step-strictly="true"
+                  :precision="2"
                   :step="1"
                   label="label"
                 ></el-input-number>
               </el-form-item>
+              <el-form-item
+                label="漏选得分："
+                v-if="questionForm.questionType == 3"
+              >
+                <el-input-number
+                  v-model="questionForm.partScore"
+                  :min="0"
+                  :max="questionForm.score"
+                  :precision="2"
+                  :step="0.5"
+                  label="label"
+                ></el-input-number>
+              </el-form-item>
             </el-form>
           </div>
           <div class="dialog-footer" slot="footer">
@@ -402,90 +409,186 @@
               <div class="qs-options qs-options2">选项设置</div>
             </li>
             <li
-              class="sub-questions"
               v-for="(subQuestions, indexs) in question.subQuestions"
               :key="indexs"
             >
-              <div class="qs-num">{{ setNum(index, indexs) }}</div>
-              <div class="qs-type">
-                {{ setSubPro(subQuestions.questionType) }}
-              </div>
-              <div class="qs-score">
-                <el-input-number
-                  class="number-ipt"
-                  size="medium"
-                  :min="1"
-                  :max="200"
-                  :precision="2"
-                  v-model="subQuestions.score"
-                  label="单题分值"
-                ></el-input-number>
-              </div>
-              <div class="qs-partScore">
-                <p v-if="subQuestions.questionType != 3">--</p>
-                <el-input-number
-                  class="number-ipt"
-                  v-else
-                  size="medium"
-                  :min="0"
-                  :precision="2"
-                  :max="subQuestions.score"
-                  :step="0.5"
-                  v-model="subQuestions.partScore"
-                  label="漏选得分"
-                ></el-input-number>
+              <p
+                class="set-ans-btn"
+                v-if="
+                  subQuestions.qusType &&
+                  subQuestions.subNum &&
+                  subQuestions.subNum > 4
+                "
+              >
+                <el-button type="primary" @click="setFormAns(indexs, index)"
+                  >批量设置答案</el-button
+                >
+              </p>
+              <div v-else class="sub-questions">
+                <div class="qs-num">
+                  {{ setNum(index, indexs, subQuestions) }}
+                </div>
+                <div class="qs-type">
+                  {{ setSubPro(subQuestions.questionType) }}
+                </div>
+                <div class="qs-score">
+                  <el-input-number
+                    class="number-ipt"
+                    size="medium"
+                    :min="1"
+                    :max="200"
+                    :precision="2"
+                    v-model="subQuestions.score"
+                    label="单题分值"
+                  ></el-input-number>
+                </div>
+                <div class="qs-partScore">
+                  <p v-if="subQuestions.questionType != 3">--</p>
+                  <el-input-number
+                    class="number-ipt"
+                    v-else
+                    size="medium"
+                    :min="0"
+                    :precision="2"
+                    :max="subQuestions.score"
+                    :step="0.5"
+                    v-model="subQuestions.partScore"
+                    label="漏选得分"
+                  ></el-input-number>
+                </div>
+                <div class="qs-options qs-options2">
+                  <p v-if="subQuestions.questionType == 5">--</p>
+                  <p v-if="subQuestions.questionType == 4" class="answer-box">
+                    <span
+                      class="answer-s"
+                      :class="subQuestions.correctAnswer == 1 ? 'active' : ''"
+                      @click="subQuestions.correctAnswer = 1"
+                      >✓</span
+                    >
+                    <span
+                      class="answer-s"
+                      :class="subQuestions.correctAnswer == 2 ? 'active' : ''"
+                      @click="subQuestions.correctAnswer = 2"
+                      >✗</span
+                    >
+                  </p>
+                  <p v-if="subQuestions.questionType == 3" class="answer-box">
+                    <span
+                      class="answer-s"
+                      v-for="option in subQuestions.answerOptions.split(',')"
+                      :class="
+                        subQuestions.correctAnswer.includes(option)
+                          ? 'active'
+                          : ''
+                      "
+                      :key="option"
+                      @click="changAnswer(subQuestions, option)"
+                      >{{ option }}</span
+                    >
+                  </p>
+                  <p v-if="subQuestions.questionType == 2" class="answer-box">
+                    <span
+                      class="answer-s"
+                      v-for="option in subQuestions.answerOptions.split(',')"
+                      :class="
+                        subQuestions.correctAnswer == option ? 'active' : ''
+                      "
+                      :key="option"
+                      @click="subQuestions.correctAnswer = option"
+                      >{{ option }}</span
+                    >
+                  </p>
+                </div>
               </div>
-              <div class="qs-options qs-options2">
-                <p v-if="subQuestions.questionType == 5">--</p>
-                <p v-if="subQuestions.questionType == 4" class="answer-box">
+            </li>
+          </ul>
+          <el-dialog
+            title="批量设置答案"
+            :visible.sync="diaSetAns"
+            width="400"
+            :modal-append-to-body="false"
+          >
+            <div class="qs-options">
+              <p class="dia-tips">
+                请点击选项按钮设置答案,多选题题目之间用“,”隔开，若添加5道题：“AC,AD,BD,AC,CD”
+              </p>
+              <p>{{ setSubPro(formAns.qusType) }}：</p>
+              <p class="ipt">
+                <el-input
+                  v-model="formAns.answerList"
+                  @keydown.native="keydownAnswer($event)"
+                ></el-input>
+              </p>
+              <p class="answer-box">
+                <template v-if="formAns.qusType == 4">
                   <span
-                    class="answer-s"
-                    :class="subQuestions.correctAnswer == 1 ? 'active' : ''"
-                    @click="subQuestions.correctAnswer = 1"
+                    class="answer-s active"
+                    @click="
+                      formAns.answerList.length < formAns.subNum
+                        ? (formAns.answerList += '✓')
+                        : ''
+                    "
                     >✓</span
                   >
                   <span
-                    class="answer-s"
-                    :class="subQuestions.correctAnswer == 2 ? 'active' : ''"
-                    @click="subQuestions.correctAnswer = 2"
+                    class="answer-s active"
+                    @click="
+                      formAns.answerList.length < formAns.subNum
+                        ? (formAns.answerList += '✗')
+                        : ''
+                    "
                     >✗</span
                   >
-                </p>
-                <p v-if="subQuestions.questionType == 3" class="answer-box">
+                </template>
+                <template v-if="formAns.qusType == 3">
                   <span
-                    class="answer-s"
-                    v-for="option in subQuestions.answerOptions.split(',')"
-                    :class="
-                      subQuestions.correctAnswer.includes(option)
-                        ? 'active'
-                        : ''
-                    "
+                    class="answer-s active"
+                    v-for="option in formAns.answerOptions.split(',')"
                     :key="option"
-                    @click="changAnswer(subQuestions, option)"
+                    @click="setMultiple(formAns, option)"
                     >{{ option }}</span
                   >
-                </p>
-                <p v-if="subQuestions.questionType == 2" class="answer-box">
                   <span
-                    class="answer-s"
-                    v-for="option in subQuestions.answerOptions.split(',')"
-                    :class="
-                      subQuestions.correctAnswer == option ? 'active' : ''
+                    class="answer-s active"
+                    @click="
+                      formAns.answerList.split(',').length < formAns.subNum
+                        ? (formAns.answerList += ',')
+                        : ''
                     "
+                    >,</span
+                  >
+                </template>
+                <template v-if="formAns.qusType == 2" class="answer-box">
+                  <span
+                    class="answer-s active"
+                    v-for="option in formAns.answerOptions.split(',')"
                     :key="option"
-                    @click="subQuestions.correctAnswer = option"
+                    @click="
+                      formAns.answerList.length < formAns.subNum
+                        ? (formAns.answerList += option)
+                        : ''
+                    "
                     >{{ option }}</span
                   >
-                </p>
-              </div>
-            </li>
-          </ul>
+                </template>
+                <span
+                  class="answer-s delButton"
+                  @click="formAns.answerList = formAns.answerList.slice(0, -1)"
+                  >x</span
+                >
+              </p>
+            </div>
+            <div class="dialog-footer" slot="footer">
+              <el-button @click="saveFormAns">确 定</el-button>
+              <el-button @click="diaSetAns = false">取 消</el-button>
+            </div>
+          </el-dialog>
         </div>
         <div class="btn-box">
           <el-button type="danger" plain round @click="linkBack"
             >取消</el-button
           >
-          <el-button round @click="step = 1">上一步</el-button>
+          <el-button round @click="backStep1">上一步</el-button>
           <el-button type="primary" round @click="save">保存</el-button>
         </div>
       </div>
@@ -494,13 +597,14 @@
 </template>
 
 <script>
-import { formatDate, deepClone } from "utils";
+import { deepClone, checkAnswer } from "utils";
 const questionForm = {
   questionTitle: "",
   questionType: 2,
   number: 10,
   selectNum: 4,
   score: 1,
+  partScore: 0,
 };
 const subQuesOptions = {
   questionType: 2,
@@ -516,7 +620,7 @@ export default {
       let score = 0;
       this.form.questionList.map((item) => {
         score += item.subQuestions.reduce((a, b) => {
-          return a + Number(b.score);
+          return a + Number(b.score ? b.score : 0);
         }, 0);
       }, 0);
       return Number(score).toFixed(2);
@@ -588,6 +692,15 @@ export default {
           { required: true, message: "请设置考试时长", trigger: "blur" },
         ],
       },
+      diaSetAns: false,
+      formAns: {
+        listIndex: 0, //大题位置
+        endIndex: 0, //相同题目最后一位题目的questionIndex
+        qusType: "", //题目类型
+        subNum: 0, //数量
+        answerOptions: [], //答案选项
+        answerList: "", //答案列表-字符串
+      },
     };
   },
   async created() {
@@ -641,12 +754,22 @@ export default {
       }
       return tit;
     },
-    setNum(index, indexs) {
+    setNum(index, indexs, sub) {
       let lengths = 0;
+      let subIndex = 0;
       for (let i = 0; i < index; i++) {
-        lengths += this.form.questionList[i].subQuestions.length;
+        let subArr = this.form.questionList[i].subQuestions.filter((item) => {
+          return !!item.questionType;
+        });
+        lengths += subArr.length;
       }
-      return lengths + indexs + 1;
+
+      for (let i = 0; i < indexs; i++) {
+        if (!!this.form.questionList[index].subQuestions[i].questionType) {
+          subIndex += 1;
+        }
+      }
+      return lengths + subIndex + 1;
     },
     setBigNum(num) {
       let txt = "";
@@ -676,7 +799,91 @@ export default {
 
       return txt;
     },
-    setAddIndex(index) {},
+    setFormAns(indexs, index) {
+      //初始化要修改的答案
+      this.formAns = { ...this.form.questionList[index].subQuestions[indexs] };
+      this.formAns.listIndex = index;
+      this.diaSetAns = true;
+    },
+    setMultiple(obj, answer) {
+      //多选答案设置
+      obj.answerList += answer;
+      let str = obj.answerList;
+      let str2 = checkAnswer(
+        str,
+        3,
+        obj.answerOptions.split(",").length,
+        obj.answerList.length
+      );
+      obj.answerList = str2;
+    },
+    saveFormAns() {
+      //批量修改答案
+      let EndIndex;
+      let subNum = this.formAns.subNum - 1;
+      this.form.questionList[this.formAns.listIndex].subQuestions.some(
+        (item, index) => {
+          if (this.formAns.endIndex == item.questionIndex) {
+            EndIndex = index;
+            return;
+          }
+        }
+      );
+
+      for (let i = 0; i <= subNum; i++) {
+        let correctAnswer = "";
+        if (this.formAns.qusType == 2) {
+          correctAnswer = this.formAns.answerList[subNum - i];
+        } else if (this.formAns.qusType == 3) {
+          correctAnswer = this.formAns.answerList.split(",")[subNum - i];
+
+          console.log(this.formAns.answerList.split(",")[subNum - i]);
+        } else if (this.formAns.qusType == 4) {
+          correctAnswer = this.formAns.answerList[subNum - i] == "✓" ? 1 : 2;
+        }
+        this.form.questionList[this.formAns.listIndex].subQuestions[
+          EndIndex - i
+        ].correctAnswer = correctAnswer;
+      }
+      this.diaSetAns = false;
+    },
+    keydownAnswer(event) {
+      //快速答案设置禁止输入
+      if (
+        event.key == "Meta" ||
+        event.key == "CapsLock" ||
+        event.key == "Shift" ||
+        event.key == "Enter" ||
+        event.key == "Alt" ||
+        event.key == "Backspace" ||
+        event.key == "Delete" ||
+        event.key == "ArrowUp" ||
+        event.key == "ArrowDown" ||
+        event.key == "ArrowLeft" ||
+        event.key == "v" ||
+        event.key == "V" ||
+        event.key == "ArrowRight"
+      ) {
+        return;
+      } else {
+        event.returnValue = "";
+      }
+    },
+    setAnswer(type, ans) {
+      let txt = "";
+      if (type == 2) {
+        txt = ans;
+      } else if (type == 3) {
+        txt = ans + ",";
+      } else if (type == 4) {
+        txt = ans == 1 ? "✓" : "✗";
+      }
+      return txt;
+    },
+    backStep1() {
+      this.formatQuestionList();
+      this.step = 1;
+    },
     setStep1() {
       this.$refs["forms"].validate((valid) => {
         // 验证通过：保存
@@ -693,19 +900,99 @@ export default {
         this.$message.warning("请添加题目！");
         return;
       }
-      let valid = "";
-      this.form.questionList.map((item, index) => {
-        if (!item.questionTitle) {
-          valid += index + 1 + "、";
-        }
-      });
-      if (!valid) {
+      // let valid = "";
+      // this.form.questionList.map((item, index) => {
+      //   if (!item.questionTitle) {
+      //     valid += index + 1 + "、";
+      //   }
+      // });
+      // if (!valid) {
+        //添加题目ID、序号
+        this.form.questionList.map((item, index) => {
+          item.questionType = 0;
+          item.subQuestions.map((items, indexs) => {
+            items.questionId = this.setNum(index, indexs);
+            items.questionIndex = this.setNum(index, indexs);
+          });
+        });
+        //整理问题
+        this.form.questionList?.map((item) => {
+          let types = [{}];
+          let addndex = 0;
+          item.subQuestions.map((sub, index) => {
+            if (!!sub.questionType && sub.questionType != 5) {
+              if (sub.questionType == types[addndex].qusType) {
+                //同类型批量答案+1
+                types[addndex].subNum += 1;
+                if (
+                  types[addndex].answerOptions.length < sub.answerOptions.length
+                ) {
+                  types[addndex].answerOptions = sub.answerOptions;
+                }
+                types[addndex].answerList += this.setAnswer(
+                  sub.questionType,
+                  sub.correctAnswer
+                );
+                if (index == item.subQuestions.length - 1) {
+                  //循环最后类型数量大于等于5，保存批量答案
+                  if (types[addndex].subNum && types[addndex].subNum >= 5) {
+                    types[addndex].endIndex = sub.questionIndex;
+                    types[addndex].index = index;
+                  }
+                }
+              } else {
+                if (types[addndex].subNum && types[addndex].subNum >= 5) {
+                  //不同类型时如果原有类型数量大于等于5，保存批量答案
+                  types[addndex].endIndex =
+                    item.subQuestions[index - 1].questionIndex;
+                  types[addndex].index = index - 1;
+                  addndex += 1;
+                  types[addndex] = {};
+                }
+                //不同类型初始化批量答案
+                types[addndex].qusType = sub.questionType;
+                types[addndex].subNum = 1;
+                types[addndex].answerOptions = sub.answerOptions;
+                types[addndex].answerList = this.setAnswer(
+                  sub.questionType,
+                  sub.correctAnswer
+                );
+              }
+            }
+          });
+          for (let i = 0; i < types.length; i++) {
+            if (types[i].qusType == 3) {
+              types[i].answerList = types[i].answerList.slice(0, -1);
+            }
+            if (types[i].subNum >= 5) {
+              item.subQuestions.splice(
+                types[i].index + i + 1,
+                0,
+                deepClone(types[i])
+              );
+            }
+          }
+          console.log(types);
+        });
         this.step = 2;
         return;
-      } else {
-        this.$message.error(
-          `大题名称不能为空，请检查第${valid.slice(0, -1)}大题！`
-        );
+      // } else {
+      //   this.$message.error(
+      //     `大题名称不能为空，请检查第${valid.slice(0, -1)}大题！`
+      //   );
+      // }
+    },
+    formatQuestionList() {
+      for (let i = 0; i < this.form.questionList.length; i++) {
+        for (
+          let j = 0;
+          j < this.form.questionList[i].subQuestions.length;
+          j++
+        ) {
+          if (this.form.questionList[i].subQuestions[j].qusType) {
+            this.form.questionList[i].subQuestions.splice(j, 1);
+          }
+        }
       }
     },
     openQuestion() {
@@ -718,6 +1005,7 @@ export default {
         ...subQuesOptions,
         selectNum: this.questionForm.selectNum,
         score: this.questionForm.score,
+        partScore: this.questionForm.partScore,
         questionType:
           this.questionForm.questionType == 6
             ? 2
@@ -758,7 +1046,7 @@ export default {
     },
     setScore(question) {
       let score = question.subQuestions.reduce((a, b) => {
-        return a + b.score;
+        return a + (b.score ? b.score : 0);
       }, 0);
       return Number(score).toFixed(2);
     },
@@ -875,16 +1163,7 @@ export default {
     async save() {
       if (this.saveLoading) return;
       this.saveLoading = true;
-      //添加题目ID、序号
-      this.form.questionList.map((item, index) => {
-        // item.questionId = index + 1;
-        // item.questionIndex = index + 1;
-        item.questionType = 0;
-        item.subQuestions.map((items, indexs) => {
-          items.questionId = this.setNum(index, indexs);
-          items.questionIndex = this.setNum(index, indexs);
-        });
-      });
+      this.formatQuestionList();
       const { data, status, info } = await this.$request.addPaper({
         ...this.form,
       });
@@ -997,9 +1276,44 @@ export default {
 .red {
   color: #f30;
 }
+.qs-options {
+  flex: 1;
+  .ipt {
+    margin-bottom: 5px;
+  }
+  .answer-box {
+    .answer-s {
+      cursor: pointer;
+      user-select: none;
+      &:first-of-type {
+        margin-left: 0;
+      }
+    }
+  }
+  .delButton {
+    text-indent: -9999999px;
+    border-color: #ff6868;
+    background: #ff6868 url("../../assets/images/arrow.png") no-repeat center;
+    background-size: 19px;
+    color: transparent;
+  }
+  .ac {
+    border-color: #ff6868;
+    background: #ff6868;
+    color: #fff;
+  }
+}
+
 .sel2 {
   width: 480px;
 }
+.set-ans-btn {
+  width: 100%;
+  padding: 10px 0 10px 630px;
+  box-sizing: border-box;
+  border-right: 1px solid #e2e2e2;
+  border-bottom: 1px solid #e2e2e2;
+}
 .content-box {
   width: 100%;
   height: 100%;
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 5a28819..5e51b28 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -101,10 +101,6 @@ export default {
         // password: "712576",
         username: "13247726488",
         password: "726488",
-        // username: "13319607658",
-        // password: "Pw607658#",
-        // username: "18213902650",
-        // password: "Pw902650#",
       },
       loginRules: {
         username: [
diff --git a/src/views/test/analysis.vue b/src/views/test/analysis.vue
index cbb2949..affa0ef 100644
--- a/src/views/test/analysis.vue
+++ b/src/views/test/analysis.vue
@@ -131,7 +131,7 @@
             :label="item.title"
             :prop="'count' + index"
             align="center"
-            ><template slot-scope="scope">{{
+            ><template slot-scope="scope"><p class="present">{{
               scope.row.questionType == "5"
                 ? ""
                 : scope.row["option" + index]
@@ -139,7 +139,7 @@
                     scope.row["present" + index]
                   })`
                 : ""
-            }}</template>
+            }}</p></template>
           </el-table-column>
         </el-table>
         <div class="hui-box" v-show="type == 1">
@@ -358,7 +358,7 @@
         <div class="down">
           <el-button
             @click="exportData"
-            type="info"
+            type="primary"
             plain
             round
             icon="fa fa-cloud-download"
@@ -640,12 +640,7 @@ export default {
               items["title"] = "未答";
               params["count" + index] = lastOPtion.count;
               params["present" + index] = lastOPtion.present;
-              params["option" + index] =
-                lastOPtion.option == 1
-                  ? "✓"
-                  : lastOPtion.option == 2
-                  ? "✗"
-                  : lastOPtion.option;
+              params["option" + index] = "?";
             }
           });
           return {
@@ -665,15 +660,15 @@ export default {
     },
     //导出
     async exportData() {
-      if (this.exportLoading == true) return;
-      this.exportLoading = true;
-      const { data, status, info } = await this.$request.exportPeriodReport();
-      this.exportLoading = false;
-      if (data) {
-        downloadFile(this.title + "报表", data);
-      } else {
-        this.$message.error(info);
-      }
+      // if (this.exportLoading == true) return;
+      // this.exportLoading = true;
+      // const { data, status, info } = await this.$request.exportPeriodReport();
+      // this.exportLoading = false;
+      // if (data) {
+      //   downloadFile(this.title + "报表", data);
+      // } else {
+      //   this.$message.error(info);
+      // }
     },
   },
 };
@@ -711,6 +706,9 @@ div::-webkit-scrollbar-thumb {
     z-index: 10;
   }
 }
+.present{
+  white-space: nowrap;
+}
 .error {
   color: #f30;
 }
diff --git a/src/views/test/editAnswer.vue b/src/views/test/editAnswer.vue
index 0da8c19..a455819 100644
--- a/src/views/test/editAnswer.vue
+++ b/src/views/test/editAnswer.vue
@@ -502,7 +502,7 @@ export default {
           let types = [{}];
           let addndex = 0;
           item.subQuestions.map((sub, index) => {
-            if (!!sub.questionType) {
+            if (!!sub.questionType && sub.questionType!=5) {
               if (sub.questionType == types[addndex].qusType) {
                 //同类型批量答案+1
                 types[addndex].subNum += 1;
@@ -527,7 +527,7 @@ export default {
                   //不同类型时如果原有类型数量大于等于5，保存批量答案
                   types[addndex].endIndex =
                     item.subQuestions[index - 1].questionIndex;
-                  types[addndex].index = index;
+                  types[addndex].index = index-1;
                   addndex += 1;
                   types[addndex] = {};
                 }
@@ -559,7 +559,7 @@ export default {
         let types = [{}];
         let addndex = 0;
         this.questionList?.map((sub, index) => {
-          if (!!sub.questionType) {
+          if (!!sub.questionType && sub.questionType!=5) {
             if (sub.questionType == types[addndex].qusType) {
               //同类型批量答案+1
               types[addndex].subNum += 1;
@@ -584,7 +584,7 @@ export default {
                 //不同类型时如果原有类型数量大于等于5，保存批量答案
                 types[addndex].endIndex =
                   this.questionList[index - 1].questionIndex;
-                types[addndex].index = index;
+                types[addndex].index = index-1;
                 addndex += 1;
                 types[addndex] = {};
               }
diff --git a/src/views/test/index.vue b/src/views/test/index.vue
index 8422f98..678260f 100644
--- a/src/views/test/index.vue
+++ b/src/views/test/index.vue
@@ -7,7 +7,12 @@
     </back-box>
     <div class="answer-header">
       <div class="sel-box">
-        <el-select class="sel" v-model="query.classId" placeholder="选择班级" @change="changeclass">
+        <el-select
+          class="sel"
+          v-model="query.classId"
+          placeholder="选择班级"
+          @change="changeclass"
+        >
           <el-option
             v-for="item in classList"
             :key="item.value"
@@ -89,10 +94,18 @@
         style="margin-bottom: 20px"
       >
         <el-radio-button :label="1">单卷测练报表</el-radio-button>
-        <el-radio-button :label="2" v-show="this.query.startDay!=this.query.endDay">阶段测练报表</el-radio-button>
+        <el-radio-button
+          :label="2"
+          v-show="this.query.startDay != this.query.endDay"
+          >阶段测练报表</el-radio-button
+        >
       </el-radio-group>
       <div v-show="tabIndex == 1" v-loading="loading">
-        <el-table :data="tableData" :show-header="tableData.length?true:false"  border style="width: 100%">
+        <el-table
+          :data="tableData"
+          border
+          style="width: 100%"
+        >
           <el-table-column
             prop="title"
             label="试卷名称"
@@ -116,7 +129,8 @@
           ></el-table-column>
           <el-table-column prop="avgScore" label="班平均分" align="center"
             ><template slot-scope="scoped">{{
-              (scoped.row.subjectiveScore == scoped.row.examPaperScore || scoped.row.answerNum == 0) &&
+              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                scoped.row.answerNum == 0) &&
               scoped.row.recordStatus == 0
                 ? "-"
                 : scoped.row.avgScore
@@ -124,7 +138,8 @@
           >
           <el-table-column prop="highestScore" label="班最高分" align="center"
             ><template slot-scope="scoped">{{
-              (scoped.row.subjectiveScore == scoped.row.examPaperScore || scoped.row.answerNum == 0) &&
+              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                scoped.row.answerNum == 0) &&
               scoped.row.recordStatus == 0
                 ? "-"
                 : scoped.row.highestScore
@@ -132,7 +147,8 @@
           >
           <el-table-column prop="lowestScore" label="班最低分" align="center"
             ><template slot-scope="scoped">{{
-              (scoped.row.subjectiveScore == scoped.row.examPaperScore || scoped.row.answerNum == 0) &&
+              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                scoped.row.answerNum == 0) &&
               scoped.row.recordStatus == 0
                 ? "-"
                 : scoped.row.lowestScore
@@ -144,11 +160,12 @@
             sortable
             align="center"
             ><template slot-scope="scoped">{{
-              (scoped.row.subjectiveScore == scoped.row.examPaperScore || scoped.row.answerNum == 0) &&
+              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                scoped.row.answerNum == 0) &&
               scoped.row.recordStatus == 0
                 ? "-"
                 : scoped.row.excellenNum
-                ? `${scoped.row.excellenNum}/${scoped.row.excellenRate}%`
+                ? `${scoped.row.excellenNum}（${scoped.row.excellenRate}%）`
                 : scoped.row.excellenNum
             }}</template></el-table-column
           >
@@ -159,11 +176,12 @@
             align="center"
             ><template slot-scope="scoped"
               >{{
-                (scoped.row.subjectiveScore == scoped.row.examPaperScore || scoped.row.answerNum == 0) &&
+                (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                  scoped.row.answerNum == 0) &&
                 scoped.row.recordStatus == 0
                   ? "-"
                   : scoped.row.goodNum
-                  ? `${scoped.row.goodNum}/${scoped.row.goodRate}%`
+                  ? `${scoped.row.goodNum}（${scoped.row.goodRate}%）`
                   : scoped.row.goodNum
               }}
             </template></el-table-column
@@ -175,11 +193,12 @@
             align="center"
             ><template slot-scope="scoped"
               >{{
-                (scoped.row.subjectiveScore == scoped.row.examPaperScore || scoped.row.answerNum == 0) &&
+                (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                  scoped.row.answerNum == 0) &&
                 scoped.row.recordStatus == 0
                   ? "-"
                   : scoped.row.passNum
-                  ? `${scoped.row.passNum}/${scoped.row.passRate}%`
+                  ? `${scoped.row.passNum}（${scoped.row.passRate}%）`
                   : scoped.row.passNum
               }}
             </template></el-table-column
@@ -190,18 +209,23 @@
             sortable
             align="center"
             ><template slot-scope="scoped">{{
-              (scoped.row.subjectiveScore == scoped.row.examPaperScore || scoped.row.nswerNum  == 0) &&
-              scoped.row.arecordStatus== 0 
+              (scoped.row.subjectiveScore == scoped.row.examPaperScore ||
+                scoped.row.nswerNum == 0) &&
+              scoped.row.arecordStatus == 0
                 ? "-"
                 : scoped.row.failedNum
-                ? `${scoped.row.failedNum}/${scoped.row.failedRate}%`
+                ? `${scoped.row.failedNum}（${scoped.row.failedRate}%）`
                 : scoped.row.failedNum
             }}</template></el-table-column
           >
           <el-table-column label="操作" align="center">
             <template slot-scope="scoped">
               <el-tooltip
-                v-if="scoped.row.answerNum != 0 || (scoped.row.recordStatus != 0 &&scoped.row.subjectiveScore == scoped.row.examPaperScore)"
+                v-if="
+                  scoped.row.answerNum != 0 ||
+                  (scoped.row.recordStatus != 0 &&
+                    scoped.row.subjectiveScore == scoped.row.examPaperScore)
+                "
                 effect="dark"
                 content="详情"
                 placement="top"
@@ -215,7 +239,10 @@
                 ></el-button>
               </el-tooltip>
               <el-tooltip
-                v-if="scoped.row.answerNum == 0 && scoped.row.subjectiveScore != scoped.row.examPaperScore"
+                v-if="
+                  scoped.row.answerNum == 0 &&
+                  scoped.row.subjectiveScore != scoped.row.examPaperScore
+                "
                 effect="dark"
                 content="设置答案"
                 placement="top"
@@ -229,7 +256,10 @@
                 ></el-button>
               </el-tooltip>
               <el-tooltip
-                v-if="scoped.row.subjectiveScore == scoped.row.examPaperScore && scoped.row.recordStatus == 0"
+                v-if="
+                  scoped.row.subjectiveScore == scoped.row.examPaperScore &&
+                  scoped.row.recordStatus == 0
+                "
                 effect="dark"
                 content="导入主观题"
                 placement="top"
@@ -263,7 +293,6 @@
           :max-height="tableMaxHeight"
           v-if="role == 'ROLE_JIAOSHI'"
           :data="tableData"
-          :show-header="tableData.length?true:false"
           border
           style="width: 100%"
         >
@@ -289,19 +318,20 @@
               :prop="'score' + index"
               :label="index == 0 ? '总分' : '成绩'"
               align="center"
+              :class-name="index%2==0?'bg':''"
             ></el-table-column>
             <el-table-column
               :prop="'classRank' + index"
               label="班名"
               align="center"
+              :class-name="index%2==0?'bg':''"
             ></el-table-column>
           </el-table-column>
         </el-table>
         <el-table
-        :show-header="tableData.length?true:false"
-          :max-height="tableMaxHeight"
           v-else
           :data="tableData"
+          :max-height="tableMaxHeight"
           border
           style="width: 100%"
         >
@@ -327,33 +357,43 @@
               :prop="'examCount' + item"
               label="测练数"
               align="center"
+              :class-name="index%2==0?'bg':''"
             ></el-table-column>
             <el-table-column
               :prop="'participationCount' + item"
               label="参与数"
               align="center"
+              :class-name="index%2==0?'bg':''"
             ></el-table-column>
             <el-table-column
               :prop="'score' + item"
               label="总分"
               align="center"
+              :class-name="index%2==0?'bg':''"
             ></el-table-column>
             <el-table-column
               :prop="'classRank' + item"
               label="班名"
               align="center"
+              :class-name="index%2==0?'bg':''"
             ></el-table-column>
           </el-table-column>
         </el-table>
       </div>
       <p class="down" v-if="tabIndex == 2">
-        <el-button type="info" plain round icon="fa fa-cloud-download"
+        <el-button type="primary" plain round icon="fa fa-cloud-download"
           >导出报表</el-button
         >
       </p>
     </div>
     <el-dialog title="导入主观题分数" :visible.sync="diaUp" width="600">
-      <up-load :url="url" :examId="examId" @upSuccess="upSuccess" fileName="主观题分数" v-loading="loadingDown">
+      <up-load
+        :url="url"
+        :examId="examId"
+        @upSuccess="upSuccess"
+        fileName="主观题分数"
+        v-loading="loadingDown"
+      >
         <template slot="down">
           <p class="down-txt">
             第一步：下载模板并编辑完成学生分数
@@ -389,7 +429,7 @@ export default {
       role: "",
       loading: false,
       diaUp: false,
-      loadingDown:false,
+      loadingDown: false,
       url: "/api_html/teaching/importSubjectiveScore",
       examId: "",
       dialogVisible: false,
@@ -547,21 +587,22 @@ export default {
       this.page = 1;
       this._QueryData();
     },
-    upSuccess(){//导入成功
-    this.diaUp = false
+    upSuccess() {
+      //导入成功
+      this.diaUp = false;
       this._QueryData();
     },
-    async changeclass(){
-      await this._QuerySubjectList()
-      this.page = 1
-      this._QueryData()
+    async changeclass() {
+      await this._QuerySubjectList();
+      this.page = 1;
+      this._QueryData();
     },
     async downExcel() {
-      this.loadingDown = true
+      this.loadingDown = true;
       let data = await this.$request.subjectiveScoreTemplate({
         examId: this.examId,
       });
-      this.loadingDown = false
+      this.loadingDown = false;
       if (data && !data.code) {
         let blob = new Blob([data], {
           type: "application/vnd.ms-excel;charset=utf-8",