diff --git a/src/views/manage/TeacherList.vue b/src/views/manage/TeacherList.vue
index 37461b90..5c4d29ea 100644
--- a/src/views/manage/TeacherList.vue
+++ b/src/views/manage/TeacherList.vue
@@ -159,7 +159,7 @@
     :close-on-click-modal="false"
     :visible.sync="showTeacherDetails"
     width="800px">
-    <teacher-details v-if="teacherDetailsId != ''" :id="teacherDetailsId"></teacher-details>
+    <teacher-details v-if="teacherDetailsId != ''" :id="teacherDetailsId" :newId="teacherDetailId"></teacher-details>
     <span slot="footer" class="dialog-footer">
       <el-button @click="handleCloseOne()">取 消</el-button>
       <!-- <el-button type="primary" @click="showTeacherDetails = false">确 定</el-button> -->
@@ -180,7 +180,8 @@
     components:{imageUpload,teacherDetails},
     data(){
       return {
-        teacherDetailsId: '',
+        teacherDetailId:'',//新数据id
+        teacherDetailsId: '',// sid
         showTeacherDetails:false,
         tSystemData:{},
         tLevelData:{},
@@ -261,8 +262,9 @@
       },
       handleName(row) {
        this.showTeacherDetails = true;
-      //  this.teacherDetailsId = row.sysId;
-       this.teacherDetailsId = '13BEBDBD-3D28-244D-648D-0CBD6796717C'
+       this.teacherDetailsId = row.sysId;
+       this.teacherDetailId = row.id;
+      //  this.teacherDetailsId = '13BEBDBD-3D28-244D-648D-0CBD6796717C'
       },
       getTeachersystem() {
         teacherBoeApi.teacherSystem(this.userInfo.sysId).then(res=>{
diff --git a/src/views/manage/teacherDetails.vue b/src/views/manage/teacherDetails.vue
index 6f79deb2..441a35d8 100644
--- a/src/views/manage/teacherDetails.vue
+++ b/src/views/manage/teacherDetails.vue
@@ -7,44 +7,44 @@
               <el-col :span="24">
                <el-form label-width="120px" size="mini">
                 <el-form-item label="头像:">
-                    <div style="width: 90px;height: 90px" v-if="form.account.avatar == ''">
-                        <img style="width:100%;height:100%" v-if="form.gender == 1" :src="webBaseUrl + '/images/Avatarman.png'" alt="" srcset="">
+                    <div style="width: 90px;height: 90px" v-if="newForm && newForm.account && newForm.account.avatar == ''">
+                        <img style="width:100%;height:100%" v-if="newForm.gender == 1" :src="webBaseUrl + '/images/Avatarman.png'" alt="" srcset="">
                         <img style="width:100%;height:100%" v-else :src="webBaseUrl + '/images/Avatarwoman.png'" alt="" srcset="">
                     </div>
                     <div style="width: 90px;height: 90px" v-else>
-                        <img style="width:100%;height:100%" :src="form.account.avatar" alt="" srcset="">
+                        <img style="width:100%;height:100%" :src="newForm && newForm.account && newForm.account.avatar" alt="" srcset="">
                     </div>
              </el-form-item>
              <el-form-item label="讲师账号:">
-                 <el-col :span="12">{{form.user.userNo}}</el-col>
+                 <el-col :span="12">{{newForm.user.userNo}}</el-col>
                  <el-col :span="12">
-                    <el-form-item label="讲师姓名:">{{form.user.name}}</el-form-item>
+                    <el-form-item label="讲师姓名:">{{newForm.user.name}}</el-form-item>
                  </el-col>
                 </el-form-item>
              <el-form-item label="讲师组织:" >
-                <el-col :span="12">--</el-col>
+                <el-col :span="12">{{form.company_name}}</el-col>
                  <el-col :span="12">
-                 <el-form-item label="初始授课时长:">{{form.user.teaching}}</el-form-item></el-col>
+                 <el-form-item label="初始授课时长:">{{formatSeconds(form.default_teaching_time)}}</el-form-item></el-col>
               </el-form-item>
             
             <el-form-item label="讲师体系:">
-                <el-col :span="12">波ue</el-col>
+                <el-col :span="12">{{form.system_name}}</el-col>
                 <el-col :span="12">
                  <el-form-item label="讲师级别:">
-                  2级
+                 {{form.level_name}}
                  </el-form-item>
                  </el-col>
             </el-form-item>
             <el-form-item label="总计授课时长:">
-                <el-col :span="12">12分账</el-col>
+                <el-col :span="12">{{formatSeconds(form.teaching_time)}}</el-col>
                 <el-col :span="12">
                     <el-form-item label="认证状态:">
-                    未认证
+                    {{form.is_certify == 1? '已认证':'未认证'}}
                    </el-form-item>
                 </el-col>
             </el-form-item>
             <el-form-item label="认证时间:">
-               <el-col :span="12">--</el-col>
+               <el-col :span="12">{{form.certify_at}}</el-col>
                 <el-col :span="12">
                   <el-form-item label="认证资料:"> --</el-form-item>
                 </el-col>
@@ -52,15 +52,15 @@
 
            
             <el-form-item label="认证人:">
-                 <el-col :span="12">认证人</el-col>
+                 <el-col :span="12">--</el-col>
                  <el-col :span="12">
-                    <el-form-item label="讲师介绍:">
-                    {{form.user.description}}
+                    <el-form-item label="讲师介绍:">--
+                      <!-- <div v-html="form.description"></div> -->
                     </el-form-item>
                  </el-col>
             </el-form-item>
-               <el-form-item label="讲师备注:">
-               --
+            <el-form-item label="讲师备注:">
+               {{form.remark}}
             </el-form-item>
           </el-form>
           </el-col>
@@ -69,7 +69,7 @@
         </el-tab-pane>
         <el-tab-pane label="授课记录" name="second">
             <div style="display:flex">
-                <div><el-button type="primary" @click="exportCourse()">导出授课记录</el-button></div>
+                <!-- <div><el-button type="primary" @click="exportCourse()">导出授课记录</el-button></div> -->
                 <div style="margin: 0 5px"><el-select v-model="records.courseType" placeholder="请选择" clearable @change="getCourseScore()">
                         <el-option
                         v-for="item in options"
@@ -79,7 +79,7 @@
                         </el-option>
                     </el-select></div>
             </div>
-            <el-table
+            <el-table height="430"
             :data="records.list"
             style="width: 100%;margin-top:10px">
             <el-table-column
@@ -130,7 +130,7 @@
                 </template>
             </el-table-column>
             </el-table>
-            <div style="text-align:center;margin-top:20px">
+            <!-- <div style="text-align:center;margin-top:20px">
              <el-pagination
                 background
                 @size-change="handleSizeChange"
@@ -141,38 +141,39 @@
                 layout="total, sizes, prev, pager, next, jumper"
                 :total="records.count">
                 </el-pagination>
-            </div>
+            </div> -->
         </el-tab-pane>
         <el-tab-pane label="授课资格" name="third">
-                    <el-table
+            <el-table height="430"
             :data="qualify.list"
             style="width: 100%">
             <el-table-column
-                prop="date"
+                prop="courseCode"
                 label="课程编号"
                 width="180">
             </el-table-column>
             <el-table-column
-                prop="name"
+                prop="courseName" show-overflow-tooltip
                 label="课程名称"
-                width="180">
-            </el-table-column>
-            <el-table-column
-                prop="address"
-                label="班级名称">
+                width="250">
             </el-table-column>
                <el-table-column
-                prop="date"
+                prop="dictionaryName"
                 label="课程分类"
                 width="180">
             </el-table-column>
             <el-table-column
-                prop="name"
+                prop="courseType"
                 label="课程类型"
-                width="180">
+                width="100">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.courseType == '0'">在线班</span>
+                  <span v-if="scope.row.courseType == '1'">面授</span>
+                  <span v-if="scope.row.courseType == '2'">线下课</span>
+                </template>
             </el-table-column>
             </el-table>
-            <div style="text-align:center;margin-top:20px">
+            <!-- <div style="text-align:center;margin-top:20px">
              <el-pagination
                 background
                 @size-change="qualifySizeChange"
@@ -183,30 +184,30 @@
                 layout="total, sizes, prev, pager, next, jumper"
                 :total="records.count">
                 </el-pagination>
-            </div>
+            </div> -->
         </el-tab-pane>
         <el-tab-pane label="未开班资源" name="fourth">
-          <el-table
+          <el-table height="430"
             :data="courseInfoList"
             style="width: 100%">
             <el-table-column
                 prop="courseCode"
                 label="班级编号"
-                width="180">
+                width="120">
             </el-table-column>
             <el-table-column
-                prop="courseName"
+                prop="courseName" show-overflow-tooltip
                 label="班级名称"
-                width="180">
+                width="200">
             </el-table-column>
             <el-table-column
-                prop="modName"
+                prop="modName" width="150" show-overflow-tooltip
                 label="模块名称">
             </el-table-column>
                <el-table-column
-                prop="date"
+                prop="teachingTime"
                 label="授课时长"
-                width="180">
+                width="100">
             </el-table-column>
             <el-table-column
                 prop="openStartTime"
@@ -216,7 +217,7 @@
             </el-table>
         </el-tab-pane>
         <el-tab-pane label="晋级过程" name="five">
-          <el-table
+          <el-table height="370"
             :data="precessList"
             style="width: 100%">
             <el-table-column
@@ -231,10 +232,6 @@
                     <span v-if="scope.row.type == '0'">手动</span>
                     <span v-if="scope.row.type == '1'">自动</span>
                 </template>
-            </el-table-column>
-            <el-table-column
-                prop="afterLevelName"
-                label="模块名称">
             </el-table-column>
                <el-table-column
                 prop="afterLevelName"
@@ -268,6 +265,7 @@ import qs from 'qs'
 import teacherApi from "@/api/modules/teacher";
 import teacherBoeApi from "@/api/boe/teacher";
 import userApi from "@/api/system/user";
+import { formatSeconds } from '@/utils/datetime.js'
 import imageUpload from "@/components/ImageUpload/index.vue";
 import { mapGetters } from "vuex";
 export default {
@@ -276,22 +274,31 @@ export default {
   props: {
     id:{
         type: String,
+    },
+    newId:{
+       type: String,
     }
   },
   data() {
     return {
+      formatSeconds,
+      baseUrl: process.env.VUE_APP_BASE_API,
+      newForm:{
+        account:{},
+        user:{},
+      },
       dialogVisible:false,
       activeName: "first",
       value: "",
       options: [//‘1,2’:面授,训练班；‘0’：在线班
-          {label:'在线班',value:'0'},
+          {label:'录播',value:'0'},
           {label:'面授',value:'1'},
-          {label:'训练班',value:'2'},
+          {label:'线下课',value:'2'},
       ],
       records:{// 授课记录
         courseType:'',
-        pageSize: 1,
-        page:5,
+        // pageSize: 1,
+        // page:5,
         count:0,
         list:[],
         row:{
@@ -316,18 +323,20 @@ export default {
   },
   mounted() {
       this.getDetail(this.id);
-      // this.getAvatar();
+      this.getAvatar();
   },
   computed: {
     ...mapGetters(["userInfo"])
   },
   methods: {
      getAvatar(){
-        teacherApi.detail().then(res => {
+        teacherApi.detail(this.newId).then(res => {
            if (res.status == 200) {
-              const result = res.result;
-              this.form = result;
-               this.dialogVisible = true;
+              // const result = res.result;
+              this.newForm = res.result;
+              if(res.result.account.avatar != '') {
+                 this.newForm.account.avatar = this.baseUrl + res.result.account.avatar;
+              }
             }
         })
       },
@@ -448,9 +457,9 @@ export default {
         let data = {
             id:this.id,// 教师id
             courseType:this.records.courseType || '0,1,2', // 课程类型：‘1,2’:面授,训练班；‘0’：在线班
-            pageSize:this.records.pageSize, // 每页数据条数
-            page:this.records.page, // 返回第几页数据
-            isPage:0, // 是否分页：0分页返回，1：不分页直接返回全部
+            // pageSize:this.records.pageSize, // 每页数据条数
+            // page:this.records.page, // 返回第几页数据
+            isPage:1, // 是否分页：0分页返回，1：不分页直接返回全部
         }
        teacherBoeApi.getCourseScore(data).then(res=>{
           if(res.status === '200') {