From 6208ea202877183cdeaf5322212cd99cfc730d7a Mon Sep 17 00:00:00 2001
From: wangxuemei <283912718@qq.com>
Date: Fri, 26 Jul 2024 09:00:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=85=E9=83=A8=E6=8E=88=E8=AF=BE=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Lecturer.js                         |    2 +-
 src/views/lecturer/ExternalLecturer.vue     |  681 ++-------
 src/views/lecturer/InsideLecturer.vue       |   70 +-
 src/views/lecturer/InsideTeaching.vue       | 1399 ++++++++-----------
 src/views/lecturer/LookExternalLecturer.vue |  116 +-
 src/views/lecturer/LookInsideLecturer.vue   |   29 +-
 6 files changed, 799 insertions(+), 1498 deletions(-)

diff --git a/src/api/Lecturer.js b/src/api/Lecturer.js
index fe29dedd..fbe67e36 100644
--- a/src/api/Lecturer.js
+++ b/src/api/Lecturer.js
@@ -29,7 +29,7 @@ export const updateTeacherState = (obj) => http.post('/admin/teacher/update-stat
 //获取内部讲师授课记录
 export const getTeacherCourseList = (obj) => http.post('/admin/teacher/getTeacherCourseList' ,obj)
 //获取内部讲师晋升接口
-export const getTeacherLogList = (obj) => http.post('/admin/teacher/getTeacherLogList' ,obj)
+export const getTeacherLogList = (obj) => http.post('/admin/teacher/queryTeacherLevelRecord' ,obj)
 //导出内部讲师列表
 // http://pretest.zcwytd.com/manageApi/lesson_records/export
 export const exportteacher = (obj) => http.post('/admin/lesson_records/export' ,obj)
diff --git a/src/views/lecturer/ExternalLecturer.vue b/src/views/lecturer/ExternalLecturer.vue
index ff76b338..6fe7da77 100644
--- a/src/views/lecturer/ExternalLecturer.vue
+++ b/src/views/lecturer/ExternalLecturer.vue
@@ -1,44 +1,34 @@
 <!-- 外部讲师页面 -->
 <template>
   <div class="ExternalLecturer">
-    <div>
-    </div>
     <!-- 搜索框及按钮 -->
-    <div class="filter">
-      <div class="filterItems">
-        <div class="select">
+    <div class="filter" style="min-width: 1380px;">
+      <a-form layout="inline">
+        <a-form-item  class="select">
           <!--  v-model:value="searchParam.name" -->
           <a-input v-model:value="searchParam.name" style="width: 230px; height: 40px; border-radius: 8px"
             placeholder="请输入讲师姓名检索" allowClear showSearch>
           </a-input>
-        </div>
-        <div class="select">
+        </a-form-item >
+        <a-form-item  class="select">
           <a-select style="width: 230px" v-model:value="searchParam.status" placeholder="账号状态"
             :options="AccountStatusList">
           </a-select>
-        </div>
+        </a-form-item >
         <div style="display: flex; margin-bottom: 20px">
-          <div class="btnn btn1" @click="searchSubmit">
-            <div class="search"></div>
-            <div class="btnText">搜索</div>
-          </div>
-          <div class="btn btn2" @click="searchReset">
-            <div class="search"></div>
-            <div class="btnText">重置</div>
-          </div>
+          <a-button @click="searchSubmit()" type="primary" class="resetbtn">查询 </a-button>      
+          <a-button class="resetbtn " @click="searchReset">重置</a-button>
         </div>
-      </div>
-      <div style="width: 100%; height: ;"></div>
-      <div class="btns">
-        <div class="btn btn3" @click="addTeacher">
-          <div class="search"></div>
-          <div class="btnText">新增讲师</div>
-        </div>
-      </div>
-      <div class="btns">
-        <div class="btn btn3" @click="showEHWorkModal" style="margin-right:20px">
-          <div class="daochu"></div>
-          <div class="btnText" @click="handleExport">导出</div>
+      </a-form>
+      <div style="width: 100%;"></div>
+      <div style="display: flex; margin-bottom: 20px">
+        <a-button @click="addTeacher()" type="primary" class="resetbtn">
+          <FolderAddOutlined /> 新增讲师
+        </a-button>
+        <div style="margin-left: 20px ;">
+          <a-button @click="handleExport()" class="resetbtn">
+            <UploadOutlined /> 导出
+          </a-button>
         </div>
       </div>
       <!-- 表格 -->
@@ -97,13 +87,13 @@
         <a-row :gutter="16">
           <a-col :span="12">
             <a-form-item label="讲师名称" name="name">
-              <a-tree-select v-model:value="formParam.name" tree-data-simple-mode style=" width:276px ;"
+              <a-tree-select v-model:value="formParam.name" tree-data-simple-mode  class="draitem"
                 :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" :tree-data="treeData" placeholder="请输入讲师名称" />
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="手机号码" name="mobile">
-                <a-input  v-model:value="formParam.mobile" style="width:276px; height: 40px; "
+                <a-input  v-model:value="formParam.mobile"  class="draitem"
                   placeholder="请输入手机号码" allowClear showSearch>
                 </a-input>
             </a-form-item>
@@ -113,14 +103,14 @@
         <a-row :gutter="16">
           <a-col :span="12">
             <a-form-item label="供应商" name="levelId">
-              <a-input  v-model:value="formParam.userNo" style="width:276px; height: 40px; "
+              <a-input  v-model:value="formParam.userNo"  class="draitem"
                   placeholder="请输入供应商" allowClear showSearch>
                 </a-input>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="讲师邮箱" name="email">
-              <a-input  v-model:value="formParam.email" style="width:276px; height: 40px; "
+              <a-input  v-model:value="formParam.email"  class="draitem"
                   placeholder="请输入讲师邮箱" allowClear showSearch>
                 </a-input>
             </a-form-item>
@@ -145,7 +135,7 @@
         <a-row :gutter="16">
           <a-col :span="24">
             <a-form-item label="备注">
-              <a-textarea    v-if="teacherdialog1 == 0"
+              <a-textarea   
                               v-model:value="formParam.remark"
                               showCount
                               :maxlength="200"
@@ -169,8 +159,8 @@
         zIndex: 1,
       } "
     >
-      <a-button style="margin-right: 8px"  @click="cancelTeacherDialog" >取消</a-button>
-                <a-button type="primary" @click="createTeacherDialog" :loading="buttonLoading">保存
+      <a-button  class="drabtn"  @click="cancelTeacherDialog" >取消</a-button>
+                <a-button   class="drabtn" type="primary" @click="createTeacherDialog" :loading="buttonLoading">保存
                 </a-button>
     </div>
     </a-drawer>
@@ -233,6 +223,7 @@
 <script lang="jsx">
 import { reactive, toRefs, ref } from "vue";
 import Editor from "@/components/project/Editor";
+import { useRouter } from "vue-router";
 import { message } from "ant-design-vue";
 import { getOutTeacherList, getOuterTeacherById, getOuterTeacherCourseList, deleteInTeacher, updateInTeacher, updateTeacherState, insertTeacherOutSide, updateOutTeacher } from "../../api/Lecturer";
 // import {getProjSt} from "../../api/indexProjStu";
