diff --git a/src/api/teacherinformation.js b/src/api/teacherinformation.js
index 1779c86..1050eae 100644
--- a/src/api/teacherinformation.js
+++ b/src/api/teacherinformation.js
@@ -102,7 +102,7 @@ export function getschoolid(params) {
 
 export function postTeacher(data) {
     return axios({
-        url: `/api/Teacher?IsOutSide=${data.IsOutSide}&Title=${data.Title}&CollegeId=${data.CollegeId}&Name=${data.Name}&Number=${data.Number}&Type=${data.Type}&Status=${data.Status}&WeiXin=${data.WeiXin}&QQ=${data.QQ}&Phone=${data.Phone}&Email=${data.Email}&WorkWechat=${data.WorkWechat}&CardNo=${data.CardNo}`,
+        url: `/api/Teacher?IsOutSide=${data.IsOutSide}&expertType=${data.expertType}&Title=${data.Title}&CollegeId=${data.CollegeId}&Name=${data.Name}&Number=${data.Number}&Type=${data.Type}&Status=${data.Status}&WeiXin=${data.WeiXin}&QQ=${data.QQ}&Phone=${data.Phone}&Email=${data.Email}&WorkWechat=${data.WorkWechat}&CardNo=${data.CardNo}`,
         method: 'post',
     })
 }
@@ -117,7 +117,7 @@ export function postTeacher(data) {
 
 export function editpostTeacher(data) {
     return axios({
-        url: `/api/Teacher/EditTeacher?IsOutSide=${data.IsOutSide}&Title=${data.Title}&TeacherId=${data.TeacherId}&CollegeId=${data.CollegeId}&Name=${data.Name}&Number=${data.Number}&Type=${data.Type}&Status=${data.Status}&WeiXin=${data.WeiXin}&QQ=${data.QQ}&Phone=${data.Phone}&Email=${data.Email}&WorkWechat=${data.WorkWechat}&CardNo=${data.CardNo}`,
+        url: `/api/Teacher/EditTeacher?IsOutSide=${data.IsOutSide}&expertType=${data.expertType}&Title=${data.Title}&TeacherId=${data.TeacherId}&CollegeId=${data.CollegeId}&Name=${data.Name}&Number=${data.Number}&Type=${data.Type}&Status=${data.Status}&WeiXin=${data.WeiXin}&QQ=${data.QQ}&Phone=${data.Phone}&Email=${data.Email}&WorkWechat=${data.WorkWechat}&CardNo=${data.CardNo}`,
         method: 'post',
 
     })
diff --git a/src/views/student-information/student-information.vue b/src/views/student-information/student-information.vue
index 8ef38dc..6113aec 100644
--- a/src/views/student-information/student-information.vue
+++ b/src/views/student-information/student-information.vue
@@ -58,8 +58,11 @@
                 <el-table-column prop="Phone" align="center" label="电话">
                 </el-table-column>
                 <el-table-column prop="Sex" align="center" label="性别">
+                    <template v-slot="scope">
+                       {{ scope.row.Sex == 1?'男':'女' }}
+                    </template>
                 </el-table-column>
-                <el-table-column prop="Email" align="center" label="邮箱">
+                <el-table-column prop="Enterprise" align="center" label="单位">
                 </el-table-column>
                 <el-table-column label="操作" align="center" width="150" fixed="right">
                     <template v-slot="scope">
@@ -130,6 +133,15 @@
                     <el-form-item label="姓名" prop="Name">
                         <el-input v-model.trim="formItem.Name" placeholder="请输入姓名" autocomplete="off"></el-input>
                     </el-form-item>
+                    <el-form-item label="性别" prop="sex">
+                        <el-select v-model="formItem.sex" placeholder="请选择性别" clearable>
+                            <el-option key="1" label="男" value="1" />
+                            <el-option key="2" label="女" value="2" />
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="单位">
+                        <el-input v-model.trim="formItem.enterprise" placeholder="请输入单位" autocomplete="off"></el-input>
+                    </el-form-item>
                     <!-- <el-form-item label="学号" prop="Num">
                         <el-input v-model.trim="formItem.Num" placeholder="请输入学号" maxlength="20"
                             autocomplete="off"></el-input>
@@ -165,7 +177,7 @@
                         </el-select>
                     </el-form-item> -->
                     <el-form-item label="班级" prop="classId">
-                        <el-select v-model="formItem.classId" placeholder="请选择班级" filterable clearable size="small"
+                        <el-select v-model="formItem.classId" placeholder="请选择班级" filterable clearable
                             class="ml-5 seachbox_input" style="width: 100%;">
                             <el-option v-for="item in classList1" :key="item.name" :label="item.name"
                                 :value="item.value" />
@@ -178,9 +190,6 @@
                     <!-- <el-form-item label="QQ号" prop="QQ">
                         <el-input v-model.trim="formItem.QQ" placeholder="请输入QQ号" autocomplete="off"></el-input>
                     </el-form-item> -->
-                    <el-form-item label="邮箱" prop="Email">
-                        <el-input v-model.trim="formItem.Email" placeholder="请输入邮箱" autocomplete="off"></el-input>
-                    </el-form-item>
                     <!-- <el-form-item label="微信号" prop="WeiXin">
                         <el-input v-model.trim="formItem.WeiXin" placeholder="请输入微信号" autocomplete="off"></el-input>
                     </el-form-item> -->
@@ -618,6 +627,8 @@ export default {
                         Email: this.formItem.Email,
                         StartTime: this.formItem.date[0],
                         EndTime: this.formItem.date[1],
+                        sex: this.formItem.sex,
+                        enterprise: this.formItem.enterprise,
                     };
                     posteditinfo(datas).then((res) => {
                         let data = res;
@@ -703,6 +714,8 @@ export default {
                         EndTime: this.formItem.date[1],
                         WeiXin: this.formItem.WeiXin,
                         Status: true,
+                        sex: this.formItem.sex,
+                        enterprise: this.formItem.enterprise,
                     };
                     posteditinfo(datas).then((res) => {
                         let data = res;
@@ -793,7 +806,8 @@ export default {
                     Email: data.Email || "",
                     QQ: data.QQ || '',
                     WeiXin: data.WeiXin || '',
-
+                    sex: data.Sex+'',
+                    enterprise: data.Enterprise,
                 }
 
                 this.drawerformtitle = '修改学生信息';
diff --git a/src/views/teach-log/teach-log.vue b/src/views/teach-log/teach-log.vue
index 4a24016..993a360 100644
--- a/src/views/teach-log/teach-log.vue
+++ b/src/views/teach-log/teach-log.vue
@@ -7,15 +7,21 @@
             <!--  检索区域  -->
             <div class="seachbox" style="display: flex;align-items: center;">
                 <!-- <div class="seachbox"> -->
-                    <el-select v-model="queryParams.Classroom" placeholder="教室" filterable clearable size="small"
+                    <el-select v-model="queryParams.Classroom" placeholder="教室" filterable clearable
                         class="ml-5 seachbox_input">
                         <el-option v-for="item in ClassroomList" :key="item.name" :label="item.name"
                             :value="item.name" />
                     </el-select>
-                    <el-input v-model.trim="queryParams.Teacher" placeholder="教师" clearable size="small"
+                    <el-input v-model.trim="queryParams.Teacher" placeholder="教师" clearable
                         style="width:200px; margin:0px 10px 0px 0px "></el-input>
+                    <el-select ref="itemSelectclass" filterable v-model="queryParams.ClassCode"
+                        placeholder="班级" clearable>
+                        <el-option v-for="item in NewClassList" :key="item.name" :label="item.name"
+                            :value="item.value">
+                        </el-option>
+                    </el-select>
                     <div style="width: 390px;">
-                        <el-date-picker v-model="queryParams.Date" value-format="YYYY-MM-DD" type="daterange"
+                        <el-date-picker style="margin-left: 10px;" v-model="queryParams.Date" value-format="YYYY-MM-DD" type="daterange"
                         @change="selecttimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"/>
                     </div>
                     <el-button class="ml-5" style="margin-left: 0px;" type="primary"
@@ -408,6 +414,7 @@ export default {
                 Status: '',
                 signal: 1,        //状态    
                 Date: [],          //日期
+                classCode:'',
             },
             //新增页
             drawerform: false,    //抽屉开关
@@ -767,7 +774,6 @@ export default {
 
 
             this.pageobj.pageNum = pageNum;
-
             getTabledata({
                 oldTotal: this.pageobj.oldTotal,
                 oldCurrent: this.pageobj.oldCurrent,
@@ -776,7 +782,8 @@ export default {
                 SchoolAreaCode: '',
                 CollegeCode: this.queryParams.College,
                 MajorCode: '',
-                ClassCode: '',
+                //ClassCode: '',
+                ClassCode: this.queryParams.ClassCode == undefined ? '':this.queryParams.ClassCode,
                 ScheduleName: this.queryParams.Section,
                 ClassroomCode: '',
                 Term: this.queryParams.Term,
@@ -1747,6 +1754,7 @@ export default {
     },
     mounted() {
         this.Initialization()
+        this.getNewClassListinfo('');
     },
     activated() {
 
diff --git a/src/views/teacher-information/teacher-information.vue b/src/views/teacher-information/teacher-information.vue
index e1394ab..c8e593d 100644
--- a/src/views/teacher-information/teacher-information.vue
+++ b/src/views/teacher-information/teacher-information.vue
@@ -76,9 +76,9 @@
                 </el-table-column>
                 <el-table-column prop="Number" align="center" label="工号">
                 </el-table-column>
-                <el-table-column prop="IsOutSide" align="center" label="校内/外">
+                <el-table-column prop="expertType" align="center" label="类型">
                     <template v-slot="scope">
-                        {{ scope.row.IsOutSide == false ? '校内' : '校外'}}
+                        {{ translateValue(scope.row.ExpertType) }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="Title" align="center" label="职务/职称">
@@ -123,10 +123,12 @@
                         <el-input v-model.trim="formItem.Title" placeholder="请输入工号" maxlength="20"
                             autocomplete="off" readonly></el-input>
                     </el-form-item> -->
-                    <el-form-item label="类型" prop="IsOutSide">
-                        <el-select v-model="formItem.IsOutSide" placeholder="类型" clearable style="width: 100%;">
+                    <el-form-item label="类型" prop="expertType">
+                        <el-select v-model="formItem.expertType" placeholder="类型" clearable style="width: 100%;">
                             <el-option key="1" label="校内" value="1" />
                             <el-option key="2" label="校外" value="2" />
+                            <el-option key="3" label="政府机关" value="3" />
+                            <el-option key="4" label="高校" value="4" />
                         </el-select>
                     </el-form-item>
                     <el-form-item label="职务/职称" prop="Title">
@@ -197,7 +199,8 @@ export default {
                 selectId: "",
                 Name: "",
                 Title: "",
-                IsOutSide: '1',
+                IsOutSide: false,
+                expertType:'',
                 Status: 2,
                 // JoinTime: "",
                 Phone: "",
@@ -245,7 +248,7 @@ export default {
                     { required: true, message: '请输入姓名', trigger: 'change' },
                     { min: 2, max: 10, message: '长度在 2 到 10 个字符', trigger: 'change' }
                 ],
-                IsOutSide: [
+                expertType: [
                     { required: true, message: '请选择类型', trigger: 'change' },
                 ],
             },
@@ -457,7 +460,7 @@ export default {
                         CollegeId: 1,
                         Name: this.formItem.Name,
                         Title: this.formItem.Title,
-                        Type: this.formItem.IsOutSide,
+                        Type: 1,
                         Status: this.formItem.Status,
                         // JoinTime: this.formItem.JoinTime,
                         WeiXin: this.formItem.WeiXin,
@@ -466,9 +469,9 @@ export default {
                         Email: this.formItem.Email,
                         WorkWechat: this.formItem.WorkWechat,
                         CardNo: "",
-                        IsOutSide: this.formItem.IsOutSide == '1' ? false : true,
+                        IsOutSide: false,
+                        expertType: this.formItem.expertType,
                     };
-
                     postTeacher(datas).then((res) => {
                         let data = res;
                         if (data == 1) {
@@ -547,7 +550,7 @@ export default {
                         CollegeId: 1,
                         Name: this.formItem.Name,
                         Title: this.formItem.Title,
-                        Type: this.formItem.IsOutSide,
+                        Type: 1,
                         Status: this.formItem.Status,
                         // JoinTime: this.formItem.JoinTime,
                         WeiXin: this.formItem.WeiXin ?? '',
@@ -557,9 +560,8 @@ export default {
                         WorkWechat: this.formItem.WorkWechat ?? '',
                         CardNo: "",
                         Number: this.formItem.Number,
-                        IsOutSide: this.formItem.IsOutSide == '1' ? false : true,
-                        
-
+                        IsOutSide: false,
+                        expertType: this.formItem.expertType,
                     };
                     editpostTeacher(datas).then((res) => {
                         let data = res;
@@ -667,7 +669,19 @@ export default {
             // this.phoneEditor.destroy();
             // this.phoneEditor = null;
         },
-
+         translateValue(value) {
+            
+            switch(value) {
+                case 1:
+                    return "校内";
+                case 2:
+                    return "校外";
+                case 3:
+                    return "政府机关";
+                case 4:
+                    return "高校";
+            }
+        },
         getinfodetail(id) {
             //获取编辑信息
             getdetail({ gtid: id }).then((res) => {
@@ -679,7 +693,7 @@ export default {
                     selectId: res.CollegeId,
                     Name: res.Name,
                     Title: res.Title,
-                    IsOutSide: res.IsOutSide == false ? '1' : '2',
+                    IsOutSide: res.IsOutSide,
                     Status: res.Status,
                     Phone: res.Phone,
                     Email: res.Email,
@@ -689,8 +703,8 @@ export default {
                     WorkWechat: res.WorkWechat,
                     CardNo: res.CardNo,
                     Number: res.Number,
+                    expertType: res.ExpertType+'',
                 }
-
                 this.drawerformtitle = '修改教师信息';
 
             })