diff --git a/src/utils/index.js b/src/utils/index.js
index 3dc6d9b..6dc2f0b 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -678,3 +678,34 @@ export function formatClass(data) {
   console.log(sectionNameArr);
   return sectionNameArr;
 }
+export function formatGradeClass(data) {
+  let gradeName = [];
+  let gradeNameArr = [];
+  data.map((item) => {
+    if (!gradeName.includes(item.gradeName)) {
+      gradeName.push(item.gradeName);
+      gradeNameArr.push({
+        value: item.grade,
+        label: item.gradeName,
+        children: [
+          {
+            value: item.classCode,
+            label: item.className,
+          },
+        ],
+      });
+    } else {
+      let gradeIndex = 0;
+      gradeNameArr.map((items, index) => {
+        if (items.value == item.grade) {
+          gradeIndex = index;
+        }
+      });
+      gradeNameArr[gradeIndex].children.push({
+        value: item.classCode,
+        label: item.className,
+      });
+    }
+  });
+  return gradeNameArr;
+}
diff --git a/src/views/index/mainIndex.vue b/src/views/index/mainIndex.vue
index 2516758..148c1fc 100644
--- a/src/views/index/mainIndex.vue
+++ b/src/views/index/mainIndex.vue
@@ -5,21 +5,33 @@
         <img class="icon" src="../../assets/nav/setUpAccount.png" alt="" />
         <div class="text">
           <p class="p1">账号管理</p>
-          <p class="p2">管理{{schoolInfo.teacherCourseCount}}个任课教师，{{schoolInfo.classManagerCount}}个班主任，{{schoolInfo.teacherGradeCount}}个备课组长账号信息。</p>
+          <p class="p2">
+            管理{{ schoolInfo.teacherCourseCount }}个任课教师，{{
+              schoolInfo.classManagerCount
+            }}个班主任，{{ schoolInfo.teacherGradeCount }}个备课组长账号信息。
+          </p>
         </div>
       </li>
       <li class="nav-item item1" @click="links('/setUpSchool')">
         <img class="icon" src="../../assets/nav/setUpSchool.png" alt="" />
         <div class="text">
           <p class="p1">学校管理</p>
-          <p class="p2">管理{{schoolInfo.gradeCount}}个年级，{{schoolInfo.classCount}}个班级，{{schoolInfo.studentCount}}名学生信息。</p>
+          <p class="p2">
+            管理{{ schoolInfo.gradeCount }}个年级，{{
+              schoolInfo.classCount
+            }}个班级，{{ schoolInfo.studentCount }}名学生信息。
+          </p>
         </div>
       </li>
       <li class="nav-item item2" @click="links('/device')">
         <img class="icon" src="../../assets/nav/device.png" alt="" />
         <div class="text">
           <p class="p1">设备状态</p>
-          <p class="p2">管理{{schoolInfo.stationCount}}个基站，{{schoolInfo.keyboardCount}}套答题器设备。</p>
+          <p class="p2">
+            管理{{ schoolInfo.stationCount }}个基站，{{
+              schoolInfo.keyboardCount
+            }}套答题器设备。
+          </p>
         </div>
       </li>
       <li class="item3">
@@ -44,8 +56,13 @@
     </ul>
     <ul class="nav-list" v-if="type == 'ROLE_JITUAN'">
       <template v-for="item in navList">
-      <li  v-if="!item.path.includes('dataSync')" :key="item.path" class="nav-item item4" @click="links(item.path)">
-        <img class="icon" :src="getImgs(item.path)" alt="" />
+        <li
+          v-if="!item.path.includes('dataSync')"
+          :key="item.path"
+          class="nav-item item4"
+          @click="links(item.path)"
+        >
+          <img class="icon" :src="getImgs(item.path)" alt="" />
           <div class="text" v-if="item.path == '/setUpConglomerate'">
             <p class="p1">学校管理</p>
             <p class="p2">管理3个区域，14个学校。</p>
@@ -62,30 +79,40 @@
             <p class="p1">使用分析</p>
             <p class="p2">按软件功能、题型统计使用频率。</p>
           </div>
-      </li>
+        </li>
       </template>
     </ul>