@@ -244,6 +235,7 @@ export default {
     Editor
   },
   setup() {
+    const router = useRouter();
     const state = reactive({
       currentPage1: 1,
       pageSize1: 10,
@@ -253,12 +245,11 @@ export default {
       delTeacherId: null, //删除id确认
       editTeacherid: null,//修改状态id确认
       userNoid: null,    //讲师详情工号确认 
-      lookTeacherId: null, //讲师详情id确认
+      id: null, //讲师详情id确认
       newStatus: null, //修改状态码确认
       deleteTeacherdialog: false, //删除弹窗
       editTeacher: false,   //修改状态弹窗
       handleOperate1: null, //修改状态弹窗内容
-      teacherdialog1: null,
       teacherdialog: false,  //控制讲师弹窗
       teacherdialogtitle: '',//讲师弹框title内容
       pageSizeOptions: ['10', '20', '30', '50'], //下拉选择每页显示多少条
@@ -280,25 +271,18 @@ export default {
       { value: 1, label: "停用" },
     ])
     const columns = ref([
-      {
-        title: '讲师编号 ',
-        dataIndex: 'userNo',
-        key: 'userNo',
-        elipsis: true,
-        width: 200,
-      },
       {
         title: '讲师姓名 ',
         dataIndex: 'name',
         key: 'name',
-        elipsis: true,
+      elipsis: true, align: "center",
         width: 200,
       },
       {
         title: '手机号 ',
         dataIndex: 'mobile',
         key: 'mobile',
-        elipsis: true,
+      elipsis: true, align: "center",
         width: 400,
         //  customRender: (value, record) => {
         //   return (
@@ -312,21 +296,21 @@ export default {
         title: '邮箱 ',
         dataIndex: 'email',
         key: 'email',
-        elipsis: true,
+      elipsis: true, align: "center",
         width: 200,
       },
       {
         title: '授课时长 ',
         dataIndex: 'teaching',
         key: 'teaching',
-        elipsis: true,
+      elipsis: true, align: "center",
         width: 200,
       },
       {
         title: '账号状态 ',
         dataIndex: 'status',
         key: 'status',
-        elipsis: true,
+      elipsis: true, align: "center",
         width: 200,
         customRender: (value) => {
           return (
@@ -346,7 +330,7 @@ export default {
         title: '操作 ',
         dataIndex: 'operation',
         key: 'operation',
-        elipsis: true,
+      elipsis: true, align: "center",
         width: 300,
         scopedSlots: { customRender: "action" },
       },
@@ -411,22 +395,16 @@ export default {
       state.pageSize1 = pageSize;
       getTableDate();
     };
-    const teacherchangePagination = (page) => {
-      state.searchParam.pageNo = page;
-      getteacherrecordstableData();
-    };
     // 新增讲师
     const addTeacher = () => {
-      state.teacherdialog1 = 0
       state.teacherdialog = true;
       state.teacherdialogtitle = '新增讲师'
     }
     //修改讲师信息弹窗
     const handleModify = (record) => {
-      state.teacherdialog1 = 0
       state.teacherdialog = true;
       state.teacherdialogtitle = '修改信息'
-      state.lookTeacherId = record.id
+      state.id = record.id
       TeacherSystem(record)
     }
     //保存
@@ -515,159 +493,36 @@ export default {
       }
       console.log(state.formParam);
     }
+    const rules = {
+      name: [{ required: true, message: '讲师不能为空' }],
+
+    }
     //表格内查看数据操作
     const handleLook = (record) => {
-      state.teacherdialog1 = 1
-      state.teacherdialog = true;
-      state.teacherdialogtitle = '查看详情'
-      state.userNoid = record.userNo
-      state.lookTeacherId = record.id
-      // alert(record.grade)
-      TeacherSystem(record)
+      let id = record.id
+      router.push({ path: '/LookExternalLecturer', query: { id } })
     }
     //外部讲师详情
     const TeacherSystem = (record) => {
-      // getOuterTeacherById(state.lookTeacherId).then((res) => {
-      //   console.log("外部讲师详情", res.data);
-      //   state.formParam = res.data.data
-      // })
-      //   .catch((err) => {
-      //     console.log("外部讲师详情", err);
-      //   });
-      state.formParam={
-        name:record.name,
-        mobile:record.mobile,
-        email:record.email,
-        teacherIntrofuce:record.teacherIntrofuce,
-        remark:record.remark,
-      }
-      if(record.id!=null ){
-      state.formParam.id = record.id 
-      }
-    }
-    // tab 标签切换
-    const particulars = () => {
-      state.tagsshow = 1
-    }
-    const teacherrecords = () => {
-      state.tagsshow = 2
-      getteacherrecordstableData()
-    }
-    const promotionrecords = () => {
-      state.tagsshow = 3
-    }
-    //授课记录列表
-    const teacherrecordsColumns = ref([
-      {
-        title: '课程编号',
-        dataIndex: 'id',
-        key: 'id',
-        elipsis: true,
-        width: 120,
-      },
-      {
-        title: '课程名称',
-        dataIndex: 'name',
-        key: 'name',
-        elipsis: true,
-        width: 120,
-      },
-      {
-        title: '课程日期',
-        dataIndex: 'beginTime',
-        key: 'beginTime',
-        elipsis: true,
-        width: 120,
-      },
-      {
-        title: '内容分类',
-        dataIndex: 'nrfl',
-        key: 'nrfl',
-        elipsis: true,
-        width: 120,
-      },
-      {
-        title: '课程类型',
-        dataIndex: 'type',
-        key: 'type',
-        elipsis: true,
-        width: 120,
-        customRender: (value) => {
-          return (
-            <div>
-              {value.record.type == 1 || value.record.type == 2 || value.record.type == 3
-                ? {
-                  "1": "项目开课",
-                  "2": "路径开课",
-                  "3": "面授开课",
-                }[value.record.type + ""] || ""
-                : "-"}
-            </div>
-          )
-        }
-      },
-      {
-        title: '学习总人数',
-        dataIndex: 'xxzrs',
-        key: 'xxzrs',
-        elipsis: true,
-        width: 120,
-      },
-      {
-        title: '授课时长',
-        dataIndex: 'duration',
-        key: 'duration',
-        elipsis: true,
-        width: 120,
-      },
-      {
-        title: '评分',
-        dataIndex: 'score ',
-        key: 'score ',
-        elipsis: true,
-        width: 120,
-      },
-      {
-        title: '开课状态',
-        dataIndex: 'status ',
-        key: 'status ',
-        elipsis: true,
-        width: 120,
-        customRender: (value) => {
-          return (
-            <div>
-              {value.record.status == 0 || value.record.status == 1
-                ? {
-                  "0": "未开课",
-                  "1": "已开课",
-                }[value.record.status + ""] || ""
-                : "-"}
-            </div>
-          )
-        }
-      }
-    ])
-    //授课记录列表数据
-    const teacherrecordstableData = ref([
-    ])
-    const getteacherrecordstableData = () => {
-      state.teacherrecordsLoading = true
-      state.loading = true;
-      let ids={id:  state.lookTeacherId  ,pageNo: "1", pageSize: "10" }
-      // let ids =
-      // {
-      //   id: "965341999643234304",
-      //   pageNo: "1",
-      //   pageSize: "10"
-      // }
-      // api接口
-      getOuterTeacherCourseList(ids).then((res) => {
-        teacherrecordstableData.value = res.data.data
-        state.teacherrecordstableDataTotal = Number(res.data.data.total);
-        state.teacherrecordsLoading = false
+      getOuterTeacherById(state.id).then((res) => {
+        console.log("外部讲师详情", res.data);
+        state.formParam = res.data.data
       })
-    };
-
+        .catch((err) => {
+          console.log("外部讲师详情", err);
+        });
+      // state.formParam={
+      //   name:record.name,
+      //   mobile:record.mobile,
+      //   email:record.email,
+      //   teacherIntrofuce:record.teacherIntrofuce,
+      //   remark:record.remark,
+      // }
+      // if(record.id!=null ){
+      // state.formParam.id = record.id 
+      // }
+    }
+  
     // getpromotionrecordstableData()
     //导出功能
     const handleExport = () => {
@@ -681,6 +536,7 @@ export default {
     }
     return {
       ...toRefs(state),
+      rules,
       handleExport,
       AccountStatusList,
       searchSubmit,
@@ -700,13 +556,6 @@ export default {
       closehandleOperate,
       getTableDate, //list接口数据调用
       TeacherSystem,
-      particulars,
-      teacherrecords,
-      promotionrecords,
-      teacherrecordstableData,
-      teacherrecordsColumns,
-      getteacherrecordstableData,
-      teacherchangePagination,
 
       // getpromotionrecordstableData
     }
@@ -775,8 +624,7 @@ export default {
   text-align: center;
 }
 
-.ExternalLecturer {
-  width: 100%;
+.ExternalLecturer {  width: 100%;
   height: 100%;
   display: flex;
   flex-direction: column;
@@ -788,277 +636,11 @@ export default {
     display: flex;
     justify-content: space-between;
     flex-wrap: wrap;
-
-    .filterItems {
-      display: flex;
-      flex-wrap: wrap;
-
       .select {
         margin-right: 20px;
         margin-bottom: 20px;
       }
-
-      .addTimeBox {
-        position: relative;
-        display: flex;
-        align-items: center;
-
-        .addTime {
-          position: absolute;
-          z-index: 10;
-          margin-left: 10px;
-          color: rgba(0, 0, 0, 0.4);
-        }
-
-        .ant-picker {
-          padding-left: 85px;
-        }
-
-        .ant-picker-range .ant-picker-active-bar {
-          margin-left: 85px;
-        }
-      }
-
-      .btn {
-        padding: 0px 26px 0px 26px;
-        height: 38px;
-        background: #4ea6ff;
-        border-radius: 8px;
-        border: 1px solid rgba(64, 158, 255, 1);
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        margin-right: 14px;
-        flex-shrink: 0;
-        cursor: pointer;
-
-        .search {
-          background-size: 100%;
-        }
-
-        .btnText {
-          font-size: 14px;
-          font-weight: 400;
-          color: #fff;
-          line-height: 36px;
-          margin-left: 5px;
-        }
-      }
-
-      .btnn {
-        padding: 0px 26px 0px 26px;
-        height: 38px;
-        background: #4ea6ff;
-        border-radius: 8px;
-        border: 1px solid rgba(64, 158, 255, 1);
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        margin-right: 14px;
-        flex-shrink: 0;
-        cursor: pointer;
-
-        .search {
-          background-size: 100%;
-        }
-
-        .btnText {
-          font-size: 14px;
-          font-weight: 400;
-          color: #ffffff;
-          line-height: 36px;
-          margin-left: 5px;
-        }
-      }
-
-      .btn1 {
-        .search {
-          width: 15px;
-          height: 17px;
-          background-image: url("../../assets/images/courseManage/search0.png");
-        }
-      }
-
-      .btn2 {
-        .search {
-          width: 16px;
-          height: 18px;
-          background-image: url("../../assets/images/courseManage/reset0.png");
-        }
-      }
-
-      // .btn1:hover {
-      //   background: rgba(64, 158, 255, 0.76);
-
-      //   .search {
-      //     background-image: url("../../assets/images/courseManage/search0.png");
-      //   }
-
-      //   .btnText {
-      //     color: #ffffff;
-      //   }
-      // }
-
-      .btn1:active {
-        background: #0982ff;
-      }
-
-      // .btn2:hover {
-      //   background: rgba(64, 158, 255, 0.1);
-      // }
-
-      .btn2:active {
-        background: #0982ff;
-      }
-    }
-
-    .btns {
-      display: flex;
-
-      // flex-wrap: wrap;
-      .btn {
-        padding: 0px 26px 0px 26px;
-        height: 38px;
-        background: #4ea6ff;
-        border-radius: 8px;
-        border: 1px solid rgba(64, 158, 255, 1);
-        display: flex;
-        align-items: center;
-        cursor: pointer;
-        justify-content: center;
-        margin-right: 14px;
-        flex-shrink: 0;
-
-        .search {
-          background-size: 100%;
-        }
-
-        .btnText {
-          font-size: 14px;
-          font-weight: 400;
-          color: #ffffff;
-          line-height: 36px;
-          margin-left: 5px;
-        }
-      }
-
-      .btn3 {
-        margin-right: 0px;
-
-        .search {
-          width: 17px;
-          height: 18px;
-          background-image: url("../../assets/images/courseManage/add0.png");
-        }
-      }
-
-      // .btn3:hover {
-      //   background: rgba(64, 158, 255, 0.76);
-      // }
-
-      .btn3:active {
-        background: #0982ff;
-      }
-    }
-  }
-
-  .tableBox {
-    margin: 20px 38px 30px;
-
-    .ant-table-thead>tr>th {
-      background-color: #eff4fc;
-    }
-
-    th {
-      background-color: #eff4fc !important;
-      text-align: center !important;
-    }
-  }
-
-  .tableBox {
-    padding-bottom: 20px;
-
-    .pa {
-      // position: absolute;
-      // bottom: 20px;
-      // left: 0;
-      width: 100%;
-      // height: 20px;
-      // background-color: red;
-      display: flex;
-      justify-content: center;
-      // margin-bottom: 10px;
-      // position: absolute;
-      // bottom: -40px;
-    }
-  }
-
-  .operation {
-    font-size: 14px;
-    font-weight: 400;
-    color: #4ea6ff;
-    margin-right: -45px;
-    display: flex;
-    justify-content: right;
-    margin-right: 18px;
-
-    // line-height: 36px;
-    .operation1 {
-      margin-left: 21px;
-      width: 28px;
-      display: inline-block;
-    }
-
-    .operation3 {
-      margin-left: 21px;
-      width: 70px;
-      display: inline-block;
-      text-align: center;
-    }
-
-    .more {
-      width: 50px;
-      display: inline-block;
-      margin-left: 21px;
-      position: relative;
-      text-align: left;
-
-      // z-index: 99999;
-      .moreArrow {
-        width: 13px;
-        height: 7px;
-        display: inline-block;
-        background-image: url("../../assets/images/navtop/down.png");
-        background-size: 100%;
-        margin: 2px;
-        margin-left: 7px;
-      }
-
-      .moreItems {
-        width: 80px;
-        padding: 5px;
-        display: none;
-        background: #ffffff;
-        box-shadow: 2px 3px 9px 3px rgba(0, 0, 0, 0.05);
-        border-radius: 3px;
-        border: 0px solid #dcdcdc;
-        position: absolute;
-        left: 0px;
-        top: 28px;
-        z-index: 100;
-        text-align: center;
-      }
-    }
-
-    .more:hover .moreArrow {
-      background-image: url("../../assets/images/navtop/up.png");
-    }
-
-    .more:hover .moreItems {
-      display: block;
-    }
-  }
-}
+    }}
 
 .delete {
   z-index: 9999;
@@ -1069,7 +651,7 @@ export default {
   position: absolute;
   left: 50%;
   top: 10%;
-  transform: translate(-50%, -50%);
+  // transform: translate(-50%, -50%);
 
   .del_header {
     position: absolute;
@@ -1161,64 +743,105 @@ export default {
     }
   }
 }
+
 .CreatePath {
-        .out {
-          z-index: 9999;
-          display: block;
-          position: absolute;
-          top: 90px;
-          width:1000px;
-          // height: 525px;
-          background-color: #fff;
+  .out {
+    z-index: 9999;
+    display: block;
+    position: absolute;
+    top: 90px;
+    width: 1080px !important;
+    height: 650px;
+    overflow: auto;
+    background-color: #fff;
 
-          box-shadow: 0 0 10px rgba(118, 136, 166, 0.21);
-          left: 50%;
-          top:400px;
-          transform: translate(-50%, -50%);
+    box-shadow: 0 0 10px rgba(118, 136, 166, 0.21);
+    left: 50%;
+    top: 300px;
+    transform: translate(-50%, -50%);
 
-          .top {
-            width: 100%;
-            height: 68px;
+    .top {
+      width: 100%;
+      height: 68px;
 
-            background: linear-gradient(
-              rgba(78, 166, 255, 0.2) 0%,
-              rgba(78, 166, 255, 0) 100%
-            );
-            display: flex;
-            align-items: center;
+      background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
+          rgba(78, 166, 255, 0) 100%);
+      display: flex;
+      align-items: center;
 
-            .topimg {
-              width: 18px;
-              height: 18px;
-              margin-left: 27px;
-              margin-top: -2px;
-            }
+      .topimg {
+        width: 18px;
+        height: 18px;
+        margin-left: 27px;
+        margin-top: -2px;
+      }
 
-            .topc {
-              color: #000000;
-              font-size: 16px;
-              margin-left: 8px;
-            }
-          }
+      .topc {
+        color: #000000;
+        font-size: 16px;
+        margin-left: 8px;
+      }
+    }
 
-          .mid {
-            width: 100%;
-            height: 100%;
-            background-color: #fff;
-            display: flex;
-            flex-direction: column;
-            align-items: center;
+    .mid {
+      width: 100%;
+      height: 100%;
+      background-color: #fff;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
 
-            .d {
-              // margin-top: 8px;
-              // color: #ff4e4e;
-              margin-left: -5px;
-            }
-          }
-        }
+      .d {
+        // margin-top: 8px;
+        // color: #ff4e4e;
+        margin-left: -5px;
+      }
+    }
+  }
 }
+
+// 重置样式
+.resetbtn {
+  width: 100px;
+  height: 40px;
+  border-radius: 8px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 14px;
+  flex-shrink: 0;
+  cursor: pointer;
+}
+
+//展开收起样式
+.moreidbtn {
+  border: none;
+  color: #4ea6ff;
+  width: 80px
+}
+
 //小竖线
 .line{
   float:left; width: 3px; height: 25px; background: #4ea6ff;border-radius: 30%; margin-right: 5px;
 }
-</style>
+//抽屉功能
+.drawaer
+/* 改变所有 a-tree-select 输入框的高度 */
+.ant-tree-select .ant-select-selection {
+  height: 40px;
+  line-height: 40px;
+  /* 确保文字垂直居中 */
+}
+.draitem{
+ width: 100%;
+  height: 40px !important; 
+  border-radius: 8px;
+  line-height: 40px;
+}
+.drabtn{
+  height:40px;
+  width:80px;
+  border-radius:8px;
+  margin-right:20px
+}
+</style>
\ No newline at end of file
diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue
index f735d500..fccb293f 100644
--- a/src/views/lecturer/InsideLecturer.vue
+++ b/src/views/lecturer/InsideLecturer.vue
@@ -64,9 +64,10 @@
           </a-select>
         </div> -->
       </a-form>
+      <div style="width: 100%;"></div>
       <div style="display: flex; margin-bottom: 20px">
         <a-button @click="addTeacher()" type="primary" class="resetbtn">
-          <UploadOutlined /> 新增讲师
+          <FolderAddOutlined /> 新增讲师
         </a-button>
         <div style="margin-left: 20px ;">
           <a-button @click="handleExport()" class="resetbtn">
@@ -130,7 +131,7 @@
         <a-row :gutter="16">
           <a-col :span="12">
             <a-form-item label="讲师名称" name="name">
-              <a-tree-select v-model:value="formParam.name" tree-data-simple-mode style=" width:276px ;"
+              <a-tree-select v-model:value="formParam.name" tree-data-simple-mode class="draitem"
                 :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" :tree-data="treeData" placeholder="请输入讲师名称" />
             </a-form-item>
           </a-col>
@@ -141,7 +142,7 @@
                   <p>自动带出讲师的组织,展示主要部分,鼠标浮上去展示所有</p>
                   {{ formParam.userNo }}
                 </template>
-                <a-input disabled v-model:value="formParam.userNo" style="width:276px; height: 40px; "
+                <a-input disabled v-model:value="formParam.userNo"  class="draitem"
                   placeholder="自动带出讲师的组织,展示主要部分,鼠标浮上去展示所有" allowClear showSearch>
                 </a-input>
               </a-popover>
@@ -152,14 +153,14 @@
         <a-row :gutter="16">
           <a-col :span="12">
             <a-form-item label="讲师级别" name="levelId">
-              <a-select style="width:276px" v-model:value="formParam.levelId" placeholder="请选择讲师级别"
+              <a-select class="draitem" v-model:value="formParam.levelId" placeholder="请选择讲师级别"
                 :options="getLevelList">
               </a-select>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="讲师体系" name="systemId">
-              <a-select style="width: 276px" v-model:value="formParam.systemId" placeholder="请选择讲师体系"
+              <a-select  class="draitem" v-model:value="formParam.systemId" placeholder="请选择讲师体系"
                 :options="LecturerSystemList">
               </a-select>
             </a-form-item>
@@ -169,7 +170,7 @@
         <a-row :gutter="16">
           <a-col :span="12">
             <a-form-item label="初始授课时长" name="defaultTeachingTime">
-              <a-input v-model:value="formParam.defaultTeachingTime" style="width:226px; height: 40px; " placeholder="0"
+              <a-input v-model:value="formParam.defaultTeachingTime" style="width:80%; height: 40px; " placeholder="0"
                 allowClear showSearch suffix="分钟">
               </a-input>
               <span v-if="formParam.defaultTeachingTime" style="margin-left: 5px ;">{{ (formParam.defaultTeachingTime /60 ).toFixed(2)}}小时</span>
@@ -178,7 +179,7 @@
           <a-col :span="12">
             <a-form-item label="认证状态" name="certStatus">
               <a-radio-group  v-model:value="formParam.certStatus"
-                  style="width:276px">
+              class="draitem">
 
                   <a-radio :value="0">未认证</a-radio>
                   <a-radio :value="1">已认证</a-radio>
@@ -191,7 +192,7 @@
         <!-- 其他信息 -->
         <a-row>
           <a-col :span="24">
-          <span class="line"></span><span>其他信息</span>
+          <span class="line" ></span><span>其他信息</span>
         </a-col>
         </a-row>
         <!-- 讲师介绍 -->
@@ -233,8 +234,8 @@
         zIndex: 1,
       } "
     >
-      <a-button style="margin-right: 8px"  @click="cancelTeacherDialog" >取消</a-button>
-                <a-button type="primary" @click="createTeacherDialog" :loading="buttonLoading">保存
+      <a-button class="drabtn"  @click="cancelTeacherDialog" >取消</a-button>
+                <a-button  class="drabtn" type="primary" @click="createTeacherDialog" :loading="buttonLoading">保存
                 </a-button>
     </div>
     </a-drawer>
@@ -295,7 +296,7 @@
   </div>
 </template>
 <script lang="jsx">
-import { reactive, toRefs, ref, watch, shallowRef, onUnmounted, defineComponent } from "vue";
+import { reactive, toRefs, ref, watch } from "vue";
 import {
   RightOutlined,
   UpOutlined,
@@ -307,7 +308,7 @@ import Editor from "@/components/project/Editor";
 // import FJUpload from "@/components/common/FJUpload";
 import { message } from "ant-design-vue";
 import { useRouter } from "vue-router";
-import { getTeacherSystemList, getTeacherList, getPayRollPlace, getLevel, insertTeacher, deleteInTeacher, updateInTeacher, getTeacherById, updateTeacherState, getTeacherCourseList, getTeacherExpertise, getTeacherExpertiseByPid, infoteacher, getTeacherLogList } from "../../api/Lecturer"; 
+import { getTeacherSystemList, getTeacherList, getPayRollPlace, getLevel, insertTeacher, deleteInTeacher, updateInTeacher, getTeacherById, updateTeacherState, getTeacherExpertise, getTeacherExpertiseByPid, infoteacher,  } from "../../api/Lecturer"; 
 // import {getProjSt} from "../../api/indexProjStu";
 // import AddTeacher from "../../components/drawers/project/AddTeacher"
 export default {
@@ -570,20 +571,6 @@ export default {
         elipsis: true, align: "center",
         align: "center",
         width: 120,
-        // customRender: (value, record) => {
-        //   return (
-        //     <div>
-        //       {value.record.grade == 0 || value.record.grade == 1 || value.record.grade == 2 || value.record.grade == 3
-        //         ? {
-        //           0: "未定级",
-        //           1: "1级",
-        //           2: "2级",
-        //           3: "3级",
-        //         }[value.record.grade + ""] || ""
-        //         : "-"}
-        //     </div>
-        //   )
-        // }
       },
       {
         title: '发薪地 ',
@@ -668,18 +655,6 @@ export default {
     ])
     //列表数据
     const tableData = ref([
-      // {
-      //   name: '夏冬',
-      //   userNo: '1152790',
-      //   organizationDTO: '京东方科技集团股份有限公司/显示器创新业务中台/品质中台/整机品保中心QA部',
-      //   lecturerSystem: 'MiniLED事业',
-      //   grade: '1',
-      //   placeOfPay: 'B1',
-      //   teachingDuration: '0.00小时',
-      //   onTheJobStatus: '1',
-      //   authenticationStatus: '1',
-      //   accountStatus: '1',
-      // },
 
     ])
     // 搜索
@@ -751,6 +726,7 @@ export default {
     }
     //修改讲师信息弹窗
     const handleModify = (record) => {
+      state.teacherdialog = true;
       state.teacherdialogtitle = '修改信息'
       state.id = record.id
       TeacherSystem()
@@ -877,10 +853,9 @@ export default {
     const TeacherSystem = () => {
       getTeacherById(state.id).then((res) => {
          if (res.data.code === 200) {
-          state.formParam = res.data.data
+          state.formParam = res.data.data[0]
          }
-        console.log("内部讲师详情", res.data.data);
-        // state.formParam=Object.assign({} ,res.data.data)
+        console.log("内部讲师详情", state.formParam);
       })
         .catch((err) => {
           console.log("内部讲师详情", err);
@@ -1214,5 +1189,16 @@ export default {
   line-height: 40px;
   /* 确保文字垂直居中 */
 }
-
+.draitem{
+ width: 100%;
+  height: 40px !important; 
+  border-radius: 8px;
+  line-height: 40px;
+}
+.drabtn{
+  height:40px;
+  width:80px;
+  border-radius:8px;
+  margin-right:20px
+}
 </style>
\ No newline at end of file
diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue
index 7d35c925..681151b4 100644
--- a/src/views/lecturer/InsideTeaching.vue
+++ b/src/views/lecturer/InsideTeaching.vue
@@ -2,84 +2,88 @@
 <template>
   <div class="InsideTeaching">
     <!-- 搜索框及按钮 -->
-    <div class="filter">
-      <div class="filterItems">
-        <div class="select">
-          <a-input v-model:value="searchParam.userNo " style="width: 230px; height: 40px; border-radius: 8px"
-            placeholder="请输入讲师姓名/工号" allowClear showSearch>
+    <div class="filter" style="min-width: 1380px;">
+      <a-form layout="inline">
+        <a-form-item class="select">
+          <!--  v-model:value="searchParam.name" -->
+          <a-input v-model:value="searchParam.userNo" style="width: 276px; height: 40px; border-radius: 8px"
+            placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch>
           </a-input>
-             
-          <!-- <a-select style="width: 230px" placeholder="请选择所属组织" v-model:value="searchParam.userNo"
+
+          <!-- <a-select style="width: 276px" placeholder="请选择所属组织" v-model:value="searchParam.userNo"
             :options="infoteacherList">
           </a-select> -->
-        </div>
-        <div class="select">
-          <a-input v-model:value="searchParam.teacherNo " style="width: 230px; height: 40px; border-radius: 8px"
-            placeholder="请输入姓名/课程编号" allowClear showSearch>
+        </a-form-item>
+        <a-form-item class="select">
+          <a-input v-model:value="searchParam.teacherNo" style="width: 260px; height: 40px; border-radius: 8px"
+            placeholder="请输入课程名称进行搜索" allowClear showSearch>
           </a-input>
+        </a-form-item>
+        <a-form-item class="select ">
+          <a-range-picker style="width: 260px; height: 40px; border-radius: 8px" v-model:value="searchdate" separator="至"
+            :placeholder="['      开始时间', '        结束时间']" @change="searchTimeChange" />
+        </a-form-item>
+        <div style="display: flex; margin-bottom: 20px">
+          <a-button @click="searchSubmit()" type="primary" class="resetbtn">查询 </a-button>
+          <!-- <div class="btn btn1" @click="searchReset" style="background:rgba(64, 158, 255, 0);" > -->
+          <!-- <div class="search"></div> -->
+          <a-button class="resetbtn " @click="searchReset">重置</a-button>
+
+          <!-- 更多筛选-->
+          <div v-if="moreid == 1">
+            <a-button @click="handlemoreid()" class="moreidbtn" type="text"> 展开
+              <RightOutlined />
+            </a-button>
+          </div>
+          <div v-if="moreid == 2">
+            <a-button @click="handlemoreid()" class="moreidbtn"> 返回
+              <UpOutlined />
+            </a-button>
+          </div>
         </div>
-        <div class="select">
-          <a-select style="width: 230px" placeholder="请选择所属组织" v-model:value="searchParam.departId"
-            :options="getOrganizationList">
-          </a-select>
-        </div>
-        <div class="select">
-          <a-select style="width: 230px" placeholder="请选择讲师体系" v-model:value="searchParam.systemId"
-            :options="LecturerSystemList">
-          </a-select>
-        </div>
-        <div class="select addTimeBox">
-          <div class="addTime">课程日期：</div>
-          <a-date-picker
-            v-model:value="searchParam.beginTime"
-            style="width: 230px"
-            format="YYYY-MM-DD"
-            separator="至"
-            placeholder="请选择课程日期"
-          />
-        </div>
-        <div class="select">
-          <a-select style="width: 230px" v-model:value="searchParam.tlevelName" placeholder="内容分类" :options="getTeacherExpertiseList">
-          </a-select>
-        </div>
-        <div class="select">
-          <a-select style="width: 230px" v-model:value="searchParam.type" placeholder="课程分类"
+        <div style="width:100%"></div>
+        <a-form-item class="select" v-if="moreid == 2">
+          <a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.type" placeholder="录入类型"
             :options="OnTheJobStatusList">
           </a-select>
-        </div>
-        <div class="select">
+        </a-form-item>
+        <a-form-item class="select" v-if="moreid == 2">
           <a-select style="width: 230px" v-model:value="searchParam.status" placeholder="开课状态"
             :options="AuthenticationStatusList">
           </a-select>
-        </div>
-        <div style="display: flex; margin-bottom: 20px">
-          <div class="btnn btn1" @click="searchSubmit">
-            <div class="search"></div>
-            <div class="btnText">搜索</div>
-          </div>
-          <div class="btn btn2" @click="searchReset">
-            <div class="search"></div>
-            <div class="btnText">重置</div>
-          </div>
-        </div>
-      </div>
-      <div class="btns">
-        <div class="btn btn3" @click="addTeacher">
-          <div class="btnText">添加授课记录</div>
-        </div>
-        <div class="btn btn3" @click="addTeacher" style="margin-left: 20px ;">
-          <div class="btnText">一键生成讲师费</div>
-        </div>
-      </div>
-      <div class="btns">
-        <div class="btn btn3" @click="showEHWorkModal" style="margin-right:20px">
-          <div class="daoru"></div>
-          <div class="btnText" @click="handleExport">导入</div>
-        </div>
-        <div class="btn btn3" @click="showEHWorkModal" style="margin-right:20px">
-          <div class="daochu"></div>
-          <div class="btnText" @click="handleExport">导出</div>
-        </div>
+        </a-form-item>
+        <a-form-item class="select" v-if="moreid == 2">
+          <a-select style="width: 230px" placeholder="请选择所属组织" v-model:value="searchParam.departId"
+            :options="getOrganizationList">
+          </a-select>
+        </a-form-item>
+        <a-form-item class="select" v-if="moreid == 2">
+          <a-select style="width: 230px" placeholder="请选择讲师体系" v-model:value="searchParam.systemId"
+            :options="LecturerSystemList">
+          </a-select>
+        </a-form-item>
+        <a-form-item class="select" v-if="moreid == 2">
+          <a-select style="width: 230px" v-model:value="searchParam.tlevelName" placeholder="内容分类"
+            :options="getTeacherExpertiseList">
+          </a-select>
+        </a-form-item>
+      </a-form>
+      <div style="width: 100%;"></div>
+      <div style="display: flex; margin-bottom: 20px">
+        <a-button @click="addTeacher()" type="primary" class="langbtn">
+          <FolderAddOutlined /> 添加授课记录
+        </a-button>
+        <!-- <div style="margin-left: 20px ;">
+          <a-button @click="addTeacher()" class="langbtn">
+            <UploadOutlined /> 一键生成讲师费
+          </a-button>
+        </div> -->
+        <a-button @click="handleExport()" class="resetbtn">
+          <DownloadOutlined /> 导入
+        </a-button>
+        <a-button @click="handleExport()" class="resetbtn">
+          <UploadOutlined /> 导出
+        </a-button>
       </div>
       <!-- 表格 -->
       <div style="padding: 10px 0">
@@ -100,255 +104,147 @@
     </div>
     <div class="tableBox ">
       <div style="float: right;">
-        <a-pagination
-            v-if="tableDataTotal > 10"
-            :showSizeChanger="true"
-            :hideOnSinglePage="true"
-            :pageSize="pageSize"
-            v-model:current="searchParam.pageNo"
-            :total="tableDataTotal"
-            class="pagination"
-            @change="changePagination"
-          />
+        <a-pagination v-if="tableDataTotal > 10" :showSizeChanger="true" :hideOnSinglePage="true" :pageSize="pageSize"
+          v-model:current="searchParam.pageNo" :total="tableDataTotal" class="pagination" @change="changePagination" />
       </div>
     </div>
     <!-- 弹窗组件 -->
-    <a-modal :visible="teacherdialog"  @ok="closeModal2" :footer="null" :closable="false"  wrapClassName="CreatePath" 
-        >
-        <div class="out">
-          <div class="top">
-          <!-- <img class="topimg" src="../../assets/images/courseManage/add1.png" /> -->
-        <div class="topc">{{teacherdialogtitle }}</div>
-          <div @click="cancelTeacherDialog" style="margin-left: 650px; cursor: pointer">
-            <img
-              style="width: 20px; height: 20px"
-              src="../../assets/images/basicinfo/close.png"
-            />
-          </div>
-        </div>
-      <div style="padding-bottom: 15px;" >
-        <div style=" margin-left: 33px; margin-right: 33px; margin-bottom: 33px;" >
-        <div class="InsideTeaching" >
-          <div class="filter">
-            <div class="filterItems">
-              <!-- <div class="select">
-          <span style="display:inline-block ;width:115px ;text-align:center ">头像 :</span>
-          
-          </div> -->
-          <!-- 讲师姓名 -->
-              <div class="select">
-                <div  style="display:inline-block ;width:5px ;text-align:center ">
-              <img
-                style="width: 5px; height: 5px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-                <!--  v-model:value="searchParam.name" -->
-                <span style="display:inline-block ;width:115px ;text-align:center ">讲师姓名 :</span>
-                <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.teacher" style="width:200px; height: 40px; "
-                  placeholder="请输入讲师姓名" allowClear showSearch>
+    <a-drawer v-model:visible="teacherdialog" placement="right" @closa="cancelTeacherDialog" :maskClosable="true" dropdown-style="drawaer"
+      width="60%" :title="teacherdialogtitle">
+      <a-form :model="formParam" :rules="rules" layout="vertical">
+        <!-- 讲师姓名  name  组织 departId-->
+        <a-row :gutter="16">
+          <a-col :span="12">
+            <a-form-item label="讲师名称" name="teacher">
+              <a-tree-select v-model:value="formParam.teacher" tree-data-simple-mode
+              class="draitem"
+                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" :tree-data="treeData" placeholder="请输入讲师名称" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="讲师组织" name="departId">
+              <a-popover title="讲师组织">
+                <template #content>
+                  {{ formParam.departId }}
+                </template>
+                <a-input disabled v-model:value="formParam.departId" class="draitem"
+                  placeholder="自动带出讲师的组织,展示主要部分,鼠标浮上去展示所有" allowClear showSearch>
                 </a-input>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.teacher }}</span>
-              </div>
-              <!-- 讲师工号 -->
-              <div class="select">
-                <div  style="display:inline-block ;width:5px ;text-align:center ">
-              <img
-                style="width: 5px; height: 5px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-                <span style="display:inline-block ;width:125px ;text-align:center ">讲师工号 :</span>
-                <a-input v-if="teacherdialog1 == 0" disabled v-model:value="formParam.userNo"
-                  style="width:200px; height: 40px; " placeholder="自动带出讲师工号" allowClear showSearch>
-                </a-input>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.userNo }}</span>
-              </div>
-              <!-- 讲师组织 -->
-              <div class="select">
-                <div  style="display:inline-block ;width:5px ;text-align:center ">
-              <img
-                style="width: 5px; height: 5px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-                <span style="display:inline-block ;width:115px ;text-align:center ">讲师组织 :</span>
-                <a-input disabled v-if="teacherdialog1 == 0" v-model:value="formParam.departId"
-                  style="width:200px; height: 40px;" placeholder="自动带出讲师组织" allowClear showSearch>
-                </a-input>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.departId }}</span>
-              </div>
-              <!-- 讲师体系 -->
-              <div class="select">
-                <div  style="display:inline-block ;width:5px ;text-align:center ">
-              <img
-                style="width: 5px; height: 5px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-                <span style="display:inline-block ;width:125px ;text-align:center ">讲师体系 :</span>
-                <a-input disabled v-if="teacherdialog1 == 0" v-model:value="formParam.departId"
-                  style="width:200px; height: 40px;" placeholder="自动带出讲师体系" allowClear showSearch>
-                </a-input>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.departId }}</span>
-              </div>
-              <!-- 讲师级别 -->
-              <div class="select">
-                <div  style="display:inline-block ;width:5px ;text-align:center ">
-              <img
-                style="width: 5px; height: 5px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-                <span style="display:inline-block ;width:115px ;text-align:center ">讲师级别 :</span>
-                <a-input v-if="teacherdialog1 == 0" disabled v-model:value="formParam.userNo"
-                  style="width:200px; height: 40px; " placeholder="自动带出讲级别" allowClear showSearch>
-                </a-input>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.userNo }}</span>
-              </div>
-              <!-- 课程名称 -->
-              <div class="select">
-                <div  style="display:inline-block ;width:5px ;text-align:center ">
-              <img
-                style="width: 5px; height: 5px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-                <span style="display:inline-block ;width:125px ;text-align:center ">课程名称 :</span>
-                   <a-select style="width: 200px" 
-                   v-if="teacherdialog1 == 0" 
-                   placeholder="填写或选择授课记录" 
-                   showSearch
-                   v-model:value="formParam.name"
-            :options="LecturerSystemList">
-            </a-select>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.name }}</span>
-              </div>
-              <!-- 培训发生组织 -->
-              <div class="select">
-                <div  style="display:inline-block ;width:5px ;text-align:center ">
-              <img
-                style="width: 5px; height: 5px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-                <span style="display:inline-block ;width:115px ;text-align:center ">培训发生组织 :</span>
-                <a-input disabled v-if="teacherdialog1 == 0" v-model:value="formParam.departId"
-                  style="width:200px; height: 40px;" placeholder="自动带出培训发生组织" allowClear showSearch>
-                </a-input>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.departId }}</span>
-              </div>
-              <!-- 授课日期 -->
-              <div class="select addTimeBox">
-                <div  style="display:inline-block ;width:5px ;text-align:center ">
-              <img
-                style="width: 5px; height: 5px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-            <span style="display:inline-block ;width:125px ;text-align:center ">授课日期 :</span>
-          <a-date-picker
-          v-if="teacherdialog1 == 0"
-            v-model:value="formParam.beginTime"
-            style="width: 200px"
-            format="YYYY-MM-DD"
-            placeholder="请选择课程日期"
-          />
-          <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.beginTime }}</span>
-        </div>
-        <!-- 授课/课程开发时长  -->
-        <div class="select">
-                <div  style="display:inline-block ;width:5px ;text-align:center ">
-              <img
-                style="width: 5px; height: 5px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-                <!--  v-model:value="searchParam.name" -->
-                <span style="display:inline-block ;width:115px ;text-align:center ">授课/课程开发时长:</span>
-                <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.duration" style="width:200px; height: 40px; "
-                  placeholder="小时 " allowClear showSearch>
-                </a-input>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.duration }}</span>
-              </div>
-              <!-- 参训人数 -->
-              <div class="select">
-                <!--  v-model:value="searchParam.name" -->
-                <span style="display:inline-block ;width:125px ;text-align:center ">参训人数 :</span>
-                <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.studys" style="width:200px; height: 40px; "
-                  placeholder="0 " allowClear showSearch>
-                </a-input>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.studys }}</span>
-              </div>
-              <!-- 评分 -->
-              <div class="select">
-                <div  style="display:inline-block ;width:5px ;text-align:center ">
-              <img
-                style="width: 5px; height: 5px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-                <!--  v-model:value="searchParam.name" -->
-                <span style="display:inline-block ;width:115px ;text-align:center ">评分 :</span>
-                <a-input v-if="teacherdialog1 == 0" v-model:value="formParam.score" style="width:200px; height: 40px; "
-                  placeholder="" allowClear showSearch>
-                </a-input>
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.score }}</span>
-              </div>
-              <!-- 内容分类 -->
-              <div class="select">
-                <div  style="display:inline-block ;width:5px ;text-align:center ">
-              <img
-                style="width: 5px; height: 5px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-                <span style="display:inline-block ;width:115px ;text-align:center ">内容分类 :</span>
-                <a-select style="width: 200px" v-if="teacherdialog1 == 0" v-model:value="formParam.tsystemName"
-                showSearch  :options="getTeacherExpertiseList" placeholder=" " >
-                   </a-select> 
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.tsystemName }}</span>
-              </div>
-              <!-- 授课类型 -->
-              <div class="select">
-                <div  style="display:inline-block ;width:5px ;text-align:center ">
-              <img
-                style="width: 5px; height: 5px"
-                src="../../assets/images/basicinfo/asterisk.png"
-              />
-            </div>
-                <span style="display:inline-block ;width:115px ;text-align:center ">授课类型 :</span>
-                <a-select style="width: 200px" v-if="teacherdialog1 == 0" v-model:value="formParam.type"
-                showSearch  :options="OnTheJobStatusList" placeholder="选择授课记录 " >
-                   </a-select> 
-                   <span v-if="teacherdialog1 == 1" class=display1>{{formParam.type==1 ?'项目开课':formParam.type==2?'路径开课' :formParam.type==3 ? '面授开课':''}}</span>
-              </div>
-              <!-- 备注 -->
-              <div style="width: 834px;height: 1px;"></div>
-              <span style="display:inline-block ;width:115px ;text-align:center ">备注 :</span>
-                <a-textarea    v-if="teacherdialog1 == 0"
-                              v-model:value="formParam.remark"
-                              showCount
-                              :maxlength="200"
-                              style="width: 500px; height: 100px; border-radius: 8px"
-                              placeholder="请输入"/>
-                              <!-- <span style="color: #c7cbd2"  v-if="teacherdialog1 == 0">
-                              {{formParam.remark.length }}/200
-                            </span> -->
-                <span v-if="teacherdialog1 == 1" class=display1>{{ formParam.remark }}</span>
-              <div class="del_btnbox"  v-if="teacherdialog1 == 0">
+              </a-popover>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <!-- 讲师体系  departId  级别 levelId -->
+        <a-row :gutter="16">
+          <a-col :span="12">
+            <a-form-item label="讲师体系" name="departId">
+              <a-select disabled  class="draitem" v-model:value="formParam.departId" placeholder="请选择讲师体系"
+                :options="LecturerSystemList">
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="讲师级别"  name="levelId">
+              <a-select disabled class="draitem" v-model:value="formParam.levelId" placeholder="请选择讲师级别"
+                :options="getLevelList">
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <!-- 内容分类 tlevelName  课程名称 teacherNo  -->
+        <a-row :gutter="16">
+          <a-col :span="12">
+            <a-form-item label="内容分类" name="tlevelName">
+              <a-select class="draitem" v-model:value="searchParam.tlevelName" placeholder="内容分类"
+                :options="getTeacherExpertiseList">
+              </a-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="课程名称：" name="teacherNo">
+              <a-input class="draitem"  v-model:value="searchParam.teacherNo" 
+                placeholder="请输入后搜索面授课" allowClear showSearch>
+              </a-input>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <!-- 授课日期 beginTime     开课状态 status -->
+        <a-row :gutter="16">
+          <a-col :span="12">
+            <a-form-item label="授课/课程日期 :" name="beginTime">
+              <a-date-picker class="draitem" v-model:value="formParam.beginTime" style="width: 200px"
+                format="YYYY-MM-DD" placeholder="请选择课程日期" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="开课状态">
+              <a-radio-group v-model:value="formParam.status" class="draitem">
+                <a-radio :value="0">未开课</a-radio>
+                <a-radio :value="1">已开课</a-radio>
+              </a-radio-group>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <!-- 授课时长defaultTeachingTime  评分 score-->
+        <a-row :gutter="16">
+          <a-col :span="12">
+            <a-form-item label="初始授课时长" name="defaultTeachingTime">
+              <a-input v-model:value="formParam.defaultTeachingTime" style="width:80%; height: 40px; " placeholder="0"
+                allowClear showSearch suffix="分钟">
+              </a-input>
+              <span v-if="formParam.defaultTeachingTime" style="margin-left: 5px ;">{{ (formParam.defaultTeachingTime /60 ).toFixed(2)}}小时</span>
+            </a-form-item>
+          </a-col>
+          <a-col :span="12">
+            <a-form-item label="评分" name="score">
+              <a-input class="draitem" v-model:value="formParam.score"  placeholder="" allowClear
+                showSearch>
+              </a-input>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <!-- 参训人数 studys-->
+        <a-row :gutter="16">
+          <a-col :span="24">
+            <a-form-item label="参训人数" name="studys">
+              <a-input  v-model:value="formParam.studys" class="draitem"
+                placeholder="0 " allowClear showSearch>
+              </a-input>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <!-- 备注 remark -->
+        <a-row :gutter="16">
+          <a-col :span="24">
+            <a-form-item label="备注">
+              <a-textarea v-model:value="formParam.remark" showCount :maxlength="200"
+                style="width: 100%; height: 100px; border-radius: 8px" placeholder="请输入" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+      <!-- <div class="del_btnbox"  v-if="teacherdialog1 == 0">
                 <a-button class="del_btn btn1" @click="cancelTeacherDialog" style="margin-right: 32px;">取消</a-button>
                 <a-button class="del_btn btn2" @click="createTeacherDialog" :loading="buttonLoading">保存
                 </a-button>
