diff --git a/src/components/setAnswer.vue b/src/components/setAnswer.vue
index bdea248..806c32a 100644
--- a/src/components/setAnswer.vue
+++ b/src/components/setAnswer.vue
@@ -1,63 +1,67 @@
 <template>
-  <el-dialog :visible.sync="diaVisible" width="400" center>
-    <div slot="title">
-      <p>
+  <div class="el-dialog-wrapper" v-show="diaVisible" width="400" center @click.self="cancel">
+    <div class="el-dialog-content">
+      <p class="title">
         <!-- 设置答案 <i class="fa fa-exchange" @click="editType = !editType"></i> -->
         设置答案
+        <i class="el-icon-close" @click="cancel"></i>
       </p>
-    </div>
-    <div v-show="editType">
-      <div v-for="(item, index) in FormQuestionList" :key="index">
-        <template v-for="(subQuestions, indexs) in item.subQuestions">
-          <div
-            class="sub-questions"
-            :key="indexs"
-            v-if="subQuestions.correctAnswer"
-          >
-            <div class="qs-num">题{{ subQuestions.questionIndex }}</div>
-            <div class="qs-options qs-options2">
-              <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"
-                  :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"
-                  :class="subQuestions.correctAnswer == option ? 'active' : ''"
-                  :key="option"
-                  @click="subQuestions.correctAnswer = option"
-                  >{{ option }}</span
-                >
-              </p>
+      <div v-show="editType">
+        <div v-for="(item, index) in FormQuestionList" :key="index">
+          <template v-for="(subQuestions, indexs) in item.subQuestions">
+            <div
+              class="sub-questions"
+              :key="indexs"
+              v-if="subQuestions.correctAnswer"
+            >
+              <div class="qs-num">题{{ subQuestions.questionIndex }}</div>
+              <div class="qs-options qs-options2">
+                <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"
+                    :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"
+                    :class="
+                      subQuestions.correctAnswer == option ? 'active' : ''
+                    "
+                    :key="option"
+                    @click="subQuestions.correctAnswer = option"
+                    >{{ option }}</span
+                  >
+                </p>
+              </div>
             </div>
-          </div>
-        </template>
+          </template>
+        </div>
       </div>
-    </div>
-    <!-- <div v-show="!editType">
+      <!-- <div v-show="!editType">
         <p class="dia-tips">
             请点击选项按钮设置答案,多选题题目之间用“,”隔开，若添加5道题：“AC,AD,BD,AC,CD”
           </p>
@@ -148,13 +152,16 @@
           </div>
         </div>
       </div> -->
-    <div slot="footer">
-      <el-button class="dia-btn" type="primary" @click="saveAnswer"
-        >确 定</el-button
-      >
-      <el-button class="dia-btn" type="danger" @click="cancel">取 消</el-button>
+      <div class="footer-box">
+        <el-button class="dia-btn" type="primary" @click="saveAnswer"
+          >确 定</el-button
+        >
+        <el-button class="dia-btn" type="danger" @click="cancel"
+          >取 消</el-button
+        >
+      </div>
     </div>
-  </el-dialog>
+  </div>
 </template>
 
 <script>
@@ -280,19 +287,59 @@ export default {
         questionList: questionList,
       });
       if (status == 0) {
-        this.$emit('saveSuccess')
+        this.$emit("saveSuccess");
       } else {
         this.$message.error(message);
       }
     },
     cancel() {
-      this.$emit('cancel')
+      this.$emit("cancel");
     },
   },
 };
 </script>
 
 <style lang="scss" scoped>
