From 696e80bb9b34fd8d244fd4bf5c70dfa08636be7a Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Tue, 31 May 2022 11:22:44 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E6=94=BE=E5=BC=80=E6=95=99=E5=B8=88?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9A=84=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UserCenter/menu.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/UserCenter/menu.vue b/src/components/UserCenter/menu.vue
index a9051d1e..d8d73cb5 100644
--- a/src/components/UserCenter/menu.vue
+++ b/src/components/UserCenter/menu.vue
@@ -73,10 +73,10 @@
             <span slot="title" class="textl">考试管理</span>
           </el-menu-item>
         </el-submenu>
-       <!-- <el-menu-item index="/manage/teachers" v-show="curIdentity == 3">
+        <el-menu-item index="/manage/teachers" v-show="curIdentity == 3">
           <svg-icon icon-class="teather"></svg-icon>
           <span slot="title">教师管理</span>
-        </el-menu-item> -->
+        </el-menu-item>
         <!-- <el-menu-item index="/case/manage" v-show="curIdentity == 3">
           <svg-icon icon-class="case"></svg-icon>
           <span slot="title">案例管理</span>

From 915c1f6601b9e051d8b58c2db78fb3be82950405 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Tue, 31 May 2022 11:33:50 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=88=B0teacher?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UserCenter/menu.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/UserCenter/menu.vue b/src/components/UserCenter/menu.vue
index d8d73cb5..50f324f8 100644
--- a/src/components/UserCenter/menu.vue
+++ b/src/components/UserCenter/menu.vue
@@ -73,6 +73,7 @@
             <span slot="title" class="textl">考试管理</span>
           </el-menu-item>
         </el-submenu>
+		<!--增加一个说明-->
         <el-menu-item index="/manage/teachers" v-show="curIdentity == 3">
           <svg-icon icon-class="teather"></svg-icon>
           <span slot="title">教师管理</span>