-              </div>
-            </div>
-          </div>
-        </div>
+              </div> -->
+      <div :style="{
+        position: 'absolute',
+        right: 0,
+        bottom: 0,
+        width: '100%',
+        borderTop: '1px solid #e9e9e9',
+        padding: '10px 16px',
+        background: '#fff',
+        textAlign: 'right',
+        zIndex: 1,
+      }">
+        <a-button  class="drabtn"  @click="cancelTeacherDialog">取消</a-button>
+        <a-button   class="drabtn" type="primary" @click="createTeacherDialog" :loading="buttonLoading">保存
+        </a-button>
       </div>
-     
-      </div>
-      </div>
-    </a-modal>
+    </a-drawer>
+
     <!-- 删除功能弹窗 -->
     <div>
       <a-modal v-model:visible="deleteTeacherdialog" :footer="null" :closable="close" wrapClassName="canclestu1"
@@ -367,8 +263,7 @@
               <div class="del_btn btn2" @click="cancelTeacherDialog" style="margin-right: 32px">
                 <div class="btnText">取消</div>
               </div>
-              <div class="del_btn btn2" 
-              @click="closeDeleteTeacher">
+              <div class="del_btn btn2" @click="closeDeleteTeacher">
                 <div class="btnText">确定</div>
               </div>
             </div>
