diff --git a/src/views/down/client.vue b/src/views/down/client.vue
index 84d5a69..8e6bada 100644
--- a/src/views/down/client.vue
+++ b/src/views/down/client.vue
@@ -228,7 +228,7 @@
               :step="1"
               :step-strictly="true"
             ></el-input-number>
-            {{ examsDuration ? "秒" : "" }}
+            {{ examsDuration ? "分" : "" }}
           </el-form-item>
           <el-form-item label="答题结构展示：" prop="displayModel">
             <el-radio-group v-model="formData.displayModel">
@@ -327,7 +327,7 @@ export default {
         multipleChoiceNum: 4,
         singleTypeNum: 20,
         askCountdown: 30,
-        examsDuration: 5400,
+        examsDuration: 90,
         displayModel: 0,
         languageSet: 0,
         otherSet: [],
@@ -401,6 +401,9 @@ export default {
       for (let key in this.formData) {
         content[key] ? (this.formData[key] = content[key]) : "";
       }
+      this.formData.examsDuration = (this.formData.examsDuration / 60).toFixed(
+        0
+      );
       this.type = 2;
       (this.configId = obj.id), (this.dialogVis = true);
     },
@@ -418,7 +421,7 @@ export default {
     },
     examsDurationChange(val) {
       if (val) {
-        this.formData.examsDuration = 5400;
+        this.formData.examsDuration = 90;
       } else {
         this.formData.examsDuration = 0;
       }
@@ -430,6 +433,7 @@ export default {
           content[key] = this.formData[key];
         }
       }
+      content.examsDuration = content.examsDuration * 60;
 
       if (this.type == 1) {
         this.addAppConfig({
diff --git a/src/views/setUp/student.vue b/src/views/setUp/student.vue
index 44b5e51..747d1d3 100644
--- a/src/views/setUp/student.vue
+++ b/src/views/setUp/student.vue
@@ -44,7 +44,7 @@
               :class="query.classId == item.id ? 'active' : ''"
               @click="classDetail(item)"
             >
-              <i class="el-icon-edit-outline"></i>
+              <i class="el-icon-edit-outline" @click.stop="setClass(item)"></i>
               {{ item.className }}（{{ item.studentCount }}）
             </li>
           </ul>
@@ -79,12 +79,16 @@
             </div>
           </div>
           <ul class="s-ul" v-loading="loading">
-            <li class="s-li" v-for="(item,index) in studentList" :key="item.id">
+            <li
+              class="s-li"
+              v-for="(item, index) in studentList"
+              :key="item.id"
+            >
               <el-popconfirm
-                  title="确定删除吗？"
-                  @confirm="removeStu(item,index)"
-                >
-              <i class="el-icon-delete" slot="reference"></i>
+                title="确定删除吗？"
+                @confirm="removeStu(item, index)"
+              >
+                <i class="el-icon-delete" slot="reference"></i>
               </el-popconfirm>
               <p class="name">{{ item.studentName }}</p>
               <p class="p1">
@@ -147,6 +151,38 @@
         <el-button @click="diaStu = false">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="修改班级" :visible.sync="diaClass" width="400">
+      <el-form
+        class="form-box"
+        ref="formClass"
+        :model="formClass"
+        :rules="rulesClass"
+        label-width="160px"
+      >
+        <el-form-item label="所在年级：">
+          <span>{{ formClass.gradeName }}</span>
+        </el-form-item>
+        <el-form-item label="班级名称：" prop="studentName">
+          <el-col :span="10">
+            <el-input maxlength="30" v-model.trim="formClass.className" />
+          </el-col>
+        </el-form-item>
+        <el-form-item label="入学年份：" prop="studentCode">
+          <el-col :span="10">
+            <el-date-picker
+              v-model="formClass.intoSchoolYear"
+              type="year"
+              placeholder="选择年"
+            >
+            </el-date-picker>
+          </el-col>
+        </el-form-item>
+      </el-form>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="saveClass">确 定</el-button>
+        <el-button @click="diaClass = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -157,6 +193,7 @@ export default {
     return {
       url: "",
       diaStu: false,
+      diaClass: false,
       query: {
         gradeName: "",
         classId: "",
@@ -179,6 +216,16 @@ export default {
           { required: true, message: "请输入学生长学号", trigger: "blur" },
         ],
       },
+      formClass: {
+        gradeName: "",
+        className: "",
+        intoSchoolYear: "",
+      },
+      rulesClass: {
+        className: [
+          { required: true, message: "请输入班级名称", trigger: "blur" },
+        ],
+      },
       gradeName: "",
       gradeList: [],
       classList: [],
@@ -213,13 +260,41 @@ export default {
       this.formStu.className = obj.className;
       this._QueryData(3);
     },
-    async removeStu(obj,index) {
-       const { data, status, info } = await this.$request.delStudent({
+    setClass(obj) {
+      this.formClass.gradeName = obj.gradeName;
+      this.formClass.classId = obj.id;
+      this.formClass.className = obj.className;
+      this.formClass.intoSchoolYear = obj.intoSchoolYear + "";
+      this.diaClass = true;
+    },
+    saveClass() {
+      this.$refs.formClass.validate(async (valid) => {
+        if (valid) {
+          const { data, status, info } = await this.$request.updateClass({
+            classId: this.formClass.classId,
+            className: this.formClass.className,
+            intoSchoolYear: this.formClass.intoSchoolYear,
+          });
+          if (status === 0) {
+            this.$message.success("修改成功");
+            this.diaClass = false;
+            this._QueryClass();
+          } else {
+            this.$message.error(info);
+          }
+        } else {
+          console.log("输入有误请检查！");
+          return false;
+        }
+      });
+    },
+    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)
+        this.studentList.splice(index, 1);
       } else {
         this.$message.error(info);
       }
diff --git a/src/views/setUp/teacher.vue b/src/views/setUp/teacher.vue
index f5ef4dd..e26a7f0 100644
--- a/src/views/setUp/teacher.vue
+++ b/src/views/setUp/teacher.vue
@@ -94,8 +94,11 @@
         </div>
         <div class="teacher-detail">
           <div class="icon-box">
-            <i class="icon el-icon-edit-outline" @click="editTeacher"></i>
-            <i class="icon el-icon-circle-plus-outline"></i>
+            <i class="icon el-icon-edit-outline" @click="editTeacher(1)"></i>
+            <i
+              class="icon el-icon-circle-plus-outline"
+              @click="editTeacher(2)"
+            ></i>
           </div>
           <div class="detail-top">
             <p class="p-item">手机号码：{{ teacherDetail.loginName }}</p>
@@ -210,7 +213,11 @@
         <el-button @click="diaUp = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="添加教师" :visible.sync="diaTeacher" width="400">
+    <el-dialog
+      :title="isAdd ? '添加教师' : setTercherType==1?'编辑教师信息':'管理班级'"
+      :visible.sync="diaTeacher"
+      width="400"
+    >
       <el-form
         class="form-box"
         ref="formTeacher"
@@ -218,23 +225,30 @@
         :rules="rulesTeacher"
         label-width="160px"
       >
-        <el-form-item label="手机号码：" prop="loginName">
+       <el-form-item v-show="isAdd || (!isAdd && setTercherType == 2)" label="教师姓名：">
+          <span>{{formTeacher.teacherName}}</span>
+        </el-form-item>
+        <el-form-item
+          v-show="isAdd || (!isAdd && setTercherType == 1)"
+          label="手机号码："
+          prop="loginName"
+        >
           <el-col :span="10">
             <el-input maxlength="11" v-model.trim="formTeacher.loginName" />
           </el-col>
         </el-form-item>
-        <el-form-item label="教师姓名：" prop="teacherName">
+        <el-form-item v-show="isAdd || (!isAdd && setTercherType == 1)" 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="性别：" prop="sex">
+        <el-form-item v-show="isAdd || (!isAdd && setTercherType == 1)" 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="教师角色：" prop="roleList">
+        <el-form-item v-show="isAdd || (!isAdd && setTercherType == 2)" label="教师角色：" prop="roleList">
           <div
             class="role-list"
             v-for="(item, index) in formTeacher.roleList"
@@ -247,7 +261,7 @@
               @change="item.classId = []"
             >
               <el-option
-                v-for="item in teacherTypeList"
+                v-for="item in teacherRoleList"
                 :key="item.value"
                 :label="item.label"
                 :value="item.value"
@@ -292,7 +306,7 @@
         </el-form-item>
       </el-form>
       <div class="dialog-footer" slot="footer">
-        <el-button @click="addTeacher">确 定</el-button>
+        <el-button type="primary" @click="addTeacher">确 定</el-button>
         <el-button @click="diaTeacher = false">取 消</el-button>
       </div>
     </el-dialog>
@@ -309,6 +323,7 @@ export default {
       diaUp: false,
       diaTeacher: false,
       isAdd: false,
+      setTercherType: 1,
       query: {
         gradeName: "",
         teacherName: "",
@@ -320,7 +335,8 @@ export default {
       gradeClassList: [],
       gradeSubList: [],
       teacherList: [],
-      teacherTypeList: [
+      teacherRoleList: [
+        //角色
         {
           value: 6,
           label: "班主任",
@@ -409,7 +425,8 @@ export default {
       this.showTId = obj.id;
       this.teacherDetail = { ...obj };
     },
-    editTeacher() {
+    editTeacher(type) {
+      this.setTercherType = type
       this.isAdd = false;
       for (let key in this.teacherDetail) {
         if (key == "realName") {
@@ -476,14 +493,14 @@ export default {
               classId: item.classId[1],
               className: this.classList.find(
                 (items) => items.value == item.classId[1]
-              ).label,
+              )?.label||"",
             });
           } else if (item.roleId == 7) {
             teacherCourseList.push({
               classId: item.classId[0],
               className: this.classList.find(
                 (items) => items.value == item.classId[0]
-              ).label,
+              )?.label||"",
               subjectName: item.classId[1],
             });
           } else {
@@ -491,7 +508,7 @@ export default {
               grade: item.classId[0],
               gradeName: this.gradeList.find(
                 (items) => items.id == item.classId[0]
-              ).label,
+              )?.label||"",
               subjectName: item.classId[1],
             });
           }
@@ -578,7 +595,7 @@ export default {
         query = { ...this.query };
       }
       this.loading = true;
-       this.teacherList=[]
+      this.teacherList = [];
       const { data, status, info } = await this.$request.teacherList({
         ...query,
       });