-    <ul class="nav-list" v-if="type == 'ROLE_JIAOSHI' || type == 'ROLE_BANZHUREN' ">
-      <template v-for="(item) in navList">
-      <li v-if="!item.path.includes('dataSync')" :key="item.path" class="nav-item item4" @click="links(item.path)">
-        <img class="icon" :src="getImgs(item.path)" alt="" />
+    <ul
+      class="nav-list"
+      v-if="type == 'ROLE_JIAOSHI' || type == 'ROLE_BANZHUREN'"
+    >
+      <template v-for="item in navList">
+        <li
+          v-if="!item.path.includes('dataSync')"
+          :key="item.path"
+          class="nav-item item4"
+          @click="links(item.path)"
+        >
+          <img class="icon" :src="getImgs(item.path)" alt="" />
           <div class="text" v-if="item.path == '/examinationPaper'">
             <p class="p1">备题组卷</p>
-            <p class="p2">管理{{schoolInfo.paperCount}}套答题卡。</p>
+            <p class="p2">管理{{ schoolInfo.paperCount }}套答题卡。</p>
           </div>
           <div class="text" v-else-if="item.path == '/portrait'">
             <p class="p1">学生画像</p>
-            <p class="p2">共分析{{schoolInfo.imagesCount}}名学生成绩。</p>
+            <p class="p2">共分析{{ schoolInfo.imagesCount }}名学生成绩。</p>
           </div>
           <div class="text" v-else-if="item.path == '/ask'">
             <p class="p1">随堂问报表</p>
-            <p class="p2">对{{schoolInfo.classPeriodCount}}套随堂问答题记录分析。</p>
+            <p class="p2">
+              对{{ schoolInfo.classPeriodCount }}套随堂问答题记录分析。
+            </p>
           </div>
           <div class="text" v-else-if="item.path == '/test'">
             <p class="p1">即时测报表</p>
-            <p class="p2">对{{schoolInfo.examCount}}套即时测答题记录分析。</p>
+            <p class="p2">对{{ schoolInfo.examCount }}套即时测答题记录分析。</p>
           </div>
-      </li>
+        </li>
       </template>
     </ul>
   </div>
@@ -98,31 +125,49 @@ export default {
     return {
       type: "",
       navList: [],
-      schoolInfo:{}
+      schoolInfo: {},
     };
   },