@@ -383,28 +278,42 @@
 import { reactive, toRefs, ref } from "vue";
 import moment, { Moment } from 'moment';
 import { useRouter } from "vue-router";
+import {
+  RightOutlined,
+  UpOutlined,
+  UploadOutlined,
+  FolderAddOutlined,
+  DownloadOutlined
+} from '@ant-design/icons-vue';
+import dayjs from "dayjs";
 // import Editor from "@/components/project/Editor";
-import ImageUpload from "@/components/project/ImageUpload";
+// import ImageUpload from "@/components/project/ImageUpload";
 import { message } from "ant-design-vue";
-import {getTeacherSystemList ,infoteacher, getTeacherExpertise,deleteInTeacherCourse} from "../../api/Lecturer";
-import {getNewInTeacherCourseList,getOrganization,getTeacherCourseList,insertInTeacherCourse,updateInTeacherCourse} from "../../api/Teaching";
+import { getTeacherSystemList, infoteacher, getTeacherExpertise, deleteInTeacherCourse } from "../../api/Lecturer";
+import { getNewInTeacherCourseList, getOrganization, getTeacherCourseList, insertInTeacherCourse, updateInTeacherCourse } from "../../api/Teaching";
 // import AddTeacher from "../../components/drawers/project/AddTeacher"
