diff --git a/src/api/apis/apis.js b/src/api/apis/apis.js
index 9f29251..fa38c2d 100644
--- a/src/api/apis/apis.js
+++ b/src/api/apis/apis.js
@@ -529,6 +529,13 @@ export default {
       data,
     });
   },
+  //  导入基站模板下载地址
+  stationTemplateUrl() {
+    return service({
+      url: setUpUrls.stationTemplateUrl,
+      method: "POST",
+    });
+  },
   //  查询下载配置列表
   appConfigList(data) {
     return service({
@@ -594,6 +601,14 @@ export default {
       responseType: 'arraybuffer',
     });
   },
+  //  发卡应用下载
+  latestClickersApp(data) {
+    return service({
+      url: setUpUrls.latestClickersApp,
+      method: "POST",
+      data,
+    });
+  },
 
   /**
    * 集团管理员-学校管理
diff --git a/src/api/urls/apis.js b/src/api/urls/apis.js
index 5698b95..86ff435 100644
--- a/src/api/urls/apis.js
+++ b/src/api/urls/apis.js
@@ -134,6 +134,8 @@ export default {
   updateDevice: "/api_html/school/manager/updateDevice",
   //   新增基站
   addStation: "/api_html/school/manager/addStation",
+  //   导入基站模板下载地址
+  stationTemplateUrl: "/api_html/school/manager/stationTemplateUrl",
   //   查询下载配置列表
   appConfigList: "/api_html/school/manager/appConfigList",
   //   查询最新的授课端应用版本
@@ -147,9 +149,11 @@ export default {
   //    设备使用分析
   usageAnalysis: "/api_html/school/manager/usageAnalysis",
   // 发卡记录
-  cardList: "/api_html/school/manager/cardList",
+  cardList: "/api_html/school/manager/clickersLogList",
   // 导出设备使用分析
   exportUsageAnalysis: "/api_html/school/manager/exportUsageAnalysis",
+  // 发卡应用下载
+  latestClickersApp: "/api_html/school/manager/latestClickersApp",
 
 
   // 查询区域列表
diff --git a/src/components/upload.vue b/src/components/upload.vue
index 92b1ade..8a7c0c4 100644
--- a/src/components/upload.vue
+++ b/src/components/upload.vue
@@ -76,7 +76,6 @@ export default {
       // }
     },
     upSuccess(res) {
-      debugger
       if (res && res.status == 0 ) {
         this.$message.success("上传成功");
         this.$emit("upSuccess");
@@ -85,7 +84,6 @@ export default {
       }
     },
     upError(res) {
-      debugger
       if (res && res.status == 0) {
         this.$message.error("上传失败");
       } else {
diff --git a/src/views/card/index.vue b/src/views/card/index.vue
index e5b91f7..1a7d551 100644
--- a/src/views/card/index.vue
+++ b/src/views/card/index.vue
@@ -10,6 +10,7 @@
       <div class="answer-header">
         <div class="sel-box">
           <el-cascader
+            @change="_QueryData(1)"
             size="small"
             class="sel"
             clearable
@@ -53,18 +54,20 @@
         v-if="!tableData.length && !loading"
         description="暂无数据"
       ></el-empty>
-      <div v-else class="table-box">
+      <div v-else class="table-box" v-loading="loading">
         <el-table :data="tableData" border style="width: 100%">
           <el-table-column
             align="center"
             label="答题器编码"
-            prop="sn"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="班级"
-            prop="className"
+            prop="clickerSn"
           ></el-table-column>
+          <el-table-column align="center" label="班级">
+            <template slot-scope="scope">
+              <span v-for="item in scope.row.classList" :key="item.classCode">{{
+                item.className
+              }}</span>
+            </template>
+          </el-table-column>
           <el-table-column
             align="center"
             label="学生姓名"
@@ -75,22 +78,40 @@
             label="学号"
             prop="studentId"
           ></el-table-column>
-          <el-table-column
-            align="center"
-            label="类型"
-            prop="type"
-          ></el-table-column>
-          <el-table-column
-            align="center"
-            label="描述"
-            prop="desc"
-          ></el-table-column>
+          <el-table-column align="center" label="类型">
+            <template slot-scope="scope">
+              {{ scope.row.operationType == 0 ? "发卡" : "补卡" }}
+            </template></el-table-column
+          >
+          <el-table-column align="center" label="描述">
+            <template slot-scope="scope">
+              {{
+                scope.row.operationType == 0
+                  ? "--"
+                  : scope.row.reason == 0
+                  ? "丢失"
+                  : "损坏"
+              }}
+            </template></el-table-column
+          >
           <el-table-column
             align="center"
             label="操作时间"
-            prop="time"
+            prop="modifiedTime"
           ></el-table-column>
         </el-table>
+        <div class="pagination-box">
+          <el-pagination
+            small=""
+            layout="total,prev, pager, next"
+            :hide-on-single-page="true"
+            :total="total"
+            @current-change="changePage"
+            :current-page="page"
+            :page-size="size"
+          >
+          </el-pagination>
+        </div>
       </div>
     </div>
   </div>
@@ -100,19 +121,23 @@
 export default {
   data() {
     return {
-      loading:false,
-      props: { multiple: true, checkStrictly: false },
+      loading: false,
+      props: { multiple: false },
       query: {
-        classId: [],
+        classId: "",
         studentName: "",
         studentCode: "",
       },
       gradeList: [],
       tableData: [],
+      page: 1,
+      size: 20,
+      total: 0,
     };
   },
   created() {
-    // this._QueryGradeList();
+    this._QueryGradeList();
+    this._QueryData();
   },
   methods: {
     // 查找班级
@@ -142,12 +167,15 @@ export default {
         this.$message.error(info);
       }
     },
+    changePage(page) {
+      this.page = page;
+      this._QueryData(4);
+    },
     async _QueryData(type) {
       let query = {};
       query.gradeName = this.query.gradeName;
-      query.classId = this.query.classId;
       if (type == 1) {
-        query.classId = this.query.classId;
+        query.classId = this.query.classId[1] ? this.query.classId[1] : "";
         this.query.studentCode = "";
         this.query.studentName = "";
       } else if (type == 2) {
@@ -158,15 +186,20 @@ export default {
         query.studentCode = this.query.studentCode;
         this.query.classId = "";
         this.query.studentName = "";
+      } else {
+        query = { ...this.query };
       }
       this.loading = true;
       const { data, status, info } = await this.$request.cardList({
         ...query,
+        page: this.page,
+        size: 20,
       });
       this.loading = false;
       console.log(status);
       if (status === 0) {
         this.tableData = data.list || [];
+        this.total = data.count;
       } else {
         this.$message.error(info);
       }
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index e3a45c2..4385104 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -5,7 +5,7 @@
         <span>设备管理</span>
       </template>
       <template slot="btns" v-if="role != 'ROLE_JITUAN' && type == 1 && !code">
-        <!-- <el-tooltip effect="dark" content="设备导入" placement="bottom">
+        <el-tooltip effect="dark" content="设备导入" placement="bottom">
           <el-button
             type="primary"
             icon="el-icon-upload2"
@@ -14,7 +14,7 @@
             circle
             @click="diaUp = true"
           ></el-button>
-        </el-tooltip> -->
+        </el-tooltip>
         <el-tooltip
           v-if="role == 'ROLE_XUEXIAO'"
           effect="dark"
@@ -400,7 +400,6 @@
     </div>
     <el-dialog title="设备导入" :visible.sync="diaUp" width="400">
       <up-load
-        id="downDevice"
         :url="url"
         @upSuccess="upSuccess"
         fileName="设备信息"
@@ -526,7 +525,7 @@ export default {
       role: "",
       code: "",
       loading: false,
-      url: "/web/upLoadDevice",
+      url: "/api_html/teaching/importStation",
       diaUp: false,
       diaAnswerEqu: false,
       gradeList: [],
@@ -788,16 +787,17 @@ export default {
       }
     },
     async downExcel() {
-      let data = await this.$request.downDevice({
+      let { data, status, info }  = await this.$request.stationTemplateUrl({
         id: this.id,
       });
-      if (data && !data.code) {
-        let blob = new Blob([data], {
-          type: "application/vnd.ms-excel;charset=utf-8",
-        });
-        downloadFile(`设备信息.xlsx`, blob);
+      if (status == 0) {
+        const a = document.createElement("a");
+        a.href = data.downloadUrl;
+        document.body.appendChild(a);
+        a.click();
+        a.remove();
       } else {
-        this.$message.error(data.info);
+        this.$message.error(info);
       }
     },
 
diff --git a/src/views/down/index.vue b/src/views/down/index.vue
index af98c14..9f825e9 100644
--- a/src/views/down/index.vue
+++ b/src/views/down/index.vue
@@ -12,11 +12,11 @@
         </p>
         <el-button plan round @click="links">授课端下载</el-button>
       </div>
-      <div class="down-item">
+      <div class="down-item" v-loading="loading">
         <p class="txt">
           配合发卡器硬件，方便学校管理员进行发卡补卡操作的软件。
         </p>
-        <el-button plan round>发卡软件下载</el-button>
+        <el-button plan round @click="downCard">发卡软件下载</el-button>
       </div>
     </div>
   </div>
@@ -24,12 +24,33 @@
 
 <script>
 export default {
+  data() {
+    return {
+      loading: false,
+    };
+  },
   methods: {
     links() {
       this.$router.push({
         path: "/downClient",
       });
     },
+    async downCard() {
+      if (this.loading == true) return;
+      this.loading = true;
+      const { data, status, info } = await this.$request.latestClickersApp();
+      this.loading = false;
+      if (status == 0) {
+        const a = document.createElement("a");
+        a.href = data.downloadUrl;
+        a.download = data.appName;
+        document.body.appendChild(a);
+        a.click();
+        a.remove();
+      } else {
+        this.$message.error(info);
+      }
+    },
   },
 };
 </script>
diff --git a/src/views/examinationPaper/add.vue b/src/views/examinationPaper/add.vue
index 39c0d28..a1f6a5f 100644
--- a/src/views/examinationPaper/add.vue
+++ b/src/views/examinationPaper/add.vue
@@ -185,8 +185,19 @@
         </el-dialog>
       </div>
       <div v-show="step == 1">
-        <div v-for="(question, index) in form.questionList" :key="index">
+        <div
+          class="question-box"
+          v-for="(question, index) in form.questionList"
+          :key="index"
+        >
           <p class="question-title">
+            <el-tooltip effect="dark" :content="question.show?'收起':'展开'" placement="left">
+              <i
+                class="el-icon-caret-right"
+                :class="question.show ? 'active' : ''"
+                @click="question.show = !question.show"
+              ></i>
+            </el-tooltip>
             <span>{{ setBigNum(index) }}、</span>
             <el-input
               class="ipt"
@@ -210,128 +221,143 @@
             <span class="m20">共：{{ question.subQuestions.length }}题</span>
             <span>共：{{ setScore(question) }}分</span>
           </p>
-          <ul class="questions-ul">
-            <li class="sub-questions">
-              <div class="qs-num">题号</div>
-              <div class="qs-type">题型</div>
-              <div class="qs-score">分数</div>
-              <div class="qs-partScore">漏选得分</div>
-              <div class="qs-options">选项设置</div>
-              <div class="qs-set">操作</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">
-                <el-select
-                  v-model="subQuestions.questionType"
-                  placeholder="选择题目类型"
-                  @change="changeSubQuestions($event, subQuestions)"
-                >
-                  <el-option label="单选题" :value="2"></el-option>
-                  <el-option label="多选题" :value="3"></el-option>
-                  <el-option label="判断题" :value="4"></el-option>
-                  <el-option label="主观题" :value="5"></el-option>
-                </el-select>
-              </div>
-              <div class="qs-score">
-                <el-input-number
-                  class="number-ipt"
-                  size="medium"
-                  :min="1"
-                  :max="200"
-                  :precision="2"
-                  :step="1"
-                  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">
-                <p v-if="subQuestions.questionType == 5">--</p>
-                <p
-                  v-else-if="subQuestions.questionType == 4"
-                  class="answer-box"
-                >
-                  <span class="answer-s">✓</span>
-                  <span class="answer-s">✗</span>
-                </p>
-                <p v-else class="answer-box">
-                  <span
-                    class="answer-s"
-                    v-for="option in subQuestions.answerOptions.split(',')"
-                    :key="option"
-                    >{{ option }}</span
+          <transition name="el-zoom-in-top">
+            <ul v-show="question.show" class="questions-ul">
+              <li class="sub-questions">
+                <div class="qs-num">题号</div>
+                <div class="qs-type">题型</div>
+                <div class="qs-score">分数</div>
+                <div class="qs-partScore">漏选得分</div>
+                <div class="qs-options">选项设置</div>
+                <div class="qs-set">操作</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">
+                  <el-select
+                    v-model="subQuestions.questionType"
+                    placeholder="选择题目类型"
+                    @change="changeSubQuestions($event, subQuestions)"
                   >
-                  <el-button
-                    size="mini"
-                    type="primary"
-                    icon="el-icon-plus"
-                    circle
-                    @click="addOptions(subQuestions)"
-                  ></el-button>
-                  <el-button
-                    size="mini"
-                    type="primary"
-                    icon="el-icon-minus"
-                    round
-                    circle
-                    @click="removeOptions(subQuestions)"
-                  ></el-button>
-                </p>
-              </div>
-              <div class="qs-set">
-                <el-popconfirm
-                  title="确定删除这道题吗？"
-                  @confirm="delTabData(indexs, index)"
-                >
-                  <el-button
-                    slot="reference"
-                    class="delete"
-                    type="danger"
-                    size="mini"
-                    circle
-                    icon="el-icon-delete"
-                  ></el-button>
-                </el-popconfirm>
-              </div>
-            </li>
-            <li class="sub-questions">
-              <div class="qs-num">添加</div>
-              <div class="qs-type">
-                <el-select
-                  v-model="addSubQuestionsType"
-                  placeholder="选择题目类型"
-                  @change="changeAddSubQuestions($event, question)"
-                >
-                  <el-option label="单选题" :value="2"></el-option>
-                  <el-option label="多选题" :value="3"></el-option>
-                  <el-option label="判断题" :value="4"></el-option>
-                  <el-option label="主观题" :value="5"></el-option>
-                </el-select>
-              </div>
-              <div class="qs-score"></div>
-              <div class="qs-partScore"></div>
-              <div class="qs-options"></div>
-              <div class="qs-set"></div>
-            </li>
-          </ul>
+                    <el-option label="单选题" :value="2"></el-option>
+                    <el-option label="多选题" :value="3"></el-option>
+                    <el-option label="判断题" :value="4"></el-option>
+                    <el-option label="主观题" :value="5"></el-option>
+                  </el-select>
+                </div>
+                <div class="qs-score">
+                  <el-input-number
+                    class="number-ipt"
+                    size="medium"
+                    :min="1"
+                    :max="200"
+                    :precision="2"
+                    :step="1"
+                    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">
+                  <p v-if="subQuestions.questionType == 5">--</p>
+                  <p
+                    v-else-if="subQuestions.questionType == 4"
+                    class="answer-box"
+                  >
+                    <span
+                      class="answer-s"
+                      :class="subQuestions.correctAnswer == 1 ? 'active' : ''"
+                      >✓</span
+                    >
+                    <span
+                      class="answer-s"
+                      :class="subQuestions.correctAnswer == 2 ? 'active' : ''"
+                      >✗</span
+                    >
+                  </p>
+                  <p v-else class="answer-box">
+                    <span
+                      class="answer-s"
+                      v-for="option in subQuestions.answerOptions.split(',')"
+                      :key="option"
+                      :class="
+                        subQuestions.correctAnswer?.includes(option)
+                          ? 'active'
+                          : ''
+                      "
+                      >{{ option }}</span
+                    >
+                    <el-button
+                      size="mini"
+                      type="primary"
+                      icon="el-icon-plus"
+                      circle
+                      @click="addOptions(subQuestions)"
+                    ></el-button>
+                    <el-button
+                      size="mini"
+                      type="primary"
+                      icon="el-icon-minus"
+                      round
+                      circle
+                      @click="removeOptions(subQuestions)"
+                    ></el-button>
+                  </p>
+                </div>
+                <div class="qs-set">
+                  <el-popconfirm
+                    title="确定删除这道题吗？"
+                    @confirm="delTabData(indexs, index)"
+                  >
+                    <el-button
+                      slot="reference"
+                      class="delete"
+                      type="danger"
+                      size="mini"
+                      circle
+                      icon="el-icon-delete"
+                    ></el-button>
+                  </el-popconfirm>
+                </div>
+              </li>
+              <li class="sub-questions">
+                <div class="qs-num">添加</div>
+                <div class="qs-type">
+                  <el-select
+                    v-model="addSubQuestionsType"
+                    placeholder="选择题目类型"
+                    @change="changeAddSubQuestions($event, question)"
+                  >
+                    <el-option label="单选题" :value="2"></el-option>
+                    <el-option label="多选题" :value="3"></el-option>
+                    <el-option label="判断题" :value="4"></el-option>
+                    <el-option label="主观题" :value="5"></el-option>
+                  </el-select>
+                </div>
+                <div class="qs-score"></div>
+                <div class="qs-partScore"></div>
+                <div class="qs-options"></div>
+                <div class="qs-set"></div>
+              </li>
+            </ul>
+          </transition>
         </div>
         <div class="add-box">
           <p class="add-question" @click="openQuestion">
@@ -379,7 +405,11 @@
                 </el-col>
               </el-form-item>
               <el-form-item label="选择题型：">
-                <el-select v-model="questionForm.questionType" placeholder="">
+                <el-select
+                  v-model="questionForm.questionType"
+                  placeholder=""
+                  @change="setQuestionForm"
+                >
                   <el-option
                     v-for="item in questionOptions"
                     :key="item.value"
@@ -393,6 +423,7 @@
               <el-form-item label="题数：">
                 <el-input-number
                   v-model="questionForm.number"
+                  @change="changeQesNum"
                   :min="1"
                   :max="100"
                   :step-strictly="true"
@@ -439,6 +470,113 @@
                   label="label"
                 ></el-input-number>
               </el-form-item>
+              <el-form-item
+                label="设置答案："
+                v-show="questionForm.questionType != 5"
+              >
+                <div class="qs-options">
+                  <p class="ipt">
+                    <el-input
+                      v-if="
+                        questionForm.questionType == 2 ||
+                        questionForm.questionType == 3 ||
+                        questionForm.questionType == 6
+                      "
+                      v-model="questionForm.answerList"
+                      @keydown.native="
+                        keydownAnswer($event, questionForm.questionType, 1)
+                      "
+                      @input="
+                        setAllAnswer($event, questionForm.questionType, 1)
+                      "
+                    ></el-input>
+                    <el-input
+                      v-if="questionForm.questionType == 4"
+                      v-model="questionForm.answerList"
+                      readonly=""
+                    ></el-input>
+                  </p>
+                  <p class="answer-box">
+                    <template v-if="questionForm.questionType == 4">
+                      <span
+                        class="answer-s active"
+                        @click="
+                          questionForm.answerList.length < questionForm.number
+                            ? (questionForm.answerList += '✓')
+                            : ''
+                        "
+                        >✓</span
+                      >
+                      <span
+                        class="answer-s active"
+                        @click="
+                          questionForm.answerList.length < questionForm.number
+                            ? (questionForm.answerList += '✗')
+                            : ''
+                        "
+                        >✗</span
+                      >
+                    </template>
+                    <template v-if="questionForm.questionType == 3">
+                      <template v-for="(option, opIdx) in rightOptions">
+                        <span
+                          v-if="opIdx < questionForm.selectNum"
+                          class="answer-s active"
+                          :key="option"
+                          @click="setMultiple(questionForm, option)"
+                          >{{ option }}</span
+                        >
+                      </template>
+                      <span
+                        class="answer-s active"
+                        @click="
+                          questionForm.answerList.split(',').length <
+                          questionForm.number
+                            ? (questionForm.answerList += ',')
+                            : ''
+                        "
+                        >,</span
+                      >
+                    </template>
+                    <template
+                      v-if="
+                        questionForm.questionType == 2 ||
+                        questionForm.questionType == 6
+                      "
+                      class="answer-box"
+                    >
+                      <template v-for="(option, opIdx) in rightOptions">
+                        <span
+                          v-if="opIdx < questionForm.selectNum"
+                          class="answer-s active"
+                          :key="option"
+                          @click="
+                            questionForm.answerList.length < questionForm.number
+                              ? (questionForm.answerList += option)
+                              : ''
+                          "
+                          >{{ option }}</span
+                        >
+                      </template>
+                    </template>
+                    <span
+                      class="answer-s delButton"
+                      @click="
+                        questionForm.answerList = questionForm.answerList.slice(
+                          0,
+                          -1
+                        )
+                      "
+                      >x</span
+                    >
+                    <span
+                      class="answer-s ac"
+                      @click="questionForm.answerList = ''"
+                      >ac</span
+                    >
+                  </p>
+                </div>
+              </el-form-item>
             </el-form>
           </div>
           <div class="dialog-footer" slot="footer">
@@ -452,208 +590,212 @@
           <p class="name">{{ form.title }}</p>
           <p class="totals">卷面总分：{{ allScore }}分</p>
         </div>
-        <div v-for="(question, index) in form.questionList" :key="index">
+        <div
+          class="question-box"
+          v-for="(question, index) in form.questionList"
+          :key="index"
+        >
           <p class="question-title">
             <span>{{ setBigNum(index) }}、</span>
             <span class="title-txt">{{ question.questionTitle }}</span>
             <span class="m20">共：{{ setNums(question.subQuestions) }}题</span>
             <span>共：{{ setScore(question) }} 分</span>
           </p>
-          <ul class="questions-ul">
-            <li class="sub-questions">
-              <div class="qs-num">题号</div>
-              <div class="qs-type">题型</div>
-              <div class="qs-score">分数</div>
-              <div class="qs-partScore">漏选得分</div>
-              <div class="qs-options qs-options2">选项设置</div>
-            </li>
-            <li
-              v-for="(subQuestions, indexs) in question.subQuestions"
-              :key="indexs"
-            >
-              <p
-                class="set-ans-btn"
-                v-if="
-                  subQuestions.qusType &&
-                  subQuestions.subNum &&
-                  subQuestions.subNum > 4
-                "
+            <ul class="questions-ul">
+              <li class="sub-questions">
+                <div class="qs-num">题号</div>
+                <div class="qs-type">题型</div>
+                <div class="qs-score">分数</div>
+                <div class="qs-partScore">漏选得分</div>
+                <div class="qs-options qs-options2">选项设置</div>
+              </li>
+              <li
+                v-for="(subQuestions, indexs) in question.subQuestions"
+                :key="indexs"
               >
-                <el-button type="primary" @click="setFormAns(indexs, index)"
-                  >批量设置答案</el-button
+                <p
+                  class="set-ans-btn"
+                  v-if="
+                    subQuestions.qusType &&
+                    subQuestions.subNum &&
+                    subQuestions.subNum > 4
+                  "
                 >
-              </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>
-            </li>
-          </ul>
-          <el-dialog
-            title="批量设置答案"
-            :visible.sync="diaSetAns"
-            :close-on-click-modal="false"
-            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-if="formAns.qusType == 2 || formAns.qusType == 3"
-                  v-model="formAns.answerList"
-                  @keydown.native="keydownAnswer($event, formAns.qusType)"
-                  @input="setAllAnswer($event, formAns.qusType)"
-                ></el-input>
-                <el-input
-                  v-if="formAns.qusType == 4"
-                  v-model="formAns.answerList"
-                  readonly=""
-                ></el-input>
-              </p>
-              <p class="answer-box">
-                <template v-if="formAns.qusType == 4">
-                  <span
-                    class="answer-s active"
-                    @click="
-                      formAns.answerList.length < formAns.subNum
-                        ? (formAns.answerList += '✓')
-                        : ''
-                    "
-                    >✓</span
-                  >
-                  <span
-                    class="answer-s active"
-                    @click="
-                      formAns.answerList.length < formAns.subNum
-                        ? (formAns.answerList += '✗')
-                        : ''
-                    "
-                    >✗</span
-                  >
-                </template>
-                <template v-if="formAns.qusType == 3">
-                  <span
-                    class="answer-s active"
-                    v-for="option in formAns.answerOptions.split(',')"
-                    :key="option"
-                    @click="setMultiple(formAns, option)"
-                    >{{ option }}</span
+                  <el-button type="primary" @click="setFormAns(indexs, index)"
+                    >批量设置答案</el-button
                   >
-                  <span
-                    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="
-                      formAns.answerList.length < formAns.subNum
-                        ? (formAns.answerList += option)
-                        : ''
-                    "
-                    >{{ option }}</span
-                  >
-                </template>
+                </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>
+              </li>
+            </ul>
+        </div>
+        <el-dialog
+          title="批量设置答案"
+          :visible.sync="diaSetAns"
+          :close-on-click-modal="false"
+          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-if="formAns.qusType == 2 || formAns.qusType == 3"
+                v-model="formAns.answerList"
+                @keydown.native="keydownAnswer($event, formAns.qusType)"
+                @input="setAllAnswer($event, formAns.qusType)"
+              ></el-input>
+              <el-input
+                v-if="formAns.qusType == 4"
+                v-model="formAns.answerList"
+                readonly=""
+              ></el-input>
+            </p>
+            <p class="answer-box">
+              <template v-if="formAns.qusType == 4">
                 <span
-                  class="answer-s delButton"
-                  @click="formAns.answerList = formAns.answerList.slice(0, -1)"
-                  >x</span
+                  class="answer-s active"
+                  @click="
+                    formAns.answerList.length < formAns.subNum
+                      ? (formAns.answerList += '✓')
+                      : ''
+                  "
+                  >✓</span
                 >
-                <span class="answer-s ac" @click="formAns.answerList = ''"
-                  >ac</span
+                <span
+                  class="answer-s active"
+                  @click="
+                    formAns.answerList.length < formAns.subNum
+                      ? (formAns.answerList += '✗')
+                      : ''
+                  "
+                  >✗</span
                 >
-              </p>
-            </div>
-            <div class="dialog-footer" slot="footer">
-              <el-button @click="saveFormAns">确 定</el-button>
-              <el-button @click="diaSetAns = false">取 消</el-button>
-            </div>
-          </el-dialog>
-        </div>
+              </template>
+              <template v-if="formAns.qusType == 3">
+                <span
+                  class="answer-s active"
+                  v-for="option in formAns.answerOptions.split(',')"
+                  :key="option"
+                  @click="setMultiple(formAns, option)"
+                  >{{ option }}</span
+                >
+                <span
+                  class="answer-s active"
+                  @click="
+                    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="
+                    formAns.answerList.length < formAns.subNum
+                      ? (formAns.answerList += option)
+                      : ''
+                  "
+                  >{{ option }}</span
+                >
+              </template>
+              <span
+                class="answer-s delButton"
+                @click="formAns.answerList = formAns.answerList.slice(0, -1)"
+                >x</span
+              >
+              <span class="answer-s ac" @click="formAns.answerList = ''"
+                >ac</span
+              >
+            </p>
+          </div>
+          <div class="dialog-footer" slot="footer">
+            <el-button @click="saveFormAns">确 定</el-button>
+            <el-button @click="diaSetAns = false">取 消</el-button>
+          </div>
+        </el-dialog>
         <div class="btn-box">
           <el-button type="danger" plain round @click="linkBack"
             >取消</el-button
@@ -675,6 +817,7 @@ const questionForm = {
   selectNum: 4,
   score: 1,
   partScore: 0,
+  answerList: "",
 };
 const subQuesOptions = {
   questionType: 2,
@@ -878,6 +1021,28 @@ export default {
 
       return txt;
     },
+    setQuestionForm(val) {
+      //切换题型清空答案
+      this.questionForm.answerList = "";
+    },
+    changeQesNum(val) {
+      //减少题数设置答案
+      if (
+        this.questionForm.questionType == 2 ||
+        this.questionForm.questionType == 4
+      ) {
+        this.questionForm.answerList = this.questionForm.answerList.substring(
+          0,
+          val
+        );
+      } else {
+        console.log(this.questionForm.answerList.split(","));
+        this.questionForm.answerList = this.questionForm.answerList
+          .split(",")
+          .splice(0, val)
+          .join(",");
+      }
+    },
     setFormAns(indexs, index) {
       //初始化要修改的答案
       this.formAns = { ...this.form.questionList[index].subQuestions[indexs] };
@@ -904,12 +1069,17 @@ export default {
       //多选答案设置
       obj.answerList += answer;
       let str = obj.answerList;
-      let str2 = checkAnswer(
-        str,
-        3,
-        obj.answerOptions.split(",").length,
-        obj.answerList.length
-      );
+      let str2;
+      if (!!obj.answerOptions) {
+        str2 = checkAnswer(
+          str,
+          3,
+          obj.answerOptions.split(",").length,
+          obj.answerList.length
+        );
+      } else {
+        str2 = checkAnswer(str, 3, obj.selectNum, obj.answerList.length);
+      }
       obj.answerList = str2;
     },
     saveFormAns() {
@@ -931,7 +1101,6 @@ export default {
           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 =
@@ -969,11 +1138,16 @@ export default {
     //     event.returnValue = "";
     //   }
     // },
-    keydownAnswer(event, type) {
+    keydownAnswer(event, type, isAddBig) {
       let answerA = "ABCDEFG";
       let answer_a = "abcdefg";
-      answerA = answerA.substring(0, this.formAns.subNum);
-      answer_a = answer_a.substring(0, this.formAns.subNum);
+      if (isAddBig) {
+        answerA = answerA.substring(0, this.questionForm.selectNum);
+        answer_a = answer_a.substring(0, this.questionForm.selectNum);
+      } else {
+        answerA = answerA.substring(0, this.formAns.subNum);
+        answer_a = answer_a.substring(0, this.formAns.subNum);
+      }
       answerA += answer_a;
       answerA = type == 2 ? answerA : answerA + ",";
       if (
@@ -996,15 +1170,26 @@ export default {
         event.returnValue = "";
       }
     },
-    setAllAnswer(event, type) {
-      let str = this.formAns.answerList;
-      let str2 = checkAnswer(
-        str,
-        type,
-        this.formAns.answerOptions.split(",").length,
-        this.formAns.subNum
-      );
-      this.formAns.answerList = str2;
+    setAllAnswer(event, type, isAddBig) {
+      if (isAddBig) {
+        let str = this.questionForm.answerList;
+        let str2 = checkAnswer(
+          str,
+          type,
+          this.questionForm.selectNum,
+          this.questionForm.number
+        );
+        this.questionForm.answerList = str2;
+      } else {
+        let str = this.formAns.answerList;
+        let str2 = checkAnswer(
+          str,
+          type,
+          this.formAns.answerOptions.split(",").length,
+          this.formAns.subNum
+        );
+        this.formAns.answerList = str2;
+      }
     },
     setAnswer(type, ans) {
       let txt = "";
@@ -1133,6 +1318,7 @@ export default {
       this.addQuestionVisible = true;
     },
     addQuestion() {
+      //添加大题
       let subQuestions = [];
       let questionsOptions = {
         ...subQuesOptions,
@@ -1164,6 +1350,20 @@ export default {
           break;
       }
       for (let i = 0; i < this.questionForm.number; i++) {
+        let answer = "";
+        if (questionsOptions.questionType == 4) {
+          answer =
+            this.questionForm.answerList[i] == "✓"
+              ? 1
+              : this.questionForm.answerList[i] == "✗"
+              ? 2
+              : "";
+        } else if (questionsOptions.questionType == 3) {
+          answer = this.questionForm.answerList.split(",")[i] || "";
+        } else if (questionsOptions.questionType == 2) {
+          answer = this.questionForm.answerList[i] || "";
+        }
+        questionsOptions.correctAnswer = answer;
         subQuestions.push({ ...questionsOptions });
       }
       this.form.questionList.push({
@@ -1171,6 +1371,7 @@ export default {
         number: this.questionForm.number,
         source: 10,
         subQuestions: [...subQuestions],
+        show: false,
       });
       this.addQuestionVisible = false;
     },
@@ -1347,8 +1548,12 @@ export default {
       if (this.saveLoading) return;
       this.saveLoading = true;
       this.formatQuestionList();
+      let formDatas = deepClone(this.form)
+      for (let i = 0; i < formDatas.questionList.length; i++) {
+        delete formDatas.questionList[i].show
+      }
       const { data, status, info } = await this.$request.addPaper({
-        ...this.form,
+        ...formDatas,
       });
       this.saveLoading = false;
       if (status == 0) {
@@ -1480,13 +1685,13 @@ export default {
     background-size: 19px;
     color: transparent;
   }
-  .answer-s.ac{
-    border:none;
+  .answer-s.ac {
+    border: none;
   }
   .ac {
     border-color: #ff6868;
     background: #ff6868;
-    color: #fff!important;
+    color: #fff !important;
   }
 }
 
@@ -1573,10 +1778,16 @@ export default {
     margin: 0 12px;
   }
 }
+.question-box {
+  margin-bottom: 20px;
+}
 .question-title {
   line-height: 40px;
+  display: flex;
+  align-items: center;
+  margin-bottom: 12px;
   .m20 {
-    margin-right: 20px;
+    margin: 0 20px;
   }
   .ipt {
     width: 300px;
@@ -1595,6 +1806,20 @@ export default {
     font-size: 16px;
     font-weight: 700;
   }
+  .el-icon-caret-right {
+    font-size: 24px;
+    color: #888;
+    transition: all 0.4s;
+    margin-right: 12px;
+    cursor: pointer;
+    &.active {
+      transform: rotate(90deg);
+    }
+  }
+}
+.questions-ul {
+  border-left: 1px solid #e2e2e2;
+  border-top: 1px solid #e2e2e2;
 }
 .el-input-number {
   width: 140px;
@@ -1630,11 +1855,6 @@ export default {
     }
   }
 }
-.questions-ul {
-  border-left: 1px solid #e2e2e2;
-  border-top: 1px solid #e2e2e2;
-  margin: 12px 0;
-}
 .qs-options {
   .answer-s {
     display: inline-block;
diff --git a/src/views/setUp/school.vue b/src/views/setUp/school.vue
index 1b32190..55a6e11 100644
--- a/src/views/setUp/school.vue
+++ b/src/views/setUp/school.vue
@@ -308,6 +308,9 @@ export default {
       if (!this.subjectName) {
         this.$message.warning("请填写科目名称");
         return;
+      }else if(this.subjectList.includes(this.subjectName)){
+        this.$message.warning("科目已存在，请重新填写～");
+        return;
       }
       this.subjectList.push(this.subjectName);
       this.formGrade.subjectNames.push(this.subjectName);