-  watch:{
-    "$store.getters.info.showRoleName":function(val){
-      window.location.reload()
-    }
+  watch: {
+    "$store.getters.info.showRoleName": function (val) {
+      let type = "";
+      this.$store.getters.info.permissions.map((item) => {
+        if (item.roleName == val) {
+          type = item.role;
+        }
+      });
+      this.type = type ? type : this.$store.getters.info.permissions[0].role;
+      this.navList = this.$store.getters.addRouters.map((item) => {
+        return {
+          name: item.name,
+          path: item.children[0].path,
+        };
+      });
+    },
   },
   created() {
-    this.type = this.$store.getters.info.permissions[0].role
-    this.navList = this.$store.getters.addRouters.map(item=>{
-      return {
-        name:item.name,
-        path:item.children[0].path,
+    let type = "";
+    this.$store.getters.info.permissions.map((item) => {
+      if (item.roleName == this.$store.getters.info.showRoleName) {
+        type = item.role;
       }
-    })
-    if(this.type == "ROLE_XUEXIAO"){
-      this.schoolIndex()
-    }else if(this.type == "ROLE_JIAOSHI" || this.type == "ROLE_BANZHUREN"){
-      this.teacherIndex()
+    });
+    this.type = type ? type : this.$store.getters.info.permissions[0].role;
+    this.navList = this.$store.getters.addRouters.map((item) => {
+      return {
+        name: item.name,
+        path: item.children[0].path,
+      };
+    });
+    if (this.type == "ROLE_XUEXIAO") {
+      this.schoolIndex();
+    } else if (this.type == "ROLE_JIAOSHI" || this.type == "ROLE_BANZHUREN") {
+      this.teacherIndex();
     }
   },
   methods: {
     getImgs(path) {
-      return require(`@/assets/nav${path}.png`)
+      return require(`@/assets/nav${path}.png`);
     },
     links(path) {
       this.$router.push({
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 2288288..a1f7b38 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -90,12 +90,12 @@ export default {
       disableClick: true,
       passwordType: "password",
       loginForm: {
-        // username: "13610050254",
-        // password: "Pw050254#",
+        username: "13610050254",
+        password: "Pw050254#",
         // username: "18946034886",
         // password: "Pw034886#",
-        username: "18332123505",
-        password: "Pw123505#",
+        // username: "18332123505",
+        // password: "Pw123505#",
       },
       loginRules: {
         username: [
diff --git a/src/views/setUp/account.vue b/src/views/setUp/account.vue
index 29e2617..8ed8c5f 100644
--- a/src/views/setUp/account.vue
+++ b/src/views/setUp/account.vue
@@ -9,9 +9,9 @@
       <div class="sel-box">
         <el-select
           class="sel"
-          v-model="query.id"
+          v-model="query.roleId"
           placeholder="选择账号角色"
-          @change="(page = 1),_QueryData(1)"
+          @change="(page = 1), _QueryData(1)"
         >
           <el-option
             v-for="item in roleList"
@@ -25,34 +25,33 @@
           class="sel"
           v-model="query.available"
           placeholder="选择账号状态"
-          @change="(page = 1),_QueryData(1)"
+          @change="(page = 1), _QueryData(1)"
         >
-          <el-option label="可用" :value="0"></el-option>
-          <el-option label="不可用" :value="1"></el-option>
+          <el-option label="正常" :value="0"></el-option>
+          <el-option label="禁用" :value="1"></el-option>
         </el-select>
         <el-input
-          type="number"
           placeholder="请输入老师账号"
           v-model="query.loginName"
           class="input-with-select"
-          @keyup.enter.native="(page = 1),_QueryData(2)"
+          @keyup.enter.native="(page = 1), _QueryData(2)"
         >
           <el-button
             slot="append"
             icon="el-icon-search"
-            @click="(page = 1),_QueryData(2)"
+            @click="(page = 1), _QueryData(2)"
           ></el-button>
         </el-input>
         <el-input
           placeholder="请输入老师姓名"
           v-model="query.realName"
           class="input-with-select"
-          @keyup.enter.native="(page = 1),_QueryData(3)"
+          @keyup.enter.native="(page = 1), _QueryData(3)"
         >
           <el-button
             slot="append"
             icon="el-icon-search"
-            @click="(page = 1),_QueryData(3)"
+            @click="(page = 1), _QueryData(3)"
           ></el-button>
         </el-input>
       </div>
@@ -117,7 +116,9 @@
               ></el-button>
               <el-dropdown-menu slot="dropdown">
                 <el-dropdown-item :command="0">重置密码</el-dropdown-item>
-                <el-dropdown-item :command="1">禁用</el-dropdown-item>
+                <el-dropdown-item :command="1">{{
+                  `${scoped.row.available == 0 ? "禁用" : "启用"}`
+                }}</el-dropdown-item>
                 <el-dropdown-item :command="2">删除</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
@@ -224,7 +225,18 @@ export default {
     },
     handleDropdownClick(value, item) {
       //更多
-      this.updateUser(item, value);
+      if (value == 2) {
+        this.$confirm("确定要删除这条账号信息吗？", "提示", {
+          customClass: "del-model",
+          cancelButttonText: "取消",
+          confirmButtonText: "确定",
+          type: "warning",
+        }).then(() => {
+          this.updateUser(item, value);
+        });
+      } else {
+        this.updateUser(item, value);
+      }
     },
     changePage(page) {
       this.page = page;
@@ -314,8 +326,17 @@ export default {
   },
 };
 </script>
-
+<style  lang="scss">
+.del-model {
+  .el-message-box__btns button:nth-child(1) {
+    color: #667ffd;
+  }
+}
+</style>
 <style lang="scss" scoped>
+.el-message-box .el-button--default {
+  color: red;
+}
 .set-count {
   margin-right: 12px;
 }
diff --git a/src/views/setUp/school.vue b/src/views/setUp/school.vue
index e59c9e8..e96f3f2 100644
--- a/src/views/setUp/school.vue
+++ b/src/views/setUp/school.vue
@@ -359,7 +359,6 @@ export default {
     },
     async _QuerySubject() {
       const { data, status, info } = await this.$request.subjectList();
-      console.log(status);
       if (status === 0) {
         this.subjectList = [...data.subjectNames] || [];
       } else {
diff --git a/src/views/setUp/student.vue b/src/views/setUp/student.vue
index a87451d..44b5e51 100644
--- a/src/views/setUp/student.vue
+++ b/src/views/setUp/student.vue
@@ -80,7 +80,12 @@
           </div>
           <ul class="s-ul" v-loading="loading">
             <li class="s-li" v-for="(item,index) in studentList" :key="item.id">
-              <i class="el-icon-delete" @click="removeStu(item,index)"></i>
+              <el-popconfirm
+                  title="确定删除吗？"
+                  @confirm="removeStu(item,index)"
+                >
+              <i class="el-icon-delete" slot="reference"></i>
+              </el-popconfirm>
               <p class="name">{{ item.studentName }}</p>
               <p class="p1">
                 答题器：{{
diff --git a/src/views/setUp/teacher.vue b/src/views/setUp/teacher.vue
index af0e893..f5ef4dd 100644
--- a/src/views/setUp/teacher.vue
+++ b/src/views/setUp/teacher.vue
@@ -22,6 +22,7 @@
             size="mini"
             plain
             circle
+            @click="addTeacherDia"
           ></el-button>
         </el-tooltip>
       </template>
@@ -93,7 +94,7 @@
         </div>
         <div class="teacher-detail">
           <div class="icon-box">
-            <i class="icon el-icon-edit-outline"></i>
+            <i class="icon el-icon-edit-outline" @click="editTeacher"></i>
             <i class="icon el-icon-circle-plus-outline"></i>
           </div>
           <div class="detail-top">
@@ -122,7 +123,9 @@
                 v-for="item in teacherDetail.managerList"
                 :key="item.classId"
               >
-                <i class="el-icon-delete"></i>
+                <el-popconfirm title="确定删除吗？" confirm="">
+                  <i class="el-icon-delete" slot="reference"></i>
+                </el-popconfirm>
                 <div class="grade-item">
                   <p class="grade-name">{{ item.className }}</p>
                   <div class="grade-class">
@@ -150,7 +153,9 @@
                 v-for="item in teacherDetail.teacherCourseList"
                 :key="item.classId"
               >
-                <i class="el-icon-delete"></i>
+                <el-popconfirm title="确定删除吗？" confirm="">
+                  <i class="el-icon-delete" slot="reference"></i>
+                </el-popconfirm>
                 <div class="grade-item">
                   <p class="grade-name">
                     {{ item.className }}（{{ item.subjectName }}）
@@ -180,7 +185,9 @@
               :key="item.grade"
             >
               <li class="grade-li">
-                <i class="el-icon-delete"></i>
+                <el-popconfirm title="确定删除吗？" confirm="">
+                  <i class="el-icon-delete" slot="reference"></i>
+                </el-popconfirm>
                 <div class="grade-item">
                   <p class="grade-name">
                     {{ item.gradeName }}（{{ item.subjectName }}）
@@ -192,7 +199,7 @@
         </div>
       </div>
     </div>
-    <el-dialog title="导入教师名单" :visible.sync="diaUp" width="400">
+    <el-dialog title="导入教师名单" :visible.sync="diaUp" width="600">
       <up-load id="downTeacher" :url="url" fileName="教师名单">
         <p class="down-txt" slot="down">
           通过Excel名单导入教师名单，点击
@@ -203,16 +210,17 @@
         <el-button @click="diaUp = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="添加学生" :visible.sync="diaTeacher" width="400">
+    <el-dialog title="添加教师" :visible.sync="diaTeacher" width="400">
       <el-form
         class="form-box"
+        ref="formTeacher"
         :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-input maxlength="11" v-model.trim="formTeacher.loginName" />
           </el-col>
         </el-form-item>
         <el-form-item label="教师姓名：" prop="teacherName">
@@ -220,14 +228,67 @@
             <el-input maxlength="30" v-model.trim="formTeacher.teacherName" />
           </el-col>
         </el-form-item>
-        <el-form-item label="性别：">
+        <el-form-item label="性别：" prop="sex">
           <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 label="教师角色：" prop="roleList">
+          <div
+            class="role-list"
+            v-for="(item, index) in formTeacher.roleList"
+            :key="item.id"
+          >
+            <el-select
+              class="sel-c"
+              v-model="item.roleId"
+              placeholder="选择角色"
+              @change="item.classId = []"
+            >
+              <el-option
+                v-for="item in teacherTypeList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
+            <el-cascader
+              v-if="item.roleId == 6"
+              class="sel-t"
+              collapse
+              clearable
+              placeholder="选择班级"
+              v-model="item.classId"
+              :options="gradeClassList"
+              :props="{ expandTrigger: 'hover' }"
+            ></el-cascader>
+            <el-cascader
+              v-if="item.roleId == 7"
+              class="sel-t"
+              collapse
+              clearable
+              placeholder="选择班级-科目"
+              v-model="item.classId"
+              :options="classList"
+              :props="{ expandTrigger: 'hover' }"
+            ></el-cascader>
+            <el-cascader
+              v-if="item.roleId == 8"
+              class="sel-t"
+              collapse
+              clearable
+              placeholder="选择年级-科目"
+              v-model="item.classId"
+              :options="gradeSubList"
+              :props="{ expandTrigger: 'hover' }"
+            ></el-cascader>
+            <i class="el-icon-close" @click="removeRoleList(index)"></i>
+          </div>
+          <p class="add-box">
+            <el-button icon="el-icon-plus" @click="addRoleList">添加</el-button>
+          </p>
         </el-form-item>
       </el-form>
       <div class="dialog-footer" slot="footer">
@@ -239,21 +300,40 @@
 </template>
 
 <script>
-import { downloadFile } from "@/utils";
+import { downloadFile, formatGradeClass, randomWord } from "@/utils";
 export default {
   data() {
     return {
       loading: false,
       url: "",
       diaUp: false,
-      diaTeacher:false,
+      diaTeacher: false,
+      isAdd: false,
       query: {
         gradeName: "",
         teacherName: "",
         phone: "",
       },
+      subjectList: [],
       gradeList: [],
+      classList: [],
+      gradeClassList: [],
+      gradeSubList: [],
       teacherList: [],
+      teacherTypeList: [
+        {
+          value: 6,
+          label: "班主任",
+        },
+        {
+          value: 7,
+          label: "任课老师",
+        },
+        {
+          value: 8,
+          label: "备课组长",
+        },
+      ],
       teacherDetail: {
         teacherName: "",
         loginName: "",
@@ -264,21 +344,60 @@ export default {
         teacherGradeList: [],
       },
       showTId: "", //显示详情 教师ID
-      formTeacher:{
-        teacherName:"",
-        loginName:"",
-        sex:1,
-        managerList:[]
+      roleList: [],
+      formTeacher: {
+        teacherName: "",
+        loginName: "",
+        sex: 1,
+        roleList: [],
+      },
+      rulesTeacher: {
+        teacherName: [
+          { required: true, message: "请输入联系电话", trigger: "blur" },
+        ],
+        loginName: [
+          { required: true, message: "请输入教师姓名", trigger: "blur" },
+        ],
+        sex: [{ required: true, message: "请选择性别", trigger: "blur" }],
+        roleList: [
+          { required: true, message: "请选择角色信息", trigger: "blur" },
+        ],
       },
-      rulesTeacher:{},
     };
   },
   async created() {
     await this._QueryDataGrade();
     this._QueryData(1);
+    this._RoleList();
+    await this._QuerySubject();
+    await this._QueryClass();
   },
   methods: {
+    addRoleList() {
+      //添加教师角色
+      this.formTeacher.roleList.push({
+        id: randomWord(true, 16, 20),
+        roleId: "",
+        classId: [],
+      });
+    },
+    removeRoleList(index) {
+      //删除教师角色
+      this.formTeacher.roleList.splice(index, 1);
+    },
+    addTeacherDia() {
+      //添加教师弹窗
+      this.isAdd = true;
+      this.formTeacher = {
+        teacherName: "",
+        loginName: "",
+        sex: 1,
+        managerList: [],
+      };
+      this.diaTeacher = true;
+    },
     setClass(obj) {
+      //教师角色数量
       return (
         obj.managerList?.length +
         obj.teacherCourseList?.length +
@@ -286,10 +405,161 @@ export default {
       );
     },
     showTeacher(obj) {
+      //教师详细数据
       this.showTId = obj.id;
       this.teacherDetail = { ...obj };
     },
-    addTeacher(){},
+    editTeacher() {
+      this.isAdd = false;
+      for (let key in this.teacherDetail) {
+        if (key == "realName") {
+          this.formTeacher.teacherName = this.teacherDetail.realName;
+        } else {
+          this.formTeacher[key] = this.teacherDetail[key];
+        }
+      }
+      this.toTeacherForm();
+      this.diaTeacher = true;
+    },
+    addTeacher() {
+      //添加教师
+      this.$refs.formTeacher.validate(async (valid) => {
+        if (valid) {
+          let obj = this.setTeacharForm();
+          if (!obj) {
+            this.$message.error("教师角色数据有误请检查！");
+            return;
+          }
+          let res;
+          if (this.isAdd) {
+            res = await this.$request.addTeacher({
+              teacherName: this.formTeacher.teacherName,
+              loginName: this.formTeacher.loginName,
+              sex: this.formTeacher.sex,
+              ...obj,
+            });
+          } else {
+            res = await this.$request.updateTeacher({
+              teacherId: this.formTeacher.id,
+              teacherName: this.formTeacher.teacherName,
+              loginName: this.formTeacher.loginName,
+              sex: this.formTeacher.sex,
+              ...obj,
+            });
+          }
+          if (res.status === 0) {
+            this.$message.success(res.info);
+            this.diaTeacher = false;
+            this._QueryData(10);
+          } else {
+            this.$message.error(res.info);
+          }
+        } else {
+          console.log("输入有误请检查！");
+          return false;
+        }
+      });
+    },
+    setTeacharForm() {
+      //转换保存教师数据格式
+      let ERR_OK = true;
+      this.formTeacher.roleList.map((item) => {
+        if (item.classId.length == 0) {
+          ERR_OK = false;
+        }
+      });
+      if (ERR_OK) {
+        let [managerList, teacherCourseList, gradeGroupList] = [[], [], []];
+        this.formTeacher.roleList.map((item) => {
+          if (item.roleId == 6) {
+            managerList.push({
+              classId: item.classId[1],
+              className: this.classList.find(
+                (items) => items.value == item.classId[1]
+              ).label,
+            });
+          } else if (item.roleId == 7) {
+            teacherCourseList.push({
+              classId: item.classId[0],
+              className: this.classList.find(
+                (items) => items.value == item.classId[0]
+              ).label,
+              subjectName: item.classId[1],
+            });
+          } else {
+            gradeGroupList.push({
+              grade: item.classId[0],
+              gradeName: this.gradeList.find(
+                (items) => items.id == item.classId[0]
+              ).label,
+              subjectName: item.classId[1],
+            });
+          }
+        });
+        return {
+          managerList,
+          teacherCourseList,
+          gradeGroupList,
+        };
+      } else {
+        return false;
+      }
+    },
+    toTeacherForm() {
+      //教师角色数据转换为form格式数据
+      this.formTeacher.roleList = [];
+      this.formTeacher.managerList?.map((item) => {
+        console.log(
+          this.classList.find(
+            (items) =>
+              items.value == item.classId || items.label == item.className
+          )
+        );
+        this.formTeacher.roleList.push({
+          id: randomWord(true, 16, 20),
+          roleId: 6,
+          classId: [
+            this.classList.find(
+              (items) =>
+                items.value == item.classId || items.label == item.className
+            ).grade,
+            item.classId,
+          ],
+        });
+      });
+      this.formTeacher.teacherCourseList?.map((item) => {
+        this.formTeacher.roleList.push({
+          id: randomWord(true, 16, 20),
+          roleId: 7,
+          classId: [
+            this.classList.find(
+              (items) =>
+                items.value == item.classId || items.label == item.className
+            ).value,
+            item.subjectName,
+          ],
+        });
+      });
+      this.formTeacher.gradeGroupList?.map((item) => {
+        this.formTeacher.roleList.push({
+          id: randomWord(true, 16, 20),
+          roleId: 8,
+          classId: [
+            this.gradeList.find((items) => items.id == item.classId[0]).id,
+            item.subjectName,
+          ],
+        });
+      });
+    },
+    async _RoleList() {
+      //角色
+      const { data, status, info } = await this.$request.roleList();
+      if (status === 0) {
+        this.roleList = data.list || [];
+      } else {
+        this.$message.error(info);
+      }
+    },
     async _QueryData(type) {
       let query = {};
       if (type == 1) {
@@ -304,8 +574,11 @@ export default {
         query.phone = this.query.phone;
         this.query.teacherName = "";
         this.query.gradeName = "";
+      } else if (type == 10) {
+        query = { ...this.query };
       }
       this.loading = true;
+       this.teacherList=[]
       const { data, status, info } = await this.$request.teacherList({
         ...query,
       });
@@ -313,13 +586,22 @@ export default {
       console.log(status);
       if (status === 0) {
         this.teacherList = data.list || [];
-        this.teacherDetail = { ...this.teacherList[0] };
-        this.showTId = this.teacherList[0]?.id;
+        if (type == 10) {
+          let detailArr =
+            data.list.filter((item) => item.id == this.formTeacher.id) || [];
+          this.teacherDetail = (detailArr.length && detailArr[0]) || {
+            ...data.list[0],
+          };
+        } else {
+          this.teacherDetail = { ...this.teacherList[0] };
+        }
+        this.showTId = this.teacherDetail.id;
       } else {
         this.$message.error(info);
       }
     },
     async _QueryDataGrade() {
+      //年级数据
       const { data, status, info } = await this.$request.gradeList();
       if (status === 0) {
         this.gradeList =
@@ -327,14 +609,60 @@ export default {
             return {
               value: item.gradeName,
               label: item.gradeName,
+              id: item.grade,
             };
           }) || [];
-        console.log(this.gradeList);
+
         this.query.gradeName = this.gradeList[0]?.value;
       } else {
         this.$message.error(info);
       }
     },
+    async _QuerySubject() {
+      //科目信息
+      const { data, status, info } = await this.$request.subjectList();
+      console.log(status);
+      if (status === 0) {
+        this.subjectList = [...data.subjectNames] || [];
+        this.gradeSubList = this.gradeList?.map((item) => {
+          return {
+            value: item.id,
+            label: item.label,
+            children: data.subjectNames.map((sub) => {
+              return {
+                value: sub,
+                label: sub,
+              };
+            }),
+          };
+        });
+      } else {
+        this.$message.error(info);
+      }
+    },
+    async _QueryClass() {
+      //班级数据
+      const { data, status, info } = await this.$request.schoolClassList();
+      if (status === 0) {
+        this.classList =
+          data.list.map((item) => {
+            return {
+              value: item.classCode,
+              label: item.className,
+              grade: item.grade,
+              children: this.subjectList.map((sub) => {
+                return {
+                  value: sub,
+                  label: sub,
+                };
+              }),
+            };
+          }) || [];
+        this.gradeClassList = formatGradeClass([...data.list]);
+      } else {
+        this.$message.error(info);
+      }
+    },
     async downExcel() {
       let data = await this.$request.downDevice({
         id: this.id,
@@ -476,4 +804,21 @@ export default {
     }
   }
 }
+.add-box {
+  margin-top: 10px;
+}
+.sel-c {
+  width: 120px;
+  margin-right: 12px;
+}
+.role-list {
+  margin-bottom: 10px;
+  .el-icon-close {
+    padding: 5px;
+    cursor: pointer;
+    margin-left: 16px;
+    background: #ccc;
+    border-radius: 50%;
+  }
+}
 </style>
\ No newline at end of file