-export default { 
+export default {
   name: "InsideTeaching",
   components: {
     // AddTeacher,
     // Editor,
-    ImageUpload
+    // ImageUpload
+    RightOutlined, //图标--展开
+    UpOutlined,//图标--收起
+    UploadOutlined,//图标--导出
+    DownloadOutlined,//图标-导入
+    FolderAddOutlined,//图标--新增
   },
   setup() {
     const router = useRouter();
     const state = reactive({
+      moreid: 1,
       currentPage1: 1,
       pageSize1: 10,
-      tableLoading:false,
-      delTeacherId:null, //删除id确认
-      userNoid:null,    //详情工号确认 
-      lookTeacherId:null, //详情id确认
+      tableLoading: false,
+      delTeacherId: null, //删除id确认
+      userNoid: null,    //详情工号确认 
+      lookTeacherId: null, //详情id确认
       deleteTeacherdialog: false, //删除弹窗
       teacherdialog1: null,
       teacherdialog: false,  //控制讲师弹窗
@@ -412,82 +321,89 @@ export default {
       pageSizeOptions: ['10', '20', '30', '50'], //下拉选择每页显示多少条
       pageSize: 10,
       tableDataTotal: -1,//table列表总条数
+      searchdate: null, //选择时间
+      startTime: null, //开始时间
+      endTime: null, //结束时间
       formParam: {
+        status: 1
       },
       searchParam: {
-        userNo:null,//工号姓名
-        teacherNo:null,//课程编号
-        tsystemName:null,//讲师体系
-        payrollPlaceName:null,//发薪地
+        userNo: null,//工号姓名
+        teacherNo: null,//课程编号
+        tsystemName: null,//讲师体系
+        payrollPlaceName: null,//发薪地
         pageNo: "1",
-        pageSize: "10"
+        pageSize: "10",
+        startDate: null,
+        endDate: null,
       },
     })
+
     //获取所属组织
     const getOrganizationList = ref([
-    //   { value: 0, systemName: "讲师体系" },
+      //   { value: 0, systemName: "讲师体系" },
     ]);
     //获取所属组织
-    const getOrganizationLista =() => {
+    const getOrganizationLista = () => {
       // console.log('getOrganizationList')
-      getOrganization().then((res)=>{
+      getOrganization().then((res) => {
         if (res.data.code === 200) {
-            let arr = res.data.data;
-            let array =[];
-            arr.map((value) => {
-              let obj = {
-                value: value.departId,
-                label: value.orgName,
-              };
-              array.push(obj);
-            });
-            getOrganizationList.value = array;
-          }
-      }) 
+          let arr = res.data.data;
+          let array = [];
+          arr.map((value) => {
+            let obj = {
+              value: value.departId,
+              label: value.orgName,
+            };
+            array.push(obj);
+          });
+          getOrganizationList.value = array;
+        }
+      })
     }
     getOrganizationLista()
     const LecturerSystemList = ref([
-    //   { value: 0, systemName: "讲师体系" },
+      //   { value: 0, systemName: "讲师体系" },
     ]);
     //获取讲师体系列表
-    const LecturerSystemLista =() => {
+    const LecturerSystemLista = () => {
       // console.log('点击了LecturerSystemLista')
-      getTeacherSystemList().then((res)=>{
+      getTeacherSystemList().then((res) => {
         if (res.data.code === 200) {
-            let arr = res.data.data;
-            let array = [];
-            arr.map((value) => {
-              let obj = {
-                value: value.id,
-                label: value.name,
-              };
-              array.push(obj);
-            });
-            LecturerSystemList.value = array;
-          }
-        console.log("获取讲师",LecturerSystemList);
-      }) 
+          let arr = res.data.data;
+          let array = [];
+          arr.map((value) => {
+            let obj = {
+              value: value.id,
+              label: value.name,
+            };
+            array.push(obj);
+          });
+          LecturerSystemList.value = array;
+        }
+        console.log("获取讲师", LecturerSystemList);
+      })
     }
     LecturerSystemLista()
     //获取内容分类
     const getTeacherExpertiseList = ref([
       // { value: 0, label: "未定级" },
     ])
-    const getTeacherExpertiseLista =() => {
-      getTeacherExpertise().then((res)=>{
+    const getTeacherExpertiseLista = () => {
+      getTeacherExpertise().then((res) => {
         if (res.data.code === 200) {
-            let arr = res.data.data;
-            let array =[];
-            arr.map((value) => {
-              let obj = {
-                value: value.id,
-                label: value.name,
-              };
-              array.push(obj);
-            });
-            getTeacherExpertiseList.value = array;
-          }
-      }) 
+          let arr = res.data.data;
+          let array = [];
+          arr.map((value) => {
+            let obj = {
+              value: value.id,
+              label: value.name,
+            };
+            array.push(obj);
+          });
+          getTeacherExpertiseList.value = array;
+        }
+      })
     }
     getTeacherExpertiseLista()
     const OnTheJobStatusList = ref([
@@ -500,8 +416,8 @@ export default {
       { value: 1, label: "已开课" },
     ])
     const columns = ref([
-      
-    {
+
+      {
         title: '课程编号 ',
         dataIndex: 'userNo',
         key: 'userNo',
@@ -523,7 +439,7 @@ export default {
         width: 120,
       },
       {
-        title: '所属组织 ', 
+        title: '所属组织 ',
         dataIndex: 'orgName',
         key: 'orgName',
         elipsis: true,
@@ -580,7 +496,7 @@ export default {
         customRender: (value) => {
           return (
             <div>
-              {value.record.type == "1" || value.record.type == "2"|| value.record.type == "3"
+              {value.record.type == "1" || value.record.type == "2" || value.record.type == "3"
                 ? {
                   "1": "项目开课",
                   "2": "路径开课",
@@ -624,6 +540,25 @@ export default {
           )
         }
       },
+      {
+        title: '是否生成课时费 ',
+        dataIndex: 'feeCreated',
+        key: 'feeCreated',
+        elipsis: true,
+        width: 120,
+        customRender: (value) => {
+          return (
+            <div>
+              {value.record.feeCreated == 0 || value.record.feeCreated == 1
+                ? {
+                  "0": "否",
+                  "1": "是",
+                }[value.record.feeCreated + ""] || ""
+                : "-"}
+            </div>
+          )
+        }
+      },
       {
         title: '操作 ',
         dataIndex: 'operation',
@@ -635,55 +570,70 @@ export default {
     ])
     //列表数据
     const tableData = ref([
-      // {
-      //   name: '夏冬',
-      //   userNo: '1152790',
-      //   organizationDTO: '京东方科技集团股份有限公司/显示器创新业务中台/品质中台/整机品保中心QA部',
-      //   lecturerSystem: 'MiniLED事业',
-      //   grade: '1',
-      //   placeOfPay: 'B1',
-      //   teachingDuration: '0.00小时',
-      //   onTheJobStatus: '1',
-      //   authenticationStatus: '1',
-      //   accountStatus: '1',
-      // },
 
     ])
+    //展开切换
+    const handlemoreid = () => {
+      if (state.moreid == 1) {
+        state.moreid = 2
+      }
+      else if (state.moreid == 2) {
+        state.moreid = 1
+        state.searchParam.type = null
+        state.searchParam.status = null
+        state.searchParam.departId = null
+        state.searchParam.systemId = null
+        state.searchParam.tlevelName = null
+      }
+    }
     // 搜索
     const searchSubmit = () => {
       getTableDate();
     };
+    //修改时间
+    const searchTimeChange = (e, date) => {
+      let startTime = date[0] + " 00:00:00";
+      let endTime = date[1] + " 23:59:59";
+      state.startTime = new Date(startTime).getTime();
+      state.endTime = new Date(endTime).getTime();
+      // state.searchParam.startDate = new Date(startDate).getTime() ;
+      // state.searchParam.endDate = new Date(endDate).getTime() ;
+      state.searchParam.startDate = state.startTime ? state.startTime : null,
+        state.searchParam.endDate = state.endTime ? state.endTime : null
+    };
     //重置
     const searchReset = () => {
       state.searchParam = {
-         pageNo: 1, 
-         pageSize: 10 ,
-         name:null,
-         offcourseId :null,
-         departId:null,
-         systemId:null,
-         beginTime:null,
-         type:null,
-         status:null
-        };
+        pageNo: 1,
+        pageSize: 10,
+        name: null,
+        offcourseId: null,
+        departId: null,
+        systemId: null,
+        beginTime: null,
+        type: null,
+        status: null
+      };
       getTableDate();
     };
     //  List接口数据
-     const getTableDate = (obj) => {
-      state.tableLoading=true 
-      let objA = {...state.searchParam};
-      getNewInTeacherCourseList(objA)
-        .then((res) => {
-          tableData.value = res.data.data.records
-          state.tableDataTotal = Number(res.data.data.total);
-          state.tableLoading=false 
-          console.log("获取tableData", tableData);
-      }) 
+    const getTableDate = (obj) => {
+      state.tableLoading = true
+      let objA = { ...state.searchParam };
+      objA.startDate = state.searchParam.startDate !== null ? dayjs(new Date(state.searchParam.startDate).getTime()).format("YYYY-MM-DD") : "",
+        objA.endDate = state.searchParam.endDate !== null ? dayjs(new Date(state.searchParam.endDate).getTime()).format("YYYY-MM-DD") : "",
+        getNewInTeacherCourseList(objA)
+          .then((res) => {
+            tableData.value = res.data.data.records
+            state.tableDataTotal = Number(res.data.data.total);
+            state.tableLoading = false
+            console.log("获取tableData", tableData);
+          })
     };
     getTableDate()
-   
+
     //   // 翻页
-    const changePagination = (page,pageSize) => {
+    const changePagination = (page, pageSize) => {
       state.searchParam.pageNo = page;
       state.currentPage1 = page;
       state.pageSize1 = pageSize;
@@ -698,7 +648,7 @@ export default {
       LecturerSystemLista()
       getTeacherExpertiseLista()
       getTeacherExpertisea()
-      
+
     }
     //修改信息弹窗
     const handleModify = (record) => {
@@ -708,80 +658,79 @@ export default {
       TeacherSystem(record)
     }
     //保存
-    const createTeacherDialog =()=>{
-      if (state.formParam.offcourseId != null ) {
-                      updateInTeacherCourse (state.formParam).then(response => {
-                            message.success("修改成功");
-                        });
-                    }
-      else {
-      insertInTeacherCourse(state.formParam)
-        .then((res) => {
-          message.success("保存成功");
-      }).catch((err) => {
-          console.log(err);
+    const createTeacherDialog = () => {
+      if (state.formParam.offcourseId != null) {
+        updateInTeacherCourse(state.formParam).then(response => {
+          message.success("修改成功");
         });
-       }
-       getTableDate();
+      }
+      else {
+        insertInTeacherCourse(state.formParam)
+          .then((res) => {
+            message.success("保存成功");
+          }).catch((err) => {
+            console.log(err);
+          });
+      }
+      getTableDate();
       state.teacherdialog = false
     }
     //删除弹窗
     const deleteModal = (record) => {
       state.deleteTeacherdialog = true
       state.delTeacherId = record.offcourseId
- 
+
     };
-    
+
     //确认删除
-    const closeDeleteTeacher=()=>{
+    const closeDeleteTeacher = () => {
       //调用删除接口
-      deleteInTeacherCourse(state.delTeacherId).then((res)=>{
-        if(res.data.code == 200 ){
+      deleteInTeacherCourse(state.delTeacherId).then((res) => {
+        if (res.data.code == 200) {
           message.success("删除成功");
           state.deleteTeacherdialog = false
           getTableDate();
         }
       })
-    } 
-    
+    }
+
     //取消按钮 清空输入的数据
     const cancelTeacherDialog = () => {
-      if(state.teacherdialog = true )
-      {
-      state.teacherdialog = false
-      cancel()
-     }
-       state.deleteTeacherdialog = false 
+      if (state.teacherdialog = true) {
+        state.teacherdialog = false
+        cancel()
+      }
+      state.deleteTeacherdialog = false
     };
 
     //清空数据
     const cancel = () => {
-      state.formParam ={
-        teacher:null,
-        userNo:null,
-        departId:null,
-        defaultTeachingTime:null,
-        tlevelName:null,
-        name:null,
-        beginTime:null,
-        duration:null,
-        studys:null,
-        score:null,
-        type:null,
-        remark:null,
-        offcourseId:null
+      state.formParam = {
+        teacher: null,
+        userNo: null,
+        departId: null,
+        defaultTeachingTime: null,
+        tlevelName: null,
+        name: null,
+        beginTime: null,
+        duration: null,
+        studys: null,
+        score: null,
+        type: null,
+        remark: null,
+        offcourseId: null
       }
-     
+
     }
-     //页面内部姓名
-     const infoteacherList = ref([
+    //页面内部姓名
+    const infoteacherList = ref([
     ]);
-    const  getinfoteacher = (obj) => {
-      state.tableLoading=true 
+    const getinfoteacher = (obj) => {
+      state.tableLoading = true
       infoteacher()
         .then((res) => {
           infoteacherList.value = res.data.data.records
-      }) 
+        })
     };
 
     //表格内查看数据操作
@@ -789,16 +738,16 @@ export default {
       state.teacherdialog1 = 1
       state.teacherdialog = true;
       state.teacherdialogtitle = '查看详情'
-      state.userNoid= record.userNo
-      state.lookTeacherId= record.teacherId
+      state.userNoid = record.userNo
+      state.lookTeacherId = record.teacherId
       // // alert(record.grade)
-       TeacherSystem(record)
+      TeacherSystem(record)
       // let id = record.userNo
       // router.push({ path: '/insideteachingdetail', query: { id  } })
       // router.push({ path: '/InsideTeachingDetail' })
     }
     //内部讲师详情
-    const TeacherSystem=(record)=>{
+    const TeacherSystem = (record) => {
       // getTeacherCourseList( state.lookTeacherId).then((res) => {
       //     console.log("内部讲师详情", res.data);
       //     state.formParam= res.data.data
@@ -806,42 +755,44 @@ export default {
       // .catch((err) => {
       //     console.log("内部讲师详情", err);
       //   });
-      state.formParam={
-        teacher:record.teacher,
-        userNo:record.userNo,
-        departId:record.departId,
-        defaultTeachingTime:record.defaultTeachingTime,
-        tlevelName:record.tlevelName,
-        name:record.name,
-        beginTime:  moment(record.beginTime, 'YYYY-MM-DD'),
+      state.formParam = {
+        teacher: record.teacher,
+        userNo: record.userNo,
+        departId: record.departId,
+        defaultTeachingTime: record.defaultTeachingTime,
+        tlevelName: record.tlevelName,
+        name: record.name,
+        beginTime: moment(record.beginTime, 'YYYY-MM-DD'),
         // ref< moment.Moment >(moment(record.beginTime,'YYYY-MM-DD')),
         //  record.beginTime,
-        duration:record.duration,
-        studys:record.studys,
-        score:record.score,
-        type:record.type,
-        remark:record.remark,
-        userNo:record.userNo,
-        type1:record.type1,
-        offcourseId:record.offcourseId,
+        duration: record.duration,
+        studys: record.studys,
+        score: record.score,
+        type: record.type,
+        remark: record.remark,
+        userNo: record.userNo,
+        type1: record.type1,
+        offcourseId: record.offcourseId,
       }
     }
     //导出功能
-    const handleExport = ()=> {
+    const handleExport = () => {
       window.open(
-        `${process.env.VUE_APP_BASE_API}/lesson_records/export?pageNo=${ state.currentPage1
+        `${process.env.VUE_APP_BASE_API}/lesson_records/export?pageNo=${state.currentPage1
         }&pageSize=${state.pageSize1}
-        &userNo=${state.searchParam.userNo ? state.searchParam.userNo : "" }
-        &teacherNo=${ state.searchParam.teacherNo ?  state.searchParam.teacherNo : ""}
+        &userNo=${state.searchParam.userNo ? state.searchParam.userNo : ""}
+        &teacherNo=${state.searchParam.teacherNo ? state.searchParam.teacherNo : ""}
         &departId=${state.searchParam.departId ? state.searchParam.departId : ""}
-        &systemId=${ state.searchParam.systemId ?  state.searchParam.systemId : ""}
-        &beginTime=${  state.searchParam.beginTime ? state.searchParam.beginTime : ""  }
-        &tlevelName=${state.searchParam.tlevelName ?  state.searchParam.tlevelName : ""}
-        &type=${state.searchParam.type ?  state.searchParam.type : ""}
-        &status=${state.searchParam.status ?  state.searchParam.status : ""}`)
-        }
+        &systemId=${state.searchParam.systemId ? state.searchParam.systemId : ""}
+        &startDate=${state.searchParam.startDate ? state.searchParam.startDate : ""}
+        &endDate=${state.searchParam.endDate ? state.searchParam.endDate : ""}
+        &tlevelName=${state.searchParam.tlevelName ? state.searchParam.tlevelName : ""}
+        &type=${state.searchParam.type ? state.searchParam.type : ""}
+        &status=${state.searchParam.status ? state.searchParam.status : ""}`)
+    }
     return {
       ...toRefs(state),
+      handlemoreid,
       infoteacherList,
       getinfoteacher,
       handleExport,
@@ -863,7 +814,7 @@ export default {
       handleModify,
       closeDeleteTeacher,
       createTeacherDialog,
-       getTableDate, //list接口数据调用
+      getTableDate, //list接口数据调用
       // getStu
       LecturerSystemLista,
       TeacherSystem,
@@ -873,19 +824,31 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
+<style lang="scss" scoped >
+.select .ant-picker {
+  width: 410px !important;
+}
+
+.addTimeBox {
+  position: relative;
+  display: flex;
+  align-items: center;
+
+  .addTime {
+    position: absolute;
+    z-index: 10;
+    margin-left: 10px;
+    color: rgba(0, 0, 0, 0.4);
+  }
+}
+
 //导出按钮icon
 .daochu {
-          width: 16px;
-          height: 18px;
-          background-image: url("../../assets/images/coursewareManage/export1.png");
-        }
-    //导入按钮icon
-.daoru{
-          width: 16px;
-          height: 18px;
-          background-image: url("../../assets/images/coursewareManage/daoru.png");
-        }  
+  width: 16px;
+  height: 18px;
+  background-image: url("../../assets/images/coursewareManage/export1.png");
+}
+
 //弹窗内详情样式
 .display1 {
   display: inline-block;
@@ -940,7 +903,7 @@ export default {
   text-align: center;
 }
 
-.InsideTeaching {
+.InsideLecturer {
   width: 100%;
   height: 100%;
   display: flex;
@@ -954,273 +917,9 @@ export default {
     justify-content: space-between;
     flex-wrap: wrap;
 
-    .filterItems {
-      display: flex;
-      flex-wrap: wrap;
-
-      .select {
-        margin-right: 20px;
-        margin-bottom: 20px;
-      }
-
-      .addTimeBox {
-        position: relative;
-        display: flex;
-        align-items: center;
-
-        .addTime {
-          position: absolute;
-          z-index: 10;
-          margin-left: 10px;
-          color: rgba(0, 0, 0, 0.4);
-        }
-
-        .ant-picker {
-          padding-left: 85px;
-        }
-
-        .ant-picker-range .ant-picker-active-bar {
-          margin-left: 85px;
-        }
-      }
-
-      .btn {
-        padding: 0px 26px 0px 26px;
-        height: 38px;
-        background: #4ea6ff;
-        border-radius: 8px;
-        border: 1px solid rgba(64, 158, 255, 1);
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        margin-right: 14px;
-        flex-shrink: 0;
-        cursor: pointer;
-
-        .search {
-          background-size: 100%;
-        }
-
-        .btnText {
-          font-size: 14px;
-          font-weight: 400;
-          color: #fff;
-          line-height: 36px;
-          margin-left: 5px;
-        }
-      }
-
-      .btnn {
-        padding: 0px 26px 0px 26px;
-        height: 38px;
-        background: #4ea6ff;
-        border-radius: 8px;
-        border: 1px solid rgba(64, 158, 255, 1);
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        margin-right: 14px;
-        flex-shrink: 0;
-        cursor: pointer;
-
-        .search {
-          background-size: 100%;
-        }
-
-        .btnText {
-          font-size: 14px;
-          font-weight: 400;
-          color: #ffffff;
-          line-height: 36px;
-          margin-left: 5px;
-        }
-      }
-
-      .btn1 {
-        .search {
-          width: 15px;
-          height: 17px;
-          background-image: url("../../assets/images/courseManage/search0.png");
-        }
-      }
-
-      .btn2 {
-        .search {
-          width: 16px;
-          height: 18px;
-          background-image: url("../../assets/images/courseManage/reset0.png");
-        }
-      }
-
-      // .btn1:hover {
-      //   background: rgba(64, 158, 255, 0.76);
-
-      //   .search {
-      //     background-image: url("../../assets/images/courseManage/search0.png");
-      //   }
-
-      //   .btnText {
-      //     color: #ffffff;
-      //   }
-      // }
-
-      .btn1:active {
-        background: #0982ff;
-      }
-
-      // .btn2:hover {
-      //   background: rgba(64, 158, 255, 0.1);
-      // }
-
-      .btn2:active {
-        background: #0982ff;
-      }
-    }
-
-    .btns {
-      display: flex;
-
-      // flex-wrap: wrap;
-      .btn {
-        padding: 0px 26px 0px 26px;
-        height: 38px;
-        background: #4ea6ff;
-        border-radius: 8px;
-        border: 1px solid rgba(64, 158, 255, 1);
-        display: flex;
-        align-items: center;
-        cursor: pointer;
-        justify-content: center;
-        margin-right: 14px;
-        flex-shrink: 0;
-
-        .search {
-          background-size: 100%;
-        }
-
-        .btnText {
-          font-size: 14px;
-          font-weight: 400;
-          color: #ffffff;
-          line-height: 36px;
-          margin-left: 5px;
-        }
-      }
-
-      .btn3 {
-        margin-right: 0px;
-
-        .search {
-          width: 17px;
-          height: 18px;
-          background-image: url("../../assets/images/courseManage/add0.png");
-        }
-      }
-
-      // .btn3:hover {
-      //   background: rgba(64, 158, 255, 0.76);
-      // }
-
-      .btn3:active {
-        background: #0982ff;
-      }
-    }
-  }
-
-  .tableBox {
-    margin: 20px 38px 30px;
-
-    .ant-table-thead>tr>th {
-      background-color: #eff4fc;
-    }
-
-    th {
-      background-color: #eff4fc !important;
-      text-align: center !important;
-    }
-  }
-
-  .tableBox {
-    padding-bottom: 20px;
-
-    .pa {
-      // position: absolute;
-      // bottom: 20px;
-      // left: 0;
-      width: 100%;
-      // height: 20px;
-      // background-color: red;
-      display: flex;
-      justify-content: center;
-      // margin-bottom: 10px;
-      // position: absolute;
-      // bottom: -40px;
-    }
-  }
-
-  .operation {
-    font-size: 14px;
-    font-weight: 400;
-    color: #4ea6ff;
-    margin-right: -45px;
-    display: flex;
-    justify-content: right;
-    margin-right: 18px;
-
-    // line-height: 36px;
-    .operation1 {
-      margin-left: 21px;
-      width: 28px;
-      display: inline-block;
-    }
-
-    .operation3 {
-      margin-left: 21px;
-      width: 70px;
-      display: inline-block;
-      text-align: center;
-    }
-
-    .more {
-      width: 50px;
-      display: inline-block;
-      margin-left: 21px;
-      position: relative;
-      text-align: left;
-
-      // z-index: 99999;
-      .moreArrow {
-        width: 13px;
-        height: 7px;
-        display: inline-block;
-        background-image: url("../../assets/images/navtop/down.png");
-        background-size: 100%;
-        margin: 2px;
-        margin-left: 7px;
-      }
-
-      .moreItems {
-        width: 100px;
-        padding: 5px;
-        display: none;
-        background: #ffffff;
-        box-shadow: 2px 3px 9px 3px rgba(0, 0, 0, 0.05);
-        border-radius: 3px;
-        border: 0px solid #dcdcdc;
-        position: absolute;
-        left: 0px;
-        top: 28px;
-        z-index: 100;
-        text-align: center;
-      }
-    }
-
-    .more:hover .moreArrow {
-      background-image: url("../../assets/images/navtop/up.png");
-    }
-
-    .more:hover .moreItems {
-      display: block;
+    .select {
+      margin-right: 20px;
+      margin-bottom: 20px;
     }
   }
 }
@@ -1234,7 +933,7 @@ export default {
   position: absolute;
   left: 50%;
   top: 10%;
-  transform: translate(-50%, -50%);
+  // transform: translate(-50%, -50%);
 
   .del_header {
     position: absolute;
@@ -1326,60 +1025,132 @@ export default {
     }
   }
 }
+
 .CreatePath {
-        .out {
-          z-index: 9999;
-          display: block;
-          position: absolute;
-          top: 90px;
-          width:850px !important;
-          height: 750px;
-          background-color: #fff;
+  .out {
+    z-index: 9999;
+    display: block;
+    position: absolute;
+    top: 90px;
+    width: 1080px !important;
+    height: 650px;
+    overflow: auto;
+    background-color: #fff;
 
-          box-shadow: 0 0 10px rgba(118, 136, 166, 0.21);
-          left: 50%;
-          top:300px;
-          transform: translate(-50%, -50%);
+    box-shadow: 0 0 10px rgba(118, 136, 166, 0.21);
+    left: 50%;
+    top: 300px;
+    transform: translate(-50%, -50%);
 
-          .top {
-            width: 100%;
-            height: 68px;
+    .top {
+      width: 100%;
+      height: 68px;
 
-            background: linear-gradient(
-              rgba(78, 166, 255, 0.2) 0%,
-              rgba(78, 166, 255, 0) 100%
-            );
-            display: flex;
-            align-items: center;
+      background: linear-gradient(rgba(78, 166, 255, 0.2) 0%,
+          rgba(78, 166, 255, 0) 100%);
+      display: flex;
+      align-items: center;
 
-            .topimg {
-              width: 18px;
-              height: 18px;
-              margin-left: 27px;
-              margin-top: -2px;
-            }
+      .topimg {
+        width: 18px;
+        height: 18px;
+        margin-left: 27px;
+        margin-top: -2px;
+      }
 
-            .topc {
-              color: #000000;
-              font-size: 16px;
-              margin-left: 8px;
-            }
-          }
+      .topc {
+        color: #000000;
+        font-size: 16px;
+        margin-left: 8px;
+      }
+    }
 
-          .mid {
-            width: 100%;
-            height: 100%;
-            background-color: #fff;
-            display: flex;
-            flex-direction: column;
-            align-items: center;
+    .mid {
+      width: 100%;
+      height: 100%;
+      background-color: #fff;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
 
-            .d {
-              // margin-top: 8px;
-              // color: #ff4e4e;
-              margin-left: -5px;
-            }
-          }
-        }
+      .d {
+        // margin-top: 8px;
+        // color: #ff4e4e;
+        margin-left: -5px;
+      }
+    }
+  }
+}
+
+//添加样式
+.langbtn {
+  height: 40px;
+  border-radius: 8px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 14px;
+  flex-shrink: 0;
+  cursor: pointer;
+}
+
+// 重置样式
+.resetbtn {
+  width: 100px;
+  height: 40px;
+  border-radius: 8px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 14px;
+  flex-shrink: 0;
+  cursor: pointer;
+}
+
+//展开收起样式
+.moreidbtn {
+  border: none;
+  color: #4ea6ff;
+  width: 80px
+}
+
+//小竖线
+.line {
+  float: left;
+  width: 3px;
+  height: 25px;
+  background: #4ea6ff;
+  border-radius: 30%;
+  margin-right: 5px;
+}
+
+//抽屉功能
+.drawaer
+
+// /* 改变所有 a-tree-select 输入框的高度 */
+//   ::v-deep  .ant-select:not(.ant-select-customize-input) .ant-select-selector{
+//   height: 40px;
+//   line-height: 40px;
+//   border-radius: 8px
+
+//   /* 确保文字垂直居中 */
+// }
+::v-deep .ant-select-single:not(.ant-select-customize-input) .ant-select-selector{
+  height: 40px !important;
+  line-height: 40px;
+  border-radius: 8px
+}
+// 抽屉内样式
+.draitem{
+ width: 100%;
+  height: 40px !important; 
+  border-radius: 8px;
+  line-height: 40px;
+}
+.drabtn{
+  height:40px;
+  width:80px;
+  border-radius:8px;
+  margin-right:20px
 }
 </style>
\ No newline at end of file
diff --git a/src/views/lecturer/LookExternalLecturer.vue b/src/views/lecturer/LookExternalLecturer.vue
index 35132dc9..de478c47 100644
--- a/src/views/lecturer/LookExternalLecturer.vue
+++ b/src/views/lecturer/LookExternalLecturer.vue
@@ -12,30 +12,20 @@ ExternalLecturer
         <!-- 讲师信息 -->
         <div style="width: 100%;margin-top: 10px;">
         <span class="line"></span>
-        <a-descriptions title="讲师信息" bordered :column="4" :contentStyle="rowCenter" :labelStyle="rowCenter">
+        <a-descriptions title="讲师信息" bordered :column="3" :contentStyle="rowCenter" :labelStyle="rowCenter">
             <!-- 一层 -->
     <a-descriptions-item label="讲师头像">{{formParam.url }}</a-descriptions-item>
     <a-descriptions-item label="讲师工号">{{formParam.userNo}}</a-descriptions-item>
-    <a-descriptions-item label="讲师姓名">{{formParam.name}}</a-descriptions-item>
-    <a-descriptions-item label="讲师体系">{{formParam.systemId}}</a-descriptions-item>
-    <!-- 二层 -->
-    <a-descriptions-item label="讲师级别">{{formParam.levelId }}</a-descriptions-item>
-    <a-descriptions-item label="认证状态">{{ formParam.certStatus==0?'未认证' :formParam.certStatus==1 ?'已认证':''}}</a-descriptions-item>
-    <a-descriptions-item label="授课时长">{{formParam.teaching}}</a-descriptions-item>
-    <a-descriptions-item label="发薪地  ">{{formParam.payrollPlaceId}}</a-descriptions-item>
-    <!-- 三层 -->
-    <a-descriptions-item label="在职">{{formParam.waitStatus==0?'在职' :formParam.waitStatus==1 ?'离职':''}}</a-descriptions-item>
-    <a-descriptions-item label="账号状态">{{formParam.status==0?'临时' :formParam.status==1 ?'启用':formParam.status==1 ?'停用':''}}</a-descriptions-item>
-    <a-descriptions-item label="所属组织" :span="2">{{formParam.departId}}</a-descriptions-item>
+    <a-descriptions-item label="手机号码">{{formParam.mobile}}</a-descriptions-item>
+    <a-descriptions-item label="讲师邮箱">{{formParam.email}}</a-descriptions-item>
+  <a-descriptions-item label="所属组织" :span="2">{{formParam.departId}}</a-descriptions-item>
   </a-descriptions>
   <div style="margin-top: 10px;"></div>
   <span class="line" ></span>
   <a-descriptions title="其他信息" bordered :column="4" :contentStyle="rowCenter" :labelStyle="rowCenter"  >
             <!-- 一层 -->
     <a-descriptions-item label="讲师介绍" :span="4"><div style="min-width: 500px;">{{formParam.description}}</div> </a-descriptions-item>
-    <a-descriptions-item label="工作职责" :span="4">{{formParam.workExperience}}</a-descriptions-item>
-    <a-descriptions-item label="擅长课程" :span="4">{{formParam.courses}}</a-descriptions-item>
-    <a-descriptions-item label="教师专长" :span="4">{{formParam.TeacherExpertise}}</a-descriptions-item>
+    <a-descriptions-item label="备注" :span="4">{{formParam.remark}}</a-descriptions-item>
   </a-descriptions>
   <!-- 记录 -->
   <div style="margin-top: 1px;"></div>
@@ -46,13 +36,13 @@ ExternalLecturer
         :data-source="teacherrecordstableData" :loading="teacherrecordsLoading" @expand="expandTable" :pagination="false">
         <template #bodyCell="{  record,  column }" >
             <!-- 鼠标悬停提示 -->
-            <template v-if="column.key === 'score'">
+            <template v-if="column.key === 'remark'">
               <a-space style="display:flex ;justify-content: space-around;  ">
                 <a-popover>
     <template #content>
-      <p>{{ record.score }}</p>
+      <p>{{ record.remark }}</p>
     </template>
-    <span>{{ record.score }}</span>
+    <span>{{ record.remark }}</span>
   </a-popover>
               </a-space>
             </template>
@@ -71,26 +61,7 @@ ExternalLecturer
           />
           </div>
        </a-tab-pane>
-    <a-tab-pane key="2" tab="晋级记录">
-      <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="promotionrecordsColumns"
-        
-          :data-source="promotionrecordstableData" :loading="promotionrecordsLoading" @expand="expandTable" :pagination="false">
-          <template #bodyCell="{ record, column }" >
-          </template>
-        </a-table>
-        <div style="float: right;">
-      <a-pagination
-            v-if="teacherrepromotableDataTotal > 10"
-            :showSizeChanger="true"
-            :hideOnSinglePage="true"
-            :pageSize="pageSize"
-            v-model:current="teacherrepromo.pageNo"
-            :total="teacherrepromotableDataTotal"
-            class="pagination"
-            @change="teacherrepromoPagination"
-          />
-          </div>
-       </a-tab-pane>
+   
   </a-tabs>
 </div>
     </a-layout-content>
@@ -99,7 +70,7 @@ ExternalLecturer
 <script lang ="jsx">
 import { useRouter,useRoute } from "vue-router";
 import { reactive, toRefs, ref } from "vue"
-import {getTeacherById,getTeacherCourseList ,getTeacherLogList} from "../../api/Lecturer"; 
+import {getTeacherById,getTeacherCourseList } from "../../api/Lecturer"; 
 export default{
     name :"LookExternalLecturer",
     components:{
@@ -210,15 +181,15 @@ export default{
       },
       {
         title: '评分',
-        dataIndex: 'score ',
-        key: 'score ',
+        dataIndex: 'score',
+        key: 'score',
         elipsis: true, align: "center",
         width: 120,
       },
       {
         title: '开课状态',
-        dataIndex: 'status ',
-        key: 'status ',
+        dataIndex: 'status',
+        key: 'status',
         elipsis: true, align: "center",
         width: 120,
         customRender: (value) => {
@@ -236,11 +207,11 @@ export default{
       },
       {
         title: '备注',
-        dataIndex: 'score ',
-        key: 'score ',
+        dataIndex: 'remark',
+        key: 'remark',
         elipsis: true, align: "center",
         width: 120,
-        scopedSlots: { customRender: "score" },
+        scopedSlots: { customRender: "remark" },
       },
     ])
     //授课记录列表数据
@@ -264,55 +235,6 @@ export default{
       state.teacherrecords.pageNo = page;
       getteacherrecordstableData();
     };
-    //晋级记录翻页
-    const teacherrepromoPagination = (page) => {
-      state.teacherrecords.pageNo = page;
-      getpromotionrecordstableData();
-    };
-        //晋级记录列表
-        const promotionrecordsColumns = ref([
-      {
-        title: '变更时间',
-        dataIndex: 'operatorTime',
-        key: 'operatorTime',
-        elipsis: true, align: "center",
-        width: 120,
-      },
-      {
-        title: '变更方式',
-        dataIndex: 'operatorType',
-        key: 'operatorType',
-        elipsis: true, align: "center",
-        width: 120,
-      },
-      {
-        title: '变更结果',
-        dataIndex: 'afterInfo',
-        key: 'afterInfo',
-        elipsis: true, align: "center",
-        width: 120,
-      },
-      {
-        title: '操作人',
-        dataIndex: 'operatorId',
-        key: 'operatorId',
-        elipsis: true, align: "center",
-        width: 120,
-      },
-    ])
-    //晋级记录列表数据
-    const promotionrecordstableData = ref([
-    ])
-    const getpromotionrecordstableData = () => {
-      state.promotionrecordsLoading = true
-      state.teacherrepromo.id = state.id
-      getTeacherLogList(state.teacherrepromo).then((res) => {
-        promotionrecordstableData.value = res.data.data.records
-        state.teacherrepromotableDataTotal = Number(res.data.data.total);
-      })
-      state.promotionrecordsLoading = false
-    };
-    getpromotionrecordstableData()
         return{
             ...toRefs(state),
             router,
@@ -323,10 +245,6 @@ export default{
       teacherrecordsColumns,
       getteacherrecordstableData,
       teacherchangePagination,
-      teacherrepromoPagination,
-      promotionrecordsColumns,
-      promotionrecordstableData,
-      getpromotionrecordstableData
         }
     }
 }
diff --git a/src/views/lecturer/LookInsideLecturer.vue b/src/views/lecturer/LookInsideLecturer.vue
index c126aa99..6ea78581 100644
--- a/src/views/lecturer/LookInsideLecturer.vue
+++ b/src/views/lecturer/LookInsideLecturer.vue
@@ -44,13 +44,13 @@
         :data-source="teacherrecordstableData" :loading="teacherrecordsLoading" @expand="expandTable" :pagination="false">
         <template #bodyCell="{  record,  column }" >
             <!-- 鼠标悬停提示 -->
-            <template v-if="column.key === 'score'">
+            <template v-if="column.key === 'remark'">
               <a-space style="display:flex ;justify-content: space-around;  ">
                 <a-popover>
     <template #content>
-      <p>{{ record.score }}</p>
+      <p>{{ record.remark }}</p>
     </template>
-    <span>{{ record.score }}</span>
+    <span>{{ record.remark }}</span>
   </a-popover>
               </a-space>
             </template>
@@ -70,6 +70,7 @@
           </div>
        </a-tab-pane>
     <a-tab-pane key="2" tab="晋级记录">
+      {{ teacherrepromo.id }}
       <a-table :header-cell-style="{ 'text-align': 'center' }" style="border: 1px solid #f2f6fe" :columns="promotionrecordsColumns"
         
           :data-source="promotionrecordstableData" :loading="promotionrecordsLoading" @expand="expandTable" :pagination="false">
@@ -131,7 +132,9 @@ export default{
     const TeacherSystem = () => {
       getTeacherById(state.id).then((res) => {
         console.log("内部讲师详情", res.data);
-        state.formParam = res.data.data
+        state.formParam = res.data.data[0];
+        state.teacherrepromo.id=res.data.data[0].kid
+        console.log(state.teacherrepromo.kid);
       })
         .catch((err) => {
           console.log("内部讲师详情", err);
@@ -167,8 +170,8 @@ export default{
       },
       {
         title: '内容分类',
-        dataIndex: 'nrfl',
-        key: 'nrfl',
+        dataIndex: 'teaching',
+        key: 'teaching',
         elipsis: true, align: "center",
         width: 120,
       },
@@ -208,8 +211,8 @@ export default{
       },
       {
         title: '评分',
-        dataIndex: 'score ',
-        key: 'score ',
+        dataIndex: 'score',
+        key: 'score',
         elipsis: true, align: "center",
         width: 120,
       },
@@ -234,11 +237,11 @@ export default{
       },
       {
         title: '备注',
-        dataIndex: 'score ',
-        key: 'score ',
+        dataIndex: 'remark ',
+        key: 'remark ',
         elipsis: true, align: "center",
         width: 120,
-        scopedSlots: { customRender: "score" },
+        scopedSlots: { customRender: "remark" },
       },
     ])
     //授课记录列表数据
@@ -303,7 +306,7 @@ export default{
     ])
     const getpromotionrecordstableData = () => {
       state.promotionrecordsLoading = true
-      state.teacherrepromo.id = state.id
+      // state.teacherrepromo.kid = state.kid
       getTeacherLogList(state.teacherrepromo).then((res) => {
         promotionrecordstableData.value = res.data.data.records
         state.teacherrepromotableDataTotal = Number(res.data.data.total);
@@ -324,7 +327,7 @@ export default{
       teacherrepromoPagination,
       promotionrecordsColumns,
       promotionrecordstableData,
-      getpromotionrecordstableData
+      getpromotionrecordstableData,
         }
     }
 }