+.el-dialog-wrapper {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  overflow: auto;
+  margin: 0;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 2022;
+  .el-dialog-content {
+    width: 600px;
+    background:#fff;
+    border-radius: 10px;
+    padding:16px 20px 20px;
+  }
+  .title{
+    font-size: 18px;
+    position: relative;
+    margin-bottom:20px;
+    .el-icon-close{
+      position: absolute;
+      top:0;
+      right:12px;
+      padding:2px;
+      font-size: 16px;
+      cursor: pointer;
+      &:hover{
+        color: #667ffa;
+      }
+    }
+  }
+}
+.footer-box {
+  text-align: center;
+  padding-top:20px;
+}
 .sub-questions {
   width: 100%;
   display: flex;
diff --git a/src/store/index.js b/src/store/index.js
index f659823..f7cfc91 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -89,12 +89,9 @@ const store = new Vuex.Store({
           }
         }
       }).catch(() => {
-        // commit("setToken", Cookies.get("JSESSIONID"));
       })
     },
     permissions({ state, commit }, that) {
-      // request.login(that.loginForm).then(res => {
-      // if (res.status == 200) {
         let userInfo = {
           permissions: [
             {
@@ -107,8 +104,6 @@ const store = new Vuex.Store({
             },
           ],
           name: "李老师",
-          // avatar: data.avatar ? data.avatar : "",
-          // uid: data.id,
           authorityRouter:[
             "setUpAccount",
             "setUpSchool",
diff --git a/src/views/dataSync/index.vue b/src/views/dataSync/index.vue
index 46208cb..19d9cde 100644
--- a/src/views/dataSync/index.vue
+++ b/src/views/dataSync/index.vue
@@ -1,13 +1,155 @@
 <template>
-  <div>数据同步</div>
+  <div>
+    <back-box>
+      <template slot="title">
+        <span>数据同步</span>
+      </template>
+    </back-box>
+    <div class="page-content">
+      <div class="down-item">
+        <p class="h-title">从U盘导入</p>
+        <p class="txt">
+          本功能帮助无法上网的授课端软件，将本地数据同步到云平台，需要先在数据包放到U盘。
+        </p>
+        <el-upload
+          class="upload-demo"
+          ref="upload"
+          :action="url"
+          :multiple="false"
+          :data="{ id: id }"
+          :with-credentials="true"
+          :limit="1"
+          :on-change="change"
+          :on-success="upSuccess"
+          :on-error="upError"
+        >
+          <div class="btn-box">
+            <i class="fa fa-cloud-upload"></i>
+            <el-button type="primary" round>选择文件</el-button>
+          </div>
+        </el-upload>
+      </div>
+
+      <div class="down-item">
+        <p class="h-title">数据导出至U盘</p>
+        <p class="txt">
+          本功能将云平台的数据导出到U盘。待导出数据包括4套答题卡。
+        </p>
+        <div class="btn-box btn-box2">
+          <i class="fa fa-cloud-download" @click="getAppDownloadUrl"></i>
+          <el-button type="primary" round>发卡软件下载</el-button>
+        </div>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
 export default {
+  data() {
+    return {
+      url: "xxx",
+      id: "",
+    };
+  },
+  methods: {
+    async getAppDownloadUrl() {
+      const { data, status, info } = await this.$request.getAppDownloadUrl();
+      if (status == 0) {
+        // this.tableData = [...data.list] || [];
+        const a = document.createElement("a");
+        a.href = data.downloadUrl;
+        document.body.appendChild(a);
+        a.click();
+        a.remove();
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async submitUpload() {
+      this.$refs.upload.submit();
 
-}
+      // const formData = new FormData()
+      // formData.append('id',this.componentId)
+      // formData.append('file',new File(this.file.raw))
+      // let {status,info} = await uploadExcel(formData);
+      // if(status===0){
+      //   this.$message.success(info);
+      //   this.$emit("upSuccess")
+      // } else {
+      //   this.$message.error(info);
+      // }
+    },
+    upSuccess(res) {
+      if (res && res.code == 0 && res.success) {
+        this.$message.success("上传成功");
+        this.$emit("upSuccess");
+      } else {
+        this.$message.error(res.message);
+      }
+    },
+    upError(res) {
+      if (res && res.status == 0) {
+        this.$message.success("上传成功");
+        this.$emit("upSuccess");
+      } else {
+        this.$message.error(res.message);
+      }
+    },
+    change(file) {
+      this.file = file;
+    },
+  },
+};
 </script>
 
-<style>
-
+<style lang="scss" scoped>
+.page-content {
+  padding: 50px;
+  display: flex;
+  justify-content: center;
+  .down-item {
+    width: 400px;
+    border-radius: 20px;
+    margin: 20px;
+    background: #f8f8f8;
+    box-shadow: 2px 2px 5px #ccc;
+    .h-title {
+      font-size: 16px;
+      color: #667ffd;
+      padding: 16px 0 16px 12px;
+    }
+    .txt {
+      height: 80px;
+      padding: 0 20px;
+      font-size: 16px;
+      color: #7f7f7f;
+      line-height: 24px;
+      text-align: center;
+    }
+  }
+  .upload-demo{
+    display: flex;
+    justify-content: center;
+  }
+  :deep(.el-upload) {
+    margin:0 auto;
+  }
+  .btn-box {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    padding-bottom: 40px;
+    .fa {
+      font-size: 80px;
+      color: #aeaeae;
+      padding-bottom: 10px;
+      cursor: pointer;
+    }
+  }
+  .btn-box {
+    width: 100%;
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/device/index.vue b/src/views/device/index.vue
index ebd6756..9372cb3 100644
--- a/src/views/device/index.vue
+++ b/src/views/device/index.vue
@@ -606,7 +606,7 @@ export default {
       if (this.loadingUpDate) return;
       this.loadingUpDate = true;
       let data = await this.$request.modifyUpgradeFlag({
-        deviceId: id ? id : this.selectionTabIds,
+        deviceIds: id ? [id] : this.selectionTabIds,
         upgradeFlag: 1,
       });
       this.loadingUpDate = false;
@@ -625,7 +625,7 @@ export default {
       if (this.loadingUpDate) return;
       this.loadingUpDate = true;
       let data = await this.$request.modifyUpgradeFlag({
-        deviceId: id ? id : this.selectionTabIds,
+        deviceIds: id ? [id] : this.selectionTabIds,
         upgradeFlag: 0,
       });
       this.loadingUpDate = false;
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 17ae6c8..7bb4a2e 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -90,8 +90,10 @@ export default {
       disableClick: true,
       passwordType: "password",
       loginForm: {
-        username: "13610050254",
-        password: "Pw050254#",
+        // username: "13610050254",
+        // password: "Pw050254#",
+        username: "18946034886",
+        password: "Pw034886#",
       },
       loginRules: {
         username: [
diff --git a/src/views/setUp/school.vue b/src/views/setUp/school.vue
index 9e6d4e7..e59c9e8 100644
--- a/src/views/setUp/school.vue
+++ b/src/views/setUp/school.vue
@@ -91,6 +91,41 @@
         <el-button @click="diaUp = false">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="修改年级信息" :visible.sync="diaGrade" width="400">
+      <el-form
+        class="form-box"
+        :model="formGrade"
+        :rules="rulesGrade"
+        label-width="160px"
+      >
+        <el-form-item label="科目：" prop="subjectNames">
+          <el-checkbox-group v-model="formGrade.subjectNames">
+            <el-checkbox
+              v-for="item in subjectList"
+              :label="item"
+              :key="item"
+              >{{ item }}</el-checkbox
+            >
+          </el-checkbox-group>
+         <el-col :span="8">
+            <el-input placeholder="添加科目" v-model.trim="subjectName" maxlength="30">
+            <i slot="suffix" class="el-input__icon el-icon-plus" @click="addSubjectName"></i>
+          </el-input>
+         </el-col>
+        </el-form-item>
+        <el-form-item label="班级：">
+          <span v-for="(item, index) in formGrade.classList" :key="item.id">{{
+            `${item.className}${
+              index == formGrade.classList.length - 1 ? "" : "、"
+            }`
+          }}</span>
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="editGrade">确 定</el-button>
+        <el-button @click="diaGrade = false">取 消</el-button>
+      </div>
+    </el-dialog>
     <el-dialog title="修改学校信息" :visible.sync="diaSchool" width="400">
       <el-form
         class="form-box"
@@ -183,13 +218,14 @@ export default {
       url: "xxx",
       diaUp: false,
       diaSchool: false,
+      diaGrade: false,
       school: {
-        schoolName: "长水实验中学",
-        managePwd: "123456",
-        contactPerson: "张老师",
-        contactPhone: "13548645321",
-        sections: "初中",
-        tenantName: "长水集团",
+        schoolName: "",
+        managePwd: "",
+        contactPerson: "",
+        contactPhone: "",
+        sections: "",
+        tenantName: "",
       },
       tableData: [],
       formSchool: {
@@ -204,6 +240,17 @@ export default {
           { required: true, message: "请填写管理密码", trigger: "blur" },
         ],
       },
+      formGrade: {
+        gradeName: "",
+        subjectNames: [],
+        classList: [],
+      },
+      rulesGrade: {
+        subjectNames: [
+          { required: true, message: "请选择科目", trigger: "blur" },
+        ],
+      },
+      subjectName:"",
       sectionsList: [
         { id: "1", name: "小学" },
         { id: "2", name: "初中" },
@@ -211,14 +258,30 @@ export default {
         { id: "4", name: "大学" },
         { id: "7", name: "高补" },
       ],
+      subjectList: [],
     };
   },
   created() {
     this._QueryDataSchool();
     this._QueryDataGrade();
+    this._QuerySubject();
   },
   methods: {
-    setGrade(obj) {},
+    setGrade(obj) {
+      this.formGrade.subjectNames = obj.subjectNames;
+      this.formGrade.classList = obj.classList;
+      this.formGrade.gradeName = obj.gradeName;
+      this.diaGrade = true;
+    },
+    addSubjectName(){
+      if(!this.subjectName){
+        this.$message.warning("请填写科目名称")
+        return
+      }
+      this.subjectList.push(this.subjectName)
+      this.formGrade.subjectNames.push(this.subjectName)
+      this.subjectName = ""
+    },
     async editSchool() {
       if (!this.formSchool.sections.length) {
         this.$message.error("请选择学段！");
@@ -232,9 +295,11 @@ export default {
         return;
       }
       this.loading = true;
-      let form = {...this.formSchool}
-      form.sections = this.formSchool.sections.join(',')
-      const { data, status, info } = await this.$request.updateSchool({...form});
+      let form = { ...this.formSchool };
+      form.sections = this.formSchool.sections.join(",");
+      const { data, status, info } = await this.$request.updateSchool({
+        ...form,
+      });
       this.loading = false;
       if (status === 0) {
         this.$message.success("修改成功~");
@@ -244,6 +309,28 @@ export default {
         this.$message.error(info);
       }
     },
+    async editGrade() {
+      if (!this.formGrade.subjectNames.length) {
+        this.$message.error("请选择科目！");
+        return;
+      }
+      if (this.loading) {
+        return;
+      }
+      this.loading = true;
+      const { data, status, info } = await this.$request.updateGrade({
+        gradeName: this.formGrade.gradeName,
+        subjectNames: this.formGrade.subjectNames,
+      });
+      this.loading = false;
+      if (status === 0) {
+        this.$message.success("修改成功~");
+        this.diaGrade = false;
+        this._QueryDataGrade();
+      } else {
+        this.$message.error(info);
+      }
+    },
     async _QueryDataSchool() {
       this.loading = true;
       const { data, status, info } = await this.$request.schoolDetail();
@@ -270,6 +357,15 @@ export default {
         this.$message.error(info);
       }
     },
+    async _QuerySubject() {
+      const { data, status, info } = await this.$request.subjectList();
+      console.log(status);
+      if (status === 0) {
+        this.subjectList = [...data.subjectNames] || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
     async downExcel() {
       let data = await this.$request.downDevice({
         id: this.id,
@@ -374,4 +470,10 @@ export default {
 .form-box {
   margin: 0 20px;
 }
+.el-icon-plus{
+  cursor: pointer;
+  &:hover{
+    color:#667ffd
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/views/setUp/student.vue b/src/views/setUp/student.vue
index a98ef2b..a87451d 100644
--- a/src/views/setUp/student.vue
+++ b/src/views/setUp/student.vue
@@ -12,6 +12,7 @@
             size="mini"
             plain
             circle
+            @click="openAddDia"
           ></el-button>
         </el-tooltip>
       </template>
@@ -41,7 +42,7 @@
               v-for="item in classList"
               :key="item.classCode"
               :class="query.classId == item.id ? 'active' : ''"
-              @click="classDetail(item.id)"
+              @click="classDetail(item)"
             >
               <i class="el-icon-edit-outline"></i>
               {{ item.className }}（{{ item.studentCount }}）
@@ -78,11 +79,14 @@
             </div>
           </div>
           <ul class="s-ul" v-loading="loading">
-            <li class="s-li" v-for="item in studentList" :key="item.id">
-              <i class="el-icon-delete"></i>
+            <li class="s-li" v-for="(item,index) in studentList" :key="item.id">
+              <i class="el-icon-delete" @click="removeStu(item,index)"></i>
               <p class="name">{{ item.studentName }}</p>
               <p class="p1">
-                答题器：{{ (item.clickerList.length && item.clickerList[0].clickerSn) || "--" }}
+                答题器：{{
+                  (item.clickerList.length && item.clickerList[0].clickerSn) ||
+                  "--"
+                }}
               </p>
               <p class="p1">长学号：{{ item.studentCode }}</p>
               <p class="p1">短学号：{{ item.shortNumber || "--" }}</p>
@@ -96,15 +100,46 @@
         </div>
       </div>
     </div>
-    <el-dialog title="导入学校名单" :visible.sync="diaUp" width="400">
-      <up-load id="downTeacher" :url="url" fileName="教师名单">
-        <p class="down-txt" slot="down">
-          通过Excel名单导入教师名单，点击
-          <el-link type="danger" @click="downExcel">模板下载</el-link> 。
-        </p>
-      </up-load>
+    <el-dialog title="添加学生" :visible.sync="diaStu" width="400">
+      <el-form
+        class="form-box"
+        :model="formStu"
+        :rules="rulesStu"
+        label-width="160px"
+      >
+        <el-form-item label="所在班级：">
+          <span>{{ formStu.className }}</span>
+        </el-form-item>
+        <el-form-item label="学生姓名：" prop="studentName">
+          <el-col :span="10">
+            <el-input maxlength="30" v-model.trim="formStu.studentName" />
+          </el-col>
+        </el-form-item>
+        <el-form-item label="长学号：" prop="studentCode">
+          <el-col :span="10">
+            <el-input maxlength="30" v-model.trim="formStu.studentCode" />
+          </el-col>
+        </el-form-item>
+        <el-form-item label="短学号：">
+          <el-col :span="10">
+            <el-input maxlength="30" v-model.trim="formStu.shortNumber" />
+          </el-col>
+        </el-form-item>
+        <el-form-item label="性别：">
+          <el-radio-group v-model="formStu.sex">
+            <el-radio :label="1">男</el-radio>
+            <el-radio :label="2">女</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="答题器编码：">
+          <el-col :span="10">
+            <el-input maxlength="30" v-model.trim="formStu.clickerSn" />
+          </el-col>
+        </el-form-item>
+      </el-form>
       <div class="dialog-footer" slot="footer">
-        <el-button @click="diaUp = false">取 消</el-button>
+        <el-button @click="addStu">确 定</el-button>
+        <el-button @click="diaStu = false">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -116,13 +151,29 @@ export default {
   data() {
     return {
       url: "",
-      diaUp: false,
+      diaStu: false,
       query: {
         gradeName: "",
         classId: "",
         studentCode: "",
         studentName: "",
       },
+      formStu: {
+        className: "",
+        studentName: "",
+        studentCode: "",
+        shortNumber: "",
+        sex: 1,
+        clickerSn: "",
+      },
+      rulesStu: {
+        studentName: [
+          { required: true, message: "请输入学生名称", trigger: "blur" },
+        ],
+        studentCode: [
+          { required: true, message: "请输入学生长学号", trigger: "blur" },
+        ],
+      },
       gradeName: "",
       gradeList: [],
       classList: [],
@@ -144,15 +195,57 @@ export default {
     this._QueryData(3);
   },
   methods: {
-    changeGrade(val) {
-      this.query.classId = "";
-      this._QueryClass(val);
+    openAddDia() {
+      this.formStu.studentName = "";
+      this.formStu.studentCode = "";
+      this.formStu.shortNumber = "";
+      this.formStu.sex = 1;
+      this.formStu.clickerSn = "";
+      this.diaStu = true;
+    },
+    classDetail(obj) {
+      this.query.classId = obj.id;
+      this.formStu.className = obj.className;
       this._QueryData(3);
     },
-    classDetail(id) {
-      this.query.classId = id;
+    async removeStu(obj,index) {
+       const { data, status, info } = await this.$request.delStudent({
+        studentId: obj.id,
+      });
+      if (status === 0) {
+        this.$message.success("删除成功");
+        this.studentList.splice(index,1)
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async changeGrade(val) {
+      this.query.classId = "";
+      await this._QueryClass(val);
       this._QueryData(3);
     },
+    async addStu() {
+      let query = {};
+      for (let key in this.formStu) {
+        if (key != "className" && this.formStu[key]) {
+          query[key] = this.formStu[key];
+        }
+      }
+      this.loading = true;
+      const { data, status, info } = await this.$request.addStudent({
+        classId: this.query.classId,
+        ...query,
+      });
+      this.loading = false;
+      console.log(status);
+      if (status === 0) {
+        this.$message.success(info);
+        this.diaStu = false;
+        this._QueryData();
+      } else {
+        this.$message.error(info);
+      }
+    },
     async _QueryData(type) {
       let query = {};
       query.gradeName = this.query.gradeName;
@@ -202,6 +295,7 @@ export default {
       if (status === 0) {
         this.classList = [...data.list] || [];
         this.query.classId = this.classList[0]?.id;
+        this.formStu.className = this.classList[0]?.className;
       } else {
         this.$message.error(info);
       }
diff --git a/src/views/setUp/teacher.vue b/src/views/setUp/teacher.vue
index dbac872..af0e893 100644
--- a/src/views/setUp/teacher.vue
+++ b/src/views/setUp/teacher.vue
@@ -192,7 +192,7 @@
         </div>
       </div>
     </div>
-    <el-dialog title="导入学校名单" :visible.sync="diaUp" width="400">
+    <el-dialog title="导入教师名单" :visible.sync="diaUp" width="400">
       <up-load id="downTeacher" :url="url" fileName="教师名单">
         <p class="down-txt" slot="down">
           通过Excel名单导入教师名单，点击
@@ -203,6 +203,38 @@
         <el-button @click="diaUp = false">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="添加学生" :visible.sync="diaTeacher" width="400">
+      <el-form
+        class="form-box"
+        :model="formTeacher"
+        :rules="rulesTeacher"
+        label-width="160px"
+      >
+        <el-form-item label="手机号码：" prop="loginName">
+          <el-col :span="10">
+            <el-input maxlength="30" v-model.trim="formTeacher.loginName" />
+          </el-col>
+        </el-form-item>
+        <el-form-item label="教师姓名：" prop="teacherName">
+          <el-col :span="10">
+            <el-input maxlength="30" v-model.trim="formTeacher.teacherName" />
+          </el-col>
+        </el-form-item>
+        <el-form-item label="性别：">
+          <el-radio-group v-model="formTeacher.sex">
+            <el-radio :label="1">男</el-radio>
+            <el-radio :label="2">女</el-radio>
+          </el-radio-group>
+        </el-form-item>
+         <el-form-item label="教师角色：">
+          
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="addTeacher">确 定</el-button>
+        <el-button @click="diaTeacher = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -211,16 +243,17 @@ import { downloadFile } from "@/utils";
 export default {
   data() {
     return {
-      loading:false,
+      loading: false,
       url: "",
       diaUp: false,
+      diaTeacher:false,
       query: {
         gradeName: "",
         teacherName: "",
         phone: "",
       },
       gradeList: [],
-      teacherList: [ ],
+      teacherList: [],
       teacherDetail: {
         teacherName: "",
         loginName: "",
@@ -231,6 +264,13 @@ export default {
         teacherGradeList: [],
       },
       showTId: "", //显示详情 教师ID
+      formTeacher:{
+        teacherName:"",
+        loginName:"",
+        sex:1,
+        managerList:[]
+      },
+      rulesTeacher:{},
     };
   },
   async created() {
@@ -249,6 +289,7 @@ export default {
       this.showTId = obj.id;
       this.teacherDetail = { ...obj };
     },
+    addTeacher(){},
     async _QueryData(type) {
       let query = {};
       if (type == 1) {
diff --git a/src/views/test/index.vue b/src/views/test/index.vue
index 3f37020..4e8fa64 100644
--- a/src/views/test/index.vue
+++ b/src/views/test/index.vue
@@ -297,6 +297,59 @@ export default {
           lianghao: 40,
           jige: 30,
           bujige: 20,
+          questionList: [
+            {
+              questionTitle: "f",
+              score: 1,
+              subQuestions: [
+                {
+                  questionIndex: 1,
+                  questionType: 2,
+                  score: 1,
+                  partScore: 0,
+                  selectNum: 4,
+                  answerOptions: ["A", "B", "C", "D"],
+                  correctAnswer: "B",
+                },
+                {
+                  questionIndex: 2,
+                  questionType: 2,
+                  score: 1,
+                  partScore: 0,
+                  selectNum: 4,
+                  answerOptions: ["A", "B", "C", "D", "E", "F"],
+                  correctAnswer: "A",
+                },
+                {
+                  questionIndex: 2,
+                  questionType: 3,
+                  score: 1,
+                  partScore: 0,
+                  selectNum: 4,
+                  answerOptions: ["A", "B", "C", "D", "E", "F"],
+                  correctAnswer: "AB",
+                },
+                {
+                  questionIndex: 2,
+                  questionType: 3,
+                  score: 1,
+                  partScore: 0,
+                  selectNum: 4,
+                  answerOptions: ["A", "B", "C", "D", "E", "F"],
+                  correctAnswer: "AB",
+                },
+                {
+                  questionIndex: 3,
+                  questionType: 4,
+                  score: 1,
+                  partScore: 0,
+                  selectNum: 0,
+                  answerOptions: [],
+                  correctAnswer: "1",
+                },
+              ],
+            },
+          ],
         },
         {
           title: "试卷二",