From 119ad56340e0eec519aff8178ba2ca293a84f56b Mon Sep 17 00:00:00 2001
From: "LAPTOP-S9RBPPM6\\bjxask-2201" <752743406@qq.com>
Date: Tue, 31 May 2022 12:24:18 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Course/collectItem.vue |  2 +-
 src/views/manage/TeacherList.vue      |  4 ++--
 src/views/manage/teacherDetails.vue   |  3 +--
 src/views/portal/article/Index.vue    | 12 +++++++++---
 src/views/portal/qa/Index.vue         | 13 ++++++++++---
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/components/Course/collectItem.vue b/src/components/Course/collectItem.vue
index 21a6bf04..1facdb19 100644
--- a/src/components/Course/collectItem.vue
+++ b/src/components/Course/collectItem.vue
@@ -134,7 +134,7 @@ export default {
 <style lang="scss" scoped>
 .one-line-ellipsis{
   display: -webkit-box;
-  // white-space:pre-wrap;
+  white-space:pre-wrap;
   word-wrap: break-word;
   word-break:break-all;
   overflow: hidden;
diff --git a/src/views/manage/TeacherList.vue b/src/views/manage/TeacherList.vue
index 8210665b..4b885766 100644
--- a/src/views/manage/TeacherList.vue
+++ b/src/views/manage/TeacherList.vue
@@ -161,7 +161,7 @@
     width="800px">
     <teacher-details v-if="teacherDetailsId != ''" :id="teacherDetailsId"></teacher-details>
     <span slot="footer" class="dialog-footer">
-      <el-button @click="handleClose">取 消</el-button>
+      <el-button @click="handleCloseOne()">取 消</el-button>
       <!-- <el-button type="primary" @click="showTeacherDetails = false">确 定</el-button> -->
     </span>
 </el-dialog>
@@ -255,7 +255,7 @@
       ...mapGetters(['userInfo'])
     },
     methods:{
-      handleClose() {
+      handleCloseOne() {
         console.log("1111");
         // this.teacherDetailsId = '';
         this.showTeacherDetails = false;
diff --git a/src/views/manage/teacherDetails.vue b/src/views/manage/teacherDetails.vue
index 4248c8a4..2ed3fe45 100644
--- a/src/views/manage/teacherDetails.vue
+++ b/src/views/manage/teacherDetails.vue
@@ -225,8 +225,7 @@
   :visible.sync="dialogVisible"
   width="300px"
   top="20%"
-  :modal="false"
-  :before-close="handleClose">
+  :modal="false">
   <div>请输入授课时长（分钟）</div>
   <div><el-input v-model="input" placeholder="请输入内容"></el-input></div>
   <span slot="footer" class="dialog-footer">
diff --git a/src/views/portal/article/Index.vue b/src/views/portal/article/Index.vue
index a8b1da3d..718876e5 100644
--- a/src/views/portal/article/Index.vue
+++ b/src/views/portal/article/Index.vue
@@ -37,7 +37,7 @@
               </div>
               <span class="more"></span>
             </el-row>
-            <div class="data-content">
+            <div class="data-content" v-if="articleList.list.length > 0">
               <div :span="24" v-for="(article, aidx) in articleList.list" :key="aidx" class="article-list">
                 <div class="article-info">
                   <!--title-->
@@ -77,7 +77,8 @@
             <div class="pagination-div">
               <span class="pag-text" @click="loadMore()" v-if="moreState == 1">加载更多</span>
               <span class="pag-text-msg" v-else-if="moreState == 2">数据加载中</span>
-              <span class="pag-text-msg" v-else-if="moreState == 3">没有更多数据了</span>
+              <span class="pag-text-msg" v-else-if="moreState == 3 && !isSeach">没有更多数据了</span>
+              <span class="pag-text-msg" v-else-if="isSeach">没有查询到相关内容</span>
             </div>
           </el-card>
         </el-row>
@@ -193,6 +194,7 @@ export default {
       ankingFixed:false,
       diagSync:false,//控制弹窗
       // articleList: []
+      isSeach:false,
     };
   },
   mounted() {
@@ -200,7 +202,9 @@ export default {
     // this.ankingWidth=el_anking.clientWidth;
     //console.log(el_anking.clientWidth,'clientWidth');
     this.articleList.keyword = this.$route.query.keyword;
-
+    if(this.articleList.keyword != '') {
+     this.isSeach = true;
+    }
     this.getArticleList();
     this.getAnkingData();
     this.searchterm();
@@ -217,6 +221,7 @@ export default {
   methods: {
     emitInput(val){
       this.articleList.keyword = val;
+      this.isSeach =true;
       this.searchData();
     },
     saveSuccess(data){
@@ -329,6 +334,7 @@ export default {
       // portalPageList接口换了，这是原来的
       apiArticle.findPortal(query).then(res => {
         if (res.status == 200 && res.result.list.length > 0) {
+          this.isSeach =false;
           let ids = [];
           res.result.list.forEach(item => {
             item.authorInfo = { name: '', avatar: '', orgInfo: '' ,sex:null};
diff --git a/src/views/portal/qa/Index.vue b/src/views/portal/qa/Index.vue
index 71fc9ee8..ab081077 100644
--- a/src/views/portal/qa/Index.vue
+++ b/src/views/portal/qa/Index.vue
@@ -48,7 +48,7 @@
                 </el-radio-group> -->
               </span>
             </el-row>
-            <div class="data-content">
+            <div class="data-content" v-if="qaList.length > 0">
               <div :span="24" v-for="(qa, qaidx) in qaList" :key="qaidx" class="qa-list">
                 <div class="qa-info-box">
                   <div class="qa-info">
@@ -85,7 +85,8 @@
             <div class="pagination-div">
               <span class="pag-text" @click="loadMore()" v-if="moreState == 1">加载更多</span>
               <span class="pag-text-msg" v-else-if="moreState == 2">数据加载中</span>
-              <span class="pag-text-msg" v-else-if="moreState == 3">没有更多数据了</span>
+              <span class="pag-text-msg" v-else-if="moreState == 3 && !isSeach">没有更多数据了</span>
+               <span class="pag-text-msg" v-else-if="isSeach">没有查询到相关内容</span>
             </div>
           </el-card>
             </el-row>
@@ -215,12 +216,16 @@ export default {
       //以上是整理后的数据
       anking: 2, //排行榜
       ankingList: [],
-      styleControl:2
+      styleControl:2,
+      isSeach:false,
     };
   },
   mounted() {
     this.queryKeyWord = this.$route.query.keyword;
     this.queryConditions.keyword = this.queryKeyWord;
+     if(this.queryConditions.keyword != '') {
+     this.isSeach = true;
+    }
     this.getQaData(true);
     this.getAnkingData();
     window.addEventListener("scroll", this.handleScroll);
@@ -232,6 +237,7 @@ export default {
   methods: {
    emitInput(val){
       this.queryKeyWord = val;
+      this.isSeach =true;
       this.search();
     },
   //发布回答
@@ -373,6 +379,7 @@ export default {
         .potallist(this.queryConditions)
         .then(res => {
           if (res.status == 200 && res.result.list.length > 0) {
+            this.isSeach = false;
             res.result.list.forEach(item => {
               item.authorInfo = { aid: '', name: '', orgInfo: '', avatar: '',sex:null, };
             });

From fb58529e774de295e3e7e85e7a258cfeaf1a785a Mon Sep 17 00:00:00 2001
From: "LAPTOP-S9RBPPM6\\bjxask-2201" <752743406@qq.com>
Date: Tue, 31 May 2022 14:34:23 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/article/Index.vue | 3 +++
 src/views/portal/qa/Index.vue      | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/views/portal/article/Index.vue b/src/views/portal/article/Index.vue
index 718876e5..8164678e 100644
--- a/src/views/portal/article/Index.vue
+++ b/src/views/portal/article/Index.vue
@@ -80,6 +80,9 @@
               <span class="pag-text-msg" v-else-if="moreState == 3 && !isSeach">没有更多数据了</span>
               <span class="pag-text-msg" v-else-if="isSeach">没有查询到相关内容</span>
             </div>
+            <div v-if="isSeach" style="height:382px">
+
+            </div>
           </el-card>
         </el-row>
          </div>
diff --git a/src/views/portal/qa/Index.vue b/src/views/portal/qa/Index.vue
index ab081077..7a15dc0a 100644
--- a/src/views/portal/qa/Index.vue
+++ b/src/views/portal/qa/Index.vue
@@ -88,6 +88,9 @@
               <span class="pag-text-msg" v-else-if="moreState == 3 && !isSeach">没有更多数据了</span>
                <span class="pag-text-msg" v-else-if="isSeach">没有查询到相关内容</span>
             </div>
+            <div v-if="isSeach" style="height:382px">
+
+            </div>
           </el-card>
             </el-row>
          </div>

From cb257a8b8300e5ac5b4e728aa617e45477e62b38 Mon Sep 17 00:00:00 2001
From: "LAPTOP-S9RBPPM6\\bjxask-2201" <752743406@qq.com>
Date: Tue, 31 May 2022 17:05:18 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E6=95=99=E5=B8=88=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/boe/teacher.js              |  73 +++++++++++++++++-
 src/views/manage/teacherDetails.vue | 113 ++++++++++++++++++++++++----
 2 files changed, 169 insertions(+), 17 deletions(-)

diff --git a/src/api/boe/teacher.js b/src/api/boe/teacher.js
index 86fe2cc2..5e530c2d 100644
--- a/src/api/boe/teacher.js
+++ b/src/api/boe/teacher.js
@@ -63,11 +63,82 @@ const teacherSystem = function(id) {
     const updateStatus = function(data) {
         return ajax.postJson('/b1/system/teacher/update-status',data);
     }
+/**
+ * 教师授课记录查询接口 
+ * @param {
+     ```json
+    id // 教师id
+    courseType // 课程类型：‘1,2’:面授,训练班；‘0’：在线班
+    pageSize // 每页数据条数
+    page // 返回第几页数据
+    isPage // 是否分页：0分页返回，1：不分页直接返回全部
+    ```
+ */
+    const getCourseScore = function(data) {
+        return ajax.get(`/b1/system/teacher/course-score?id=${data.id}&courseType=${data.courseType}&pageSize=${data.pageSize}&page=${data.page}&isPage=${data.isPage}`);
+    }
+/**
+ * 内部讲师-授课资格 查询接口
+ * @param {
+   id // 教师id
+    pageSize // 每页数据条数
+    page // 返回第几页数据
+    ```}
+ */
+    const getTeachingQualify = function(data) {
+        return ajax.get(`/b1/system/teacher/teaching-qualify?id=${data.id}&pageSize=${data.pageSize}&page=${data.page}`);
+    }
+/**
+ * 内部讲师-未开班资源查询接口
+ * @param {
+   id // 教师id
+    ```
+ */
+    const getCourseInfo = function(id) {
+        return ajax.get('/b1/system/teacher/course-info?id='+id);
+    }
+/**
+ * 内部讲师-未开班资源查询接口
+ * @param {
+   id // 教师id
+    ```
+ */
+    const teacherUpgradePrecess = function(id) {
+        return ajax.get('/b1/system/teacher/teacher-upgrade-precess?id='+id);
+    }
+/**
+ * 内部讲师-未开班资源查询接口
+ * @param {
+    courseId   // 课程id  
+    modId   // 模块id 
+    teacherId  // 教师id
+    teachingTime   // 授课时间
+ */
+    const editModelTeacher = function(data) {
+        return ajax.postJson('/b1/system/teacher/edit-model-teacher',data);
+    }
+/**
+ * 内部讲师-删除模块讲师接口
+ * @param {
+    courseId   // 课程id  
+    modId   // 模块id 
+    teacherId  // 教师id
+    remark   // 备注
+ */
+    const deleteModelTeacher = function(data) {
+        return ajax.postJson('/b1/system/teacher/delete-model-teacher',data);
+    }
+
 
 export default {
     editTeacher,
     teacherSystem,
     teacherInfo,
     deleteTeacher,
-    updateStatus
+    updateStatus,
+    getCourseScore,
+    getTeachingQualify,
+    getCourseInfo,
+    teacherUpgradePrecess,
+    deleteModelTeacher
 }
\ No newline at end of file
diff --git a/src/views/manage/teacherDetails.vue b/src/views/manage/teacherDetails.vue
index 2ed3fe45..6d804766 100644
--- a/src/views/manage/teacherDetails.vue
+++ b/src/views/manage/teacherDetails.vue
@@ -24,7 +24,7 @@
              <el-form-item label="讲师组织:" >
                 <el-col :span="12">--</el-col>
                  <el-col :span="12">
-                 <el-form-item label="初始授课时长:">12分账</el-form-item></el-col>
+                 <el-form-item label="初始授课时长:">{{form.user.teaching}}</el-form-item></el-col>
               </el-form-item>
             
             <el-form-item label="讲师体系:">
@@ -55,7 +55,7 @@
                  <el-col :span="12">认证人</el-col>
                  <el-col :span="12">
                     <el-form-item label="讲师介绍:">
-                    讲师介绍
+                    {{form.user.description}}
                     </el-form-item>
                  </el-col>
             </el-form-item>
@@ -70,7 +70,7 @@
         <el-tab-pane label="授课记录" name="second">
             <div style="display:flex">
                 <div><el-button type="primary">导出授课记录</el-button></div>
-                <div style="margin: 0 5px"><el-select v-model="value" placeholder="请选择" clearable >
+                <div style="margin: 0 5px"><el-select v-model="records.courseType" placeholder="请选择" clearable @change="getCourseScore()">
                         <el-option
                         v-for="item in options"
                         :key="item.value"
@@ -80,43 +80,48 @@
                     </el-select></div>
             </div>
             <el-table
-            :data="tableData"
+            :data="records.list"
             style="width: 100%;margin-top:10px">
             <el-table-column
-                prop="date"
+                prop="courseCode"
                 label="班级编号"
                 width="180">
             </el-table-column>
             <el-table-column
-                prop="name"
+                prop="courseType"
                 label="类型"
                 width="180">
+                <template slot-scope="scope">
+                    <span v-if="scope.row.courseType == '1'">面授班</span>
+                    <span v-if="scope.row.courseType == '2'">训练班</span>
+                    <span v-if="scope.row.courseType == '0'">在线班</span>
+                </template>
             </el-table-column>
             <el-table-column
-                prop="address"
+                prop="courseName"
                 label="班级名称">
             </el-table-column>
                <el-table-column
-                prop="date"
+                prop="modName"
                 label="模块名称"
                 width="180">
             </el-table-column>
             <el-table-column
-                prop="name"
+                prop="teachingTime"
                 label="授课时长(min)"
                 width="180">
             </el-table-column>
             <el-table-column
-                prop="address"
+                prop="openStartTime"
                 label="开班时间">
             </el-table-column>
                 <el-table-column
-                prop="name"
+                prop="courseStatus"
                 label="班级状态"
                 width="180">
             </el-table-column>
             <el-table-column
-                prop="address"
+                prop="teacherScore"
                 label="评分">
             </el-table-column>
                 <el-table-column
@@ -128,6 +133,18 @@
                 </template>
             </el-table-column>
             </el-table>
+            <div style="text-align:center;margin-top:20px">
+             <el-pagination
+                background
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :current-page="records.page"
+                :page-sizes="[10, 20, 30, 40]"
+                :page-size="records.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="records.count">
+                </el-pagination>
+            </div>
         </el-tab-pane>
         <el-tab-pane label="授课资格" name="third">
                     <el-table
@@ -237,6 +254,7 @@
 </template>
 
 <script>
+import qs from 'qs'
 import teacherApi from "@/api/modules/teacher";
 import teacherBoeApi from "@/api/boe/teacher";
 import userApi from "@/api/system/user";
@@ -255,7 +273,24 @@ export default {
       dialogVisible:false,
       activeName: "first",
       value: "",
-      options: [],
+      options: [//‘1,2’:面授,训练班；‘0’：在线班
+          {label:'在线班',value:'0'},
+          {label:'面授',value:'1'},
+          {label:'训练班',value:'2'},
+      ],
+      records:{// 授课记录
+        courseType:'',
+        pageSize: 1,
+        page:10,
+        count:0,
+        list:[]
+      },
+      qualify:{//授课资格
+        pageSize: 1,
+        page:10,
+        count:0,
+        list:[]
+      },
       tableData: [],
       input:'',
       form:{
@@ -265,7 +300,6 @@ export default {
     };
   },
   mounted() {
-      console.log(this.id,'id');
       this.getDetail(this.id)
   },
   computed: {
@@ -273,10 +307,57 @@ export default {
   },
   methods: {
       update(row) {
-       console.log(row,'row');
        this.dialogVisible = true;
       },
-    handleClick() {},
+    handleClick(tab, event) {
+        if(tab.name == 'second') {// 授课记录
+           this.getCourseScore();
+        } else if(tab.name == 'third') {// 授课资格
+           this.getTeachingQualify();
+        }else if(tab.name == 'fourth') {// 为开班资源
+
+        }if(tab.name == 'five') {// 晋级过程
+
+        }
+    },
+    // 授课资格
+    getTeachingQualify() {
+        let data = {
+            id:this.id, // 教师id
+            pageSize:this.qualify.pageSize, // 每页数据条数
+            page:this.qualify.page, // 返回第几页数据
+        }
+      teacherBoeApi.getTeachingQualify(data).then(res=>{
+         if(res.status == '200') {
+
+         }
+      })
+    },
+    // 授课记录
+    getCourseScore() {
+        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：不分页直接返回全部
+        }
+       teacherBoeApi.getCourseScore(data).then(res=>{
+          if(res.status === '200') {
+             this.records.list = res.result.data;
+
+          }
+       })
+    },
+    handleSizeChange(val) {
+      this.records.pageSize = val
+      this.records.page = 1
+      this.getCourseScore()
+    },
+    handleCurrentChange(val) {
+      this.records.page = val
+      this.getCourseScore()
+    },
     getDetail(id) {
       this.saveLoading = false;
       this.newOrEdit = "编辑教师";

From 52d45cf39e87ef3bac65e9f345fff38e05a7ed0e Mon Sep 17 00:00:00 2001
From: "LAPTOP-S9RBPPM6\\bjxask-2201" <752743406@qq.com>
Date: Wed, 1 Jun 2022 11:50:15 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E6=95=99=E5=B8=88=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/boe/teacher.js              |   7 +-
 src/views/manage/teacherDetails.vue | 180 +++++++++++++++++++++-------
 2 files changed, 139 insertions(+), 48 deletions(-)

diff --git a/src/api/boe/teacher.js b/src/api/boe/teacher.js
index 5e530c2d..028c3705 100644
--- a/src/api/boe/teacher.js
+++ b/src/api/boe/teacher.js
@@ -98,7 +98,7 @@ const teacherSystem = function(id) {
         return ajax.get('/b1/system/teacher/course-info?id='+id);
     }
 /**
- * 内部讲师-未开班资源查询接口
+ * 内部讲师-晋级过程查询接口
  * @param {
    id // 教师id
     ```
@@ -107,7 +107,7 @@ const teacherSystem = function(id) {
         return ajax.get('/b1/system/teacher/teacher-upgrade-precess?id='+id);
     }
 /**
- * 内部讲师-未开班资源查询接口
+ * 内部讲师-修改模块讲师信息
  * @param {
     courseId   // 课程id  
     modId   // 模块id 
@@ -140,5 +140,6 @@ export default {
     getTeachingQualify,
     getCourseInfo,
     teacherUpgradePrecess,
-    deleteModelTeacher
+    deleteModelTeacher,
+    editModelTeacher
 }
\ No newline at end of file
diff --git a/src/views/manage/teacherDetails.vue b/src/views/manage/teacherDetails.vue
index 6d804766..1f4b2c73 100644
--- a/src/views/manage/teacherDetails.vue
+++ b/src/views/manage/teacherDetails.vue
@@ -83,14 +83,12 @@
             :data="records.list"
             style="width: 100%;margin-top:10px">
             <el-table-column
-                prop="courseCode"
-                label="班级编号"
-                width="180">
+                prop="courseCode" width="120"
+                label="班级编号">
             </el-table-column>
             <el-table-column
                 prop="courseType"
-                label="类型"
-                width="180">
+                label="类型">
                 <template slot-scope="scope">
                     <span v-if="scope.row.courseType == '1'">面授班</span>
                     <span v-if="scope.row.courseType == '2'">训练班</span>
@@ -98,27 +96,26 @@
                 </template>
             </el-table-column>
             <el-table-column
-                prop="courseName"
-                label="班级名称">
+                prop="courseName" show-overflow-tooltip
+                label="班级名称" width="180">
             </el-table-column>
                <el-table-column
-                prop="modName"
+                prop="modName" show-overflow-tooltip
                 label="模块名称"
-                width="180">
+                width="100">
             </el-table-column>
             <el-table-column
                 prop="teachingTime"
-                label="授课时长(min)"
-                width="180">
+                label="授课时长(min)" width="120">
             </el-table-column>
             <el-table-column
                 prop="openStartTime"
-                label="开班时间">
+                label="开班时间" width="140">
             </el-table-column>
                 <el-table-column
                 prop="courseStatus"
                 label="班级状态"
-                width="180">
+                width="100">
             </el-table-column>
             <el-table-column
                 prop="teacherScore"
@@ -126,10 +123,10 @@
             </el-table-column>
                 <el-table-column
                 label="操作"
-                width="180">
+                width="120">
                <template slot-scope="scope">
-                    <el-button type="text" @click="update()">修改</el-button>
-                    <el-button type="text">删除</el-button>
+                    <el-button type="text" @click="recordsUpdate(scope.row)">修改</el-button>
+                    <el-button type="text" @click="recordsDel(scope.row)">删除</el-button>
                 </template>
             </el-table-column>
             </el-table>
@@ -148,7 +145,7 @@
         </el-tab-pane>
         <el-tab-pane label="授课资格" name="third">
                     <el-table
-            :data="tableData"
+            :data="qualify.list"
             style="width: 100%">
             <el-table-column
                 prop="date"
@@ -175,23 +172,35 @@
                 width="180">
             </el-table-column>
             </el-table>
+            <div style="text-align:center;margin-top:20px">
+             <el-pagination
+                background
+                @size-change="qualifySizeChange"
+                @current-change="qualifyCurrentChange"
+                :current-page="records.page"
+                :page-sizes="[10, 20, 30, 40]"
+                :page-size="records.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="records.count">
+                </el-pagination>
+            </div>
         </el-tab-pane>
         <el-tab-pane label="未开班资源" name="fourth">
-                        <el-table
-            :data="tableData"
+          <el-table
+            :data="courseInfoList"
             style="width: 100%">
             <el-table-column
-                prop="date"
+                prop="courseCode"
                 label="班级编号"
                 width="180">
             </el-table-column>
             <el-table-column
-                prop="name"
+                prop="courseName"
                 label="班级名称"
                 width="180">
             </el-table-column>
             <el-table-column
-                prop="address"
+                prop="modName"
                 label="模块名称">
             </el-table-column>
                <el-table-column
@@ -200,39 +209,40 @@
                 width="180">
             </el-table-column>
             <el-table-column
-                prop="name"
+                prop="openStartTime"
                 label="开班时间"
                 width="180">
             </el-table-column>
             </el-table>
         </el-tab-pane>
         <el-tab-pane label="晋级过程" name="five">
-                             <el-table
-            :data="tableData"
+          <el-table
+            :data="precessList"
             style="width: 100%">
             <el-table-column
-                prop="date"
+                prop="operatorTime"
                 label="变更时间"
                 width="180">
             </el-table-column>
             <el-table-column
-                prop="name"
-                label="变更方式"
-                width="180">
+                prop="type"
+                label="变更方式">
+                  <template slot-scope="scope">
+                    <span v-if="scope.row.type == '0'">手动</span>
+                    <span v-if="scope.row.type == '1'">自动</span>
+                </template>
             </el-table-column>
             <el-table-column
-                prop="address"
+                prop="afterLevelName"
                 label="模块名称">
             </el-table-column>
                <el-table-column
-                prop="date"
-                label="变更结果"
-                width="180">
+                prop="afterLevelName"
+                label="变更结果">
             </el-table-column>
             <el-table-column
-                prop="name"
-                label="操作人"
-                width="180">
+                prop="operatorName"
+                label="操作人">
             </el-table-column>
             </el-table>
         </el-tab-pane>
@@ -244,10 +254,10 @@
   top="20%"
   :modal="false">
   <div>请输入授课时长（分钟）</div>
-  <div><el-input v-model="input" placeholder="请输入内容"></el-input></div>
+  <div style="margin-top:20px"><el-input v-model="records.row.teachingTime" placeholder="请输入内容"></el-input></div>
   <span slot="footer" class="dialog-footer">
     <el-button @click="dialogVisible = false">取 消</el-button>
-    <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+    <el-button type="primary" @click="editModelTeacher()">确 定</el-button>
   </span>
 </el-dialog>
   </div>
@@ -281,16 +291,21 @@ export default {
       records:{// 授课记录
         courseType:'',
         pageSize: 1,
-        page:10,
+        page:5,
         count:0,
-        list:[]
+        list:[],
+        row:{
+          teachingTime:'',
+        },
       },
       qualify:{//授课资格
         pageSize: 1,
-        page:10,
+        page:5,
         count:0,
         list:[]
       },
+      courseInfoList: [],//未开班资源
+      precessList:[],//晋级过程
       tableData: [],
       input:'',
       form:{
@@ -306,7 +321,40 @@ export default {
     ...mapGetters(["userInfo"])
   },
   methods: {
-      update(row) {
+      recordsDel(row) {
+        this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+           let data = {
+            courseId:row.courseId,   // 课程id  
+            modId:row.modId,   // 模块id 
+            teacherId:row.teacherId,  // 教师id
+            remark:'',   // 备注
+        }
+         teacherBoeApi.deleteModelTeacher(data).then(res=>{
+            if(res.status == '200') {
+              this.getCourseScore();
+              this.$message({
+                type: 'success',
+                message: '删除成功!'
+            });
+            } else {
+              this.$message.error(res.message);  
+            }
+         })
+          
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          });          
+        });
+       
+      },
+      recordsUpdate(row) {
+       this.records.row = row;
        this.dialogVisible = true;
       },
     handleClick(tab, event) {
@@ -315,11 +363,27 @@ export default {
         } else if(tab.name == 'third') {// 授课资格
            this.getTeachingQualify();
         }else if(tab.name == 'fourth') {// 为开班资源
-
+           this.getCourseInfo();
         }if(tab.name == 'five') {// 晋级过程
-
+           this.teacherUpgradePrecess();
         }
     },
+    // 晋级过程
+    teacherUpgradePrecess() {
+      teacherBoeApi.teacherUpgradePrecess(this.id).then(res=>{
+          if(res.status == '200') {
+             this.precessList = res.result.data;
+          }
+      })
+    },
+    // 未开班资源
+    getCourseInfo() {
+      teacherBoeApi.getCourseInfo(this.id).then(res=>{
+          if(res.status == '200') {
+             this.courseInfoList = res.result.data;
+          }
+      })
+    },
     // 授课资格
     getTeachingQualify() {
         let data = {
@@ -329,10 +393,36 @@ export default {
         }
       teacherBoeApi.getTeachingQualify(data).then(res=>{
          if(res.status == '200') {
-
+           this.qualify.list = res.result.data;
          }
       })
     },
+    qualifySizeChange(val) {
+      this.qualify.pageSize = val
+      this.qualify.page = 1
+      this.getTeachingQualify()
+    },
+    qualifyCurrentChange(val) {
+      this.qualify.page = val
+      this.getTeachingQualify()
+    },
+    editModelTeacher() {
+        let data = {
+            courseId:this.records.row.courseId,   // 课程id  
+            modId:this.records.row.modId,   // 模块id 
+            teacherId:this.records.row.teacherId,  // 教师id
+            teachingTime:this.records.row.teachingTime,   // 授课时间
+        }
+      teacherBoeApi.editModelTeacher(data).then(res=>{
+          if(res.status == '200') {
+            this.$message.success('修改成功');
+            this.dialogVisible = false;
+            this.getCourseScore();
+          } else {
+            this.$message.error(res.message);
+          }
+      })
+    },
     // 授课记录
     getCourseScore() {
         let data = {

From d9af206c415f6f81f107aa5fd30653fc3b2f9a7c Mon Sep 17 00:00:00 2001
From: "LAPTOP-S9RBPPM6\\bjxask-2201" <752743406@qq.com>
Date: Wed, 1 Jun 2022 14:30:46 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E6=95=99=E5=B8=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/TeacherList.vue    |  6 +++---
 src/views/manage/teacherDetails.vue | 21 +++++++++++++++------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/views/manage/TeacherList.vue b/src/views/manage/TeacherList.vue
index 4b885766..10ce05c1 100644
--- a/src/views/manage/TeacherList.vue
+++ b/src/views/manage/TeacherList.vue
@@ -256,13 +256,13 @@
     },
     methods:{
       handleCloseOne() {
-        console.log("1111");
         // this.teacherDetailsId = '';
         this.showTeacherDetails = false;
       },
       handleName(row) {
        this.showTeacherDetails = true;
-       this.teacherDetailsId = row.id;
+      //  this.teacherDetailsId = row.sysId;
+       this.teacherDetailsId = '13BEBDBD-3D28-244D-648D-0CBD6796717C'
       },
       getTeachersystem() {
         teacherBoeApi.teacherSystem(this.userInfo.sysId).then(res=>{
@@ -600,7 +600,7 @@
         eleLink.download = '教师授课信息';
         eleLink.style.display = 'none';
         eleLink.setAttribute('target', '_blank');
-        eleLink.href = `${process.env.VUE_APP_BASE_API}/xboe/m/course/manage/export-teacher-course?teacherId=${row.id}`;
+        eleLink.href = `${process.env.VUE_APP_BASE_API}/xboe/teacher/compose/export/courses?tid=${row.id}&sysId=${row.sysId}&courseType=0,1,3`;
         document.body.appendChild(eleLink);
         eleLink.click();
         document.body.removeChild(eleLink);
diff --git a/src/views/manage/teacherDetails.vue b/src/views/manage/teacherDetails.vue
index 1f4b2c73..a4b8fd47 100644
--- a/src/views/manage/teacherDetails.vue
+++ b/src/views/manage/teacherDetails.vue
@@ -69,7 +69,7 @@
         </el-tab-pane>
         <el-tab-pane label="授课记录" name="second">
             <div style="display:flex">
-                <div><el-button type="primary">导出授课记录</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"
@@ -321,6 +321,16 @@ export default {
     ...mapGetters(["userInfo"])
   },
   methods: {
+        exportCourse(row){
+        var eleLink = document.createElement('a');
+        eleLink.download = '教师授课信息';
+        eleLink.style.display = 'none';
+        eleLink.setAttribute('target', '_blank');
+        eleLink.href = `${process.env.VUE_APP_BASE_API}/xboe/teacher/compose/export/courses?teacherId=${this.id}`;
+        document.body.appendChild(eleLink);
+        eleLink.click();
+        document.body.removeChild(eleLink);
+      },
       recordsDel(row) {
         this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', {
           confirmButtonText: '确定',
@@ -448,14 +458,13 @@ export default {
       this.records.page = val
       this.getCourseScore()
     },
-    getDetail(id) {
-      this.saveLoading = false;
-      this.newOrEdit = "编辑教师";
-      this.allowInput = true;
-      teacherApi.detail(id).then(res => {
+    getDetail() {
+      teacherBoeApi.teacherInfo(this.id).then(res => {
         if (res.status == 200) {
           const result = res.result;
           this.form = result;
+        } else {
+          this.$message.error(res.message); 
         }
       });
     }

From 9f9a455a68b8b56d1616ef192aa311cb717ff4da Mon Sep 17 00:00:00 2001
From: "LAPTOP-S9RBPPM6\\bjxask-2201" <752743406@qq.com>
Date: Wed, 1 Jun 2022 14:32:01 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/teacherDetails.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/manage/teacherDetails.vue b/src/views/manage/teacherDetails.vue
index a4b8fd47..976d947f 100644
--- a/src/views/manage/teacherDetails.vue
+++ b/src/views/manage/teacherDetails.vue
@@ -326,7 +326,7 @@ export default {
         eleLink.download = '教师授课信息';
         eleLink.style.display = 'none';
         eleLink.setAttribute('target', '_blank');
-        eleLink.href = `${process.env.VUE_APP_BASE_API}/xboe/teacher/compose/export/courses?teacherId=${this.id}`;
+        eleLink.href = `${process.env.VUE_APP_BASE_API}/xboe/teacher/compose/export/courses?tid=${row.id}&sysId=${row.sysId}&courseType=0,1,3`;
         document.body.appendChild(eleLink);
         eleLink.click();
         document.body.removeChild(eleLink);

From 97675d1f388a17a07ba68fa998baa5ec26072b18 Mon Sep 17 00:00:00 2001
From: "LAPTOP-S9RBPPM6\\bjxask-2201" <752743406@qq.com>
Date: Wed, 1 Jun 2022 15:03:13 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore    | 2 ++
 vue.config.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..4e637713
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+node_modules
diff --git a/vue.config.js b/vue.config.js
index bfa2bd30..f69b259d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -113,7 +113,7 @@ module.exports = {
         proxy: {
             '/systemapi': {
                 // 目标代理服务器地址
-                target: 'http://127.0.0.1:9090',
+                target: 'http://192.168.0.10:9090',
                 changeOrigin: true,
                 logLevel:'debug',
                 secure: false,

From c474ffca71e0a0506fae98fb14fd190084f53edd Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Wed, 1 Jun 2022 17:05:28 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E6=95=99=E5=B8=88=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/boe/teacher.js                 | 18 +++++++++---------
 src/api/modules/teacher.js             | 11 +++++++++++
 src/components/Course/weikeContent.vue |  3 ++-
 src/views/manage/TeacherList.vue       | 10 +++++-----
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/api/boe/teacher.js b/src/api/boe/teacher.js
index 028c3705..45b2fb0d 100644
--- a/src/api/boe/teacher.js
+++ b/src/api/boe/teacher.js
@@ -41,8 +41,8 @@ const teacherSystem = function(id) {
     teacher_id 教师id
  * } data 查询条件
  */
-    const teacherInfo = function(data) {
-        return ajax.get('/b1/system/teacher/teacher-info',data);
+    const teacherInfo = function(sysId) {
+        return ajax.get('/b1/system/teacher/teacher-info?teacher_id='+sysId);
     }
 /**
  * 教师删除接口
@@ -56,7 +56,7 @@ const teacherSystem = function(id) {
 /**
  * 教师启用禁用接口
  * @param {
-    teacher_id     
+    teacher_id
     status 状态；0：临时；1：正式；2：停用
  * }  查询条件
  */
@@ -64,7 +64,7 @@ const teacherSystem = function(id) {
         return ajax.postJson('/b1/system/teacher/update-status',data);
     }
 /**
- * 教师授课记录查询接口 
+ * 教师授课记录查询接口
  * @param {
      ```json
     id // 教师id
@@ -109,8 +109,8 @@ const teacherSystem = function(id) {
 /**
  * 内部讲师-修改模块讲师信息
  * @param {
-    courseId   // 课程id  
-    modId   // 模块id 
+    courseId   // 课程id
+    modId   // 模块id
     teacherId  // 教师id
     teachingTime   // 授课时间
  */
@@ -120,8 +120,8 @@ const teacherSystem = function(id) {
 /**
  * 内部讲师-删除模块讲师接口
  * @param {
-    courseId   // 课程id  
-    modId   // 模块id 
+    courseId   // 课程id
+    modId   // 模块id
     teacherId  // 教师id
     remark   // 备注
  */
@@ -142,4 +142,4 @@ export default {
     teacherUpgradePrecess,
     deleteModelTeacher,
     editModelTeacher
-}
\ No newline at end of file
+}
diff --git a/src/api/modules/teacher.js b/src/api/modules/teacher.js
index a74398ae..5a039cc0 100644
--- a/src/api/modules/teacher.js
+++ b/src/api/modules/teacher.js
@@ -173,6 +173,17 @@ const end=function(id){
 const exports=function(query){
 	return ajax.post('/xboe/teacher/export',query);
 }
+
+/**
+ * courseType // 课程类型：‘1,2’:面授,训练班；‘0’：在线班
+ * sysId:教师的sysId
+ * tid： 教师的id
+ * @param {tid,sysId,countType,pageSize:100,pageIndex} query 
+ */
+const findAllCourses=function(query){
+	return ajax.post('/xboe/teacher/compose/find/courses',query);
+}
+
 export default {
     findByName,
     getInfoById,
diff --git a/src/components/Course/weikeContent.vue b/src/components/Course/weikeContent.vue
index 387c19ae..9938c4a0 100644
--- a/src/components/Course/weikeContent.vue
+++ b/src/components/Course/weikeContent.vue
@@ -103,7 +103,7 @@
                             <el-image :src="fileBaseUrl+cware.content.content" fit="fill"></el-image>
                           </div>
                           <div v-if="cware.content.contentType==40">
-                            <div style="padding: 10px;color: #767676; ">如果pdf无法显示，请稍后再试，文档转化是异步处理，有可能是文档还未转化完成 </div>
+                            <div style="padding: 10px;color: #767676; ">如果pdf无法显示，请稍后再试，文档转化是异步处理，有可能是文档还未转化完成，您可以先提交课程内容 </div>
                             <pdfPreview v-if="cware.content.contentType == 40" :filePath="fileBaseUrl+cware.content.pdfPath"></pdfPreview>
                           </div>
                       </div>
@@ -580,6 +580,7 @@
             setupTage:0,
           },
         },
+        pdfTip:'',//pdf文件的提示
         hasCWare:{ keyword:'', count: 0, pageSize: 10, pageIndex: 1, list:[]},
         homework:{
           show:1,
diff --git a/src/views/manage/TeacherList.vue b/src/views/manage/TeacherList.vue
index 10ce05c1..4b6ffb87 100644
--- a/src/views/manage/TeacherList.vue
+++ b/src/views/manage/TeacherList.vue
@@ -6,7 +6,7 @@
              <el-select v-model="tSystemData" value-key="id" clearable @change="changeSystem" placeholder="请选择教师体系">
                  <el-option v-for="item in systemData" :key="item.id" :label="item.name" :value="item"></el-option>
               </el-select>
-           </div> 
+           </div>
            <!-- 要在换一个变量与新建区别开 -->
             <div style="padding: 0px 5px;">
               <el-select v-model="tLevelData" clearable value-key="id" placeholder="请选择教师级别">
@@ -31,10 +31,10 @@
       <el-table-column type="selection"></el-table-column>
       <el-table-column label="姓名" prop="name" fixed>
         <template slot-scope="scope">
-          <span @click="handleName(scope.row)">{{scope.row.name}}</span>
+          <a @click="handleName(scope.row)">{{scope.row.name}}</a>
         </template>
       </el-table-column>
-    
+
       <el-table-column label="部门" prop="departName"></el-table-column>
       <!-- <el-table-column label="创建时间" sortable prop="sysCreateTime"></el-table-column> -->
       <el-table-column label="修改时间" sortable width="155" prop="sysUpdateTime"></el-table-column>
@@ -585,7 +585,7 @@
         eleForm.style="display:none;";
         eleForm.method='post';
         eleForm.action=`${process.env.VUE_APP_BASE_API}/xboe/teacher/export?name=${this.queryName}`;
-      
+
         var hdnFilePath = document.createElement('input');
         hdnFilePath.type = 'hidden';
         hdnFilePath.name = 'ids';
@@ -600,7 +600,7 @@
         eleLink.download = '教师授课信息';
         eleLink.style.display = 'none';
         eleLink.setAttribute('target', '_blank');
-        eleLink.href = `${process.env.VUE_APP_BASE_API}/xboe/teacher/compose/export/courses?tid=${row.id}&sysId=${row.sysId}&courseType=0,1,3`;
+        eleLink.href = `${process.env.VUE_APP_BASE_API}/xboe/teacher/compose/export/courses?tid=${row.id}&sysId=${row.sysId}&courseType=0,1,2`;
         document.body.appendChild(eleLink);
         eleLink.click();
         document.body.removeChild(eleLink);

From 952de677512a92c74a7d46eb86cd1366ed2e3875 Mon Sep 17 00:00:00 2001
From: "LAPTOP-S9RBPPM6\\bjxask-2201" <752743406@qq.com>
Date: Wed, 1 Jun 2022 17:35:55 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/TeacherList.vue    |  2 +-
 src/views/manage/teacherDetails.vue | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/views/manage/TeacherList.vue b/src/views/manage/TeacherList.vue
index 4b6ffb87..37461b90 100644
--- a/src/views/manage/TeacherList.vue
+++ b/src/views/manage/TeacherList.vue
@@ -31,7 +31,7 @@
       <el-table-column type="selection"></el-table-column>
       <el-table-column label="姓名" prop="name" fixed>
         <template slot-scope="scope">
-          <a @click="handleName(scope.row)">{{scope.row.name}}</a>
+          <span class="previewStyle" @click="handleName(scope.row)">{{scope.row.name}}</span>
         </template>
       </el-table-column>
 
diff --git a/src/views/manage/teacherDetails.vue b/src/views/manage/teacherDetails.vue
index 976d947f..6f79deb2 100644
--- a/src/views/manage/teacherDetails.vue
+++ b/src/views/manage/teacherDetails.vue
@@ -315,12 +315,22 @@ export default {
     };
   },
   mounted() {
-      this.getDetail(this.id)
+      this.getDetail(this.id);
+      // this.getAvatar();
   },
   computed: {
     ...mapGetters(["userInfo"])
   },
   methods: {
+     getAvatar(){
+        teacherApi.detail().then(res => {
+           if (res.status == 200) {
+              const result = res.result;
+              this.form = result;
+               this.dialogVisible = true;
+            }
+        })
+      },
         exportCourse(row){
         var eleLink = document.createElement('a');
         eleLink.download = '教师授课信息';

From 772dc2009302e14697fdfdc5cdd0187932c96d14 Mon Sep 17 00:00:00 2001
From: "LAPTOP-S9RBPPM6\\bjxask-2201" <752743406@qq.com>
Date: Wed, 1 Jun 2022 18:56:11 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E6=95=99=E5=B8=88=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=A0=B8=E5=AF=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/TeacherList.vue    |  10 ++-
 src/views/manage/teacherDetails.vue | 125 +++++++++++++++-------------
 2 files changed, 73 insertions(+), 62 deletions(-)

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') {

From 33563eef1081f91e47594e30668bc475ba892772 Mon Sep 17 00:00:00 2001
From: "LAPTOP-S9RBPPM6\\bjxask-2201" <752743406@qq.com>
Date: Thu, 2 Jun 2022 10:43:25 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/manage/teacherDetails.vue | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/views/manage/teacherDetails.vue b/src/views/manage/teacherDetails.vue
index 441a35d8..4914ad4c 100644
--- a/src/views/manage/teacherDetails.vue
+++ b/src/views/manage/teacherDetails.vue
@@ -44,21 +44,23 @@
                 </el-col>
             </el-form-item>
             <el-form-item label="认证时间:">
-               <el-col :span="12">{{form.certify_at}}</el-col>
+               <el-col :span="12">{{formatsec(form.certify_at *1000)}}</el-col>
                 <el-col :span="12">
-                  <el-form-item label="认证资料:"> --</el-form-item>
+                  <el-form-item label="认证资料:">
+                    <!-- <a href="http://" target="_blank" rel="noopener noreferrer"></a> -->
+                  </el-form-item>
                 </el-col>
             </el-form-item>
 
            
-            <el-form-item label="认证人:">
-                 <el-col :span="12">--</el-col>
-                 <el-col :span="12">
-                    <el-form-item label="讲师介绍:">--
-                      <!-- <div v-html="form.description"></div> -->
-                    </el-form-item>
-                 </el-col>
+            <!-- <el-form-item label="认证人:"> -->
+                 <!-- <el-col :span="12">--</el-col> -->
+                 <!-- <el-col :span="12"> -->
+            <el-form-item label="讲师介绍:">
+                <div v-html="form.description"></div>
             </el-form-item>
+                 <!-- </el-col>
+            </el-form-item> -->
             <el-form-item label="讲师备注:">
                {{form.remark}}
             </el-form-item>
@@ -265,7 +267,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 { formatSeconds,formatsec } from '@/utils/datetime.js'
 import imageUpload from "@/components/ImageUpload/index.vue";
 import { mapGetters } from "vuex";
 export default {
@@ -281,6 +283,7 @@ export default {
   },
   data() {
     return {
+      formatsec,
       formatSeconds,
       baseUrl: process.env.VUE_APP_BASE_API,
       newForm:{
@@ -495,6 +498,8 @@ export default {
  .teacher-details {
   height: 500px;
   .one{
+    height: 460px;
+    overflow-y: auto;
       .el-form-item{
           margin-bottom: 10px;
       }