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/19] =?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/19] =?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/19] =?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/19] =?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/19] =?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/19] =?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/19] =?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/19] =?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/19] =?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/19] =?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/19] =?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/19] =?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 e851882d0fd277e0402556d2affc23379de21669 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Thu, 2 Jun 2022 10:34:35 +0800
Subject: [PATCH 13/19] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E7=AE=A1=E7=90=86=E6=93=8D=E4=BD=9C=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=AD=9B=E9=80=89=E5=92=8C=E5=90=8D=E7=A7=B0=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Study/manager.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/Study/manager.vue b/src/components/Study/manager.vue
index 769e9659..325ffcec 100644
--- a/src/components/Study/manager.vue
+++ b/src/components/Study/manager.vue
@@ -44,7 +44,7 @@
             </el-col>
             <el-col :span="2">
               <div class="grid-content bg-purple">
-                <el-button type="primary" style="margin-left: 20px;" @click="getSignupList()" >搜索</el-button>
+                <el-button type="primary" style="margin-left: 20px;" @click="getSignupList()" >搜ssz索</el-button>
               </div>
             </el-col>
               <!-- <el-col :span="2"> -->
@@ -623,14 +623,16 @@ export default {
         pageIndex: this.study.pageIndex,
         pageSize: this.study.pageSize
       };
+     
       apicourseStudy.findSignup(params).then(res => {
         if (res.status === 200) {
+         
           let ids = [];
           res.result.list.forEach(item => {
             ids.push(item.aid);
           });
           this.getQaUserData(res.result.list, ids);
-          // this.study.list = res.result.list;
+           this.study.list = res.result.list;
           this.study.count = res.result.count;
         } else {
           this.$message.error(res.message);

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 14/19] =?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;
       }

From d9718c6e554e7ec7ade1949c2c751dd0738968dc Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Thu, 2 Jun 2022 11:32:05 +0800
Subject: [PATCH 15/19] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E6=8E=92=E8=A1=8C?=
 =?UTF-8?q?=E6=A6=9C=E5=92=8Cpdf=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/case/Index.vue   |  166 +-
 src/views/portal/course/Micro.vue | 3362 +++++++++++++++--------------
 src/views/study/PortalIndex.vue   | 2891 +++++++++++++------------
 3 files changed, 3284 insertions(+), 3135 deletions(-)

diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index f9c1eabf..957afcd6 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -144,27 +144,92 @@
          </el-row>
       </div>
       <div style="width: 245px;margin-left: 5px;">
-        <div id="fixd-box">
-           <el-card class="ranking-card">
-            <div slot="header">
-              <span>排行榜</span>
-            </div>
-            <div>
-              <el-row class="ranking-title" v-for="(item,index) in ankingList" :key="index">
-                <el-col :span="6">
+        <div>
+           <div id="fixd-box">
+             <el-card class="ranking-card" >
+              <div slot="header">
+                <span style="font-size: 14px;font-weight: 600;color: #333333;">好评榜</span>
+              </div>
+              <div style="padding-bottom:10px">
+                <el-row class="ranking-title">
+                  <!-- <el-col :span="15" style="color: #333333;font-size: 14px;">名称</el-col> -->
+                  <!-- <el-col :offset="4" :span="5" class="center" style="color: #333333;font-size: 14px;">分数</el-col> -->
+                </el-row>
+                <el-row class="ranking-title  bacolor" v-for="(item, index) in ankingList" :key="index" >
+                  <el-col :span="6" style="height:34px">
                     <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
                     <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
                     <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
-                </el-col>
-                <el-col class="center" :span="18">{{item.sysCreateUname}}</el-col>
-                <!-- <el-col class="center" :span="7">{{''}}</el-col>
-                <el-col class="center" :span="7">{{item.counts}}</el-col> -->
-              </el-row>
-            </div>
-          </el-card>
+                    <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
+                  </el-col>
+                  <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.sysCreateUname" placement="top-start">
+                        <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.sysCreateUname }}</el-col>
+                  </el-tooltip>
+                  <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
+                </el-row>
+              </div>
+            </el-card>
+                <div style="height: 10px;"></div>
+              <el-card class="ranking-card" >
+              <div slot="header">
+                <span style="font-size: 14px;font-weight: 600;color: #333333;">人气榜</span>
+              </div>
+              <div style="padding-bottom:10px">
+                <el-row class="ranking-title">
+                  <!-- <el-col :span="15" style="color: #333333;font-size: 14px;">名称</el-col> -->
+                  <!-- <el-col :offset="4" :span="5" class="center" style="color: #333333;font-size: 14px;">分数</el-col> -->
+                </el-row>
+                <el-row class="ranking-title  bacolor" v-for="(item, index) in Popularity" :key="index" >
+                  <el-col :span="6" style="height:34px">
+                    <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
+                    <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
+                    <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
+                    <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
+                  </el-col>
+                  <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title" placement="top-start">
+                        <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.title }}</el-col>
+                  </el-tooltip>
+                  <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
+                </el-row>
+              </div>
+            </el-card>
+             <div style="height: 10px;"></div>
+              <el-card class="ranking-card" >
+              <div slot="header">
+                <span style="font-size: 14px;font-weight: 600;color: #333333;">人气榜</span>
+              </div>
+              <div style="padding-bottom:10px">
+                <el-row class="ranking-title">
+                  <!-- <el-col :span="15" style="color: #333333;font-size: 14px;">名称</el-col> -->
+                  <!-- <el-col :offset="4" :span="5" class="center" style="color: #333333;font-size: 14px;">分数</el-col> -->
+                </el-row>
+                <el-row class="ranking-title  bacolor" v-for="(item, index) in Positive" :key="index" >
+                  <el-col :span="6" style="height:34px">
+                    <img v-if="index===0" :src="`${webBaseUrl}/images/first.png`"/>
+                    <img v-if="index===1" :src="`${webBaseUrl}/images/second.png`"/>
+                    <img v-if="index===2" :src="`${webBaseUrl}/images/third.png`"/>
+                    <span style="margin-left: 10px" v-if="index!=2&&index!=0&&index!=1">{{index+1}}</span>
+                  </el-col>
+                  <el-tooltip :enterable="false" @click.native="jumpRouter(item)" effect="light" :content="item.title" placement="top-start">
+                        <el-col :span="15" style="cursor: pointer;" class="title-line-ellipsis"> {{ item.title }}</el-col>
+                  </el-tooltip>
+                  <!-- <el-col class="center" style="color: #FF8E00;" :span="5">{{ item.score }}</el-col> -->
+                </el-row>
+              </div>
+            </el-card>
+
+
+           </div>
+
+
         </div>
+        
+
          
+
+
       </div>
+      
       <el-row :gutter="10">
       </el-row>
       <div style="height: 50px;"></div>
@@ -198,6 +263,7 @@ import author from '@/components/Portal/authorInfo.vue';
 import apiCase from '@/api/modules/cases.js';
 import apiUser from '@/api/system/user.js';
 import apiSearchterm from "@/api/modules/searchterm.js";
+import apiDict from "@/api/modules/dict.js";
 export default {
   name: 'index',
   components: { portalHeader, portalFooter, portalFloatTools, interactBar,timeShow ,author},
@@ -219,6 +285,8 @@ export default {
         list:[]
       },
       ankingList:[],
+      Popularity:[],
+      Positive:[],
       protocolDialogVisible: false,
       protocolConfirmButton:true,
       queryCondition:{
@@ -244,7 +312,9 @@ export default {
     }
     this.keyWord = this.$route.query.keyword;
     this.getAnkingData()
+    this.getPopularity()
     this.searchterm()
+    this.getPositive()
     this.getCaseData();
     window.addEventListener(
       "scroll",
@@ -377,17 +447,78 @@ export default {
       });
     },
     getAnkingData(){
-      apiCase.usernameList(10).then(res=>{
+      apiCase.usernameList(5).then(res=>{
         if(res.status==200){
           this.ankingList=res.result
+        //  console.log(res)
         }
       })
+    },
+    getPopularity(){
+      apiCase.queryPraises(5).then(res=>{
+        if(res.status==200){
+          this.Popularity=res.result
+          // console.log(this.Popularity)
+        }
+      })
+    },
+    getPositive(){
+      apiCase.queryComments(5).then(res=>{
+        if(res.status==200){
+          this.Positive=res.result
+           console.log(res)
+        }
+      })
+    },
+
+    jumpRouter(item){
+        this.$router.push(`/case/detail?id=${item.id}`);
+
     }
+
+
   }
 };
 </script>
 
 <style scoped lang="scss">
+.ranking-title {
+     line-height: 34px;
+    font-size: 15px;
+    color: #333333;
+    .center-titlt{
+      font-size: 15px;
+      color: #333333;
+    }
+    .center{
+      text-align: right;
+    }
+    img{
+      margin-top: 5px;
+    }
+  }
+::v-deep .title-line-ellipsis{
+  // width: 100%;
+   display: -webkit-box;
+   overflow: hidden;
+  text-overflow:ellipsis;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  box-sizing: border-box;
+  word-break:break-all;
+}
+::v-deep .el-card__body{
+  padding: 0;
+}
+::v-deep .bacolor:nth-child(odd){
+  background-color: #fff;
+  padding: 0 5px;
+}
+::v-deep .bacolor:nth-child(even){
+  background-color: #f6f6f6;
+  padding: 0 5px;
+
+}
 ::v-deep .el-card{
   border: none;
   border-radius: 0px;
@@ -598,8 +729,7 @@ export default {
       text-align: center;
     }
   }
-  .ranking-title {
-  }
+  
   .aligh-title{
     font-size: 14px;
     color: #333333;
diff --git a/src/views/portal/course/Micro.vue b/src/views/portal/course/Micro.vue
index b3d5d35b..da23d7ff 100644
--- a/src/views/portal/course/Micro.vue
+++ b/src/views/portal/course/Micro.vue
@@ -1,1677 +1,1685 @@
-<template>
-  <div>
-    <portal-header current="course" :goSearch="1"></portal-header>
-    <div class="portal-content xcontent">
-      <el-breadcrumb separator-class="el-icon-arrow-right" class="breadcrumb-nav">
-        <el-breadcrumb-item :to="{ path: '/course' }">课程列表</el-breadcrumb-item>
-        <el-breadcrumb-item>课程详情</el-breadcrumb-item>
-      </el-breadcrumb>
-      <el-row :gutter="10">
-        <el-col :span="24">
-          <el-card :body-style="{ padding: '0px', 'min-height': '500px' }">
-            <el-row class="detail">
-              <el-col :span="18">
-                <el-tabs v-model="activeName" @tab-click="changeTab">
-                  <el-tab-pane label="课件" name="courseware">
-                    <div>
-                      <div class="courseware-div" v-if="enrollStutas == 1" style="max-height: 400px;">
-                        <course-image :course="courseInfo" class="courseware-img"></course-image>
-                       <!-- <el-button type="warning"  @click="submitEnroll" class="courseware-enroll-btn">报名后即可开始学习！</el-button> -->
-                      </div>
-                      <div class="courseware-div" v-else>
-                       <div v-if="coursewareInfo.content.contentType == 10" style="position: relative;">
-                           <videoPlayer id="myVideoPlayer" :src="fileBaseUrl+curriculumData.url" style="width: 100%;"
-                            @onPlayerPlaying="onPlayerPlaying"
-                            @onPlayerPlay="onPlayerPlay"
-                            :initTime="videoPlayingTime"
-                            :isDrag="curriculumData.isDrag"
-                            @onPlayerPause="onPlayerPause"
-                            @onFullscreen="onFullscreen"
-                            @onPlayerEnded="onPlayerEnded">
-                        </videoPlayer>
-                         <!-- v-if="playerBoxShow" -->
-                         <div class="player-box" v-if="playerBoxShow">
-                        <div class="player-praise">
-                          <div @click="praiseContent" style="cursor: pointer;">
-                            <img class="icon-small" v-if="isPraise" :src="require('@/assets/images/icon/praise-active.png')" />
-                            <img class="icon-small" v-else :src="require('@/assets/images/icon/zhan.png')" />
-                            <!-- {{ courseInfo.praises }} -->
-                            <div style="color:#fff;cursor: pointer;">赞</div>
-                          </div>
-                          <div style="margin-left: 15px;cursor: pointer;" @click="treadContent">
-                            <img class="icon-small" v-if="isTrample" :src="require('@/assets/images/icon/trample-active.png')" />
-                            <img class="icon-small" v-else :src="require('@/assets/images/icon/cai.png')" />
-                            <!-- {{ courseInfo.trampleCount }} -->
-                            <div style="color:#fff;cursor: pointer;">踩</div>
-                          </div>
-                        </div>
-                        <div v-if="!scoreInfo.has" class="player-rate">
-                          <el-rate v-model="scoreInfo.score" text-color="#ff9900" score-template="{value}" void-color="#fff" @change="addScore"></el-rate>
-                        </div>
-                        <div v-if="scoreInfo.has" style="padding-top: 5px;display: flex;">
-                          <div class="player-rate" style="padding-left: 35px;">
-                            <el-rate disabled v-model="courseInfo.score" :allow-half="true" ></el-rate>
-                          </div>
-                          <span class="score-text" style="margin-top:35px">
-                            <span style="color:#ffb30f;">{{ toScore(courseInfo.score) }}</span>
-                            <span style="font-size: 12px;color: #fff">分</span>
-                          </span>
-                       </div>
-                      </div>
-                      </div>
-                      <div v-if="coursewareInfo.content.contentType == 20">
-                        <div class="con-audio">
-                          <div class="con-audio-player">
-                            <audioPlayer :url="fileBaseUrl+curriculumData.url"
-                              :name="coursewareInfo.content.contentName"
-                                @onPlaying="audioPlaying"
-                                @onPlay="audioPlay"
-                                :isDrag="curriculumData.isDrag"
-                                @onPause="audioPause"
-                                @onPlayEnd="audioEnd">
-                            </audioPlayer>
-                          </div>
-                        </div>
-                      </div>
-                      <div v-if="coursewareInfo.content.contentType == 30">
-                        <img :src="fileBaseUrl+coursewareInfo.content.content" alt="图片">
-                      </div>
-                      <div v-if="coursewareInfo.content.contentType == 40">
-                        <pdfPreview :autoScroll="true" v-if="coursewareInfo.content.contentType == 40" :filePath="fileBaseUrl+coursewareInfo.content.content"></pdfPreview>
-                      </div>
-                      <div v-if="coursewareInfo.content.contentType == 41">
-                        <div class="couretitle" style="padding: 20px;text-align: left;" v-html="coursewareInfo.content.content"></div>
-                        </div>
-                      <div v-if="coursewareInfo.content.contentType == 52">
-                          <div class="hyper-link" v-if="conLink.openType==2">
-                              <div class="hyper-link-row">课程内容是外部连接</div>
-                              <div class="hyper-link-row">{{conLink.url}}</div>
-                          </div>
-                          <div v-if="conLink.openType==1">
-                              <iframe :src="conLink.url" style="width: 100%;border:0px;min-height: 473px;border:0px" border="0" frameborder="0"></iframe>
-                          </div>
-                      </div>
-                    </div>
-                  </div>
-                  </el-tab-pane>
-                  <el-tab-pane v-if="homeworkInfo.has" :disabled="enrollStutas == 1" label="作业" name="homework">
-                    <homework v-if="studyId!=''" :studyId="studyId" :content="homeworkInfo.content" ></homework>
-                  </el-tab-pane>
-                  <el-tab-pane v-if="examInfo.has" :disabled="enrollStutas == 1" label="考试" name="test">
-                    <exam v-if="studyId!=''" :studyId="studyId" :content="examInfo.content"></exam>
-                  </el-tab-pane>
-                  <el-tab-pane v-if="assessInfo.has" :disabled="enrollStutas == 1" label="评估" name="assess">
-                    <assess v-if="studyId!=''" :studyId="studyId" :content="assessInfo.content"></assess>
-                  </el-tab-pane>
-                </el-tabs>
-                <div style="display: flex;justify-content: space-between;padding: 10px;align-items: center;">
-                  <div class="score">
-                    <!-- <el-rate disabled v-model="courseInfo.score" :max="5" :allow-half="true" show-score score-template="{value}"></el-rate> -->
-                    <div v-if="enrollStutas == 1 && !scoreInfo.has">
-                      <div v-if="courseInfo.score">
-                          <el-rate disabled v-model="courseInfo.score"></el-rate>
-                          <span class="score-text">{{toScore(courseInfo.score)}}<span style="font-size: 14px;">分</span></span>
-                      </div>
-                      <div v-else class="score-no">未评分</div>
-                    </div>
-
-                   <div v-if="enrollStutas == 2" style="display: flex;justify-content: center; align-items: center;">
-                      <div v-if="!scoreInfo.has" style="margin-left:10px;cursor: pointer;padding-top: 15px;">
-                                <el-rate  v-model="scoreInfo.score"  @change="addScore"></el-rate>
-                      </div>
-                      <div v-else style="padding-top: 10px;display: flex;margin-left: 10px">
-                        <div style="padding-top: 5px;">
-                        <el-rate disabled v-model="courseInfo.score" :allow-half="true" ></el-rate>
-                        </div>
-                        <div><span class="score-text">{{toScore(courseInfo.score)}}</span><span style="font-size: 14px;">分</span></div>
-                      </div>
-                   </div>
-                  </div>
-                  <div style="display: flex;align-items: center;padding-top: 15px;">
-                    <div @click="praiseContent" style="cursor: pointer;">
-                      <img class="icon-small" v-if="isPraise" :src="require('@/assets/images/icon/praise-active.png')">
-                      <img class="icon-small" v-else :src="require('@/assets/images/icon/praise.png')"><span style="margin-left: 5px;color: #666666;font-size: 18px;">{{courseInfo.praises}}</span>
-                    </div>
-                    <div style="margin-left: 15px;cursor: pointer;" @click="treadContent">
-                      <img class="icon-small" v-if="isTrample" :src="require('@/assets/images/icon/trample-active.png')">
-                      <img class="icon-small" v-else :src="require('@/assets/images/icon/trample.png')"><span style="margin-left: 5px;color: #666666;font-size: 18px;">{{courseInfo.trampleCount}}</span>
-                    </div>
-                  </div>
-                </div>
-              </el-col>
-              <el-col :span="6" class="cont">
-                <interactBar :readonly="enrollStutas==1" :type="1" :data="courseInfo" :views="false" :praises="false" :comments="false"></interactBar>
-                <div class="title title-index">{{courseInfo.name}}</div>
-                <div class="study-count"><span class="num">{{courseInfo.studys}}人学习</span></div>
-                <!-- <div class="course-info-tools-btns">
-                    <span style="color: #f8a114;font-size: 36px;">{{toScore(courseInfo.score)}}</span>
-                    <span style="font-size: 14px;color: #787878;">分</span>
-                </div> -->
-                <!-- <div class="label"><el-tag class="label-item" effect="plain">了解公司</el-tag></div> -->
-                <div class="label"><el-tag class="label-item" effect="plain">录播课</el-tag></div>
-                <div class="label" v-if="tags.length >0">
-                  <el-tag class="label-item" effect="plain" v-for="(item, index) in tags" :key="index">{{item}}</el-tag>
-                  <!-- <el-tag class="label-item" effect="plain">中心长</el-tag> -->
-                </div>
-                <div v-if="enrollStutas != 2" class="score"  style="padding-top: 135px;justify-content: flex-start;">
-                    <!-- <el-rate style="display: inline-block; " disabled v-model="courseInfo.score" score-template="{value}" show-score text-color="#ff8e00"></el-rate>
-                    <span style="font-size: 14px;color: #f7ba2a;">分</span> -->
-                    <div v-if="courseInfo.score">
-                    <el-rate disabled v-model="courseInfo.score"></el-rate>
-                    <span class="score-text">{{toScore(courseInfo.score)}}<span style="font-size: 14px;">分</span></span>
-                    </div>
-                    <div v-else class="score-no">未评分</div>
-                    <!-- <el-rate style="display: inline-block; " disabled v-model="courseInfo.score" text-color="#ff8e00"></el-rate>
-                    <span style="font-size: 14px;color: #f7ba2a;">{{courseInfo.score}}分</span> -->
-                </div>
-                <!-- <div class="keyword"><el-tag class="label-item" effect="plain">质量</el-tag></div> -->
-                <!--资源归属是一共有三级，这里只显示三级-->
-                <!-- <div class="study-count">资源归属：{{courseInfo.resOwner}}</div> -->
-                <!-- <div class="btn-div" style="padding-top: 70px;">
-                  <el-button class="btn" type="primary" v-if="enrollStutas == 1" @click="submitEnroll">立即报名</el-button>
-                </div> -->
-                <!-- 二维码 -->
-                <!-- <div class="qr-code" style="padding-top: 10px;">
-                  <div id="qrcode" ref="qrcode" class="qrcode" ></div>
-                  <div>手机扫码观看</div>
-                </div> -->
-               <!-- <div style="width: 100px;height:300px" v-if="courseInfo.device == 2 || courseInfo.device == 3"> -->
-                  <img class="detail-img" v-show="!showQrcode && (courseInfo.device == 2 || courseInfo.device == 3)" @click="showQrcode = true" src="../../../assets/images/qr.png" alt="" srcset="">
-                  <div class="qr-code" v-show="showQrcode && ((courseInfo.device == 2 || courseInfo.device == 3))" style="padding-top: 10px;">
-                    <div id="qrcode" ref="qrcode" class="qrcode" @click="showQrcode = false"></div>
-                    <!-- <div style="margin-left: 27px">手机扫码观看</div> -->
-                  </div>
-                <!-- </div> -->
-              </el-col>
-              <!-- 11 -->
-            </el-row>
-          </el-card>
-          <el-row :gutter="10">
-            <el-col :span="18">
-              <div class="el-tab-pane-boxContent" style="background-color: #FFFFFF;padding: 20px;margin-top: 10px;">
-                 <el-tabs v-model="bootTabActive">
-                    <el-tab-pane label="课程介绍" name="info">
-                      <div class="content"><img src="@/assets/images/icon/remark-iocn.png" alt="" srcset=""> 目标人群</div>
-                      <div class="content-text" >{{courseInfo.forUsers}}</div>
-                      <div class="content"><img src="@/assets/images/icon/remark-iocn.png" alt="" srcset=""> 课程价值</div>
-                      <div class="content-text">{{courseInfo.value}}</div>
-                      <div class="content"><img src="@/assets/images/icon/remark-iocn.png" alt="" srcset=""> 详细介绍</div>
-                      <div class="content-text" v-html="courseInfo.summary"></div>
-                    </el-tab-pane>
-                    <el-tab-pane :label="'评论('+commentsTtoal+')'" name="commnets">
-                      <comments v-if="courseInfo.id!=''"
-                        :readonly="enrollStutas==1"
-                        :showTop="false"
-                        @writeTotal="showCommentsTotal"
-                        @success="addCommentSuccess"
-                        @delSuccess="delCommentSuccess"
-                        :obj-type="1"
-                        :to-users="toUsers"
-                        :obj-id="courseInfo.id"
-                        :obj-title="courseInfo.name">
-                      </comments>
-                    </el-tab-pane>
-                  </el-tabs>
-                </div>
-            </el-col>
-            <el-col :span="6">
-              <el-card :body-style="{ padding: '0px' }" class="teachers">
-                <div class="top">授课讲师</div>
-                <div>
-                  <div class="teacher" v-for="(item, idx) in teachers" :key="idx" >
-                    <div class="teacher-avator">
-                      <el-avatar v-if="item.avatar !== ''" :src="item.avatar" shape="circle" :size="50"></el-avatar>
-                      <!-- <div class="teacher-text" v-if="item.avatar !== '' "></div> -->
-                      <!-- <el-avatar v-if="item.avatar && item.avatar!=''" icon="el-icon-user" shape="square" :size="50"></el-avatar> -->
-                       <div class="teacher-text" v-else>
-                         <div v-if="sex === 1 "><img src="../../../../public/images/Avatarman.png" alt=""></div>
-                         <div v-else><img src="../../../../public/images/Avatarwoman.png" alt=""></div>
-
-                      </div>
-                    </div>
-                    <div class="teacher-info">
-                      <div class="teacher-name">{{ item.teacherName }}</div>
-                      <div class="teacher-remark" v-html="item.remark"></div>
-                    </div>
-                  </div>
-                </div>
-              </el-card>
-            </el-col>
-          </el-row>
-        </el-col>
-      </el-row>
-    </div>
-    <portal-footer></portal-footer>
-  </div>
-</template>
-
-<script>
-import QRCode from 'qrcodejs2';
-import { mapGetters,mapActions} from 'vuex';
-import portalHeader from "@/components/PortalHeader.vue";
-import comments from "@/components/Portal/comments.vue";
-import portalFooter from "@/components/PortalFooter.vue";
-import interactBar from "@/components/Portal/interactBar.vue";
-import apiCourse from "@/api/modules/course.js";
-import apiCourseFile from "@/api/modules/courseFile.js";
-import apiCoursePortal from "@/api/modules/coursePortal.js";
-import apiUser from '@/api/system/user.js';
-import exam from '@/components/Course/exam';
-import homework from '@/components/Course/homework';
-import assess from '@/components/Course/assess';
-import {
-  formatDate,
-  resListMap,
-  toScore,
-  courseType,
-  getType,
-  numberToLetter,
-  correctJudgment,
-  userAvatarText
-} from "@/utils/tools.js";
-import apicourseStudy from "@/api/modules/courseStudy.js";
-import apiVideoStudy from "@/api/modules/videoStudy.js";
-import apiCourseGrade from "@/api/modules/courseGrade.js";
-import apiPraises from "@/api/modules/praises.js";
-import apiTrample from "@/api/modules/trample.js";
-import FileUpload from "@/components/FileUpload/index.vue";
-import pdfPreview from "@/components/PdfPreview/index.vue";
-// import {resOwnerIndexName} from '@/utils/type.js';
-import { setTimeout } from "timers";
-import videoPlayer from '@/components/VideoPlayer/index.vue';
-import audioPlayer from '@/components/AudioPlayer/index.vue';
-import courseImage from "@/components/Course/courseImage.vue";
-import studyUtil from '@/utils/study.js';
-import {encrypt} from '@/utils/jsencrypt.js';
-import cookies from 'vue-cookies'
-export default {
-  name: "micro",
-  components: {
-    portalHeader,
-    portalFooter,
-    interactBar,
-    FileUpload,
-    comments,
-    pdfPreview,
-    videoPlayer,
-    audioPlayer,
-    courseImage,
-    homework,
-    exam,
-    assess
-  },
-  computed: {
-    ...mapGetters(['resOwnerMap','sysTypeMap','userInfo']),
-  },
-  data() {
-    return {
-      sex:null,
-      playerBoxShow:false,
-      userAvatarText,
-      showQrcode:false,
-      qrcode: '',
-      showiframe: false,//用于超连接的
-      toScore,
-      correctJudgment:correctJudgment,
-      show:0,
-      studyId: "",
-      tags: [],
-      numberToLetter: numberToLetter,
-      // resOwnerListMap: resOwnerIndexName,
-      fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
-      blobUrl:'',//播放的文件地址，新添加，采用blob方式
-      getType: getType,
-      courseType,
-      activeName: "courseware",
-      courseInfo: {
-        id: "",
-        type: 10,
-        name: "",
-        favorites: 0,
-        comments: 0,
-        shares: 0,
-        praises: 0,
-        views: 0
-      },
-      toUsers:[],//可以@的用户列表
-      teachers: [],
-      totalContent: 4, //微课默认是4项
-      conLink:{openType:1,url:''},//对于超连接的内容
-      curriculumData:{url:'',isDrag:true,completeSetup:1,setupTage:0,second:0},// 课件内容
-      coursewareInfo: {
-        content: {},
-        finish: false,
-        process:0,
-        status:1,
-        studyItemId: ""
-      },
-      homeworkInfo: {
-        has: false,
-        content: {},
-        info: {},
-        studyItemId: "",
-        filePath: ""
-      },
-      examInfo: {
-        has: false,
-        content: {},
-        info: {},
-        paper: [],
-        studyItemId: ""
-      },
-      assessInfo: {
-        has: false,
-        allowSubmit: true,
-        content: {},
-        info: {},
-        studyItemId: ""
-      },
-      enrollStutas: 1, // 1 :未报名，2:已报名
-      dialogVisible: false,
-      testStart: false,
-      courseRate: 5,
-      videoPlayingTime:0,//当前视频的耿入的时间点
-      appendStartTime: null, //记录追加的开始时间
-      scoreInfo: {
-        score: 5,
-        has: false
-      },
-      interactRuning:false,
-      isPraise: false,
-      isTrample: false,
-      bootTabActive:'info',
-      commentsTtoal:0,
-      appendHandle:null,//追加时长时间对象
-      isAppendTime:false,//是否追加学习时长
-      appentId:'',//当前追加的学习时长的id
-      appentInterval:30000,//追加学习时间的间隔 30秒加一次
-    };
-  },
-  mounted() {
-    this.showQrimage();
-    this.$watermark.set(this.userInfo.name+this.userInfo.loginName);
-    this.loadResOwners();
-    let id = this.$route.query.id;
-    this.courseInfo.id = id;
-    let $this = this;
-    //页面只支取一次，所以先直接写在这里面
-    apiCoursePortal.detail(id).then(rs => {
-      if (rs.status == 200) {
-        this.courseInfo = rs.result.course;
-        // this.courseInfo.score = this.toScore(rs.result.course.score);
-        if(rs.result.course.tags != '') this.tags = rs.result.course.tags.split(",");
-        this.teachers = rs.result.teachers;
-
-        if(rs.result.teachers && rs.result.teachers.length > 0){
-          let userIds=[];
-          let ctoUsers=[];
-          rs.result.teachers.forEach(item=>{
-            item.avatar = "";
-            userIds.push(item.teacherId);
-            ctoUsers.push({aid:item.teacherId,name:item.teacherName,});
-          })
-          this.toUsers=ctoUsers;
-          this.loadAuthorInfo(rs.result.teachers,userIds)
-        }
-        this.totalContent = rs.result.contents.length; //计算总内容数
-        if (!rs.result.course.resOwner3) {
-          this.courseInfo.resOwner = this.resOwnerName(
-            rs.result.course.resOwner2
-          );
-        } else {
-          this.courseInfo.resOwner = this.resOwnerName(
-            rs.result.course.resOwner3
-          );
-        }
-        rs.result.contents.forEach(con => {
-          if (con.sortIndex == 1) {
-            $this.coursewareInfo.content = con;
-            if(con.contentType == 10 || con.contentType == 20) {
-                if(con.content.startsWith('\{')){
-                 this.curriculumData=JSON.parse(con.content);
-              }else{
-                 this.curriculumData.url=con.content;
-              }
-              //对url进行加密处理
-              $this.createPlayUrl(this.curriculumData.url);
-
-            } else if (con.contentType == 40) {
-              //需要读取pdf的路径
-              if($this.coursewareInfo.content.content!='' && $this.coursewareInfo.content.content.indexOf('.pdf')==-1){
-                  apiCourseFile.detail($this.coursewareInfo.content.contentRefId).then(cfrs=>{
-                    if(cfrs.status==200){
-                       $this.coursewareInfo.content.content=cfrs.result.previewFilePath;
-                    }else{
-                       $this.$message.error('加载pdf课件文件失败');
-                    }
-                  });
-              }
-              //let url = this.fileBaseUrl + r.content;
-            }else if(con.contentType ==52){
-              if(con.content.startsWith('\{')){
-                 this.conLink=JSON.parse(con.content);
-              }else{
-                 this.conLink.url=con.content;
-                 this.conLink.openType=1;
-              }
-              if(this.conLink.openType==2){
-                //直接设置完成状态
-                this.widthOpen(this.conLink.url);
-              }
-            }
-            // //加载课件的学习情况
-          } else if (con.sortIndex == 2) {
-            $this.homeworkInfo.content = con;
-            $this.homeworkInfo.has = true;
-            //查询作业信息，并显示
-          } else if (con.sortIndex == 3) {
-            $this.examInfo.has = true;
-            $this.examInfo.content = con;
-            //查询考试信息并显示
-            //$this.loadExamInfo();
-          } else if (con.sortIndex == 4) {
-            $this.assessInfo.has = true;
-            $this.assessInfo.content = con;
-            //转化文本为json内容
-          }
-        });
-        //study info
-        this.loadStudyInfo();
-      } else {
-        this.$message.error(rs.message);
-      }
-    });
-  },
-  methods: {
-     createPlayUrl(u){
-       let nowDate=new Date();
-       let ctime=parseInt(nowDate.getTime()/1000);
-       let beforeUrl=parseInt(nowDate.getTime()/1000)+u;
-       //console.log(beforeUrl,'beforeUrl');
-       let urlSign=encodeURIComponent(encrypt(beforeUrl));
-       //console.log(urlSign,'urlSign');
-       cookies.set('PLAYSIGN_TIME', ctime);//写客户端的cookie保存
-       this.blobUrl=process.env.VUE_APP_BASE_API+'/xboe/m/course/play/resource?sign='+urlSign;
-
-     },
-     createVideoBlob(url){
-       let $this=this;
-       let xhr = new  XMLHttpRequest;
-       xhr.open("GET",url,true);
-       xhr.responseType = 'blob';
-       //xhr.onload：只有 4 状态会触发
-       xhr.onreadystatechange = function() {
-           if (xhr.readyState==4 && xhr.status == 200) {//请求成功
-               //获取blob对象
-               let blob = xhr.response;
-               //获取blob对象地址，并把值赋给容器
-               let urlObj = window.URL.createObjectURL(blob);
-               $this.blobUrl=urlObj;
-           }
-       };
-       xhr.send();
-     },
-     showQrimage(row){
-       let urlPre=window.location.protocol+'//'+window.location.host;
-      // https://u.boe.com/mobile/pages/resource/microDetail?id=963456709515939840
-      // this.qrcode = this.webBaseUrl+'/mobile/pages/resource/microDetail?id='+this.courseInfo.id;
-        this.qrcode =urlPre+ '/mobile/pages/resource/microDetail?id='+this.courseInfo.id;
-        //console.log(this.qrcode,'qrcode');
-        this.$nextTick(() => {
-        this.crateQrcode();
-      });
-     },
-    crateQrcode(){
-       this.qr = new QRCode('qrcode', {
-        width: 80,
-        height: 80, // 高度
-        text: this.qrcode // 二维码内容
-        // render: 'canvas' // 设置渲染方式（有两种方式 table和canvas，默认是canvas）
-        // background: '#f0f'
-        // foreground: '#ff0'
-      });
-    },
-    ...mapActions({
-      getResOwnerTree:'resOwner/getResOwnerTree',
-      loadResOwners:'resOwner/loadResOwners',
-      getSysTypeTree:'sysType/getSysTypeTree',
-      loadSysTypes:'sysType/loadSysTypes'
-    }),
-    resOwnerName(code){
-      if(code==''){return '';}
-      return this.resOwnerMap.get(code);
-    },
-    widthOpen(url) {
-      window.open(this.webBaseUrl+url,'_blank');
-    },
-    showCommentsTotal(total){
-      this.commentsTtoal=total;
-    },
-    addCommentSuccess(comm){
-      this.commentsTtoal++;
-    },
-    delCommentSuccess() {
-      this.commentsTtoal--;
-    },
-    saveStudyItem(){ //先保存学习的内容,针对于音视频的内容
-      if(this.coursewareInfo.finish || this.coursewareInfo.studyItemId) {
-        return;//已记录学习记录的不再保存
-      }
-      let params = {
-        studyId: this.studyId, //学习id,
-        courseId: this.courseInfo.id, //课程id,
-        contentId: this.coursewareInfo.content.id, //内容id,
-        contentType:this.coursewareInfo.content.contentType, //内容id,
-        contentName: this.coursewareInfo.content.contentName, //内容名称
-        progress: 0,
-        lastStudyTime:0,
-        status:2,
-        studyDuration:0,
-        contentTotal: this.totalContent
-      };
-      apiVideoStudy.saveStudyItem(params).then(res=>{
-          if(res.status == 200){
-            this.coursewareInfo.studyItemId=res.result.id;
-            this.coursewareInfo.finish = false;
-            this.coursewareInfo.status = 2;
-            this.coursewareInfo.progress = 1;
-          }else{
-            console.log("记录学习失败:" + res.message + "，" + res.error);
-          }
-      });
-    },
-    finishStudyItem(){ //设置完成学习的内容,针对于音视频的内容
-        let params={
-          itemId:this.coursewareInfo.studyItemId,
-          studyId:this.studyId,
-          courseId:this.courseInfo.id,
-          cnum:this.totalContent
-        }
-        apiVideoStudy.finishStudyItem(params).then(res=>{
-            if(res.status == 200){
-              this.coursewareInfo.finish = true;
-              this.coursewareInfo.status = 9;
-              this.coursewareInfo.progress = 100;
-            }else{
-              console.log("记录完成学习失败:" + res.message + "，" + res.error);
-            }
-        });
-    },
-    onFullscreen(full){
-      let divId='videowatermark';
-      var div = document.getElementById('myVideoPlayer')
-      if(full){
-      	var div3 = document.createElement("div");
-        div3.id =divId;
-        div3.setAttribute("class", "fullmark");
-      	div3.innerHTML='';
-        //从父组件传过来的水印内容
-        //div3.innerText =this.userInfo.name+this.userInfo.code;
-      	for(var i=0;i<8;i++){
-      		div3.innerHTML+='<div style="color:#ffffff;width: 40%;height: 155px;padding-left:60px;padding-top:50px; display: flex;justify-content: center; transform: rotate(-36deg);font-size:20px;">'+this.userInfo.name+this.userInfo.loginName+'</div>';
-      	}
-        div3.style.cssText = "position:absolute;pointer-events: none; width: 100%;height: 100%;top:0;left:0;bottom: 0;right: 0; display: flex;justify-content: center;flex-wrap: wrap;overflow: hidden; opacity:0.3;padding-top:10px";
-      	div.appendChild(div3);
-      }else{
-      	var markDiv=div.querySelector("#"+divId);
-        //console.log(markDiv,'markDiv');
-      	if(markDiv){
-      		div.removeChild(markDiv);
-      	}
-      }
-    },
-    onPlayerPlay(){
-      this.playerBoxShow = false;
-      //console.log("开始播放");
-      this.isAppendTime=false;
-
-      //视频类的内容，开始播放时才会记录完成情况
-      //2022-05-24修改，判断播放的
-      let $this=this;
-      //console.log(this.curriculumData,'this.curriculumData');
-      //完成类型 completeSetup 0表默认，打开后5秒算学完，1表按进度，2表按时间
-      //完成值（非默认情况下起作用） setupTage
-      if(!$this.coursewareInfo.finish){
-        let completeType=this.curriculumData.completeSetup;
-        if(completeType==0){
-          //默认5秒后学习完成.
-          setTimeout(() => {$this.saveStudyInfo();}, 5000);
-        }else{
-          //先记录进行中的学习内容
-          this.saveStudyItem();
-        }
-      }
-    },
-    onPlayerPause(){
-      //console.log("暂停");
-    },
-    onPlayerEnded(){
-       //this.onFullscreen(false);//退出全屏
-       this.playerBoxShow = true;
-       this.isAppendTime=true;//开始追加学习时间
-       //this.saveStudyDuration();//保存添加学习时长
-       if(!this.coursewareInfo.finish){
-         this.finishStudyItem();
-       }
-    },
-    onPlayerPlaying(itme){
-      this.isAppendTime=false;//禁止追加学习时间
-      this.appendStartTime=null;
-      //console.log("当前播放11"+itme);
-      let intTime=parseInt(itme);
-      //console.log(intTime,'intTime');
-      this.videoPlayingTime=intTime;
-      //判断是否完成
-      let completeType=this.curriculumData.completeSetup;
-      let completeSecond=this.curriculumData.second;
-      if(!completeSecond){
-        completeSecond=5;//如果没有就采用默认的时间了
-      }
-
-      if(completeType>0 && !this.coursewareInfo.finish){ //因为1按进度，2按时长都是计算时间，所以这里直接大于0处理
-          if(completeType==1){
-            let finishPercent=this.curriculumData.setupTage;
-            let videDuration=this.coursewareInfo.content.duration;
-            let percent =intTime*100/videDuration;
-            if(percent>=finishPercent){
-                this.finishStudyItem();
-            }
-          }else if(completeType==2){
-            if(intTime>completeSecond){
-               this.finishStudyItem();
-            }
-          }
-
-      }
-      //以下是每10秒记录一次学习时长
-      let saveTime=Math.floor(intTime%10);
-      if(intTime>10 && saveTime==0 && this.coursewareInfo.studyItemId!=''){
-        //记录播放时间
-        //console.log('记录播放时间:'+intTime);
-        let postData={
-          itemId:this.coursewareInfo.studyItemId,
-          videoTime:intTime
-        }
-        apicourseStudy.studyVideoTime(postData).then(rs=>{
-           if(rs.status!=200){
-             console.log('记录播放时间错误');
-           }
-        })
-      }
-
-    },
-    audioPlaying(item,currentTime){
-      let intTime=parseInt(currentTime);//秒
-      //console.log("当前播放时间="+item+',currentTime='+intTime);
-      //判断是否完成
-      let completeType=this.curriculumData.completeSetup;
-      let completeSecond=this.curriculumData.second;
-      if(!completeSecond){
-        completeSecond=5;//如果没有就采用默认的时间了
-      }
-
-      if(completeType>0 && !this.coursewareInfo.finish){ //因为1按进度，2按时长都是计算时间，所以这里直接大于0处理
-          if(completeType==1){
-            let finishPercent=this.curriculumData.setupTage;
-            let videDuration=this.coursewareInfo.content.duration;
-            let percent =intTime*100/videDuration;
-            if(percent>=finishPercent){
-                this.finishStudyItem();
-            }
-          }else if(completeType==2){
-            if(intTime>=completeSecond){
-               this.finishStudyItem();
-            }
-          }
-
-      }
-      //以下是每5秒记录一次学习时长
-      let saveTime=Math.floor(intTime%10);
-      if(intTime>10 && saveTime==0 && this.coursewareInfo.studyItemId!=''){
-        //记录播放时间
-        //console.log('记录播放时间:'+intTime);
-        let postData={
-          itemId:this.coursewareInfo.studyItemId,
-          videoTime:intTime
-        }
-        apicourseStudy.studyVideoTime(postData).then(rs=>{
-           if(rs.status!=200){
-             console.log('记录播放时间错误');
-           }
-        })
-      }
-    },
-    audioPlay(){
-      //console.log("开始播放");
-      let $this=this;
-      if (!$this.coursewareInfo.finish) {
-        let completeType=this.curriculumData.completeSetup;
-        //console.log(completeType,"completeType");
-        if(completeType==0){
-          //默认5秒后学习完成.
-          setTimeout(() => {$this.saveStudyInfo();}, 5000);
-        }else{
-          //先记录进行中的学习内容
-          this.saveStudyItem();
-        }
-      }
-    },
-    audioPause(){
-      //console.log("暂停");
-    },
-    audioEnd(){
-      // this.playerBoxShow = true;
-      //console.log("播放结束");
-      if(!this.coursewareInfo.finish){
-        this.finishStudyItem();
-      }
-    },
-    changeTab(tab){
-      this.playerBoxShow = false;
-      this.saveStudyDuration();//保存一次学习时长，在切换时
-      let $this = this;
-      if (tab.name == "homework") {
-
-      } else if (tab.name == "test") {
-
-      } else if (tab.name == "assess") {
-        // //console.log('加载评估信息');,评估只会有一个，所以主直接取
-        // let params = {
-        //   studyId: this.studyId,
-        //   contentId: this.assessInfo.content.id
-        // };
-        // apicourseStudy.myAssessList(params).then(res => {
-        //   if (res.status == 200) {
-        //     if (res.result.length > 0) {
-        //       this.assessInfo.allowSubmit = false;
-        //       this.assessInfo.info = JSON.parse(res.result[0].asContent);
-        //     }
-        //   } else {
-        //     this.$message.error(res.message);
-        //   }
-        // });
-      } else {
-        //在课件页面，记录开始时间
-        //对于视频类的，是在点击开始播放后执行的
-        if(this.coursewareInfo.content.contentType>10){
-          this.isAppendTime=true;
-          this.appendStudyTime(false);
-          if(!this.coursewareInfo.finish){
-             setTimeout(() => {$this.saveStudyInfo();}, 5000);
-          }
-        }else{
-          this.isAppendTime=false;
-        }
-      }
-    },
-    saveStudyInfo() {
-      //记录课件学习信息
-      if (this.activeName != "courseware") {
-        //只有在课件页面停留超过5秒才会记录
-        return;
-      }
-      if (this.coursewareInfo.finish) {
-        return;
-      }
-      let params = {
-        studyId: this.studyId, //学习id,
-        courseId: this.coursewareInfo.content.courseId, //课程id,
-        contentId: this.coursewareInfo.content.id, //内容id,
-        contentType:this.coursewareInfo.content.contentType, //内容id,
-        contentName: this.coursewareInfo.content.contentName, //内容名称
-        progress: 100,
-        status:9,
-        contentTotal: this.totalContent
-      };
-      apicourseStudy.studyContent(params).then(res => {
-        if (res.status == 200) {
-          this.coursewareInfo.studyItemId=res.result;
-          this.coursewareInfo.finish = true; //课件内容已学习，记录状态
-        } else {
-          console.log("记录学习失败:" + res.message + "，" + res.error);
-        }
-      });
-    },
-    saveStudyDuration(){
-       let duration=studyUtil.getStudyDuration();
-       if(duration>0){
-           let postData = {
-             id:this.appentId,
-             studyId: this.studyId,
-             courseId: this.courseInfo.id,
-             contentId: this.coursewareInfo.content.id,
-             studyInfo:
-               this.courseInfo.name +
-               "-" +
-               this.coursewareInfo.content.contentName,
-             duration: duration
-           };
-           apicourseStudy.appendStudyTime(postData).then(rs => {
-             if (rs.status == 200){
-               this.appentId=rs.result;
-               studyUtil.clearStudyDuration();//清除本地存储
-             } else {
-               console.log(rs.message);
-             }
-           });
-       }
-    },
-    appendStudyTime(flag) {
-      if(this.studyId==''){
-        return;
-      }
-
-      if(!this.isAppendTime){
-        //如果不追加时间，把追加开始时间设置为null
-        this.appendStartTime=null;
-        return;
-      }
-
-      if(this.appendHandle!=null){
-        window.clearTimeout(this.appendHandle);
-      }
-
-      //首先从本地读取
-      let duration=studyUtil.getStudyDuration();
-
-      //追加学习时间
-      let $this = this;
-      if(this.appendStartTime == null) {
-        this.appendStartTime = new Date();
-        this.appendHandle=setTimeout(function() {$this.appendStudyTime();}, $this.appentInterval);
-        if(duration>0 && flag){
-          this.saveStudyDuration();
-        }
-        return;
-      }
-
-      //当前进行的时间
-      let now = new Date();
-      let m = now.getTime() - this.appendStartTime.getTime(); //相差的毫秒数
-      let sen = parseInt(m / 1000); //计算秒数
-
-      //console.log(duration,'duration')
-      //console.log(sen,'sen')
-      duration=duration+sen;
-      if(flag){
-         //这个时候才进行存储 ，否则只能是存储在本地
-         if(duration>0){
-            let postData = {
-              id:this.appentId,
-              studyId: this.studyId,
-              courseId: this.courseInfo.id,
-              contentId: this.coursewareInfo.content.id,
-              studyInfo:
-                this.courseInfo.name +
-                "-" +
-                this.coursewareInfo.content.contentName,
-              duration: sen
-            };
-            apicourseStudy.appendStudyTime(postData).then(rs => {
-              if (rs.status == 200){
-                $this.appentId=rs.result;
-                $this.appendStartTime = new Date(); //重置开始时间
-                studyUtil.clearStudyDuration();//清除本地存储
-              } else {
-                console.log(rs.message);
-              }
-            });
-         }
-
-      }else{
-        $this.appendStartTime = new Date(); //重置开始时间
-        studyUtil.setStudyDuration(duration);//添加到本地存储中
-      }
-      this.appendHandle=setTimeout(function() {$this.appendStudyTime();},$this.appentInterval);
-    },
-    loadStudyInfo() {
-      //获取学习信息
-      let $this = this;
-      this.loadScorePraiseAndTrample();
-      apicourseStudy.studyInfo(this.courseInfo.id).then(res => {
-        if (res.status == 200) {
-          res.result.signup ? (this.enrollStutas = 2) : (this.enrollStutas = 1);
-          if(res.result.signup) {
-            //this.bootTabActive = 'commnets';//系统自动报名，这里不进行切换了
-            this.studyId = res.result.studyId; //设置学习id
-
-            //需要判断此内容是否已学习完成，如果已学习完成，不需要再请不说了
-            res.result.contents.forEach(con => {
-              if (con.contentId == $this.coursewareInfo.content.id) {
-                  $this.coursewareInfo.studyItemId=con.id;
-                  $this.coursewareInfo.status=con.status;
-                  $this.coursewareInfo.progress=con.progress;
-
-                  if(con.contentType==10 || con.contentType==20){
-                    if(con.progress==100 || con.status==9){
-                      $this.coursewareInfo.finish = true;
-                    }else{
-                      $this.coursewareInfo.finish = false;
-                    }
-                  }else{
-                    $this.coursewareInfo.finish = true; //课件已学习
-                  }
-
-                  if(con.lastStudyTime){
-                    //如果上次课件已经播放完成，此处应该是$this.coursewareInfo.content.duration
-                    //也就是从头开开始
-                    $this.videoPlayingTime=con.lastStudyTime;
-                  }
-                //console.log()
-              }else if (con.contentId == $this.homeworkInfo.content.id) {
-                  $this.homeworkInfo.studyItemId = con.id;
-              }else if (con.contentId ==$this.examInfo.content.id) {
-                  $this.examInfo.studyItemId = con.id;
-              }else if (con.contentId == $this.assessInfo.content.id) {
-                  $this.assessInfo.studyItemId = con.id;
-              }
-            });
-            //存储上一次学习时长，主要用于上次未存储的学习时长
-            this.saveStudyDuration();
-            if(!$this.coursewareInfo.finish && $this.coursewareInfo.content.contentType>20) {
-              //未完居，并且类型不是视频的，直接设计5秒后学习完成
-                setTimeout(() => {$this.saveStudyInfo();}, 5000); //5秒后记录学习
-                //开始记录学习时长
-                $this.isAppendTime=true;
-                $this.appendStudyTime(false);
-            }
-          }else{
-            //signup 没有报名的情况下，直接报名
-            this.submitEnroll();
-          }
-        } else {
-          this.$message.error(res.message);
-        }
-      });
-    },
-    submitEnroll() { //提交报名
-      let pamars = {
-        courseId: this.courseInfo.id,
-        courseName: this.courseInfo.name,
-        courseType: this.courseInfo.type,
-        signType: 1,
-        signInfo: ""
-      };
-      let $this = this;
-      apicourseStudy.signup(pamars).then(res => {
-        if (res.status == 200) {
-          //this.$message({ type: "success", message: "报名成功" });
-          this.enrollStutas = 2;
-          this.studyId=res.result.studyId;//设置学习的ID
-          //this.loadStudyInfo();
-          if($this.coursewareInfo.content.contentType>20){
-              this.isAppendTime=true;
-              this.appendStudyTime(false); //报名成功记录开始时间
-              //报名成功后，就直接记录课件学习情况，5秒后
-              setTimeout(() => {$this.saveStudyInfo();}, 5000);
-          }else{
-             //对于视频类的处理，用户手动点击播放，不做处理
-          }
-        } else {
-          this.$message.error(res.message);
-        }
-      });
-    },
-    loadScorePraiseAndTrample() {
-      //加载是否打过分
-      //if(this.enrollStutas>1){
-        apiCourseGrade.has(this.courseInfo.id).then(rs => {
-          if (rs.status == 200 && rs.result) {
-            this.scoreInfo.has = true;
-          }
-          //console.log(rs.result,'rs.result');
-        });
-      //}
-      apiPraises.has(1, this.courseInfo.id).then(rs => {
-        if (rs.status == 200 && rs.result) {
-          this.isPraise = true;
-        }
-      });
-      apiTrample.has(this.courseInfo.id).then(rs => {
-        if (rs.status == 200 && rs.result) {
-          this.isTrample = true;
-        }
-      });
-    },
-    addScore() {
-      let that = this;
-      let postData = {
-        courseId: this.courseInfo.id,
-        studyId: this.studyId,
-        score: this.scoreInfo.score
-      };
-      if (this.scoreInfo.score > 0) {
-        apiCourseGrade.grade(postData).then(rs => {
-          if (rs.status == 200) {
-            this.$message.success("打分成功，谢谢您的打分");
-            that.scoreInfo.has = true;
-            that.courseInfo.score = rs.result;
-          } else {
-            this.$message.error("打分处理失败，请稍后再试");
-          }
-        });
-      }
-    },
-    praiseContent() {
-      if(this.enrollStutas==1){
-        this.$message.error("报名学习之后才可以点赞");
-        return;
-      }
-      if(this.isTrample){
-        this.$message.error("您已踩过了，不能再赞了");
-        return;
-      }
-      if(this.interactRuning){
-				return;
-			}
-			this.interactRuning=true;
-      let postData = {
-        objType: 1,
-        objId: this.courseInfo.id,
-        title: this.courseInfo.name
-      };
-      if(this.isPraise){
-         apiPraises.remove(1,this.courseInfo.id).then(res=>{
-           this.interactRuning=false;
-           if (res.status == 200){
-             if(this.courseInfo.praises>0){
-               this.courseInfo.praises--;
-             }
-             this.$message.info("已取消点赞");
-             this.isPraise = false;
-           } else {
-             this.$message.error("取消点赞失败,请稍后再试");
-           }
-          });
-      }else{
-        apiPraises.save(postData).then(rs => {
-          this.interactRuning=false;
-          if (rs.status == 200) {
-            this.courseInfo.praises++;
-            this.$message.success("点赞成功");
-            this.isPraise = true;
-          } else {
-            this.$message.error("点赞失败,请稍后再试");
-          }
-        });
-      }
-
-    },
-    treadContent() {
-      if(this.enrollStutas==1){
-        this.$message.error("只有报名学习后才可以踩");
-        return;
-      }
-      if(this.isPraise){
-        this.$message.error("您已赞过了，不能再踩了");
-        return;
-      }
-      if(this.interactRuning){
-					return;
-			}
-			this.interactRuning=true;
-      if(this.isTrample){
-        apiTrample.remove(this.courseInfo.id).then(rs => {
-          this.interactRuning=false;
-          if (rs.status == 200) {
-            if(this.courseInfo.trampleCount>0){
-              this.courseInfo.trampleCount--;
-            }
-            this.$message.info("已取消踩");
-            this.isTrample = false;
-          } else {
-            this.$message.error("取消失败,请稍后再试");
-          }
-        });
-      }else{
-        apiTrample.trample(this.courseInfo.id).then(rs => {
-          this.interactRuning=false;
-          if (rs.status == 200) {
-            this.courseInfo.trampleCount++;
-            this.$message.success("已踩");
-            this.isTrample = true;
-          } else {
-            this.$message.error("踩失败,请稍后再试");
-          }
-        });
-      }
-
-    },
-    loadAuthorInfo(list,ids){ //加载作者信息，头像，机构信息
-      if(ids.length==0){
-        return;
-      }
-      apiUser.getByIds(ids).then(res=>{
-        if(res.status==200){
-          list.forEach((item,index)=>{
-            res.result.some(author=>{
-              if(author.aid==item.teacherId){
-                if(author.avatar){
-                  item.avatar=this.fileBaseUrl + author.avatar;
-                }
-                this.sex = author.sex
-                return true;
-              }else{
-                return false;
-              }
-            })
-          });
-        }else{
-          //console.log('加载课程信息失败:'+res.error);
-          //this.$message.error(res.message);
-        }
-      });
-    },
-  }
-};
-</script>
-
-<style scoped lang="scss" scoped>
-.couretitle{
-  word-break: break-all;
-}
-::v-deep .teacher .teacher-avator .teacher-text {
-  background: none;
-  border: none;
-}
-
-
-.player-box{
-  position: absolute;
-  // top: 62px;
-  // left: 184px;
-  width: 300px;
-  left: 50%;
-  top: 50%;
-  transform: translate(-50%, -50%);
-  height: 187px;
-  background: rgba(74, 74, 74,.5);
-  border-radius: 33px;
-  text-align: center;
-  padding: 20px;
-  box-sizing: border-box;
-  .player-praise{
-    margin-top: 25px;
-    display: flex;
-    // justify-items: center;
-    justify-content: center;
-  }
-  .player-rate{
-    margin-top: 39px;
-  }
-}
-::v-deep .el-tabs__nav-wrap::after {
-    // content: "";
-    // position: absolute;
-    // left: 0;
-    // bottom: 0;
-    // width: 100%;
-    // height: 2px;
-    background-color: #fff;
-    // z-index: 1;
-}
-::v-deep .el-tabs__nav-wrap::after {
-    // content: "";
-    // position: absolute;
-    // left: 0;
-    // bottom: 0;
-    // width: 100%;
-    // height: 2px;
-    background-color: #fff;
-    // z-index: 1;
-}
-.qrcode{
-    display: inline-block;
-    img {
-        width: 132px;
-        height: 132px;
-        background-color: #fff; //设置白色背景色
-        padding: 6px; // 利用padding的特性，挤出白边
-        box-sizing: border-box;
-    }
-}
-.ref-score{
-  // background: #e4e4e4;
-  // width: 64px;
-  // height: 32px;
-  // border-radius: 17px;
-  // line-height: 32px;
-  // // opacity: 0.24;
-  // color: #000;
-  // font-size: 14px;
-  // border: none;
-  // text-align: center;
-}
-.portal-content ::v-deep .el-rate__icon{
-  font-size: 24px !important;
-}
-::v-deep .el-tag {
-    background-color: #ecf5ff;
-    border-color: #409EFF;
-    display: inline-block;
-    height: 28px;
-    padding: 0 10px;
-    line-height: 28px;
-    font-size: 12px;
-    color: #3e7fff;
-    border-width: 1px;
-    border-style: solid;
-    border-radius: 0px;
-    box-sizing: border-box;
-    white-space: nowrap;
-}
-.content{
-  padding: 10px 0;
-    font-size: 18px;
-    color: #343434;
- img{
-   width: 18px;
- }
-}
-.content-text{
-  margin: 10px 0;
-  font-size: 14px;
-  text-indent: 2em;
-  color: #666666;
-  word-break:break-all;
-}
-   ::v-deep .el-tabs__item.is-active {
-    color: #409EFF;
-    font-size: 18px;
-  }
-  .icon-small{
-    width: 20px;
-    height: 20px;
-    line-height: 20px;
-    // vertical-align: middle;
-  }
-  .con-audio{
-    padding: 50px;
-    text-align: center;
-    .con-audio-title{
-      font-size: 16px;
-      font-weight: 700;
-    }
-    .con-audio-player{
-      padding: 20px 100px;
-    }
-  }
-  .hyper-link{
-    padding-left:20px;
-    text-align: center;
-    padding-top: 100px;
-    .hyper-link-row{
-      padding: 20px;
-    }
-  }
-.red{
-  background: red;
-   background-image: linear-gradient(to bottom right, rgb(245, 30, 30) , rgb(241, 227, 21));
-}
-.paper-item-answer{
-  line-height: 30px;
-  border-bottom: 1px solid #ccc;
-  margin-bottom: 10px;
-}
-.paper-item-opts{
-   .el-radio {
-        display: block;
-      }
-  .el-checkbox {
-       display: block;
-      }
-}
-.detail {
-  background-color: #fff;
-  padding: 5px 20px 10px 20px;
-  position: relative;
-    .detail-img{
-  cursor: pointer;
-   position: absolute;
-   bottom: 0;
-   right: 0;
-  }
-  .courseware-div {
-    border: 1px solid #f0f0f0;
-    min-height: 400px;
-
-    // width: 876px;
-    // font-size: 30px;
-    text-align: center;
-    // line-height: 100px;
-    position: relative;
-    .courseware-img {
-      vertical-align: middle;
-      width: 100%;
-      height: 100%;
-    }
-    .courseware-enroll-btn {
-      position: absolute;
-      width: 270px;
-      height: 68px;
-      font-size: 22px;
-      left: 230px;
-      top: 165px;
-      opacity: 0.3;
-      background: #000000;
-      border-radius: 21px;
-    }
-    .video-div {
-      position: absolute;
-      z-index: 999999999;
-      top: 0;
-      left: 0;
-      width: 100%;
-      height: 100%;
-      background: rgba(101, 101, 101, 0.9);
-      .good {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        margin-top: 200px;
-        div {
-          line-height: 1;
-          margin: 0 15px;
-          .svg-icon {
-            width: 30px;
-            height: 30px;
-          }
-        }
-        div:nth-of-type(2) {
-          .svg-icon {
-            transform: scaleX(-1);
-            transform: rotate(180deg);
-          }
-        }
-        // margin-bottom: 50px;
-        // line-height: 20px;
-        // .el-link{
-        //   font-size: 30px;
-        //   color: #70a5f4;
-        //   margin: 0 30px;
-        // }
-      }
-    }
-  }
-  .score {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-
-        .el-rate {
-          display: inline-block;
-
-        }
-        .score-text{
-          font-size: 28px;
-          color: #FFB30F ;
-          font-family: "Arial";
-          margin-left: 23px;
-          // font-weight: 600;
-        }
-      // margin-bottom: 19px;
-        .score-no{
-          color: #FFB30F;
-          padding: 5px 0;
-          background: #efefef;
-          border-radius: 20px;
-          width: 65px;
-          font-size: 12px;
-          font-weight: 600;
-          text-align: center;
-        }
-      }
-  .homework-div {
-    border: 1px solid #bcbcbc;
-    min-height: 500px;
-    padding: 20px;
-    font-size: 14px;
-    .homework-title {
-      font-weight: 600;
-      margin-bottom: 10px;
-    }
-    .homework-content {
-      color: #666;
-      margin-bottom: 10px;
-    }
-  }
-  .test-div {
-    border: 1px solid #bcbcbc;
-    min-height: 500px;
-    padding: 20px;
-    font-size: 16px;
-
-    .test-info {
-      margin-bottom: 10px;
-      .el-radio {
-        display: block;
-      }
-    }
-  }
-  .assess-div {
-    border: 1px solid #bcbcbc;
-    min-height: 500px;
-    padding: 20px;
-    font-size: 14px;
-    .assess-info {
-      margin-bottom: 10px;
-    }
-  }
-  .cont {
-    padding: 10px 25px 25px 25px;
-    height: 540px;
-    .title {
-      font-size: 20px;
-      font-weight: 600;
-      line-height: 36px;
-      word-break:break-all;
-    }
-    .course-info-tools-btns {
-      ::v-deep .interact-bar-btns {
-        justify-content: flex-start !important;
-      }
-      .course-info-tools-btn {
-        margin: 0 15px 0 0;
-      }
-      margin-bottom: 15px;
-    }
-    .label {
-      margin-bottom: 15px;
-      .label-item {
-        margin-right: 5px;
-        margin-bottom: 5px;
-      }
-    }
-    .keyword {
-      margin-bottom: 15px;
-      .label-item {
-        margin-right: 5px;
-      }
-    }
-    .study-count {
-      padding: 20px 0;
-      .num {
-        color:  #444444;
-        font-size: 16px;
-
-      }
-      margin-bottom: 15px;
-    }
-    .btn-div {
-      margin-top: 30px;
-      .btn{
-        border-radius: 0px;
-        font-size: 16px;
-      }
-    }
-    .qr-code {
-      cursor: pointer;
-      text-align: right;
-      position: absolute;
-      bottom: 0;
-      right: 4px;
-      div {
-        text-align: center;
-        font-size: 14px;
-      }
-    }
-    .view-summary {
-      position: absolute;
-      margin-bottom: 10px;
-      margin-left: 18px;
-    }
-  }
-}
-.summary-div {
-  .summary-content {
-    font-size: 14px;
-    line-height: 25px;
-  }
-}
-.info {
-  background-color: #fff;
-  margin-top: 20px;
-  padding: 0 10px;
-  .content {
-    color: #666;
-    line-height: 25px;
-    text-indent: 2em;
-    padding: 5px 10px;
-  }
-  .pinglun-div {
-    background-color: #fff;
-    padding: 0px 20px 10px 20px;
-    .title {
-      font-size: 16px;
-      font-weight: 600;
-      line-height: 50px;
-      border-bottom: 1px solid #dfdfdf;
-      .tip {
-        color: #666;
-        font-size: 12px;
-        margin: 0 10px;
-      }
-    }
-    .submit-div {
-      margin: 15px 0;
-    }
-    .bottom {
-      text-align: right;
-    }
-
-    .data {
-      margin-top: 10px;
-      background-color: #fff;
-      padding: 5px 20px 10px 20px;
-      .data-item {
-        border-bottom: 1px solid #dfdfdf;
-        margin-top: 10px;
-        .top {
-          font-size: 18px;
-          font-weight: 600;
-          span {
-            font-size: 14px;
-            color: #666;
-            font-weight: normal;
-          }
-        }
-        .text {
-          margin: 15px 0 5px 0;
-          padding-left: 40px;
-          line-height: 35px;
-        }
-        .huifu {
-          padding-left: 40px;
-          padding-bottom: 10px;
-          border-bottom: 1px solid #dfdfdf;
-        }
-        .result-div {
-          padding-left: 40px;
-          padding-top: 10px;
-          .top {
-            font-size: 16px;
-          }
-        }
-        .up-div {
-          padding: 0 15px;
-          .up-btn {
-            padding: 8px 20px;
-            color: #000;
-          }
-        }
-        img {
-          margin-right: 10px;
-          width: 30px;
-          border: 1px solid #eee;
-          border-radius: 50%;
-          vertical-align: middle;
-        }
-      }
-    }
-  }
-}
-::v-deep .el-tabs__header{
-	.el-tabs__item{
-		font-size: 15px;
-	}
-	.is-active{
-		font-size: 16px;
-		font-weight: 600;
-	}
-}
-.teacher {
-  background-color: #ffffff;
-  display: flex;
-  border-top: 1px solid #e7e7e7;
-  padding: 10px 0px;
-  // .teacher-avator {
-
-  // }
-  .teacher-info {
-    flex: 1;
-    .teacher-name {
-      padding: 0px 5px 10px 10px;
-    }
-    .teacher-remark {
-      padding: 0px 5px 0px 10px;
-      font-size: 12px;
-      color: #797979;
-    }
-  }
-}
-.teachers {
-  background-color: #fff;
-  margin-top: 10px;
-  padding: 5px 15px 5px 10px;
-  .top {
-    font-size: 16px;
-    font-weight: 600;
-    line-height: 50px;
-  }
-   div{
-      img{
-        width: 68px;
-        height: 68px;
-      }
-    }
-}
-</style>
-<style scoped>
-.assessRadio1 /deep/ .el-radio-button__inner {
-  padding-left: 36px;
-  padding-right: 36px;
-}
-/* ::v-deep .el-tab-pane-boxContent{
-	.el-tabs__nav{
-		.el-tabs{
-			.el-tabs__header{
-				.el-tabs__nav{
-					.is-active{
-						font-size: 25px!important;
-					}
-				}
-			}
-		}
-	}
-} */
-</style>
+<template>
+  <div>
+    <portal-header current="course" :goSearch="1"></portal-header>
+    <div class="portal-content xcontent">
+      <el-breadcrumb separator-class="el-icon-arrow-right" class="breadcrumb-nav">
+        <el-breadcrumb-item :to="{ path: '/course' }">课程列表</el-breadcrumb-item>
+        <el-breadcrumb-item>课程详情</el-breadcrumb-item>
+      </el-breadcrumb>
+      <el-row :gutter="10">
+        <el-col :span="24">
+          <el-card :body-style="{ padding: '0px', 'min-height': '500px' }">
+            <el-row class="detail">
+              <el-col :span="18">
+                <el-tabs v-model="activeName" @tab-click="changeTab">
+                  <el-tab-pane label="课件" name="courseware">
+                    <div>
+                      <div class="courseware-div" v-if="enrollStutas == 1" style="max-height: 400px;">
+                        <course-image :course="courseInfo" class="courseware-img"></course-image>
+                       <!-- <el-button type="warning"  @click="submitEnroll" class="courseware-enroll-btn">报名后即可开始学习！</el-button> -->
+                      </div>
+                      <div class="courseware-div" v-else>
+                       <div v-if="coursewareInfo.content.contentType == 10" style="position: relative;">
+                           <videoPlayer id="myVideoPlayer" :src="fileBaseUrl+curriculumData.url" style="width: 100%;"
+                            @onPlayerPlaying="onPlayerPlaying"
+                            @onPlayerPlay="onPlayerPlay"
+                            :initTime="videoPlayingTime"
+                            :isDrag="curriculumData.isDrag"
+                            @onPlayerPause="onPlayerPause"
+                            @onFullscreen="onFullscreen"
+                            @onPlayerEnded="onPlayerEnded">
+                        </videoPlayer>
+                         <!-- v-if="playerBoxShow" -->
+                         <div class="player-box" v-if="playerBoxShow">
+                        <div class="player-praise">
+                          <div @click="praiseContent" style="cursor: pointer;">
+                            <img class="icon-small" v-if="isPraise" :src="require('@/assets/images/icon/praise-active.png')" />
+                            <img class="icon-small" v-else :src="require('@/assets/images/icon/zhan.png')" />
+                            <!-- {{ courseInfo.praises }} -->
+                            <div style="color:#fff;cursor: pointer;">赞</div>
+                          </div>
+                          <div style="margin-left: 15px;cursor: pointer;" @click="treadContent">
+                            <img class="icon-small" v-if="isTrample" :src="require('@/assets/images/icon/trample-active.png')" />
+                            <img class="icon-small" v-else :src="require('@/assets/images/icon/cai.png')" />
+                            <!-- {{ courseInfo.trampleCount }} -->
+                            <div style="color:#fff;cursor: pointer;">踩</div>
+                          </div>
+                        </div>
+                        <div v-if="!scoreInfo.has" class="player-rate">
+                          <el-rate v-model="scoreInfo.score" text-color="#ff9900" score-template="{value}" void-color="#fff" @change="addScore"></el-rate>
+                        </div>
+                        <div v-if="scoreInfo.has" style="padding-top: 5px;display: flex;">
+                          <div class="player-rate" style="padding-left: 35px;">
+                            <el-rate disabled v-model="courseInfo.score" :allow-half="true" ></el-rate>
+                          </div>
+                          <span class="score-text" style="margin-top:35px">
+                            <span style="color:#ffb30f;">{{ toScore(courseInfo.score) }}</span>
+                            <span style="font-size: 12px;color: #fff">分</span>
+                          </span>
+                       </div>
+                      </div>
+                      </div>
+                      <div v-if="coursewareInfo.content.contentType == 20">
+                        <div class="con-audio">
+                          <div class="con-audio-player">
+                            <audioPlayer :url="fileBaseUrl+curriculumData.url"
+                              :name="coursewareInfo.content.contentName"
+                                @onPlaying="audioPlaying"
+                                @onPlay="audioPlay"
+                                :isDrag="curriculumData.isDrag"
+                                @onPause="audioPause"
+                                @onPlayEnd="audioEnd">
+                            </audioPlayer>
+                          </div>
+                        </div>
+                      </div>
+                      <div v-if="coursewareInfo.content.contentType == 30">
+                        <img :src="fileBaseUrl+coursewareInfo.content.content" alt="图片">
+                      </div>
+                      <div v-if="coursewareInfo.content.contentType == 40">
+                        <div style="padding: 10px;color: #767676; " v-if="curCFile.converStatus < 2">
+                          <div>此课程内容无法预览，请联系管理员</div>
+                        </div>
+                          <div style="padding: 10px;color: #767676;" v-if="curCFile.converStatus == 3">
+                              此课程内容无法预览，请联系管理员
+                          </div>
+                        <pdfPreview :autoScroll="true" v-if="coursewareInfo.content.contentType == 40" :filePath="fileBaseUrl+coursewareInfo.content.content"></pdfPreview>
+                      </div>
+                      <div v-if="coursewareInfo.content.contentType == 41">
+                        <div class="couretitle" style="padding: 20px;text-align: left;" v-html="coursewareInfo.content.content"></div>
+                        </div>
+                      <div v-if="coursewareInfo.content.contentType == 52">
+                          <div class="hyper-link" v-if="conLink.openType==2">
+                              <div class="hyper-link-row">课程内容是外部连接</div>
+                              <div class="hyper-link-row">{{conLink.url}}</div>
+                          </div>
+                          <div v-if="conLink.openType==1">
+                              <iframe :src="conLink.url" style="width: 100%;border:0px;min-height: 473px;border:0px" border="0" frameborder="0"></iframe>
+                          </div>
+                      </div>
+                    </div>
+                  </div>
+                  </el-tab-pane>
+                  <el-tab-pane v-if="homeworkInfo.has" :disabled="enrollStutas == 1" label="作业" name="homework">
+                    <homework v-if="studyId!=''" :studyId="studyId" :content="homeworkInfo.content" ></homework>
+                  </el-tab-pane>
+                  <el-tab-pane v-if="examInfo.has" :disabled="enrollStutas == 1" label="考试" name="test">
+                    <exam v-if="studyId!=''" :studyId="studyId" :content="examInfo.content"></exam>
+                  </el-tab-pane>
+                  <el-tab-pane v-if="assessInfo.has" :disabled="enrollStutas == 1" label="评估" name="assess">
+                    <assess v-if="studyId!=''" :studyId="studyId" :content="assessInfo.content"></assess>
+                  </el-tab-pane>
+                </el-tabs>
+                <div style="display: flex;justify-content: space-between;padding: 10px;align-items: center;">
+                  <div class="score">
+                    <!-- <el-rate disabled v-model="courseInfo.score" :max="5" :allow-half="true" show-score score-template="{value}"></el-rate> -->
+                    <div v-if="enrollStutas == 1 && !scoreInfo.has">
+                      <div v-if="courseInfo.score">
+                          <el-rate disabled v-model="courseInfo.score"></el-rate>
+                          <span class="score-text">{{toScore(courseInfo.score)}}<span style="font-size: 14px;">分</span></span>
+                      </div>
+                      <div v-else class="score-no">未评分</div>
+                    </div>
+
+                   <div v-if="enrollStutas == 2" style="display: flex;justify-content: center; align-items: center;">
+                      <div v-if="!scoreInfo.has" style="margin-left:10px;cursor: pointer;padding-top: 15px;">
+                                <el-rate  v-model="scoreInfo.score"  @change="addScore"></el-rate>
+                      </div>
+                      <div v-else style="padding-top: 10px;display: flex;margin-left: 10px">
+                        <div style="padding-top: 5px;">
+                        <el-rate disabled v-model="courseInfo.score" :allow-half="true" ></el-rate>
+                        </div>
+                        <div><span class="score-text">{{toScore(courseInfo.score)}}</span><span style="font-size: 14px;">分</span></div>
+                      </div>
+                   </div>
+                  </div>
+                  <div style="display: flex;align-items: center;padding-top: 15px;">
+                    <div @click="praiseContent" style="cursor: pointer;">
+                      <img class="icon-small" v-if="isPraise" :src="require('@/assets/images/icon/praise-active.png')">
+                      <img class="icon-small" v-else :src="require('@/assets/images/icon/praise.png')"><span style="margin-left: 5px;color: #666666;font-size: 18px;">{{courseInfo.praises}}</span>
+                    </div>
+                    <div style="margin-left: 15px;cursor: pointer;" @click="treadContent">
+                      <img class="icon-small" v-if="isTrample" :src="require('@/assets/images/icon/trample-active.png')">
+                      <img class="icon-small" v-else :src="require('@/assets/images/icon/trample.png')"><span style="margin-left: 5px;color: #666666;font-size: 18px;">{{courseInfo.trampleCount}}</span>
+                    </div>
+                  </div>
+                </div>
+              </el-col>
+              <el-col :span="6" class="cont">
+                <interactBar :readonly="enrollStutas==1" :type="1" :data="courseInfo" :views="false" :praises="false" :comments="false"></interactBar>
+                <div class="title title-index">{{courseInfo.name}}</div>
+                <div class="study-count"><span class="num">{{courseInfo.studys}}人学习</span></div>
+                <!-- <div class="course-info-tools-btns">
+                    <span style="color: #f8a114;font-size: 36px;">{{toScore(courseInfo.score)}}</span>
+                    <span style="font-size: 14px;color: #787878;">分</span>
+                </div> -->
+                <!-- <div class="label"><el-tag class="label-item" effect="plain">了解公司</el-tag></div> -->
+                <div class="label"><el-tag class="label-item" effect="plain">录播课</el-tag></div>
+                <div class="label" v-if="tags.length >0">
+                  <el-tag class="label-item" effect="plain" v-for="(item, index) in tags" :key="index">{{item}}</el-tag>
+                  <!-- <el-tag class="label-item" effect="plain">中心长</el-tag> -->
+                </div>
+                <div v-if="enrollStutas != 2" class="score"  style="padding-top: 135px;justify-content: flex-start;">
+                    <!-- <el-rate style="display: inline-block; " disabled v-model="courseInfo.score" score-template="{value}" show-score text-color="#ff8e00"></el-rate>
+                    <span style="font-size: 14px;color: #f7ba2a;">分</span> -->
+                    <div v-if="courseInfo.score">
+                    <el-rate disabled v-model="courseInfo.score"></el-rate>
+                    <span class="score-text">{{toScore(courseInfo.score)}}<span style="font-size: 14px;">分</span></span>
+                    </div>
+                    <div v-else class="score-no">未评分</div>
+                    <!-- <el-rate style="display: inline-block; " disabled v-model="courseInfo.score" text-color="#ff8e00"></el-rate>
+                    <span style="font-size: 14px;color: #f7ba2a;">{{courseInfo.score}}分</span> -->
+                </div>
+                <!-- <div class="keyword"><el-tag class="label-item" effect="plain">质量</el-tag></div> -->
+                <!--资源归属是一共有三级，这里只显示三级-->
+                <!-- <div class="study-count">资源归属：{{courseInfo.resOwner}}</div> -->
+                <!-- <div class="btn-div" style="padding-top: 70px;">
+                  <el-button class="btn" type="primary" v-if="enrollStutas == 1" @click="submitEnroll">立即报名</el-button>
+                </div> -->
+                <!-- 二维码 -->
+                <!-- <div class="qr-code" style="padding-top: 10px;">
+                  <div id="qrcode" ref="qrcode" class="qrcode" ></div>
+                  <div>手机扫码观看</div>
+                </div> -->
+               <!-- <div style="width: 100px;height:300px" v-if="courseInfo.device == 2 || courseInfo.device == 3"> -->
+                  <img class="detail-img" v-show="!showQrcode && (courseInfo.device == 2 || courseInfo.device == 3)" @click="showQrcode = true" src="../../../assets/images/qr.png" alt="" srcset="">
+                  <div class="qr-code" v-show="showQrcode && ((courseInfo.device == 2 || courseInfo.device == 3))" style="padding-top: 10px;">
+                    <div id="qrcode" ref="qrcode" class="qrcode" @click="showQrcode = false"></div>
+                    <!-- <div style="margin-left: 27px">手机扫码观看</div> -->
+                  </div>
+                <!-- </div> -->
+              </el-col>
+              <!-- 11 -->
+            </el-row>
+          </el-card>
+          <el-row :gutter="10">
+            <el-col :span="18">
+              <div class="el-tab-pane-boxContent" style="background-color: #FFFFFF;padding: 20px;margin-top: 10px;">
+                 <el-tabs v-model="bootTabActive">
+                    <el-tab-pane label="课程介绍" name="info">
+                      <div class="content"><img src="@/assets/images/icon/remark-iocn.png" alt="" srcset=""> 目标人群</div>
+                      <div class="content-text" >{{courseInfo.forUsers}}</div>
+                      <div class="content"><img src="@/assets/images/icon/remark-iocn.png" alt="" srcset=""> 课程价值</div>
+                      <div class="content-text">{{courseInfo.value}}</div>
+                      <div class="content"><img src="@/assets/images/icon/remark-iocn.png" alt="" srcset=""> 详细介绍</div>
+                      <div class="content-text" v-html="courseInfo.summary"></div>
+                    </el-tab-pane>
+                    <el-tab-pane :label="'评论('+commentsTtoal+')'" name="commnets">
+                      <comments v-if="courseInfo.id!=''"
+                        :readonly="enrollStutas==1"
+                        :showTop="false"
+                        @writeTotal="showCommentsTotal"
+                        @success="addCommentSuccess"
+                        @delSuccess="delCommentSuccess"
+                        :obj-type="1"
+                        :to-users="toUsers"
+                        :obj-id="courseInfo.id"
+                        :obj-title="courseInfo.name">
+                      </comments>
+                    </el-tab-pane>
+                  </el-tabs>
+                </div>
+            </el-col>
+            <el-col :span="6">
+              <el-card :body-style="{ padding: '0px' }" class="teachers">
+                <div class="top">授课讲师</div>
+                <div>
+                  <div class="teacher" v-for="(item, idx) in teachers" :key="idx" >
+                    <div class="teacher-avator">
+                      <el-avatar v-if="item.avatar !== ''" :src="item.avatar" shape="circle" :size="50"></el-avatar>
+                      <!-- <div class="teacher-text" v-if="item.avatar !== '' "></div> -->
+                      <!-- <el-avatar v-if="item.avatar && item.avatar!=''" icon="el-icon-user" shape="square" :size="50"></el-avatar> -->
+                       <div class="teacher-text" v-else>
+                         <div v-if="sex === 1 "><img src="../../../../public/images/Avatarman.png" alt=""></div>
+                         <div v-else><img src="../../../../public/images/Avatarwoman.png" alt=""></div>
+
+                      </div>
+                    </div>
+                    <div class="teacher-info">
+                      <div class="teacher-name">{{ item.teacherName }}</div>
+                      <div class="teacher-remark" v-html="item.remark"></div>
+                    </div>
+                  </div>
+                </div>
+              </el-card>
+            </el-col>
+          </el-row>
+        </el-col>
+      </el-row>
+    </div>
+    <portal-footer></portal-footer>
+  </div>
+</template>
+
+<script>
+import QRCode from 'qrcodejs2';
+import { mapGetters,mapActions} from 'vuex';
+import portalHeader from "@/components/PortalHeader.vue";
+import comments from "@/components/Portal/comments.vue";
+import portalFooter from "@/components/PortalFooter.vue";
+import interactBar from "@/components/Portal/interactBar.vue";
+import apiCourse from "@/api/modules/course.js";
+import apiCourseFile from "@/api/modules/courseFile.js";
+import apiCoursePortal from "@/api/modules/coursePortal.js";
+import apiUser from '@/api/system/user.js';
+import exam from '@/components/Course/exam';
+import homework from '@/components/Course/homework';
+import assess from '@/components/Course/assess';
+import {
+  formatDate,
+  resListMap,
+  toScore,
+  courseType,
+  getType,
+  numberToLetter,
+  correctJudgment,
+  userAvatarText
+} from "@/utils/tools.js";
+import apicourseStudy from "@/api/modules/courseStudy.js";
+import apiVideoStudy from "@/api/modules/videoStudy.js";
+import apiCourseGrade from "@/api/modules/courseGrade.js";
+import apiPraises from "@/api/modules/praises.js";
+import apiTrample from "@/api/modules/trample.js";
+import FileUpload from "@/components/FileUpload/index.vue";
+import pdfPreview from "@/components/PdfPreview/index.vue";
+// import {resOwnerIndexName} from '@/utils/type.js';
+import { setTimeout } from "timers";
+import videoPlayer from '@/components/VideoPlayer/index.vue';
+import audioPlayer from '@/components/AudioPlayer/index.vue';
+import courseImage from "@/components/Course/courseImage.vue";
+import studyUtil from '@/utils/study.js';
+import {encrypt} from '@/utils/jsencrypt.js';
+import cookies from 'vue-cookies'
+export default {
+  name: "micro",
+  components: {
+    portalHeader,
+    portalFooter,
+    interactBar,
+    FileUpload,
+    comments,
+    pdfPreview,
+    videoPlayer,
+    audioPlayer,
+    courseImage,
+    homework,
+    exam,
+    assess
+  },
+  computed: {
+    ...mapGetters(['resOwnerMap','sysTypeMap','userInfo']),
+  },
+  data() {
+    return {
+      curCFile:{},
+      sex:null,
+      playerBoxShow:false,
+      userAvatarText,
+      showQrcode:false,
+      qrcode: '',
+      showiframe: false,//用于超连接的
+      toScore,
+      correctJudgment:correctJudgment,
+      show:0,
+      studyId: "",
+      tags: [],
+      numberToLetter: numberToLetter,
+      // resOwnerListMap: resOwnerIndexName,
+      fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
+      blobUrl:'',//播放的文件地址，新添加，采用blob方式
+      getType: getType,
+      courseType,
+      activeName: "courseware",
+      courseInfo: {
+        id: "",
+        type: 10,
+        name: "",
+        favorites: 0,
+        comments: 0,
+        shares: 0,
+        praises: 0,
+        views: 0
+      },
+      toUsers:[],//可以@的用户列表
+      teachers: [],
+      totalContent: 4, //微课默认是4项
+      conLink:{openType:1,url:''},//对于超连接的内容
+      curriculumData:{url:'',isDrag:true,completeSetup:1,setupTage:0,second:0},// 课件内容
+      coursewareInfo: {
+        content: {},
+        finish: false,
+        process:0,
+        status:1,
+        studyItemId: ""
+      },
+      homeworkInfo: {
+        has: false,
+        content: {},
+        info: {},
+        studyItemId: "",
+        filePath: ""
+      },
+      examInfo: {
+        has: false,
+        content: {},
+        info: {},
+        paper: [],
+        studyItemId: ""
+      },
+      assessInfo: {
+        has: false,
+        allowSubmit: true,
+        content: {},
+        info: {},
+        studyItemId: ""
+      },
+      enrollStutas: 1, // 1 :未报名，2:已报名
+      dialogVisible: false,
+      testStart: false,
+      courseRate: 5,
+      videoPlayingTime:0,//当前视频的耿入的时间点
+      appendStartTime: null, //记录追加的开始时间
+      scoreInfo: {
+        score: 5,
+        has: false
+      },
+      interactRuning:false,
+      isPraise: false,
+      isTrample: false,
+      bootTabActive:'info',
+      commentsTtoal:0,
+      appendHandle:null,//追加时长时间对象
+      isAppendTime:false,//是否追加学习时长
+      appentId:'',//当前追加的学习时长的id
+      appentInterval:30000,//追加学习时间的间隔 30秒加一次
+    };
+  },
+  mounted() {
+    this.showQrimage();
+    this.$watermark.set(this.userInfo.name+this.userInfo.loginName);
+    this.loadResOwners();
+    let id = this.$route.query.id;
+    this.courseInfo.id = id;
+    let $this = this;
+    //页面只支取一次，所以先直接写在这里面
+    apiCoursePortal.detail(id).then(rs => {
+      if (rs.status == 200) {
+        this.courseInfo = rs.result.course;
+        // this.courseInfo.score = this.toScore(rs.result.course.score);
+        if(rs.result.course.tags != '') this.tags = rs.result.course.tags.split(",");
+        this.teachers = rs.result.teachers;
+
+        if(rs.result.teachers && rs.result.teachers.length > 0){
+          let userIds=[];
+          let ctoUsers=[];
+          rs.result.teachers.forEach(item=>{
+            item.avatar = "";
+            userIds.push(item.teacherId);
+            ctoUsers.push({aid:item.teacherId,name:item.teacherName,});
+          })
+          this.toUsers=ctoUsers;
+          this.loadAuthorInfo(rs.result.teachers,userIds)
+        }
+        this.totalContent = rs.result.contents.length; //计算总内容数
+        if (!rs.result.course.resOwner3) {
+          this.courseInfo.resOwner = this.resOwnerName(
+            rs.result.course.resOwner2
+          );
+        } else {
+          this.courseInfo.resOwner = this.resOwnerName(
+            rs.result.course.resOwner3
+          );
+        }
+        rs.result.contents.forEach(con => {
+          if (con.sortIndex == 1) {
+            $this.coursewareInfo.content = con;
+            if(con.contentType == 10 || con.contentType == 20) {
+                if(con.content.startsWith('\{')){
+                 this.curriculumData=JSON.parse(con.content);
+              }else{
+                 this.curriculumData.url=con.content;
+              }
+              //对url进行加密处理
+              $this.createPlayUrl(this.curriculumData.url);
+
+            } else if (con.contentType == 40) {
+              //需要读取pdf的路径
+              if($this.coursewareInfo.content.content!='' && $this.coursewareInfo.content.content.indexOf('.pdf')==-1){
+                  apiCourseFile.detail($this.coursewareInfo.content.contentRefId).then(cfrs=>{
+                    if(cfrs.status==200){
+                      this.curCFile = cfrs.result;
+                      $this.coursewareInfo.content.content=cfrs.result.previewFilePath;
+                    }else{
+                       $this.$message.error('加载pdf课件文件失败');
+                    }
+                  });
+              }
+              //let url = this.fileBaseUrl + r.content;
+            }else if(con.contentType ==52){
+              if(con.content.startsWith('\{')){
+                 this.conLink=JSON.parse(con.content);
+              }else{
+                 this.conLink.url=con.content;
+                 this.conLink.openType=1;
+              }
+              if(this.conLink.openType==2){
+                //直接设置完成状态
+                this.widthOpen(this.conLink.url);
+              }
+            }
+            // //加载课件的学习情况
+          } else if (con.sortIndex == 2) {
+            $this.homeworkInfo.content = con;
+            $this.homeworkInfo.has = true;
+            //查询作业信息，并显示
+          } else if (con.sortIndex == 3) {
+            $this.examInfo.has = true;
+            $this.examInfo.content = con;
+            //查询考试信息并显示
+            //$this.loadExamInfo();
+          } else if (con.sortIndex == 4) {
+            $this.assessInfo.has = true;
+            $this.assessInfo.content = con;
+            //转化文本为json内容
+          }
+        });
+        //study info
+        this.loadStudyInfo();
+      } else {
+        this.$message.error(rs.message);
+      }
+    });
+  },
+  methods: {
+     createPlayUrl(u){
+       let nowDate=new Date();
+       let ctime=parseInt(nowDate.getTime()/1000);
+       let beforeUrl=parseInt(nowDate.getTime()/1000)+u;
+       //console.log(beforeUrl,'beforeUrl');
+       let urlSign=encodeURIComponent(encrypt(beforeUrl));
+       //console.log(urlSign,'urlSign');
+       cookies.set('PLAYSIGN_TIME', ctime);//写客户端的cookie保存
+       this.blobUrl=process.env.VUE_APP_BASE_API+'/xboe/m/course/play/resource?sign='+urlSign;
+
+     },
+     createVideoBlob(url){
+       let $this=this;
+       let xhr = new  XMLHttpRequest;
+       xhr.open("GET",url,true);
+       xhr.responseType = 'blob';
+       //xhr.onload：只有 4 状态会触发
+       xhr.onreadystatechange = function() {
+           if (xhr.readyState==4 && xhr.status == 200) {//请求成功
+               //获取blob对象
+               let blob = xhr.response;
+               //获取blob对象地址，并把值赋给容器
+               let urlObj = window.URL.createObjectURL(blob);
+               $this.blobUrl=urlObj;
+           }
+       };
+       xhr.send();
+     },
+     showQrimage(row){
+       let urlPre=window.location.protocol+'//'+window.location.host;
+      // https://u.boe.com/mobile/pages/resource/microDetail?id=963456709515939840
+      // this.qrcode = this.webBaseUrl+'/mobile/pages/resource/microDetail?id='+this.courseInfo.id;
+        this.qrcode =urlPre+ '/mobile/pages/resource/microDetail?id='+this.courseInfo.id;
+        //console.log(this.qrcode,'qrcode');
+        this.$nextTick(() => {
+        this.crateQrcode();
+      });
+     },
+    crateQrcode(){
+       this.qr = new QRCode('qrcode', {
+        width: 80,
+        height: 80, // 高度
+        text: this.qrcode // 二维码内容
+        // render: 'canvas' // 设置渲染方式（有两种方式 table和canvas，默认是canvas）
+        // background: '#f0f'
+        // foreground: '#ff0'
+      });
+    },
+    ...mapActions({
+      getResOwnerTree:'resOwner/getResOwnerTree',
+      loadResOwners:'resOwner/loadResOwners',
+      getSysTypeTree:'sysType/getSysTypeTree',
+      loadSysTypes:'sysType/loadSysTypes'
+    }),
+    resOwnerName(code){
+      if(code==''){return '';}
+      return this.resOwnerMap.get(code);
+    },
+    widthOpen(url) {
+      window.open(this.webBaseUrl+url,'_blank');
+    },
+    showCommentsTotal(total){
+      this.commentsTtoal=total;
+    },
+    addCommentSuccess(comm){
+      this.commentsTtoal++;
+    },
+    delCommentSuccess() {
+      this.commentsTtoal--;
+    },
+    saveStudyItem(){ //先保存学习的内容,针对于音视频的内容
+      if(this.coursewareInfo.finish || this.coursewareInfo.studyItemId) {
+        return;//已记录学习记录的不再保存
+      }
+      let params = {
+        studyId: this.studyId, //学习id,
+        courseId: this.courseInfo.id, //课程id,
+        contentId: this.coursewareInfo.content.id, //内容id,
+        contentType:this.coursewareInfo.content.contentType, //内容id,
+        contentName: this.coursewareInfo.content.contentName, //内容名称
+        progress: 0,
+        lastStudyTime:0,
+        status:2,
+        studyDuration:0,
+        contentTotal: this.totalContent
+      };
+      apiVideoStudy.saveStudyItem(params).then(res=>{
+          if(res.status == 200){
+            this.coursewareInfo.studyItemId=res.result.id;
+            this.coursewareInfo.finish = false;
+            this.coursewareInfo.status = 2;
+            this.coursewareInfo.progress = 1;
+          }else{
+            console.log("记录学习失败:" + res.message + "，" + res.error);
+          }
+      });
+    },
+    finishStudyItem(){ //设置完成学习的内容,针对于音视频的内容
+        let params={
+          itemId:this.coursewareInfo.studyItemId,
+          studyId:this.studyId,
+          courseId:this.courseInfo.id,
+          cnum:this.totalContent
+        }
+        apiVideoStudy.finishStudyItem(params).then(res=>{
+            if(res.status == 200){
+              this.coursewareInfo.finish = true;
+              this.coursewareInfo.status = 9;
+              this.coursewareInfo.progress = 100;
+            }else{
+              console.log("记录完成学习失败:" + res.message + "，" + res.error);
+            }
+        });
+    },
+    onFullscreen(full){
+      let divId='videowatermark';
+      var div = document.getElementById('myVideoPlayer')
+      if(full){
+      	var div3 = document.createElement("div");
+        div3.id =divId;
+        div3.setAttribute("class", "fullmark");
+      	div3.innerHTML='';
+        //从父组件传过来的水印内容
+        //div3.innerText =this.userInfo.name+this.userInfo.code;
+      	for(var i=0;i<8;i++){
+      		div3.innerHTML+='<div style="color:#ffffff;width: 40%;height: 155px;padding-left:60px;padding-top:50px; display: flex;justify-content: center; transform: rotate(-36deg);font-size:20px;">'+this.userInfo.name+this.userInfo.loginName+'</div>';
+      	}
+        div3.style.cssText = "position:absolute;pointer-events: none; width: 100%;height: 100%;top:0;left:0;bottom: 0;right: 0; display: flex;justify-content: center;flex-wrap: wrap;overflow: hidden; opacity:0.3;padding-top:10px";
+      	div.appendChild(div3);
+      }else{
+      	var markDiv=div.querySelector("#"+divId);
+        //console.log(markDiv,'markDiv');
+      	if(markDiv){
+      		div.removeChild(markDiv);
+      	}
+      }
+    },
+    onPlayerPlay(){
+      this.playerBoxShow = false;
+      //console.log("开始播放");
+      this.isAppendTime=false;
+
+      //视频类的内容，开始播放时才会记录完成情况
+      //2022-05-24修改，判断播放的
+      let $this=this;
+      //console.log(this.curriculumData,'this.curriculumData');
+      //完成类型 completeSetup 0表默认，打开后5秒算学完，1表按进度，2表按时间
+      //完成值（非默认情况下起作用） setupTage
+      if(!$this.coursewareInfo.finish){
+        let completeType=this.curriculumData.completeSetup;
+        if(completeType==0){
+          //默认5秒后学习完成.
+          setTimeout(() => {$this.saveStudyInfo();}, 5000);
+        }else{
+          //先记录进行中的学习内容
+          this.saveStudyItem();
+        }
+      }
+    },
+    onPlayerPause(){
+      //console.log("暂停");
+    },
+    onPlayerEnded(){
+       //this.onFullscreen(false);//退出全屏
+       this.playerBoxShow = true;
+       this.isAppendTime=true;//开始追加学习时间
+       //this.saveStudyDuration();//保存添加学习时长
+       if(!this.coursewareInfo.finish){
+         this.finishStudyItem();
+       }
+    },
+    onPlayerPlaying(itme){
+      this.isAppendTime=false;//禁止追加学习时间
+      this.appendStartTime=null;
+      //console.log("当前播放11"+itme);
+      let intTime=parseInt(itme);
+      //console.log(intTime,'intTime');
+      this.videoPlayingTime=intTime;
+      //判断是否完成
+      let completeType=this.curriculumData.completeSetup;
+      let completeSecond=this.curriculumData.second;
+      if(!completeSecond){
+        completeSecond=5;//如果没有就采用默认的时间了
+      }
+
+      if(completeType>0 && !this.coursewareInfo.finish){ //因为1按进度，2按时长都是计算时间，所以这里直接大于0处理
+          if(completeType==1){
+            let finishPercent=this.curriculumData.setupTage;
+            let videDuration=this.coursewareInfo.content.duration;
+            let percent =intTime*100/videDuration;
+            if(percent>=finishPercent){
+                this.finishStudyItem();
+            }
+          }else if(completeType==2){
+            if(intTime>completeSecond){
+               this.finishStudyItem();
+            }
+          }
+
+      }
+      //以下是每10秒记录一次学习时长
+      let saveTime=Math.floor(intTime%10);
+      if(intTime>10 && saveTime==0 && this.coursewareInfo.studyItemId!=''){
+        //记录播放时间
+        //console.log('记录播放时间:'+intTime);
+        let postData={
+          itemId:this.coursewareInfo.studyItemId,
+          videoTime:intTime
+        }
+        apicourseStudy.studyVideoTime(postData).then(rs=>{
+           if(rs.status!=200){
+             console.log('记录播放时间错误');
+           }
+        })
+      }
+
+    },
+    audioPlaying(item,currentTime){
+      let intTime=parseInt(currentTime);//秒
+      //console.log("当前播放时间="+item+',currentTime='+intTime);
+      //判断是否完成
+      let completeType=this.curriculumData.completeSetup;
+      let completeSecond=this.curriculumData.second;
+      if(!completeSecond){
+        completeSecond=5;//如果没有就采用默认的时间了
+      }
+
+      if(completeType>0 && !this.coursewareInfo.finish){ //因为1按进度，2按时长都是计算时间，所以这里直接大于0处理
+          if(completeType==1){
+            let finishPercent=this.curriculumData.setupTage;
+            let videDuration=this.coursewareInfo.content.duration;
+            let percent =intTime*100/videDuration;
+            if(percent>=finishPercent){
+                this.finishStudyItem();
+            }
+          }else if(completeType==2){
+            if(intTime>=completeSecond){
+               this.finishStudyItem();
+            }
+          }
+
+      }
+      //以下是每5秒记录一次学习时长
+      let saveTime=Math.floor(intTime%10);
+      if(intTime>10 && saveTime==0 && this.coursewareInfo.studyItemId!=''){
+        //记录播放时间
+        //console.log('记录播放时间:'+intTime);
+        let postData={
+          itemId:this.coursewareInfo.studyItemId,
+          videoTime:intTime
+        }
+        apicourseStudy.studyVideoTime(postData).then(rs=>{
+           if(rs.status!=200){
+             console.log('记录播放时间错误');
+           }
+        })
+      }
+    },
+    audioPlay(){
+      //console.log("开始播放");
+      let $this=this;
+      if (!$this.coursewareInfo.finish) {
+        let completeType=this.curriculumData.completeSetup;
+        //console.log(completeType,"completeType");
+        if(completeType==0){
+          //默认5秒后学习完成.
+          setTimeout(() => {$this.saveStudyInfo();}, 5000);
+        }else{
+          //先记录进行中的学习内容
+          this.saveStudyItem();
+        }
+      }
+    },
+    audioPause(){
+      //console.log("暂停");
+    },
+    audioEnd(){
+      // this.playerBoxShow = true;
+      //console.log("播放结束");
+      if(!this.coursewareInfo.finish){
+        this.finishStudyItem();
+      }
+    },
+    changeTab(tab){
+      this.playerBoxShow = false;
+      this.saveStudyDuration();//保存一次学习时长，在切换时
+      let $this = this;
+      if (tab.name == "homework") {
+
+      } else if (tab.name == "test") {
+
+      } else if (tab.name == "assess") {
+        // //console.log('加载评估信息');,评估只会有一个，所以主直接取
+        // let params = {
+        //   studyId: this.studyId,
+        //   contentId: this.assessInfo.content.id
+        // };
+        // apicourseStudy.myAssessList(params).then(res => {
+        //   if (res.status == 200) {
+        //     if (res.result.length > 0) {
+        //       this.assessInfo.allowSubmit = false;
+        //       this.assessInfo.info = JSON.parse(res.result[0].asContent);
+        //     }
+        //   } else {
+        //     this.$message.error(res.message);
+        //   }
+        // });
+      } else {
+        //在课件页面，记录开始时间
+        //对于视频类的，是在点击开始播放后执行的
+        if(this.coursewareInfo.content.contentType>10){
+          this.isAppendTime=true;
+          this.appendStudyTime(false);
+          if(!this.coursewareInfo.finish){
+             setTimeout(() => {$this.saveStudyInfo();}, 5000);
+          }
+        }else{
+          this.isAppendTime=false;
+        }
+      }
+    },
+    saveStudyInfo() {
+      //记录课件学习信息
+      if (this.activeName != "courseware") {
+        //只有在课件页面停留超过5秒才会记录
+        return;
+      }
+      if (this.coursewareInfo.finish) {
+        return;
+      }
+      let params = {
+        studyId: this.studyId, //学习id,
+        courseId: this.coursewareInfo.content.courseId, //课程id,
+        contentId: this.coursewareInfo.content.id, //内容id,
+        contentType:this.coursewareInfo.content.contentType, //内容id,
+        contentName: this.coursewareInfo.content.contentName, //内容名称
+        progress: 100,
+        status:9,
+        contentTotal: this.totalContent
+      };
+      apicourseStudy.studyContent(params).then(res => {
+        if (res.status == 200) {
+          this.coursewareInfo.studyItemId=res.result;
+          this.coursewareInfo.finish = true; //课件内容已学习，记录状态
+        } else {
+          console.log("记录学习失败:" + res.message + "，" + res.error);
+        }
+      });
+    },
+    saveStudyDuration(){
+       let duration=studyUtil.getStudyDuration();
+       if(duration>0){
+           let postData = {
+             id:this.appentId,
+             studyId: this.studyId,
+             courseId: this.courseInfo.id,
+             contentId: this.coursewareInfo.content.id,
+             studyInfo:
+               this.courseInfo.name +
+               "-" +
+               this.coursewareInfo.content.contentName,
+             duration: duration
+           };
+           apicourseStudy.appendStudyTime(postData).then(rs => {
+             if (rs.status == 200){
+               this.appentId=rs.result;
+               studyUtil.clearStudyDuration();//清除本地存储
+             } else {
+               console.log(rs.message);
+             }
+           });
+       }
+    },
+    appendStudyTime(flag) {
+      if(this.studyId==''){
+        return;
+      }
+
+      if(!this.isAppendTime){
+        //如果不追加时间，把追加开始时间设置为null
+        this.appendStartTime=null;
+        return;
+      }
+
+      if(this.appendHandle!=null){
+        window.clearTimeout(this.appendHandle);
+      }
+
+      //首先从本地读取
+      let duration=studyUtil.getStudyDuration();
+
+      //追加学习时间
+      let $this = this;
+      if(this.appendStartTime == null) {
+        this.appendStartTime = new Date();
+        this.appendHandle=setTimeout(function() {$this.appendStudyTime();}, $this.appentInterval);
+        if(duration>0 && flag){
+          this.saveStudyDuration();
+        }
+        return;
+      }
+
+      //当前进行的时间
+      let now = new Date();
+      let m = now.getTime() - this.appendStartTime.getTime(); //相差的毫秒数
+      let sen = parseInt(m / 1000); //计算秒数
+
+      //console.log(duration,'duration')
+      //console.log(sen,'sen')
+      duration=duration+sen;
+      if(flag){
+         //这个时候才进行存储 ，否则只能是存储在本地
+         if(duration>0){
+            let postData = {
+              id:this.appentId,
+              studyId: this.studyId,
+              courseId: this.courseInfo.id,
+              contentId: this.coursewareInfo.content.id,
+              studyInfo:
+                this.courseInfo.name +
+                "-" +
+                this.coursewareInfo.content.contentName,
+              duration: sen
+            };
+            apicourseStudy.appendStudyTime(postData).then(rs => {
+              if (rs.status == 200){
+                $this.appentId=rs.result;
+                $this.appendStartTime = new Date(); //重置开始时间
+                studyUtil.clearStudyDuration();//清除本地存储
+              } else {
+                console.log(rs.message);
+              }
+            });
+         }
+
+      }else{
+        $this.appendStartTime = new Date(); //重置开始时间
+        studyUtil.setStudyDuration(duration);//添加到本地存储中
+      }
+      this.appendHandle=setTimeout(function() {$this.appendStudyTime();},$this.appentInterval);
+    },
+    loadStudyInfo() {
+      //获取学习信息
+      let $this = this;
+      this.loadScorePraiseAndTrample();
+      apicourseStudy.studyInfo(this.courseInfo.id).then(res => {
+        if (res.status == 200) {
+          res.result.signup ? (this.enrollStutas = 2) : (this.enrollStutas = 1);
+          if(res.result.signup) {
+            //this.bootTabActive = 'commnets';//系统自动报名，这里不进行切换了
+            this.studyId = res.result.studyId; //设置学习id
+
+            //需要判断此内容是否已学习完成，如果已学习完成，不需要再请不说了
+            res.result.contents.forEach(con => {
+              if (con.contentId == $this.coursewareInfo.content.id) {
+                  $this.coursewareInfo.studyItemId=con.id;
+                  $this.coursewareInfo.status=con.status;
+                  $this.coursewareInfo.progress=con.progress;
+
+                  if(con.contentType==10 || con.contentType==20){
+                    if(con.progress==100 || con.status==9){
+                      $this.coursewareInfo.finish = true;
+                    }else{
+                      $this.coursewareInfo.finish = false;
+                    }
+                  }else{
+                    $this.coursewareInfo.finish = true; //课件已学习
+                  }
+
+                  if(con.lastStudyTime){
+                    //如果上次课件已经播放完成，此处应该是$this.coursewareInfo.content.duration
+                    //也就是从头开开始
+                    $this.videoPlayingTime=con.lastStudyTime;
+                  }
+                //console.log()
+              }else if (con.contentId == $this.homeworkInfo.content.id) {
+                  $this.homeworkInfo.studyItemId = con.id;
+              }else if (con.contentId ==$this.examInfo.content.id) {
+                  $this.examInfo.studyItemId = con.id;
+              }else if (con.contentId == $this.assessInfo.content.id) {
+                  $this.assessInfo.studyItemId = con.id;
+              }
+            });
+            //存储上一次学习时长，主要用于上次未存储的学习时长
+            this.saveStudyDuration();
+            if(!$this.coursewareInfo.finish && $this.coursewareInfo.content.contentType>20) {
+              //未完居，并且类型不是视频的，直接设计5秒后学习完成
+                setTimeout(() => {$this.saveStudyInfo();}, 5000); //5秒后记录学习
+                //开始记录学习时长
+                $this.isAppendTime=true;
+                $this.appendStudyTime(false);
+            }
+          }else{
+            //signup 没有报名的情况下，直接报名
+            this.submitEnroll();
+          }
+        } else {
+          this.$message.error(res.message);
+        }
+      });
+    },
+    submitEnroll() { //提交报名
+      let pamars = {
+        courseId: this.courseInfo.id,
+        courseName: this.courseInfo.name,
+        courseType: this.courseInfo.type,
+        signType: 1,
+        signInfo: ""
+      };
+      let $this = this;
+      apicourseStudy.signup(pamars).then(res => {
+        if (res.status == 200) {
+          //this.$message({ type: "success", message: "报名成功" });
+          this.enrollStutas = 2;
+          this.studyId=res.result.studyId;//设置学习的ID
+          //this.loadStudyInfo();
+          if($this.coursewareInfo.content.contentType>20){
+              this.isAppendTime=true;
+              this.appendStudyTime(false); //报名成功记录开始时间
+              //报名成功后，就直接记录课件学习情况，5秒后
+              setTimeout(() => {$this.saveStudyInfo();}, 5000);
+          }else{
+             //对于视频类的处理，用户手动点击播放，不做处理
+          }
+        } else {
+          this.$message.error(res.message);
+        }
+      });
+    },
+    loadScorePraiseAndTrample() {
+      //加载是否打过分
+      //if(this.enrollStutas>1){
+        apiCourseGrade.has(this.courseInfo.id).then(rs => {
+          if (rs.status == 200 && rs.result) {
+            this.scoreInfo.has = true;
+          }
+          //console.log(rs.result,'rs.result');
+        });
+      //}
+      apiPraises.has(1, this.courseInfo.id).then(rs => {
+        if (rs.status == 200 && rs.result) {
+          this.isPraise = true;
+        }
+      });
+      apiTrample.has(this.courseInfo.id).then(rs => {
+        if (rs.status == 200 && rs.result) {
+          this.isTrample = true;
+        }
+      });
+    },
+    addScore() {
+      let that = this;
+      let postData = {
+        courseId: this.courseInfo.id,
+        studyId: this.studyId,
+        score: this.scoreInfo.score
+      };
+      if (this.scoreInfo.score > 0) {
+        apiCourseGrade.grade(postData).then(rs => {
+          if (rs.status == 200) {
+            this.$message.success("打分成功，谢谢您的打分");
+            that.scoreInfo.has = true;
+            that.courseInfo.score = rs.result;
+          } else {
+            this.$message.error("打分处理失败，请稍后再试");
+          }
+        });
+      }
+    },
+    praiseContent() {
+      if(this.enrollStutas==1){
+        this.$message.error("报名学习之后才可以点赞");
+        return;
+      }
+      if(this.isTrample){
+        this.$message.error("您已踩过了，不能再赞了");
+        return;
+      }
+      if(this.interactRuning){
+				return;
+			}
+			this.interactRuning=true;
+      let postData = {
+        objType: 1,
+        objId: this.courseInfo.id,
+        title: this.courseInfo.name
+      };
+      if(this.isPraise){
+         apiPraises.remove(1,this.courseInfo.id).then(res=>{
+           this.interactRuning=false;
+           if (res.status == 200){
+             if(this.courseInfo.praises>0){
+               this.courseInfo.praises--;
+             }
+             this.$message.info("已取消点赞");
+             this.isPraise = false;
+           } else {
+             this.$message.error("取消点赞失败,请稍后再试");
+           }
+          });
+      }else{
+        apiPraises.save(postData).then(rs => {
+          this.interactRuning=false;
+          if (rs.status == 200) {
+            this.courseInfo.praises++;
+            this.$message.success("点赞成功");
+            this.isPraise = true;
+          } else {
+            this.$message.error("点赞失败,请稍后再试");
+          }
+        });
+      }
+
+    },
+    treadContent() {
+      if(this.enrollStutas==1){
+        this.$message.error("只有报名学习后才可以踩");
+        return;
+      }
+      if(this.isPraise){
+        this.$message.error("您已赞过了，不能再踩了");
+        return;
+      }
+      if(this.interactRuning){
+					return;
+			}
+			this.interactRuning=true;
+      if(this.isTrample){
+        apiTrample.remove(this.courseInfo.id).then(rs => {
+          this.interactRuning=false;
+          if (rs.status == 200) {
+            if(this.courseInfo.trampleCount>0){
+              this.courseInfo.trampleCount--;
+            }
+            this.$message.info("已取消踩");
+            this.isTrample = false;
+          } else {
+            this.$message.error("取消失败,请稍后再试");
+          }
+        });
+      }else{
+        apiTrample.trample(this.courseInfo.id).then(rs => {
+          this.interactRuning=false;
+          if (rs.status == 200) {
+            this.courseInfo.trampleCount++;
+            this.$message.success("已踩");
+            this.isTrample = true;
+          } else {
+            this.$message.error("踩失败,请稍后再试");
+          }
+        });
+      }
+
+    },
+    loadAuthorInfo(list,ids){ //加载作者信息，头像，机构信息
+      if(ids.length==0){
+        return;
+      }
+      apiUser.getByIds(ids).then(res=>{
+        if(res.status==200){
+          list.forEach((item,index)=>{
+            res.result.some(author=>{
+              if(author.aid==item.teacherId){
+                if(author.avatar){
+                  item.avatar=this.fileBaseUrl + author.avatar;
+                }
+                this.sex = author.sex
+                return true;
+              }else{
+                return false;
+              }
+            })
+          });
+        }else{
+          //console.log('加载课程信息失败:'+res.error);
+          //this.$message.error(res.message);
+        }
+      });
+    },
+  }
+};
+</script>
+
+<style scoped lang="scss" scoped>
+.couretitle{
+  word-break: break-all;
+}
+::v-deep .teacher .teacher-avator .teacher-text {
+  background: none;
+  border: none;
+}
+
+
+.player-box{
+  position: absolute;
+  // top: 62px;
+  // left: 184px;
+  width: 300px;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  height: 187px;
+  background: rgba(74, 74, 74,.5);
+  border-radius: 33px;
+  text-align: center;
+  padding: 20px;
+  box-sizing: border-box;
+  .player-praise{
+    margin-top: 25px;
+    display: flex;
+    // justify-items: center;
+    justify-content: center;
+  }
+  .player-rate{
+    margin-top: 39px;
+  }
+}
+::v-deep .el-tabs__nav-wrap::after {
+    // content: "";
+    // position: absolute;
+    // left: 0;
+    // bottom: 0;
+    // width: 100%;
+    // height: 2px;
+    background-color: #fff;
+    // z-index: 1;
+}
+::v-deep .el-tabs__nav-wrap::after {
+    // content: "";
+    // position: absolute;
+    // left: 0;
+    // bottom: 0;
+    // width: 100%;
+    // height: 2px;
+    background-color: #fff;
+    // z-index: 1;
+}
+.qrcode{
+    display: inline-block;
+    img {
+        width: 132px;
+        height: 132px;
+        background-color: #fff; //设置白色背景色
+        padding: 6px; // 利用padding的特性，挤出白边
+        box-sizing: border-box;
+    }
+}
+.ref-score{
+  // background: #e4e4e4;
+  // width: 64px;
+  // height: 32px;
+  // border-radius: 17px;
+  // line-height: 32px;
+  // // opacity: 0.24;
+  // color: #000;
+  // font-size: 14px;
+  // border: none;
+  // text-align: center;
+}
+.portal-content ::v-deep .el-rate__icon{
+  font-size: 24px !important;
+}
+::v-deep .el-tag {
+    background-color: #ecf5ff;
+    border-color: #409EFF;
+    display: inline-block;
+    height: 28px;
+    padding: 0 10px;
+    line-height: 28px;
+    font-size: 12px;
+    color: #3e7fff;
+    border-width: 1px;
+    border-style: solid;
+    border-radius: 0px;
+    box-sizing: border-box;
+    white-space: nowrap;
+}
+.content{
+  padding: 10px 0;
+    font-size: 18px;
+    color: #343434;
+ img{
+   width: 18px;
+ }
+}
+.content-text{
+  margin: 10px 0;
+  font-size: 14px;
+  text-indent: 2em;
+  color: #666666;
+  word-break:break-all;
+}
+   ::v-deep .el-tabs__item.is-active {
+    color: #409EFF;
+    font-size: 18px;
+  }
+  .icon-small{
+    width: 20px;
+    height: 20px;
+    line-height: 20px;
+    // vertical-align: middle;
+  }
+  .con-audio{
+    padding: 50px;
+    text-align: center;
+    .con-audio-title{
+      font-size: 16px;
+      font-weight: 700;
+    }
+    .con-audio-player{
+      padding: 20px 100px;
+    }
+  }
+  .hyper-link{
+    padding-left:20px;
+    text-align: center;
+    padding-top: 100px;
+    .hyper-link-row{
+      padding: 20px;
+    }
+  }
+.red{
+  background: red;
+   background-image: linear-gradient(to bottom right, rgb(245, 30, 30) , rgb(241, 227, 21));
+}
+.paper-item-answer{
+  line-height: 30px;
+  border-bottom: 1px solid #ccc;
+  margin-bottom: 10px;
+}
+.paper-item-opts{
+   .el-radio {
+        display: block;
+      }
+  .el-checkbox {
+       display: block;
+      }
+}
+.detail {
+  background-color: #fff;
+  padding: 5px 20px 10px 20px;
+  position: relative;
+    .detail-img{
+  cursor: pointer;
+   position: absolute;
+   bottom: 0;
+   right: 0;
+  }
+  .courseware-div {
+    border: 1px solid #f0f0f0;
+    min-height: 400px;
+
+    // width: 876px;
+    // font-size: 30px;
+    text-align: center;
+    // line-height: 100px;
+    position: relative;
+    .courseware-img {
+      vertical-align: middle;
+      width: 100%;
+      height: 100%;
+    }
+    .courseware-enroll-btn {
+      position: absolute;
+      width: 270px;
+      height: 68px;
+      font-size: 22px;
+      left: 230px;
+      top: 165px;
+      opacity: 0.3;
+      background: #000000;
+      border-radius: 21px;
+    }
+    .video-div {
+      position: absolute;
+      z-index: 999999999;
+      top: 0;
+      left: 0;
+      width: 100%;
+      height: 100%;
+      background: rgba(101, 101, 101, 0.9);
+      .good {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        margin-top: 200px;
+        div {
+          line-height: 1;
+          margin: 0 15px;
+          .svg-icon {
+            width: 30px;
+            height: 30px;
+          }
+        }
+        div:nth-of-type(2) {
+          .svg-icon {
+            transform: scaleX(-1);
+            transform: rotate(180deg);
+          }
+        }
+        // margin-bottom: 50px;
+        // line-height: 20px;
+        // .el-link{
+        //   font-size: 30px;
+        //   color: #70a5f4;
+        //   margin: 0 30px;
+        // }
+      }
+    }
+  }
+  .score {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        .el-rate {
+          display: inline-block;
+
+        }
+        .score-text{
+          font-size: 28px;
+          color: #FFB30F ;
+          font-family: "Arial";
+          margin-left: 23px;
+          // font-weight: 600;
+        }
+      // margin-bottom: 19px;
+        .score-no{
+          color: #FFB30F;
+          padding: 5px 0;
+          background: #efefef;
+          border-radius: 20px;
+          width: 65px;
+          font-size: 12px;
+          font-weight: 600;
+          text-align: center;
+        }
+      }
+  .homework-div {
+    border: 1px solid #bcbcbc;
+    min-height: 500px;
+    padding: 20px;
+    font-size: 14px;
+    .homework-title {
+      font-weight: 600;
+      margin-bottom: 10px;
+    }
+    .homework-content {
+      color: #666;
+      margin-bottom: 10px;
+    }
+  }
+  .test-div {
+    border: 1px solid #bcbcbc;
+    min-height: 500px;
+    padding: 20px;
+    font-size: 16px;
+
+    .test-info {
+      margin-bottom: 10px;
+      .el-radio {
+        display: block;
+      }
+    }
+  }
+  .assess-div {
+    border: 1px solid #bcbcbc;
+    min-height: 500px;
+    padding: 20px;
+    font-size: 14px;
+    .assess-info {
+      margin-bottom: 10px;
+    }
+  }
+  .cont {
+    padding: 10px 25px 25px 25px;
+    height: 540px;
+    .title {
+      font-size: 20px;
+      font-weight: 600;
+      line-height: 36px;
+      word-break:break-all;
+    }
+    .course-info-tools-btns {
+      ::v-deep .interact-bar-btns {
+        justify-content: flex-start !important;
+      }
+      .course-info-tools-btn {
+        margin: 0 15px 0 0;
+      }
+      margin-bottom: 15px;
+    }
+    .label {
+      margin-bottom: 15px;
+      .label-item {
+        margin-right: 5px;
+        margin-bottom: 5px;
+      }
+    }
+    .keyword {
+      margin-bottom: 15px;
+      .label-item {
+        margin-right: 5px;
+      }
+    }
+    .study-count {
+      padding: 20px 0;
+      .num {
+        color:  #444444;
+        font-size: 16px;
+
+      }
+      margin-bottom: 15px;
+    }
+    .btn-div {
+      margin-top: 30px;
+      .btn{
+        border-radius: 0px;
+        font-size: 16px;
+      }
+    }
+    .qr-code {
+      cursor: pointer;
+      text-align: right;
+      position: absolute;
+      bottom: 0;
+      right: 4px;
+      div {
+        text-align: center;
+        font-size: 14px;
+      }
+    }
+    .view-summary {
+      position: absolute;
+      margin-bottom: 10px;
+      margin-left: 18px;
+    }
+  }
+}
+.summary-div {
+  .summary-content {
+    font-size: 14px;
+    line-height: 25px;
+  }
+}
+.info {
+  background-color: #fff;
+  margin-top: 20px;
+  padding: 0 10px;
+  .content {
+    color: #666;
+    line-height: 25px;
+    text-indent: 2em;
+    padding: 5px 10px;
+  }
+  .pinglun-div {
+    background-color: #fff;
+    padding: 0px 20px 10px 20px;
+    .title {
+      font-size: 16px;
+      font-weight: 600;
+      line-height: 50px;
+      border-bottom: 1px solid #dfdfdf;
+      .tip {
+        color: #666;
+        font-size: 12px;
+        margin: 0 10px;
+      }
+    }
+    .submit-div {
+      margin: 15px 0;
+    }
+    .bottom {
+      text-align: right;
+    }
+
+    .data {
+      margin-top: 10px;
+      background-color: #fff;
+      padding: 5px 20px 10px 20px;
+      .data-item {
+        border-bottom: 1px solid #dfdfdf;
+        margin-top: 10px;
+        .top {
+          font-size: 18px;
+          font-weight: 600;
+          span {
+            font-size: 14px;
+            color: #666;
+            font-weight: normal;
+          }
+        }
+        .text {
+          margin: 15px 0 5px 0;
+          padding-left: 40px;
+          line-height: 35px;
+        }
+        .huifu {
+          padding-left: 40px;
+          padding-bottom: 10px;
+          border-bottom: 1px solid #dfdfdf;
+        }
+        .result-div {
+          padding-left: 40px;
+          padding-top: 10px;
+          .top {
+            font-size: 16px;
+          }
+        }
+        .up-div {
+          padding: 0 15px;
+          .up-btn {
+            padding: 8px 20px;
+            color: #000;
+          }
+        }
+        img {
+          margin-right: 10px;
+          width: 30px;
+          border: 1px solid #eee;
+          border-radius: 50%;
+          vertical-align: middle;
+        }
+      }
+    }
+  }
+}
+::v-deep .el-tabs__header{
+	.el-tabs__item{
+		font-size: 15px;
+	}
+	.is-active{
+		font-size: 16px;
+		font-weight: 600;
+	}
+}
+.teacher {
+  background-color: #ffffff;
+  display: flex;
+  border-top: 1px solid #e7e7e7;
+  padding: 10px 0px;
+  // .teacher-avator {
+
+  // }
+  .teacher-info {
+    flex: 1;
+    .teacher-name {
+      padding: 0px 5px 10px 10px;
+    }
+    .teacher-remark {
+      padding: 0px 5px 0px 10px;
+      font-size: 12px;
+      color: #797979;
+    }
+  }
+}
+.teachers {
+  background-color: #fff;
+  margin-top: 10px;
+  padding: 5px 15px 5px 10px;
+  .top {
+    font-size: 16px;
+    font-weight: 600;
+    line-height: 50px;
+  }
+   div{
+      img{
+        width: 68px;
+        height: 68px;
+      }
+    }
+}
+</style>
+<style scoped>
+.assessRadio1 /deep/ .el-radio-button__inner {
+  padding-left: 36px;
+  padding-right: 36px;
+}
+/* ::v-deep .el-tab-pane-boxContent{
+	.el-tabs__nav{
+		.el-tabs{
+			.el-tabs__header{
+				.el-tabs__nav{
+					.is-active{
+						font-size: 25px!important;
+					}
+				}
+			}
+		}
+	}
+} */
+</style>
diff --git a/src/views/study/PortalIndex.vue b/src/views/study/PortalIndex.vue
index b5459e7b..b4b702e4 100644
--- a/src/views/study/PortalIndex.vue
+++ b/src/views/study/PortalIndex.vue
@@ -1,1440 +1,1451 @@
-<template>
-  <div>
-    <!-- 课程详情点击应该传参的 -->
-    <portal-header current="course" :goSearch="1"></portal-header>
-    <div class="portal-content xcontent">
-      <el-breadcrumb separator-class="el-icon-arrow-right" class="breadname">
-        <el-breadcrumb-item :to="{ path: '/course' }">课程列表</el-breadcrumb-item>
-        <el-breadcrumb-item :to="{ path: `/course/detail?id=${courseId}` }">课程详情</el-breadcrumb-item>
-        <el-breadcrumb-item>课程学习</el-breadcrumb-item>
-      </el-breadcrumb>
-      <!-- <span style="display:block;margin-bottom:10px">课程列表 > 课程详情 > 课程学习</span> -->
-      <div style="background-color: #FFFFFF; border-bottom:1px solid #eee; display: flex;justify-content: space-between;">
-        <div class="portal-content-title">{{ courseInfo.name }}</div>
-        <div style="padding-top: 15px;padding-right: 30px;"><interactBar :type="1" :data="courseInfo" :comments="false" :praises="false" :views="false"></interactBar></div>
-      </div>
-      <el-row>
-        <el-col :span="16">
-          <div style="min-height: 450px;">
-            <!-- <div style="background-color: #FFFFFF;font-weight: 600;border-bottom:1px solid #d0d0d0 ;padding: 10px;font-size: 22px;color: #333333;">{{ courseInfo.name }}</div> -->
-            <!--课程资源内容播放-->
-            <div class="player" style="width: 100%;border: 1px solid #ffffff;background-color: #FFFFFF;overflow: auto;">
-              <div>
-                <div v-if="resType == null || resType == 0">
-                  <!--先显示视频图片-->
-                  <course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
-                </div>
-                <div v-if="resType == 10" style="position: relative;">
-                  <videoPlayer  id="myVideoPlayer" v-if="resType == 10"
-                    :src="fileBaseUrl+curriculumData.url"
-                    @onPlayerPlaying="onPlayerPlaying"
-                    :initTime="contentData.lastStudyTime"
-                    @onPlayerPlay="onPlayerPlay"
-                    :isDrag="curriculumData.isDrag"
-                    @onFullscreen="onFullscreen"
-                    @onPlayerPause="onPlayerPause"
-                    @onPlayerEnded="onPlayerEnded"
-                  ></videoPlayer>
-                  <div class="player-box" v-if="playerBoxShow">
-                    <div class="player-praise" style="cursor: pointer;">
-                      <div @click="praiseContent">
-                        <img class="icon-small" v-if="isPraise" :src="require('@/assets/images/icon/praise-active.png')" />
-                        <img class="icon-small" v-else :src="require('@/assets/images/icon/zhan.png')" />
-                        <!-- {{ courseInfo.praises }} -->
-                        <div style="color:#fff;cursor: pointer;">赞</div>
-                      </div>
-                      <div style="margin-left: 15px;cursor: pointer;" @click="treadContent">
-                        <img class="icon-small" v-if="isTrample" :src="require('@/assets/images/icon/trample-active.png')" />
-                        <img class="icon-small" v-else :src="require('@/assets/images/icon/cai.png')" />
-                        <!-- {{ courseInfo.trampleCount }} -->
-                        <div style="color:#fff;cursor: pointer;">踩</div>
-                      </div>
-                    </div>
-                    <div v-if="!scoreInfo.has" class="player-rate">
-                      <el-rate v-model="scoreInfo.score" text-color="#ff9900" score-template="{value}" void-color="#fff" @change="addScore"></el-rate>
-                    </div>
-                      <div v-if="scoreInfo.has" style="padding-top: 5px;display: flex;">
-                    <div class="player-rate" style="padding-left: 35px;">
-                      <el-rate disabled v-model="courseInfo.score" :allow-half="true" ></el-rate>
-                    </div>
-                    <span class="score-text" style="margin-top:35px">
-                      <span style="color:#ffb30f;">{{ toScore(courseInfo.score) }}</span>
-                      <span style="font-size: 12px;color: #fff">分</span>
-                    </span>
-
-                   </div>
-                  </div>
-                </div>
-                <div v-if="resType == 20">
-                  <div class="con-audio">
-                    <div class="con-audio-title">{{ contentData.contentName }}</div>
-                    <div class="con-audio-player">
-                      <audioPlayer
-                        v-if="resType == 20"
-                        :url="fileBaseUrl + curriculumData.url"
-                        :name="contentData.contentName"
-                        @onPlaying="audioPlaying"
-                        :isDrag="curriculumData.isDrag"
-                        @onPlay="audioPlay"
-                        @onPause="audioPause"
-                        @onPlayEnd="audioEnd"
-                      ></audioPlayer>
-                    </div>
-                  </div>
-                </div>
-                <div v-if="resType == 40"><pdfPreview :autoScroll="true" v-if="resType == 40" :filePath="fileBaseUrl + contentData.content"></pdfPreview></div>
-                <div v-if="resType == 41"><div style="padding: 20px;" v-html="contentData.content"></div></div>
-                <div v-if="resType == 52">
-                  <div v-if="contentData.content != ''">
-                    <div class="hyper-link" v-if="conLink.openType == 2">
-                      <div class="hyper-link-row">{{ contentData.contentName }}</div>
-                      <div class="hyper-link-row">{{ conLink.url }}</div>
-                    </div>
-                    <div v-if="conLink.openType == 1"><iframe :src="conLink.url" style="width: 100%;border:0px;min-height: 473px;" frameborder="0"></iframe></div>
-                  </div>
-                </div>
-                <div v-if="resType == 60"><homework v-if="resType == 60 && studyId != ''" :studyId="studyId" :content="contentData"></homework></div>
-                <div v-if="resType == 61"><exam v-if="resType == 61 && studyId != '' " :studyId="studyId" :content="contentData"></exam></div>
-                <div v-if="resType == 62" style="padding:5px">
-                  <assess v-if="resType == 62 && studyId != '' && contentData.id" :studyId="studyId" :content="contentData"></assess>
-                </div>
-              </div>
-            </div>
-            <div class="course-interact">
-              <div class="score" style="display: flex;">
-                <div v-if="!scoreInfo.has" style="margin-left:10px;cursor: pointer;">
-                  <!-- <el-popover placement="top" width="300" trigger="hover"> -->
-                    <!-- <div style="text-align:center;line-height:50px;padding:20px 0px">
-
-                      <div style="padding-top:30px"><el-button @click="addScore">提交评分</el-button></div>
-                    </div> -->
-                      <el-rate v-model="scoreInfo.score" @change="addScore"></el-rate>
-                    <!-- <el-tag class="ref-score" slot="reference">去评分</el-tag> -->
-                  <!-- </el-popover> -->
-                </div>
-                <div v-if="scoreInfo.has" style="padding-top: 5px;display: flex;">
-                   <div style="padding-top: 0px;">
-                    <el-rate disabled v-model="courseInfo.score" :allow-half="true" ></el-rate>
-                  </div>
-                  <div>
-                        <span class="score-text">{{ toScore(courseInfo.score) }}</span>
-                        <span style="font-size: 14px;">分</span>
-                  </div>
-                </div>
-              </div>
-              <div style="display: flex;justify-content: flex-end;cursor: pointer;">
-                <div @click="praiseContent">
-                  <img class="icon-small" v-if="isPraise" :src="require('@/assets/images/icon/praise-active.png')" />
-                  <img class="icon-small" v-else :src="require('@/assets/images/icon/praise.png')" />
-                  {{ courseInfo.praises }}
-                </div>
-                <div style="margin-left: 15px;" @click="treadContent">
-                  <img class="icon-small" v-if="isTrample" :src="require('@/assets/images/icon/trample-active.png')" />
-                  <img class="icon-small" v-else :src="require('@/assets/images/icon/trample.png')" />
-                  {{ courseInfo.trampleCount }}
-                </div>
-              </div>
-            </div>
-            <div style="padding-left:5px;margin: 14px 0px;background-color: #FFFFFF;" class="info">
-              <comments v-if="courseInfo.id && courseInfo.id != ''" :obj-type="1" :obj-id="courseInfo.id" :toUsers="toUsers"></comments>
-            </div>
-          </div>
-        </el-col>
-        <el-col :span="8">
-          <div class="catalog-box" style="min-height: 450px;">
-            <!-- <p class="title">课程目录</p> -->
-            <!-- <el-tabs type="border-card" v-model="ctabName" @tab-click="ctabChange">
-              <el-tab-pane label="课程目录" name="catalog"> -->
-            <div style="min-height: 500px;">
-              <div class="catalog">
-                <el-collapse style="border-top:none" class="catalog-row" v-model="activeNames" @change="handleChange">
-
-                  <el-collapse-item v-for="(item, index) in catalogTree" :key="index" :name="index">
-                    <!-- <template class="collapse-title" slot="title" > -->
-                    <div style="display:flex;margin-bottom:18px;">
-                      
-
-                    <!-- 标题 -->
-                    <div style="flex:1;line-height:20px" class="mltit">
-                       <el-tooltip class="item" effect="light" :content="item.section.name" placement="top-start">
-                          <span   style="font-size:16px;font-weight: 700;color: #343434;margin-left: 15px;">
-                              {{ item.section.name }}</span>
-                            </el-tooltip>
-                      
-                    </div>
-                      <!-- 状态 -->
-                    <div style="text-align: right;">
-                      <span :class="statusToContent(item.section.status).class">{{ statusToContent(item.section.status).text }}</span>
-                       
-                    </div>
-                    </div>
-                   
-                      
-                    <!-- </template> -->
-                    <ul>
-                      <li @click="showRes(ele,i,index)" v-for="(ele, i) in item.children" :key="i" class="catalog-cell" style="display: flex;justify-content: space-between;">
-                        <!-- <span :class="statusToContent(ele.status).class">{{ statusToContent(ele.status).text }}</span> -->
-                        <div class="catalog-text">
-                          <span :class="['title-type', contentData.id == ele.id ? 'type-click' : '', 'type-kuang']">{{ getType(ele.contentType) }}</span>
-
-                            <el-tooltip class="item" effect="light" :content=" ele.contentName" placement="top-start">
-                                <span :style="{ color: contentData.id == ele.id ? '#ffaa00' : '' }">{{ ele.contentName }}</span>
-                            </el-tooltip>
-
-                        </div>
-                        <div>
-                          <!-- <span style="margin-right: 5px;color: #6c6c6c; " v-if="ele.duration>0">{{parseInt(ele.lastStudyTime/60)}}/{{parseInt(ele.duration/60)}}</span> -->
-                          <!--状态 有问题,未切换为正在进行的状态-->
-                          <span :class="statusToContent(ele.status).class">{{ statusToContent(ele.status).text }}</span>
-                        </div>
-                      </li>
-                    </ul>
-                  </el-collapse-item>
-                </el-collapse>
-              </div>
-            </div>
-            <!-- </el-tab-pane>
-            </el-tabs> -->
-          </div>
-          <div style="margin-top: 11px;margin-left:18px">
-            <el-card :body-style="{ padding: '0px' }" class="teachers">
-              <div class="top">授课讲师</div>
-              <div>
-                <div class="teacher" v-for="(item, idx) in teachers" :key="idx">
-                  <div class="teacher-avator">
-                    <!-- <div class="teacher-text" v-if="item.authorInfo.avatar == ''">{{userAvatarText(item.teacherName)}}</div> -->
-                    <el-avatar v-if="item.authorInfo.avatar !== ''" :src="fileBaseUrl + item.authorInfo.avatar" shape="circle" :size="50"></el-avatar>
-                     <div v-else class="teacher-text">
-                        <div v-if="item.authorInfo.sex === 1 "><img src="../../../public/images/Avatarman.png" alt=""></div>
-                        <div v-else><img src="../../../public/images/Avatarwoman.png" alt=""></div>
-
-                     </div>
-                  </div>
-                  <div class="teacher-info">
-                    <div class="teacher-name">{{ item.teacherName }}</div>
-                    <div class="teacher-remark" v-html="item.remark"></div>
-                  </div>
-                </div>
-              </div>
-            </el-card>
-          </div>
-        </el-col>
-      </el-row>
-    </div>
-    <portal-footer></portal-footer>
-  </div>
-</template>
-
-<script>
-import { mapGetters } from 'vuex';
-import portalHeader from '@/components/PortalHeader.vue';
-import portalFooter from '@/components/PortalFooter.vue';
-import comments from '@/components/Portal/comments.vue';
-import courseImage from '@/components/Course/courseImage.vue';
-import exam from '@/components/Course/exam';
-import homework from '@/components/Course/homework';
-import assess from '@/components/Course/assess';
-import interactBar from '@/components/Portal/interactBar.vue';
-import apiStudy from '@/api/modules/courseStudy.js';
-import apiVideoStudy from "@/api/modules/videoStudy.js";
-import apiCourseGrade from '@/api/modules/courseGrade.js';
-import apiPraises from '@/api/modules/praises.js';
-import apiTrample from '@/api/modules/trample.js';
-import apiCoursePortal from '@/api/modules/coursePortal.js';
-import apiCourse from '@/api/modules/course.js';
-import apiUser from '@/api/system/user.js';
-import apiCourseFile from '@/api/modules/courseFile.js';
-import { resListMap, resOwnerListMap, courseType, getType, toScore,userAvatarText } from '@/utils/tools.js';
-import pdfPreview from '@/components/PdfPreview/index.vue';
-import audioPlayer from '@/components/AudioPlayer/index.vue';
-import videoPlayer from '@/components/VideoPlayer/index.vue';
-import hyperLink from '@/components/Course/hyperLink.vue';
-import studyUtil from '@/utils/study.js';
-export default {
-  name: 'ucStudyIndex',
-  components: { courseImage, portalHeader, portalFooter, hyperLink, comments, homework, exam, interactBar, assess, pdfPreview, audioPlayer, videoPlayer },
-  data() {
-    return {
-      interactRuning:false,
-      playerBoxShow:false,
-      userAvatarText,
-      publicPath: process.env.VUE_APP_PUBLIC_PATH,
-      showiframe: false,
-      toScore,
-      courseId: '',//当前课程的id
-      studyId: '', //当前学习的id
-      initContentId: '', //初始化当前学习的内容节
-      blobUrl:'',//播放的文件地址，新添加，采用blob方式
-      contentData: {
-        studyItemId:'',
-        status:1
-      }, //当前的显示的内容
-      conLink: { openType: 1, url: '' }, //对于超连接的内容
-      curriculumData:{url:'',isDrag:true,completeSetup:0,setupTage:0,second:0},// 课件内容
-      courseInfo: { id: '', name: '' }, //课程信息
-      totalContent: 0, //课程内容数量
-      pageCount: 0,
-      currentPage: 0,
-      fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
-      contentList: [],
-      sectionList: [],
-      teachers: [],
-      toUsers: [], //对于@教师的处理
-      getType: getType,
-      ctabName: 'catalog',
-      resType: null,
-      activeNames: [0, 1, 2, 3, 4],
-      scoreInfo: {
-        dlgShow: false,
-        score: 5,
-        has: false
-      },
-      isPraise: false,
-      isTrample: false,
-      appendStartTime: null, //记录追加的开始时间
-      appendHandle:null,
-      isAppendTime:false,//是否追加学习时长
-      appentId:'',//当前追加的学习时长的id
-      appentInterval:30000,//追加学习时间的间隔 30秒加一次
-      handleTimeout:null
-    };
-  },
-  mounted() {
-    this.$watermark.set(this.userInfo.name + this.userInfo.loginName);
-    this.courseId = this.$route.query.id;
-    this.loadData();
-  },
-  computed: {
-    ...mapGetters(['userInfo']),
-    catalogTree() {
-      let treeList = [];
-      let $this = this;
-      $this.sectionList.forEach(sec => {
-        let treeNode = { section: sec, children: [] };
-        sec.status = 1;
-        let finishCount = 0;
-        $this.contentList.forEach(c => {
-          if (c.csectionId == sec.id) {
-            if (c.status > 1) {
-              sec.status = 2;
-              if(c.status == 9){
-                finishCount++;
-              }
-            }
-            treeNode.children.push(c);
-          }
-        });
-        if (finishCount == treeNode.children.length) {
-          sec.status = 9;
-        }
-        treeList.push(treeNode);
-      });
-      return treeList;
-    }
-  },
-  methods: {
-    createVideoBlob(url){
-      let $this=this;
-      let xhr = new  XMLHttpRequest;
-      xhr.open("GET",url,true);
-      xhr.responseType = 'blob';
-      //xhr.onload：只有 4 状态会触发
-      xhr.onreadystatechange = function() {
-          if (xhr.readyState==4 && xhr.status == 200) {//请求成功
-              //获取blob对象
-              let blob = xhr.response;
-              //获取blob对象地址，并把值赋给容器
-              let urlObj = window.URL.createObjectURL(blob);
-              $this.blobUrl=urlObj;
-          }
-      };
-      xhr.send();
-    },
-    widthOpen(url) {
-      window.open(url, '_blank');
-    },
-    formatTime(duration){
-      let min=0;
-      if(duration>0){
-        min=parseInt(duration/60);
-      }
-      return min;
-    },
-    saveStudyItem(){ //先保存学习的内容,针对于音视频的内容
-      if(this.contentData.studyItemId) {
-        return;//已经有记录的，不需要再保存了
-      }
-      let params = {
-        studyId: this.studyId, //学习id,
-        courseId: this.courseId, //课程id,
-        contentId: this.contentData.id, //内容id,
-        contentType:this.contentData.contentType, //内容id,
-        contentName: this.contentData.contentName, //内容名称
-        progress: 0,
-        lastStudyTime:0,
-        status:2,
-        studyDuration:0,
-        contentTotal: this.totalContent
-      };
-      apiVideoStudy.saveStudyItem(params).then(res=>{
-          if(res.status == 200){
-            this.contentData.studyItemId=res.result.id;
-            this.contentData.status = 2;//进行中状态
-          }else{
-            console.log("记录学习失败:" + res.message + "，" + res.error);
-          }
-      });
-    },
-    finishStudyItem(){ //设置完成学习的内容,针对于音视频的内容
-        if(!this.contentData.studyItemId){
-          //这种可能没有，不过这里也是为了万中那个1
-          this.saveStudyInfo();
-        }else{
-          let params={
-            itemId:this.contentData.studyItemId,
-            studyId:this.studyId,
-            courseId:this.courseId,
-            cnum:this.totalContent
-          }
-          apiVideoStudy.finishStudyItem(params).then(res=>{
-              if(res.status == 200){
-                this.contentData.status = 9;
-                this.contentData.progress = 100;
-              }else{
-                console.log("记录完成学习失败:" + res.message + "，" + res.error);
-              }
-          });
-        }
-    },
-    onFullscreen(full){
-      let divId='videowatermark';
-      var div = document.getElementById('myVideoPlayer')
-      if(full){
-      	var div3 = document.createElement("div");
-        div3.id =divId;
-        div3.setAttribute("class", "fullmark");
-      	div3.innerHTML='';
-        //从父组件传过来的水印内容
-        //div3.innerText =this.userInfo.name+this.userInfo.code;
-      	for(var i=0;i<8;i++){
-      		div3.innerHTML+='<div style="color:#ffffff;width: 40%;height: 155px;padding-left:60px;padding-top:50px; display: flex;justify-content: center; transform: rotate(-36deg);font-size:20px;">'+this.userInfo.name+this.userInfo.loginName+'</div>';
-      	}
-        div3.style.cssText = "position:absolute;pointer-events: none; width: 100%;height: 100%;top:0;left:0;bottom: 0;right: 0; display: flex;justify-content: center;flex-wrap: wrap;overflow: hidden; opacity:0.3;padding-top:10px";
-      	div.appendChild(div3);
-      }else{
-      	var markDiv=div.querySelector("#"+divId);
-      	if(markDiv){
-      		div.removeChild(markDiv);
-      	}
-      }
-    },
-    onPlayerPlay() {
-      //console.log("开始播放");
-      this.playerBoxShow = false;
-      let $this=this;
-      //console.log(this.contentData.status,'this.contentData.status');
-      if(this.contentData.status<9){
-        let completeType=this.curriculumData.completeSetup;
-        //console.log(completeType,'completeType');
-        if(completeType==0){
-          //默认5秒后学习完成.
-          $this.handleTimeout= setTimeout(function() {$this.saveStudyInfo();}, 5000); //5秒后记录学习完成
-        }else{
-          //先记录进行中的学习内容
-          this.saveStudyItem();
-        }
-      }
-    },
-    onPlayerPause() {
-      //console.log("暂停");
-    },
-    onPlayerEnded() {
-      this.playerBoxShow = true;
-      if(this.contentData.status<9){
-        this.finishStudyItem();
-      }
-    },
-    onPlayerPlaying(itme) {
-      this.isAppendTime=false;
-      this.appendStartTime=null;
-      //console.log("当前播放"+itme);
-      //console.log("当前播放11"+itme);
-      if (this.contentData.contentType && this.contentData.contentType == 10) {
-        let intTime = parseInt(itme);
-        //判断是否完成
-        let completeType=this.curriculumData.completeSetup;
-        let completeSecond=this.curriculumData.second;
-        if(!completeSecond){
-          completeSecond=5;//如果没有就采用默认的时间了
-        }
-        if(completeType>0 && this.contentData.status<9){ //因为1按进度，2按时长都是计算时间，所以这里直接大于0处理
-            if(completeType==1){
-              let finishPercent=this.curriculumData.setupTage;
-              let videDuration=this.contentData.duration;
-              let percent =intTime*100/videDuration;
-              if(percent>=finishPercent){
-                  this.finishStudyItem();
-              }
-            }else if(completeType==2){
-              if(intTime>=completeSecond){
-                 this.finishStudyItem();
-              }
-            }
-        }
-        //下面是每隔10秒记录一下次
-        let saveTime = Math.floor(intTime % 10);
-        if (intTime > 10 && intTime!=this.contentData.lastStudyTime && saveTime == 0 && this.contentData.studyItemId != '') {
-          this.contentData.lastStudyTime=intTime;
-          let postData = {
-            itemId: this.contentData.studyItemId,
-            videoTime: intTime
-          };
-          //console.log('记录播放时间')
-          apiStudy.studyVideoTime(postData).then(rs => {
-            if (rs.status != 200) {
-              console.log('记录播放时间错误');
-            }
-          });
-        }
-      }
-    },
-    audioPlaying(item,currentTime) {
-      //console.log("当前播放"+item);
-      let intTime = parseInt(currentTime);
-      //判断是否完成
-      let completeType=this.curriculumData.completeSetup;
-      let completeSecond=this.curriculumData.second;
-      if(!completeSecond){
-        completeSecond=5;//如果没有就采用默认的时间了
-      }
-      if(completeType>0 && this.contentData.status<9){ //因为1按进度，2按时长都是计算时间，所以这里直接大于0处理
-          if(completeType==1){
-            let finishPercent=this.curriculumData.setupTage;
-            let videDuration=this.contentData.duration;
-            let percent =intTime*100/videDuration;
-            if(percent>=finishPercent){
-                this.finishStudyItem();
-            }
-          }else if(completeType==2){
-            if(intTime>=completeSecond){
-               this.finishStudyItem();
-            }
-          }
-      }
-      //下面是每隔10秒记录一下次
-      let saveTime = Math.floor(intTime % 10);
-      if (intTime > 10 && intTime!=this.contentData.lastStudyTime && saveTime == 0 && this.contentData.studyItemId) {
-        this.contentData.lastStudyTime=intTime;
-        let postData = {
-          itemId: this.contentData.studyItemId,
-          videoTime: intTime
-        };
-        //console.log('记录播放时间')
-        apiStudy.studyVideoTime(postData).then(rs => {
-          if (rs.status != 200) {
-            console.log('记录播放时间错误');
-          }
-        });
-      }
-    },
-    audioPlay() {
-      //console.log("开始播放");
-      let $this=this;
-      if(this.contentData.status!=9){
-        let completeType=this.curriculumData.completeSetup;
-        if(completeType==0){
-          //默认5秒后学习完成.
-          $this.handleTimeout= setTimeout(function() {$this.saveStudyInfo();}, 5000); //5秒后记录学习完成
-        }else{
-          //先记录进行中的学习内容
-          this.saveStudyItem();
-        }
-      }
-    },
-    audioPause() {
-      //console.log("暂停");
-    },
-    audioEnd() {
-       //console.log("播放结束");
-      if(this.contentData.status<9){
-        this.finishStudyItem();
-      }
-
-    },
-    loadData() {
-      apiCoursePortal.detail(this.courseId).then(rs => {
-        if (rs.status == 200) {
-          //设置必须的字段
-          rs.result.sections.forEach(sec => {
-            sec.status = 0; //加入状态表未开始
-            rs.result.contents.forEach(c => {
-              c.status = 0; //初始化状态 ，未开始
-              c.studyItemId = ''; //初始化字段，学习条目id
-              c.lastStudyTime = 0; //初始化上次一学习的时间，作用于视频插放
-            });
-          });
-          this.sectionList = rs.result.sections;
-          this.courseInfo = rs.result.course;
-          this.teachers = rs.result.teachers;
-          if (rs.result.teachers && rs.result.teachers.length > 0) {
-            let userIds = [];
-            let ctoUsers = [];
-            rs.result.teachers.forEach(item => {
-              item.authorInfo = { aid: '', name: '', orgInfo: '', avatar: '', code: '',sex:null, };
-              userIds.push(item.teacherId);
-              ctoUsers.push({ aid: item.teacherId, name: item.teacherName });
-            });
-            this.toUsers = ctoUsers;
-            this.loadAuthorInfo(rs.result.teachers, userIds);
-          }
-          this.contentList = rs.result.contents;
-          this.totalContent = rs.result.contents.length;
-          //加载学习的数据
-          this.loadStudyData();
-        } else {
-          this.$message.error(rs.message);
-        }
-      });
-    },
-    loadStudyData() {
-      let $this = this;
-      apiStudy.studyInfo(this.courseId).then(res => {
-        if (res.status == 200) {
-          if (res.result.signup){
-            this.loadScorePraiseAndTrample();
-            this.studyId = res.result.studyId;
-            //对已学习的内容进行比对，重要的字段， 学习内容id，在后缀的
-            let playIndex = -1;
-            this.contentList.forEach((con, conIdx) => {
-              res.result.contents.forEach((scon, sconIdx) => {
-                if (scon.contentId == con.id) {
-                  //定位显示的内容
-                  if ($this.initContentId != '' && $this.initContentId == scon.contentId) {
-                    //定位当前学习的内容，是上一次学习的内容
-                    playIndex = conIdx;
-                  } else {
-                    if (sconIdx == 0 && con.contentType < 52){
-                      playIndex = conIdx;
-                    }
-                  }
-                  //console.log(scon.contentId,con.id);
-                  con.lastStudyTime = scon.lastStudyTime;
-                  //以下判断是为了兼容之前的问题，学习状态
-                  if(scon.status){
-                    con.status = scon.status;
-                  }else{
-                    con.status = 9;
-                  }
-                  con.studyItemId = scon.id; //这个就是学习内容（条目）的id
-                  //console.log(scon.id,"scon.id");
-                  //console.log(con,"scon.id");
-                }
-              });
-            });
-            //如果没有，就定位第一项内容
-            if (playIndex == -1) {
-              this.showRes(this.contentList[0]);
-            } else {
-              this.showRes(this.contentList[playIndex]);
-            }
-          } else {
-            this.$message.error('您还未报名');
-            if (this.courseInfo.type == 10) {
-              location.href = this.webBaseUrl + '/course/micro?id=' + this.courseId;
-            } else {
-              location.href = this.webBaseUrl + '/course/detail?id=' + this.courseId;
-            }
-          }
-        } else {
-          this.$message.error(res.message);
-        }
-      });
-    },
-    saveStudyInfo() {
-      //记录课件学习信息
-      if (this.contentData.contentType >= 60) {
-        //只有在课件页面停留超过5秒才会记录
-        return;
-      }
-      if (this.contentData.status == 9) {
-        //已学习完的，不用再添加
-        return;
-      }
-      let params = {
-        studyId: this.studyId, //学习id,
-        courseId: this.courseId, //课程id,
-        contentId: this.contentData.id, //内容id,
-        contentType:this.contentData.contentType,
-        contentName: this.contentData.contentName, //内容名称
-        progress: 100,
-        status:9,
-        contentTotal: this.totalContent
-      };
-      apiStudy.studyContent(params).then(res => {
-        if (res.status == 200) {
-          this.contentData.status = 9; //完成
-          this.contentData.studyItemId = res.result; //学习记录id
-        } else {
-          console.log('记录学习失败:' + res.message + '，' + res.error);
-        }
-      });
-    },
-    saveStudyDuration(){ //保存本地存储的学习时长
-       let duration=studyUtil.getStudyDuration();
-       if(duration>0){
-           let postData = {
-             id:this.appentId,
-             studyId: this.studyId,
-             courseId: this.courseInfo.id,
-             contentId: this.contentData.id,
-             studyInfo:
-               this.courseInfo.name +
-               "-" +
-               this.contentData.contentName,
-             duration: duration
-           };
-           apiStudy.appendStudyTime(postData).then(rs => {
-             if (rs.status == 200){
-               this.appentId=rs.result;
-               studyUtil.clearStudyDuration();//清除本地存储
-             } else {
-               console.log(rs.message);
-             }
-           });
-       }
-    },
-    appendStudyTime(flag) {
-      if(this.studyId==''){
-        return;
-      }
-      if(!this.contentData.id){
-        return;
-      }
-      if(!this.isAppendTime){
-        this.appendStartTime =null;
-        return;
-      }
-
-      if(this.appendHandle!=null){
-        window.clearTimeout(this.appendHandle);
-      }
-      //首先从本地读取
-      let duration=studyUtil.getStudyDuration();
-      //追加学习时间
-      let $this = this;
-      if (this.appendStartTime == null) {
-        this.appendStartTime = new Date();
-        this.appendHandle=setTimeout(function() {$this.appendStudyTime();}, $this.appentInterval);
-        if(duration>0 && flag){
-          this.saveStudyDuration();
-        }
-        return;
-      }
-      let now = new Date();
-      let m = now.getTime() - this.appendStartTime.getTime(); //相差的毫秒数
-      let sen = parseInt(m / 1000); //计算秒数
-      duration=duration+sen;
-      if(flag) {
-        if(duration>0){
-            let postData = {
-              id:this.appentId,
-              studyId: this.studyId,
-              courseId: this.courseInfo.id,
-              contentId: this.contentData.id,
-              studyInfo:
-                this.courseInfo.name +
-                "-" +
-                this.contentData.contentName,
-              duration: duration
-            };
-            apiStudy.appendStudyTime(postData).then(rs => {
-              if (rs.status == 200){
-                $this.appentId=rs.result;
-                $this.appendStartTime = new Date(); //重置开始时间
-                studyUtil.clearStudyDuration();//清除本地存储
-                //this.appendHandle=setTimeout(function() {$this.appendStudyTime();}, $this.appentInterval);
-              } else {
-                console.log(rs.message);
-              }
-            });
-        }
-      } else {
-        $this.appendStartTime = new Date(); //重置开始时间
-        studyUtil.setStudyDuration(duration);//添加到本地存储中
-      }
-      this.appendHandle=setTimeout(function() {$this.appendStudyTime();},$this.appentInterval);
-    },
-    ctabChange(e) {
-      //当前已经不再使用
-      //console.log(e);
-    },
-    showRes(r,i,index) {//i:子节下标，index:章下标
-      if(i!=undefined && index!=undefined) {
-        if(this.courseInfo.orderStudy) {
-          if(i == 0) {
-            if(index > 0) { //第一章 第一节
-              let preCatalog=this.catalogTree[index-1];
-              let last=preCatalog.children[preCatalog.children.length-1];
-              if(last.status!=9){
-                this.$message.warning('请按顺序学习！');
-                return;
-              }
-            }
-          }else{
-            let pre=this.catalogTree[index].children[i-1];
-            if(pre.status!=9){
-                this.$message.warning('请按顺序学习！');
-                return;
-              }
-          }
-        }
-      }
-
-      this.playerBoxShow=false;
-      //显示内容部分
-      let $this = this;
-      this.resType = r.contentType;
-      this.contentData = r;
-      this.saveStudyDuration();
-
-      if(r.contentType == 10 || r.contentType == 20) {
-          if (r.content.startsWith('\{')) {
-              this.curriculumData = JSON.parse(r.content);
-            } else {
-              this.curriculumData.url = r.content;
-            }
-            //let url=process.env.VUE_APP_BASE_API+'/xboe/m/course/file/show?cf='+this.curriculumData.url;
-            let url=this.fileBaseUrl+this.curriculumData.url;
-            //this.createVideoBlob(url);
-      } else if (r.contentType == 40) {
-        //let url = this.fileBaseUrl + r.content;
-        if (r.content != '' && r.content.indexOf('.pdf') == -1) {
-          apiCourseFile.detail(r.contentRefId).then(cfrs => {
-            if (cfrs.status == 200) {
-              r.content = cfrs.result.previewFilePath;
-              //console.log(r.content);
-            } else {
-              $this.$message.error('加载pdf课件文件失败');
-            }
-          });
-        }
-      } else if (r.contentType == 52) {
-        this.isAppendTime=false;
-        if (r.content.startsWith('\{')) {
-          this.conLink = JSON.parse(r.content);
-        } else {
-          this.conLink.url = r.content;
-          this.conLink.openType = 1;
-        }
-        if (this.conLink.openType == 2) {
-          //直接设置完成状态
-          this.widthOpen(this.conLink.url);
-        }
-        //this.conLink=
-      } else if (r.contentType == 61) {
-        // 考试
-      } else if (r.contentType == 60) {
-        // 作业
-      } else if (r.contentType == 62) {
-        // 评估
-        //评估不需要查找，因为内容就是content中
-        console.log('评估处理');
-      }
-      if(this.contentData.status<2){
-         this.contentData.status=2;//进行中
-      }
-      if(this.contentData.contentType>20){ //非视频类的
-        this.isAppendTime=true;
-        this.appendStudyTime();
-        this.handleTimeout= setTimeout(function() {$this.saveStudyInfo();}, 5000); //5秒后记录学习完成
-      }
-
-    },
-    handleChange(val) {
-      console.log(val);
-    },
-    loadScorePraiseAndTrample() {
-      //加载是否请过分
-      apiCourseGrade.has(this.courseId).then(rs => {
-        if (rs.status == 200 && rs.result) {
-          this.scoreInfo.has = true;
-        }
-      });
-      apiPraises.has(1, this.courseId).then(rs => {
-        if (rs.status == 200 && rs.result) {
-          this.isPraise = true;
-        }
-      });
-      apiTrample.has(this.courseId).then(rs => {
-        if (rs.status == 200 && rs.result) {
-          this.isTrample = true;
-        }
-      });
-    },
-    addScore() {
-      let that = this;
-      let postData = {
-        courseId: this.courseInfo.id,
-        studyId: this.studyId,
-        score: this.scoreInfo.score
-      };
-      if (this.scoreInfo.score > 0) {
-        apiCourseGrade.grade(postData).then(rs => {
-          if (rs.status == 200){
-            this.$message.success('打分成功，谢谢您的打分');
-            that.scoreInfo.has = true;
-            that.courseInfo.score = rs.result;
-          } else {
-            this.$message.error('打分处理失败，请稍后再试');
-          }
-        });
-      }
-    },
-    praiseContent() {
-      if (this.isTrample) {
-        this.$message.error('您已踩过了，不能再赞了');
-        return;
-      }
-       if(this.interactRuning){
-				return;
-			}
-			this.interactRuning=true;
-      let postData = {
-        objType: 1,
-        objId: this.courseId,
-        title: this.courseInfo.name
-      };
-      if (this.isPraise) {
-        apiPraises.remove(1, this.courseInfo.id).then(res => {
-          this.interactRuning=false;
-          if (res.status == 200) {
-            this.$message.info('已取消点赞');
-            this.isPraise = false;
-            this.courseInfo.praises--;
-          } else {
-            this.$message.error('取消点赞失败,请稍后再试');
-          }
-        });
-      } else {
-        apiPraises.save(postData).then(rs => {
-          this.interactRuning=false;
-          if (rs.status == 200) {
-            this.$message.success('点赞成功');
-            this.isPraise = true;
-            this.courseInfo.praises++;
-          } else {
-            this.$message.error('点赞失败,请稍后再试');
-          }
-        });
-      }
-    },
-    treadContent() {
-      if (this.isPraise) {
-        this.$message.error('您已赞过了，不能再踩了');
-        return;
-      }
-       if(this.interactRuning){
-				return;
-			}
-			this.interactRuning=true;
-      if (this.isTrample) {
-        apiTrample.remove(this.courseInfo.id).then(rs => {
-          this.interactRuning=false;
-          if (rs.status == 200) {
-            this.$message.info('已取消踩');
-            this.isTrample = false;
-            this.courseInfo.trampleCount--;
-          } else {
-            this.$message.error('取消失败,请稍后再试');
-          }
-        });
-      } else {
-        apiTrample.trample(this.courseInfo.id).then(rs => {
-          this.interactRuning=false;
-          if (rs.status == 200) {
-            this.$message.success('已踩');
-            this.isTrample = true;
-            this.courseInfo.trampleCount++;
-          } else {
-            this.$message.error('踩失败,请稍后再试');
-          }
-        });
-      }
-    },
-    statusToContent(status) {
-      let data = null;
-      switch (status) {
-        case 1: {
-          data = {
-            text: '未开始',
-            class: 'catalog-cell-state1'
-          };
-          break;
-        }
-        case 2: {
-          data = {
-            text: '进行中',
-            class: 'catalog-cell-state2'
-          };
-          break;
-        }
-        case 9: {
-          data = {
-            text: '已完成',
-            class: 'catalog-cell-state9'
-          };
-          break;
-        }
-        default:
-          {
-            data = {
-              text: '未开始',
-              class: 'catalog-cell-state1'
-            };
-          }
-          break;
-      }
-      return data;
-    },
-    loadAuthorInfo(list, ids) {
-      //加载作者信息，头像，机构信息
-      if (ids.length == 0) {
-        return;
-      }
-      apiUser.getByIds(ids).then(res => {
-        if (res.status == 200) {
-          list.forEach((item, index) => {
-            res.result.some(author => {
-              if (author.aid == item.teacherId) {
-                item.authorInfo = author;
-                return true;
-              } else {
-                return false;
-              }
-            });
-          });
-        } else {
-          //console.log('加载课程信息失败:'+res.error);
-          //this.$message.error(res.message);
-        }
-      });
-    }
-  }
-};
-</script>
-
-<style scoped lang="scss">
-.mltit{
-  
-  // width: 70%;
-  // width: ;
-  word-break:break-all;
-  // line-height: 25px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 1;
-}
-.catalog-text{
-  width: 70%;
-  overflow: hidden;
-  word-break:break-all;
-  text-overflow: ellipsis;
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 1;
-  height: 40px;
-}
-.player-box{
-  position: absolute;
-  // top: 62px;
-  // left: 184px;
-  width: 300px;
-  left: 50%;
-  top: 50%;
-  transform: translate(-50%, -50%);
-  height: 187px;
-  background: rgba(74, 74, 74,.5);
-  border-radius: 33px;
-  text-align: center;
-  padding: 20px;
-  box-sizing: border-box;
-  .player-praise{
-    margin-top: 25px;
-    display: flex;
-    // justify-items: center;
-    justify-content: center;
-  }
-  .player-rate{
-    margin-top: 35px;
-  }
-}
-.score {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  .el-rate {
-    display: inline-block;
-  }
-  .score-text {
-    font-size: 28px;
-    color: #ffb30f;
-    font-family: 'Arial';
-    margin-left: 23px;
-    // font-weight: 600;
-  }
-  // margin-bottom: 19px;
-  .score-no {
-    color: #ffb30f;
-    padding: 5px 0;
-    background: #efefef;
-    border-radius: 20px;
-    width: 65px;
-    font-size: 12px;
-    font-weight: 600;
-    text-align: center;
-  }
-}
-.portal-content-title {
-  font-weight: 600;
-  padding: 10px;
-  font-size: 22px;
-  line-height: 40px;
-  color: #333333;
-  word-break:break-all;
-}
-
-.type-kuang {
-  color: #666666;
-  border: 1px solid #666666;
-}
-.type-click {
-  color: #ffb30f !important;
-  border: 1px solid #ffb30f !important;
-}
-::v-deep .el-rate__icon {
-  font-size: 22px;
-  margin-right: 6px;
-  color: #ff8e00;
-  transition: 0.3s;
-}
-.ref-score {
-  // background: #e4e4e4;
-  // width: 64px;
-  // height: 32px;
-  // border-radius: 17px;
-  // line-height: 32px;
-  // // opacity: 0.24;
-  // color: #000;
-  // font-size: 14px;
-  // border: none;
-}
-.icon-small {
-  width: 20px;
-  height: 20px;
-  line-height: 20px;
-  vertical-align: middle;
-}
-.con-audio {
-  padding: 50px;
-  text-align: center;
-  .con-audio-title {
-    font-size: 16px;
-    font-weight: 700;
-  }
-  .con-audio-player {
-    padding: 20px 100px;
-  }
-}
-.hyper-link {
-  padding-left: 20px;
-  text-align: center;
-  padding-top: 100px;
-  .hyper-link-row {
-    padding: 20px;
-  }
-}
-.catalog-box {
-  background: #fff;
-  // padding: 15px 0px;
-  // box-shadow: 1px 1px 2px 2px #ededed;
-  .title {
-    font-size: 16px;
-    font-weight: 600;
-    color: #333333;
-    padding-left: 20px;
-  }
-}
-.collapse-title {
-  flex: 1 0 90%;
-  order: 1;
-}
-
-.el-collapse-item__header {
-  flex: 1 0 auto;
-  order: -1;
-}
-.course-interact {
-  height: 54px;
-  // padding-top: 10px;
-  // padding-right: 10px;
-  padding: 0 20px;
-  line-height: 54px;
-  background-color: #FFFFFF;
-  display: flex;
-  justify-content: space-between;
-  box-sizing: border-box;
-}
-.interact-btn {
-  margin-right: 10px;
-}
-.uc-badge {
-  margin-top: 10px;
-  margin-right: 40px;
-}
-.cres-list {
-  list-style-type: decimal;
-  margin: 0px;
-  li {
-    line-height: 30px;
-  }
-  .current {
-    color: #1ea0fa;
-  }
-}
-.uc-course {
-  display: flex;
-  justify-content: space-around;
-  border: 1px solid #f0f0f0;
-  padding: 10px;
-  .uc-course-img {
-    width: 200px;
-    img {
-      width: 200px;
-      border: 1px solid #f4f4f5;
-    }
-  }
-  .uc-course-info {
-    flex: 1;
-    line-height: 28px;
-    padding: 0px 10px;
-    .uc-course-name {
-      font-size: 18px;
-      font-weight: 700;
-    }
-    .uc-course-text {
-      color: #747474;
-    }
-  }
-  .uc-course-btns {
-    width: 150px;
-  }
-}
-
-.catalog-cell-state2 {
-  height: 24px;
-  width: 58px;
-  line-height: 20px;
-  border: 0px dotted #bed2f8;
-  padding: 3px 10px;
-  color: #ff8e00;
-  font-size: 12px;
-  border-radius: 6px;
-  margin-left: 2px;
-  background: #ffedd6;
-}
-.catalog-cell-state9 {
-  height: 24px;
-  width: 58px;
-  line-height: 20px;
-  border: 0px dotted #bed2f8;
-  padding: 3px 10px;
-  color: #3e7fff;
-  font-size: 12px;
-  border-radius: 6px;
-  margin-left: 2px;
-  background: #edf2fd;
-  // margin-left: 68%;
-  // background-color: #BED2F8;
-}
-.catalog-cell-state1 {
-  height: 24px;
-  width: 58px;
-  line-height: 20px;
-  border: 0px dotted #edf2fd;
-  border-radius: 6px;
-  padding: 3px 10px;
-  color: #ff3e3e;
-  font-size: 12px;
-  margin-left: 2px;
-  background: #fff0f0;
-}
-.catalog {
-  height: 500px;
-  max-width: 500px;
-  overflow: auto;
-  .catalog-row {
-    margin: 0px;
-    padding: 0px 10px 10px 10px;
-    .title-type {
-      width: 36px;
-      height: 24px;
-      padding: 2px 5px;
-      color: #666666;
-      border: 1px solid #666666;
-      margin-right: 8px;
-    }
-    ul {
-      padding: 0px;
-      margin: 0px;
-      li {
-        padding: 6px 0;
-      }
-    }
-    .catalog-cell {
-      line-height: 32px;
-      cursor: pointer;
-      list-style: none;
-      margin: 0px;
-      padding-left: 20px;
-      color: #5c5c5c;
-    }
-  }
-}
-.video-div {
-  position: absolute;
-  z-index: 999999999;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  background: rgba(101, 101, 101, 0.9);
-  .good {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    margin-top: 200px;
-    div {
-      line-height: 1;
-      margin: 0 15px;
-      .svg-icon {
-        width: 30px;
-        height: 30px;
-      }
-    }
-    div:nth-of-type(2) {
-      .svg-icon {
-        transform: scaleX(-1);
-        transform: rotate(180deg);
-      }
-    }
-    // margin-bottom: 50px;
-    // line-height: 20px;
-    // .el-link{
-    //   font-size: 30px;
-    //   color: #70a5f4;
-    //   margin: 0 30px;
-    // }
-  }
-  // .score {
-  //   display: flex;
-  //   justify-content: center;
-  //   align-items: center;
-  //   padding-top: 20px
-  // }
-}
-
-::v-deep .el-tag {
-    background-color: #ecf5ff;
-    border-color: #409EFF;
-    display: inline-block;
-    height: 28px;
-    padding: 0 10px;
-    line-height: 28px;
-    font-size: 12px;
-    color: #3e7fff;
-    border-width: 1px;
-    border-style: solid;
-    border-radius: 0px;
-    box-sizing: border-box;
-    white-space: nowrap;
-}
-::v-deep .teacher .teacher-avator .teacher-text{
-  background: none;
-  border: none;
-}
-.teacher {
-  background-color: #ffffff;
-  display: flex;
-  border-top: 1px solid #e7e7e7;
-  padding: 10px 0px;
-  .teacher-avator {
-    ::v-deep .el-avatar {
-      width: 68px !important;
-      height: 68px !important;
-      border-radius: 0px;
-    }
-    .teacher-text {
-      width: 68px;
-      height: 68px;
-      div{
-        img{
-           width: 68px;
-           height: 68px;
-        }
-      }
-      // text-align: center;
-      // line-height: 68px;
-      // border-radius: 50%;
-      // color: #73adfe;
-      // border: 2px solid #73adfe;
-      // background: #d9e9ff;
-    }
-  }
-  .teacher-info {
-    flex: 1;
-    .teacher-name {
-      padding: 0px 5px 10px 10px;
-    }
-    .teacher-remark {
-      padding: 0px 5px 0 10px;
-      font-size: 14px;
-      color: #666666;
-      line-height: 20px;
-    }
-  }
-}
-.teachers {
-  background-color: #fff;
-  margin-top: 10px;
-  padding: 5px 15px 5px 10px;
-  .top {
-    font-size: 16px;
-    font-weight: 600;
-    line-height: 50px;
-  }
-}
-.breadname {
-  margin-bottom: 15px;
-}
-//目录的样式更改
-::v-deep .el-collapse-item{
-  .el-collapse-item__header{
-    // position: relative;
-    direction:rtl;
-    display: flex;
-    // justify-content;
-    justify-content: space-between;
-    // .el-collapse-item__arrow{
-    //   float:right;
-    // }
-    // span{
-    //   float:right;
-    // }
-    i{
-      display:none
-    }
-  }
-}
-</style>
+<template>
+  <div>
+    <!-- 课程详情点击应该传参的 -->
+    <portal-header current="course" :goSearch="1"></portal-header>
+    <div class="portal-content xcontent">
+      <el-breadcrumb separator-class="el-icon-arrow-right" class="breadname">
+        <el-breadcrumb-item :to="{ path: '/course' }">课程列表</el-breadcrumb-item>
+        <el-breadcrumb-item :to="{ path: `/course/detail?id=${courseId}` }">课程详情</el-breadcrumb-item>
+        <el-breadcrumb-item>课程学习</el-breadcrumb-item>
+      </el-breadcrumb>
+      <!-- <span style="display:block;margin-bottom:10px">课程列表 > 课程详情 > 课程学习</span> -->
+      <div style="background-color: #FFFFFF; border-bottom:1px solid #eee; display: flex;justify-content: space-between;">
+        <div class="portal-content-title">{{ courseInfo.name }}</div>
+        <div style="padding-top: 15px;padding-right: 30px;"><interactBar :type="1" :data="courseInfo" :comments="false" :praises="false" :views="false"></interactBar></div>
+      </div>
+      <el-row>
+        <el-col :span="16">
+          <div style="min-height: 450px;">
+            <!-- <div style="background-color: #FFFFFF;font-weight: 600;border-bottom:1px solid #d0d0d0 ;padding: 10px;font-size: 22px;color: #333333;">{{ courseInfo.name }}</div> -->
+            <!--课程资源内容播放-->
+            <div class="player" style="width: 100%;border: 1px solid #ffffff;background-color: #FFFFFF;overflow: auto;">
+              <div>
+                <div v-if="resType == null || resType == 0">
+                  <!--先显示视频图片-->
+                  <course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
+                </div>
+                <div v-if="resType == 10" style="position: relative;">
+                  <videoPlayer  id="myVideoPlayer" v-if="resType == 10"
+                    :src="fileBaseUrl+curriculumData.url"
+                    @onPlayerPlaying="onPlayerPlaying"
+                    :initTime="contentData.lastStudyTime"
+                    @onPlayerPlay="onPlayerPlay"
+                    :isDrag="curriculumData.isDrag"
+                    @onFullscreen="onFullscreen"
+                    @onPlayerPause="onPlayerPause"
+                    @onPlayerEnded="onPlayerEnded"
+                  ></videoPlayer>
+                  <div class="player-box" v-if="playerBoxShow">
+                    <div class="player-praise" style="cursor: pointer;">
+                      <div @click="praiseContent">
+                        <img class="icon-small" v-if="isPraise" :src="require('@/assets/images/icon/praise-active.png')" />
+                        <img class="icon-small" v-else :src="require('@/assets/images/icon/zhan.png')" />
+                        <!-- {{ courseInfo.praises }} -->
+                        <div style="color:#fff;cursor: pointer;">赞</div>
+                      </div>
+                      <div style="margin-left: 15px;cursor: pointer;" @click="treadContent">
+                        <img class="icon-small" v-if="isTrample" :src="require('@/assets/images/icon/trample-active.png')" />
+                        <img class="icon-small" v-else :src="require('@/assets/images/icon/cai.png')" />
+                        <!-- {{ courseInfo.trampleCount }} -->
+                        <div style="color:#fff;cursor: pointer;">踩</div>
+                      </div>
+                    </div>
+                    <div v-if="!scoreInfo.has" class="player-rate">
+                      <el-rate v-model="scoreInfo.score" text-color="#ff9900" score-template="{value}" void-color="#fff" @change="addScore"></el-rate>
+                    </div>
+                      <div v-if="scoreInfo.has" style="padding-top: 5px;display: flex;">
+                    <div class="player-rate" style="padding-left: 35px;">
+                      <el-rate disabled v-model="courseInfo.score" :allow-half="true" ></el-rate>
+                    </div>
+                    <span class="score-text" style="margin-top:35px">
+                      <span style="color:#ffb30f;">{{ toScore(courseInfo.score) }}</span>
+                      <span style="font-size: 12px;color: #fff">分</span>
+                    </span>
+
+                   </div>
+                  </div>
+                </div>
+                <div v-if="resType == 20">
+                  <div class="con-audio">
+                    <div class="con-audio-title">{{ contentData.contentName }}</div>
+                    <div class="con-audio-player">
+                      <audioPlayer
+                        v-if="resType == 20"
+                        :url="fileBaseUrl + curriculumData.url"
+                        :name="contentData.contentName"
+                        @onPlaying="audioPlaying"
+                        :isDrag="curriculumData.isDrag"
+                        @onPlay="audioPlay"
+                        @onPause="audioPause"
+                        @onPlayEnd="audioEnd"
+                      ></audioPlayer>
+                    </div>
+                  </div>
+                </div>
+                <div v-if="resType == 40">
+                  <div style="padding: 10px;color: #767676; " v-if="curCFile.converStatus < 2">
+                    <div>此课程内容无法预览，请联系管理员</div>
+                  </div>
+                    <div style="padding: 10px;color: #767676;" v-if="curCFile.converStatus == 3">
+                        此课程内容无法预览，请联系管理员
+                    </div>
+                  <pdfPreview :autoScroll="true" v-if="resType == 40" :filePath="fileBaseUrl + contentData.content"></pdfPreview>
+                </div>
+                <div v-if="resType == 41"><div style="padding: 20px;" v-html="contentData.content"></div></div>
+                <div v-if="resType == 52">
+                  <div v-if="contentData.content != ''">
+                    <div class="hyper-link" v-if="conLink.openType == 2">
+                      <div class="hyper-link-row">{{ contentData.contentName }}</div>
+                      <div class="hyper-link-row">{{ conLink.url }}</div>
+                    </div>
+                    <div v-if="conLink.openType == 1"><iframe :src="conLink.url" style="width: 100%;border:0px;min-height: 473px;" frameborder="0"></iframe></div>
+                  </div>
+                </div>
+                <div v-if="resType == 60"><homework v-if="resType == 60 && studyId != ''" :studyId="studyId" :content="contentData"></homework></div>
+                <div v-if="resType == 61"><exam v-if="resType == 61 && studyId != '' " :studyId="studyId" :content="contentData"></exam></div>
+                <div v-if="resType == 62" style="padding:5px">
+                  <assess v-if="resType == 62 && studyId != '' && contentData.id" :studyId="studyId" :content="contentData"></assess>
+                </div>
+              </div>
+            </div>
+            <div class="course-interact">
+              <div class="score" style="display: flex;">
+                <div v-if="!scoreInfo.has" style="margin-left:10px;cursor: pointer;">
+                  <!-- <el-popover placement="top" width="300" trigger="hover"> -->
+                    <!-- <div style="text-align:center;line-height:50px;padding:20px 0px">
+
+                      <div style="padding-top:30px"><el-button @click="addScore">提交评分</el-button></div>
+                    </div> -->
+                      <el-rate v-model="scoreInfo.score" @change="addScore"></el-rate>
+                    <!-- <el-tag class="ref-score" slot="reference">去评分</el-tag> -->
+                  <!-- </el-popover> -->
+                </div>
+                <div v-if="scoreInfo.has" style="padding-top: 5px;display: flex;">
+                   <div style="padding-top: 0px;">
+                    <el-rate disabled v-model="courseInfo.score" :allow-half="true" ></el-rate>
+                  </div>
+                  <div>
+                        <span class="score-text">{{ toScore(courseInfo.score) }}</span>
+                        <span style="font-size: 14px;">分</span>
+                  </div>
+                </div>
+              </div>
+              <div style="display: flex;justify-content: flex-end;cursor: pointer;">
+                <div @click="praiseContent">
+                  <img class="icon-small" v-if="isPraise" :src="require('@/assets/images/icon/praise-active.png')" />
+                  <img class="icon-small" v-else :src="require('@/assets/images/icon/praise.png')" />
+                  {{ courseInfo.praises }}
+                </div>
+                <div style="margin-left: 15px;" @click="treadContent">
+                  <img class="icon-small" v-if="isTrample" :src="require('@/assets/images/icon/trample-active.png')" />
+                  <img class="icon-small" v-else :src="require('@/assets/images/icon/trample.png')" />
+                  {{ courseInfo.trampleCount }}
+                </div>
+              </div>
+            </div>
+            <div style="padding-left:5px;margin: 14px 0px;background-color: #FFFFFF;" class="info">
+              <comments v-if="courseInfo.id && courseInfo.id != ''" :obj-type="1" :obj-id="courseInfo.id" :toUsers="toUsers"></comments>
+            </div>
+          </div>
+        </el-col>
+        <el-col :span="8">
+          <div class="catalog-box" style="min-height: 450px;">
+            <!-- <p class="title">课程目录</p> -->
+            <!-- <el-tabs type="border-card" v-model="ctabName" @tab-click="ctabChange">
+              <el-tab-pane label="课程目录" name="catalog"> -->
+            <div style="min-height: 500px;">
+              <div class="catalog">
+                <el-collapse style="border-top:none" class="catalog-row" v-model="activeNames" @change="handleChange">
+
+                  <el-collapse-item v-for="(item, index) in catalogTree" :key="index" :name="index">
+                    <!-- <template class="collapse-title" slot="title" > -->
+                    <div style="display:flex;margin-bottom:18px;">
+                      
+
+                    <!-- 标题 -->
+                    <div style="flex:1;line-height:20px" class="mltit">
+                       <el-tooltip class="item" effect="light" :content="item.section.name" placement="top-start">
+                          <span   style="font-size:16px;font-weight: 700;color: #343434;margin-left: 15px;">
+                              {{ item.section.name }}</span>
+                            </el-tooltip>
+                      
+                    </div>
+                      <!-- 状态 -->
+                    <div style="text-align: right;">
+                      <span :class="statusToContent(item.section.status).class">{{ statusToContent(item.section.status).text }}</span>
+                       
+                    </div>
+                    </div>
+                   
+                      
+                    <!-- </template> -->
+                    <ul>
+                      <li @click="showRes(ele,i,index)" v-for="(ele, i) in item.children" :key="i" class="catalog-cell" style="display: flex;justify-content: space-between;">
+                        <!-- <span :class="statusToContent(ele.status).class">{{ statusToContent(ele.status).text }}</span> -->
+                        <div class="catalog-text">
+                          <span :class="['title-type', contentData.id == ele.id ? 'type-click' : '', 'type-kuang']">{{ getType(ele.contentType) }}</span>
+
+                            <el-tooltip class="item" effect="light" :content=" ele.contentName" placement="top-start">
+                                <span :style="{ color: contentData.id == ele.id ? '#ffaa00' : '' }">{{ ele.contentName }}</span>
+                            </el-tooltip>
+
+                        </div>
+                        <div>
+                          <!-- <span style="margin-right: 5px;color: #6c6c6c; " v-if="ele.duration>0">{{parseInt(ele.lastStudyTime/60)}}/{{parseInt(ele.duration/60)}}</span> -->
+                          <!--状态 有问题,未切换为正在进行的状态-->
+                          <span :class="statusToContent(ele.status).class">{{ statusToContent(ele.status).text }}</span>
+                        </div>
+                      </li>
+                    </ul>
+                  </el-collapse-item>
+                </el-collapse>
+              </div>
+            </div>
+            <!-- </el-tab-pane>
+            </el-tabs> -->
+          </div>
+          <div style="margin-top: 11px;margin-left:18px">
+            <el-card :body-style="{ padding: '0px' }" class="teachers">
+              <div class="top">授课讲师</div>
+              <div>
+                <div class="teacher" v-for="(item, idx) in teachers" :key="idx">
+                  <div class="teacher-avator">
+                    <!-- <div class="teacher-text" v-if="item.authorInfo.avatar == ''">{{userAvatarText(item.teacherName)}}</div> -->
+                    <el-avatar v-if="item.authorInfo.avatar !== ''" :src="fileBaseUrl + item.authorInfo.avatar" shape="circle" :size="50"></el-avatar>
+                     <div v-else class="teacher-text">
+                        <div v-if="item.authorInfo.sex === 1 "><img src="../../../public/images/Avatarman.png" alt=""></div>
+                        <div v-else><img src="../../../public/images/Avatarwoman.png" alt=""></div>
+
+                     </div>
+                  </div>
+                  <div class="teacher-info">
+                    <div class="teacher-name">{{ item.teacherName }}</div>
+                    <div class="teacher-remark" v-html="item.remark"></div>
+                  </div>
+                </div>
+              </div>
+            </el-card>
+          </div>
+        </el-col>
+      </el-row>
+    </div>
+    <portal-footer></portal-footer>
+  </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex';
+import portalHeader from '@/components/PortalHeader.vue';
+import portalFooter from '@/components/PortalFooter.vue';
+import comments from '@/components/Portal/comments.vue';
+import courseImage from '@/components/Course/courseImage.vue';
+import exam from '@/components/Course/exam';
+import homework from '@/components/Course/homework';
+import assess from '@/components/Course/assess';
+import interactBar from '@/components/Portal/interactBar.vue';
+import apiStudy from '@/api/modules/courseStudy.js';
+import apiVideoStudy from "@/api/modules/videoStudy.js";
+import apiCourseGrade from '@/api/modules/courseGrade.js';
+import apiPraises from '@/api/modules/praises.js';
+import apiTrample from '@/api/modules/trample.js';
+import apiCoursePortal from '@/api/modules/coursePortal.js';
+import apiCourse from '@/api/modules/course.js';
+import apiUser from '@/api/system/user.js';
+import apiCourseFile from '@/api/modules/courseFile.js';
+import { resListMap, resOwnerListMap, courseType, getType, toScore,userAvatarText } from '@/utils/tools.js';
+import pdfPreview from '@/components/PdfPreview/index.vue';
+import audioPlayer from '@/components/AudioPlayer/index.vue';
+import videoPlayer from '@/components/VideoPlayer/index.vue';
+import hyperLink from '@/components/Course/hyperLink.vue';
+import studyUtil from '@/utils/study.js';
+export default {
+  name: 'ucStudyIndex',
+  components: { courseImage, portalHeader, portalFooter, hyperLink, comments, homework, exam, interactBar, assess, pdfPreview, audioPlayer, videoPlayer },
+  data() {
+    return {
+      curCFile:{},
+      interactRuning:false,
+      playerBoxShow:false,
+      userAvatarText,
+      publicPath: process.env.VUE_APP_PUBLIC_PATH,
+      showiframe: false,
+      toScore,
+      courseId: '',//当前课程的id
+      studyId: '', //当前学习的id
+      initContentId: '', //初始化当前学习的内容节
+      blobUrl:'',//播放的文件地址，新添加，采用blob方式
+      contentData: {
+        studyItemId:'',
+        status:1
+      }, //当前的显示的内容
+      conLink: { openType: 1, url: '' }, //对于超连接的内容
+      curriculumData:{url:'',isDrag:true,completeSetup:0,setupTage:0,second:0},// 课件内容
+      courseInfo: { id: '', name: '' }, //课程信息
+      totalContent: 0, //课程内容数量
+      pageCount: 0,
+      currentPage: 0,
+      fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
+      contentList: [],
+      sectionList: [],
+      teachers: [],
+      toUsers: [], //对于@教师的处理
+      getType: getType,
+      ctabName: 'catalog',
+      resType: null,
+      activeNames: [0, 1, 2, 3, 4],
+      scoreInfo: {
+        dlgShow: false,
+        score: 5,
+        has: false
+      },
+      isPraise: false,
+      isTrample: false,
+      appendStartTime: null, //记录追加的开始时间
+      appendHandle:null,
+      isAppendTime:false,//是否追加学习时长
+      appentId:'',//当前追加的学习时长的id
+      appentInterval:30000,//追加学习时间的间隔 30秒加一次
+      handleTimeout:null
+    };
+  },
+  mounted() {
+    this.$watermark.set(this.userInfo.name + this.userInfo.loginName);
+    this.courseId = this.$route.query.id;
+    this.loadData();
+  },
+  computed: {
+    ...mapGetters(['userInfo']),
+    catalogTree() {
+      let treeList = [];
+      let $this = this;
+      $this.sectionList.forEach(sec => {
+        let treeNode = { section: sec, children: [] };
+        sec.status = 1;
+        let finishCount = 0;
+        $this.contentList.forEach(c => {
+          if (c.csectionId == sec.id) {
+            if (c.status > 1) {
+              sec.status = 2;
+              if(c.status == 9){
+                finishCount++;
+              }
+            }
+            treeNode.children.push(c);
+          }
+        });
+        if (finishCount == treeNode.children.length) {
+          sec.status = 9;
+        }
+        treeList.push(treeNode);
+      });
+      return treeList;
+    }
+  },
+  methods: {
+    createVideoBlob(url){
+      let $this=this;
+      let xhr = new  XMLHttpRequest;
+      xhr.open("GET",url,true);
+      xhr.responseType = 'blob';
+      //xhr.onload：只有 4 状态会触发
+      xhr.onreadystatechange = function() {
+          if (xhr.readyState==4 && xhr.status == 200) {//请求成功
+              //获取blob对象
+              let blob = xhr.response;
+              //获取blob对象地址，并把值赋给容器
+              let urlObj = window.URL.createObjectURL(blob);
+              $this.blobUrl=urlObj;
+          }
+      };
+      xhr.send();
+    },
+    widthOpen(url) {
+      window.open(url, '_blank');
+    },
+    formatTime(duration){
+      let min=0;
+      if(duration>0){
+        min=parseInt(duration/60);
+      }
+      return min;
+    },
+    saveStudyItem(){ //先保存学习的内容,针对于音视频的内容
+      if(this.contentData.studyItemId) {
+        return;//已经有记录的，不需要再保存了
+      }
+      let params = {
+        studyId: this.studyId, //学习id,
+        courseId: this.courseId, //课程id,
+        contentId: this.contentData.id, //内容id,
+        contentType:this.contentData.contentType, //内容id,
+        contentName: this.contentData.contentName, //内容名称
+        progress: 0,
+        lastStudyTime:0,
+        status:2,
+        studyDuration:0,
+        contentTotal: this.totalContent
+      };
+      apiVideoStudy.saveStudyItem(params).then(res=>{
+          if(res.status == 200){
+            this.contentData.studyItemId=res.result.id;
+            this.contentData.status = 2;//进行中状态
+          }else{
+            console.log("记录学习失败:" + res.message + "，" + res.error);
+          }
+      });
+    },
+    finishStudyItem(){ //设置完成学习的内容,针对于音视频的内容
+        if(!this.contentData.studyItemId){
+          //这种可能没有，不过这里也是为了万中那个1
+          this.saveStudyInfo();
+        }else{
+          let params={
+            itemId:this.contentData.studyItemId,
+            studyId:this.studyId,
+            courseId:this.courseId,
+            cnum:this.totalContent
+          }
+          apiVideoStudy.finishStudyItem(params).then(res=>{
+              if(res.status == 200){
+                this.contentData.status = 9;
+                this.contentData.progress = 100;
+              }else{
+                console.log("记录完成学习失败:" + res.message + "，" + res.error);
+              }
+          });
+        }
+    },
+    onFullscreen(full){
+      let divId='videowatermark';
+      var div = document.getElementById('myVideoPlayer')
+      if(full){
+      	var div3 = document.createElement("div");
+        div3.id =divId;
+        div3.setAttribute("class", "fullmark");
+      	div3.innerHTML='';
+        //从父组件传过来的水印内容
+        //div3.innerText =this.userInfo.name+this.userInfo.code;
+      	for(var i=0;i<8;i++){
+      		div3.innerHTML+='<div style="color:#ffffff;width: 40%;height: 155px;padding-left:60px;padding-top:50px; display: flex;justify-content: center; transform: rotate(-36deg);font-size:20px;">'+this.userInfo.name+this.userInfo.loginName+'</div>';
+      	}
+        div3.style.cssText = "position:absolute;pointer-events: none; width: 100%;height: 100%;top:0;left:0;bottom: 0;right: 0; display: flex;justify-content: center;flex-wrap: wrap;overflow: hidden; opacity:0.3;padding-top:10px";
+      	div.appendChild(div3);
+      }else{
+      	var markDiv=div.querySelector("#"+divId);
+      	if(markDiv){
+      		div.removeChild(markDiv);
+      	}
+      }
+    },
+    onPlayerPlay() {
+      //console.log("开始播放");
+      this.playerBoxShow = false;
+      let $this=this;
+      //console.log(this.contentData.status,'this.contentData.status');
+      if(this.contentData.status<9){
+        let completeType=this.curriculumData.completeSetup;
+        //console.log(completeType,'completeType');
+        if(completeType==0){
+          //默认5秒后学习完成.
+          $this.handleTimeout= setTimeout(function() {$this.saveStudyInfo();}, 5000); //5秒后记录学习完成
+        }else{
+          //先记录进行中的学习内容
+          this.saveStudyItem();
+        }
+      }
+    },
+    onPlayerPause() {
+      //console.log("暂停");
+    },
+    onPlayerEnded() {
+      this.playerBoxShow = true;
+      if(this.contentData.status<9){
+        this.finishStudyItem();
+      }
+    },
+    onPlayerPlaying(itme) {
+      this.isAppendTime=false;
+      this.appendStartTime=null;
+      //console.log("当前播放"+itme);
+      //console.log("当前播放11"+itme);
+      if (this.contentData.contentType && this.contentData.contentType == 10) {
+        let intTime = parseInt(itme);
+        //判断是否完成
+        let completeType=this.curriculumData.completeSetup;
+        let completeSecond=this.curriculumData.second;
+        if(!completeSecond){
+          completeSecond=5;//如果没有就采用默认的时间了
+        }
+        if(completeType>0 && this.contentData.status<9){ //因为1按进度，2按时长都是计算时间，所以这里直接大于0处理
+            if(completeType==1){
+              let finishPercent=this.curriculumData.setupTage;
+              let videDuration=this.contentData.duration;
+              let percent =intTime*100/videDuration;
+              if(percent>=finishPercent){
+                  this.finishStudyItem();
+              }
+            }else if(completeType==2){
+              if(intTime>=completeSecond){
+                 this.finishStudyItem();
+              }
+            }
+        }
+        //下面是每隔10秒记录一下次
+        let saveTime = Math.floor(intTime % 10);
+        if (intTime > 10 && intTime!=this.contentData.lastStudyTime && saveTime == 0 && this.contentData.studyItemId != '') {
+          this.contentData.lastStudyTime=intTime;
+          let postData = {
+            itemId: this.contentData.studyItemId,
+            videoTime: intTime
+          };
+          //console.log('记录播放时间')
+          apiStudy.studyVideoTime(postData).then(rs => {
+            if (rs.status != 200) {
+              console.log('记录播放时间错误');
+            }
+          });
+        }
+      }
+    },
+    audioPlaying(item,currentTime) {
+      //console.log("当前播放"+item);
+      let intTime = parseInt(currentTime);
+      //判断是否完成
+      let completeType=this.curriculumData.completeSetup;
+      let completeSecond=this.curriculumData.second;
+      if(!completeSecond){
+        completeSecond=5;//如果没有就采用默认的时间了
+      }
+      if(completeType>0 && this.contentData.status<9){ //因为1按进度，2按时长都是计算时间，所以这里直接大于0处理
+          if(completeType==1){
+            let finishPercent=this.curriculumData.setupTage;
+            let videDuration=this.contentData.duration;
+            let percent =intTime*100/videDuration;
+            if(percent>=finishPercent){
+                this.finishStudyItem();
+            }
+          }else if(completeType==2){
+            if(intTime>=completeSecond){
+               this.finishStudyItem();
+            }
+          }
+      }
+      //下面是每隔10秒记录一下次
+      let saveTime = Math.floor(intTime % 10);
+      if (intTime > 10 && intTime!=this.contentData.lastStudyTime && saveTime == 0 && this.contentData.studyItemId) {
+        this.contentData.lastStudyTime=intTime;
+        let postData = {
+          itemId: this.contentData.studyItemId,
+          videoTime: intTime
+        };
+        //console.log('记录播放时间')
+        apiStudy.studyVideoTime(postData).then(rs => {
+          if (rs.status != 200) {
+            console.log('记录播放时间错误');
+          }
+        });
+      }
+    },
+    audioPlay() {
+      //console.log("开始播放");
+      let $this=this;
+      if(this.contentData.status!=9){
+        let completeType=this.curriculumData.completeSetup;
+        if(completeType==0){
+          //默认5秒后学习完成.
+          $this.handleTimeout= setTimeout(function() {$this.saveStudyInfo();}, 5000); //5秒后记录学习完成
+        }else{
+          //先记录进行中的学习内容
+          this.saveStudyItem();
+        }
+      }
+    },
+    audioPause() {
+      //console.log("暂停");
+    },
+    audioEnd() {
+       //console.log("播放结束");
+      if(this.contentData.status<9){
+        this.finishStudyItem();
+      }
+
+    },
+    loadData() {
+      apiCoursePortal.detail(this.courseId).then(rs => {
+        if (rs.status == 200) {
+          //设置必须的字段
+          rs.result.sections.forEach(sec => {
+            sec.status = 0; //加入状态表未开始
+            rs.result.contents.forEach(c => {
+              c.status = 0; //初始化状态 ，未开始
+              c.studyItemId = ''; //初始化字段，学习条目id
+              c.lastStudyTime = 0; //初始化上次一学习的时间，作用于视频插放
+            });
+          });
+          this.sectionList = rs.result.sections;
+          this.courseInfo = rs.result.course;
+          this.teachers = rs.result.teachers;
+          if (rs.result.teachers && rs.result.teachers.length > 0) {
+            let userIds = [];
+            let ctoUsers = [];
+            rs.result.teachers.forEach(item => {
+              item.authorInfo = { aid: '', name: '', orgInfo: '', avatar: '', code: '',sex:null, };
+              userIds.push(item.teacherId);
+              ctoUsers.push({ aid: item.teacherId, name: item.teacherName });
+            });
+            this.toUsers = ctoUsers;
+            this.loadAuthorInfo(rs.result.teachers, userIds);
+          }
+          this.contentList = rs.result.contents;
+          this.totalContent = rs.result.contents.length;
+          //加载学习的数据
+          this.loadStudyData();
+        } else {
+          this.$message.error(rs.message);
+        }
+      });
+    },
+    loadStudyData() {
+      let $this = this;
+      apiStudy.studyInfo(this.courseId).then(res => {
+        if (res.status == 200) {
+          if (res.result.signup){
+            this.loadScorePraiseAndTrample();
+            this.studyId = res.result.studyId;
+            //对已学习的内容进行比对，重要的字段， 学习内容id，在后缀的
+            let playIndex = -1;
+            this.contentList.forEach((con, conIdx) => {
+              res.result.contents.forEach((scon, sconIdx) => {
+                if (scon.contentId == con.id) {
+                  //定位显示的内容
+                  if ($this.initContentId != '' && $this.initContentId == scon.contentId) {
+                    //定位当前学习的内容，是上一次学习的内容
+                    playIndex = conIdx;
+                  } else {
+                    if (sconIdx == 0 && con.contentType < 52){
+                      playIndex = conIdx;
+                    }
+                  }
+                  //console.log(scon.contentId,con.id);
+                  con.lastStudyTime = scon.lastStudyTime;
+                  //以下判断是为了兼容之前的问题，学习状态
+                  if(scon.status){
+                    con.status = scon.status;
+                  }else{
+                    con.status = 9;
+                  }
+                  con.studyItemId = scon.id; //这个就是学习内容（条目）的id
+                  //console.log(scon.id,"scon.id");
+                  //console.log(con,"scon.id");
+                }
+              });
+            });
+            //如果没有，就定位第一项内容
+            if (playIndex == -1) {
+              this.showRes(this.contentList[0]);
+            } else {
+              this.showRes(this.contentList[playIndex]);
+            }
+          } else {
+            this.$message.error('您还未报名');
+            if (this.courseInfo.type == 10) {
+              location.href = this.webBaseUrl + '/course/micro?id=' + this.courseId;
+            } else {
+              location.href = this.webBaseUrl + '/course/detail?id=' + this.courseId;
+            }
+          }
+        } else {
+          this.$message.error(res.message);
+        }
+      });
+    },
+    saveStudyInfo() {
+      //记录课件学习信息
+      if (this.contentData.contentType >= 60) {
+        //只有在课件页面停留超过5秒才会记录
+        return;
+      }
+      if (this.contentData.status == 9) {
+        //已学习完的，不用再添加
+        return;
+      }
+      let params = {
+        studyId: this.studyId, //学习id,
+        courseId: this.courseId, //课程id,
+        contentId: this.contentData.id, //内容id,
+        contentType:this.contentData.contentType,
+        contentName: this.contentData.contentName, //内容名称
+        progress: 100,
+        status:9,
+        contentTotal: this.totalContent
+      };
+      apiStudy.studyContent(params).then(res => {
+        if (res.status == 200) {
+          this.contentData.status = 9; //完成
+          this.contentData.studyItemId = res.result; //学习记录id
+        } else {
+          console.log('记录学习失败:' + res.message + '，' + res.error);
+        }
+      });
+    },
+    saveStudyDuration(){ //保存本地存储的学习时长
+       let duration=studyUtil.getStudyDuration();
+       if(duration>0){
+           let postData = {
+             id:this.appentId,
+             studyId: this.studyId,
+             courseId: this.courseInfo.id,
+             contentId: this.contentData.id,
+             studyInfo:
+               this.courseInfo.name +
+               "-" +
+               this.contentData.contentName,
+             duration: duration
+           };
+           apiStudy.appendStudyTime(postData).then(rs => {
+             if (rs.status == 200){
+               this.appentId=rs.result;
+               studyUtil.clearStudyDuration();//清除本地存储
+             } else {
+               console.log(rs.message);
+             }
+           });
+       }
+    },
+    appendStudyTime(flag) {
+      if(this.studyId==''){
+        return;
+      }
+      if(!this.contentData.id){
+        return;
+      }
+      if(!this.isAppendTime){
+        this.appendStartTime =null;
+        return;
+      }
+
+      if(this.appendHandle!=null){
+        window.clearTimeout(this.appendHandle);
+      }
+      //首先从本地读取
+      let duration=studyUtil.getStudyDuration();
+      //追加学习时间
+      let $this = this;
+      if (this.appendStartTime == null) {
+        this.appendStartTime = new Date();
+        this.appendHandle=setTimeout(function() {$this.appendStudyTime();}, $this.appentInterval);
+        if(duration>0 && flag){
+          this.saveStudyDuration();
+        }
+        return;
+      }
+      let now = new Date();
+      let m = now.getTime() - this.appendStartTime.getTime(); //相差的毫秒数
+      let sen = parseInt(m / 1000); //计算秒数
+      duration=duration+sen;
+      if(flag) {
+        if(duration>0){
+            let postData = {
+              id:this.appentId,
+              studyId: this.studyId,
+              courseId: this.courseInfo.id,
+              contentId: this.contentData.id,
+              studyInfo:
+                this.courseInfo.name +
+                "-" +
+                this.contentData.contentName,
+              duration: duration
+            };
+            apiStudy.appendStudyTime(postData).then(rs => {
+              if (rs.status == 200){
+                $this.appentId=rs.result;
+                $this.appendStartTime = new Date(); //重置开始时间
+                studyUtil.clearStudyDuration();//清除本地存储
+                //this.appendHandle=setTimeout(function() {$this.appendStudyTime();}, $this.appentInterval);
+              } else {
+                console.log(rs.message);
+              }
+            });
+        }
+      } else {
+        $this.appendStartTime = new Date(); //重置开始时间
+        studyUtil.setStudyDuration(duration);//添加到本地存储中
+      }
+      this.appendHandle=setTimeout(function() {$this.appendStudyTime();},$this.appentInterval);
+    },
+    ctabChange(e) {
+      //当前已经不再使用
+      //console.log(e);
+    },
+    showRes(r,i,index) {//i:子节下标，index:章下标
+      if(i!=undefined && index!=undefined) {
+        if(this.courseInfo.orderStudy) {
+          if(i == 0) {
+            if(index > 0) { //第一章 第一节
+              let preCatalog=this.catalogTree[index-1];
+              let last=preCatalog.children[preCatalog.children.length-1];
+              if(last.status!=9){
+                this.$message.warning('请按顺序学习！');
+                return;
+              }
+            }
+          }else{
+            let pre=this.catalogTree[index].children[i-1];
+            if(pre.status!=9){
+                this.$message.warning('请按顺序学习！');
+                return;
+              }
+          }
+        }
+      }
+
+      this.playerBoxShow=false;
+      //显示内容部分
+      let $this = this;
+      this.resType = r.contentType;
+      this.contentData = r;
+      this.saveStudyDuration();
+
+      if(r.contentType == 10 || r.contentType == 20) {
+          if (r.content.startsWith('\{')) {
+              this.curriculumData = JSON.parse(r.content);
+            } else {
+              this.curriculumData.url = r.content;
+            }
+            //let url=process.env.VUE_APP_BASE_API+'/xboe/m/course/file/show?cf='+this.curriculumData.url;
+            let url=this.fileBaseUrl+this.curriculumData.url;
+            //this.createVideoBlob(url);
+      } else if (r.contentType == 40) {
+        // if (r.content != '' && r.content.indexOf('.pdf') == -1) {
+          apiCourseFile.detail(r.contentRefId).then(cfrs => {
+            if (cfrs.status == 200) {
+              r.content = cfrs.result.previewFilePath;
+              this.curCFile = cfrs.result;
+              if(cfrs.result.previewFilePath == '' && cfrs.result.filePath.indexOf('pdf') > -1) {
+                r.content = cfrs.result.filePath;
+              }
+            } else {
+              $this.$message.error('加载pdf课件文件失败');
+            }
+          });
+        // }
+      } else if (r.contentType == 52) {
+        this.isAppendTime=false;
+        if (r.content.startsWith('\{')) {
+          this.conLink = JSON.parse(r.content);
+        } else {
+          this.conLink.url = r.content;
+          this.conLink.openType = 1;
+        }
+        if (this.conLink.openType == 2) {
+          //直接设置完成状态
+          this.widthOpen(this.conLink.url);
+        }
+        //this.conLink=
+      } else if (r.contentType == 61) {
+        // 考试
+      } else if (r.contentType == 60) {
+        // 作业
+      } else if (r.contentType == 62) {
+        // 评估
+        //评估不需要查找，因为内容就是content中
+        console.log('评估处理');
+      }
+      if(this.contentData.status<2){
+         this.contentData.status=2;//进行中
+      }
+      if(this.contentData.contentType>20){ //非视频类的
+        this.isAppendTime=true;
+        this.appendStudyTime();
+        this.handleTimeout= setTimeout(function() {$this.saveStudyInfo();}, 5000); //5秒后记录学习完成
+      }
+
+    },
+    handleChange(val) {
+      console.log(val);
+    },
+    loadScorePraiseAndTrample() {
+      //加载是否请过分
+      apiCourseGrade.has(this.courseId).then(rs => {
+        if (rs.status == 200 && rs.result) {
+          this.scoreInfo.has = true;
+        }
+      });
+      apiPraises.has(1, this.courseId).then(rs => {
+        if (rs.status == 200 && rs.result) {
+          this.isPraise = true;
+        }
+      });
+      apiTrample.has(this.courseId).then(rs => {
+        if (rs.status == 200 && rs.result) {
+          this.isTrample = true;
+        }
+      });
+    },
+    addScore() {
+      let that = this;
+      let postData = {
+        courseId: this.courseInfo.id,
+        studyId: this.studyId,
+        score: this.scoreInfo.score
+      };
+      if (this.scoreInfo.score > 0) {
+        apiCourseGrade.grade(postData).then(rs => {
+          if (rs.status == 200){
+            this.$message.success('打分成功，谢谢您的打分');
+            that.scoreInfo.has = true;
+            that.courseInfo.score = rs.result;
+          } else {
+            this.$message.error('打分处理失败，请稍后再试');
+          }
+        });
+      }
+    },
+    praiseContent() {
+      if (this.isTrample) {
+        this.$message.error('您已踩过了，不能再赞了');
+        return;
+      }
+       if(this.interactRuning){
+				return;
+			}
+			this.interactRuning=true;
+      let postData = {
+        objType: 1,
+        objId: this.courseId,
+        title: this.courseInfo.name
+      };
+      if (this.isPraise) {
+        apiPraises.remove(1, this.courseInfo.id).then(res => {
+          this.interactRuning=false;
+          if (res.status == 200) {
+            this.$message.info('已取消点赞');
+            this.isPraise = false;
+            this.courseInfo.praises--;
+          } else {
+            this.$message.error('取消点赞失败,请稍后再试');
+          }
+        });
+      } else {
+        apiPraises.save(postData).then(rs => {
+          this.interactRuning=false;
+          if (rs.status == 200) {
+            this.$message.success('点赞成功');
+            this.isPraise = true;
+            this.courseInfo.praises++;
+          } else {
+            this.$message.error('点赞失败,请稍后再试');
+          }
+        });
+      }
+    },
+    treadContent() {
+      if (this.isPraise) {
+        this.$message.error('您已赞过了，不能再踩了');
+        return;
+      }
+       if(this.interactRuning){
+				return;
+			}
+			this.interactRuning=true;
+      if (this.isTrample) {
+        apiTrample.remove(this.courseInfo.id).then(rs => {
+          this.interactRuning=false;
+          if (rs.status == 200) {
+            this.$message.info('已取消踩');
+            this.isTrample = false;
+            this.courseInfo.trampleCount--;
+          } else {
+            this.$message.error('取消失败,请稍后再试');
+          }
+        });
+      } else {
+        apiTrample.trample(this.courseInfo.id).then(rs => {
+          this.interactRuning=false;
+          if (rs.status == 200) {
+            this.$message.success('已踩');
+            this.isTrample = true;
+            this.courseInfo.trampleCount++;
+          } else {
+            this.$message.error('踩失败,请稍后再试');
+          }
+        });
+      }
+    },
+    statusToContent(status) {
+      let data = null;
+      switch (status) {
+        case 1: {
+          data = {
+            text: '未开始',
+            class: 'catalog-cell-state1'
+          };
+          break;
+        }
+        case 2: {
+          data = {
+            text: '进行中',
+            class: 'catalog-cell-state2'
+          };
+          break;
+        }
+        case 9: {
+          data = {
+            text: '已完成',
+            class: 'catalog-cell-state9'
+          };
+          break;
+        }
+        default:
+          {
+            data = {
+              text: '未开始',
+              class: 'catalog-cell-state1'
+            };
+          }
+          break;
+      }
+      return data;
+    },
+    loadAuthorInfo(list, ids) {
+      //加载作者信息，头像，机构信息
+      if (ids.length == 0) {
+        return;
+      }
+      apiUser.getByIds(ids).then(res => {
+        if (res.status == 200) {
+          list.forEach((item, index) => {
+            res.result.some(author => {
+              if (author.aid == item.teacherId) {
+                item.authorInfo = author;
+                return true;
+              } else {
+                return false;
+              }
+            });
+          });
+        } else {
+          //console.log('加载课程信息失败:'+res.error);
+          //this.$message.error(res.message);
+        }
+      });
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.mltit{
+  
+  // width: 70%;
+  // width: ;
+  word-break:break-all;
+  // line-height: 25px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+}
+.catalog-text{
+  width: 70%;
+  overflow: hidden;
+  word-break:break-all;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+  height: 40px;
+}
+.player-box{
+  position: absolute;
+  // top: 62px;
+  // left: 184px;
+  width: 300px;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  height: 187px;
+  background: rgba(74, 74, 74,.5);
+  border-radius: 33px;
+  text-align: center;
+  padding: 20px;
+  box-sizing: border-box;
+  .player-praise{
+    margin-top: 25px;
+    display: flex;
+    // justify-items: center;
+    justify-content: center;
+  }
+  .player-rate{
+    margin-top: 35px;
+  }
+}
+.score {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  .el-rate {
+    display: inline-block;
+  }
+  .score-text {
+    font-size: 28px;
+    color: #ffb30f;
+    font-family: 'Arial';
+    margin-left: 23px;
+    // font-weight: 600;
+  }
+  // margin-bottom: 19px;
+  .score-no {
+    color: #ffb30f;
+    padding: 5px 0;
+    background: #efefef;
+    border-radius: 20px;
+    width: 65px;
+    font-size: 12px;
+    font-weight: 600;
+    text-align: center;
+  }
+}
+.portal-content-title {
+  font-weight: 600;
+  padding: 10px;
+  font-size: 22px;
+  line-height: 40px;
+  color: #333333;
+  word-break:break-all;
+}
+
+.type-kuang {
+  color: #666666;
+  border: 1px solid #666666;
+}
+.type-click {
+  color: #ffb30f !important;
+  border: 1px solid #ffb30f !important;
+}
+::v-deep .el-rate__icon {
+  font-size: 22px;
+  margin-right: 6px;
+  color: #ff8e00;
+  transition: 0.3s;
+}
+.ref-score {
+  // background: #e4e4e4;
+  // width: 64px;
+  // height: 32px;
+  // border-radius: 17px;
+  // line-height: 32px;
+  // // opacity: 0.24;
+  // color: #000;
+  // font-size: 14px;
+  // border: none;
+}
+.icon-small {
+  width: 20px;
+  height: 20px;
+  line-height: 20px;
+  vertical-align: middle;
+}
+.con-audio {
+  padding: 50px;
+  text-align: center;
+  .con-audio-title {
+    font-size: 16px;
+    font-weight: 700;
+  }
+  .con-audio-player {
+    padding: 20px 100px;
+  }
+}
+.hyper-link {
+  padding-left: 20px;
+  text-align: center;
+  padding-top: 100px;
+  .hyper-link-row {
+    padding: 20px;
+  }
+}
+.catalog-box {
+  background: #fff;
+  // padding: 15px 0px;
+  // box-shadow: 1px 1px 2px 2px #ededed;
+  .title {
+    font-size: 16px;
+    font-weight: 600;
+    color: #333333;
+    padding-left: 20px;
+  }
+}
+.collapse-title {
+  flex: 1 0 90%;
+  order: 1;
+}
+
+.el-collapse-item__header {
+  flex: 1 0 auto;
+  order: -1;
+}
+.course-interact {
+  height: 54px;
+  // padding-top: 10px;
+  // padding-right: 10px;
+  padding: 0 20px;
+  line-height: 54px;
+  background-color: #FFFFFF;
+  display: flex;
+  justify-content: space-between;
+  box-sizing: border-box;
+}
+.interact-btn {
+  margin-right: 10px;
+}
+.uc-badge {
+  margin-top: 10px;
+  margin-right: 40px;
+}
+.cres-list {
+  list-style-type: decimal;
+  margin: 0px;
+  li {
+    line-height: 30px;
+  }
+  .current {
+    color: #1ea0fa;
+  }
+}
+.uc-course {
+  display: flex;
+  justify-content: space-around;
+  border: 1px solid #f0f0f0;
+  padding: 10px;
+  .uc-course-img {
+    width: 200px;
+    img {
+      width: 200px;
+      border: 1px solid #f4f4f5;
+    }
+  }
+  .uc-course-info {
+    flex: 1;
+    line-height: 28px;
+    padding: 0px 10px;
+    .uc-course-name {
+      font-size: 18px;
+      font-weight: 700;
+    }
+    .uc-course-text {
+      color: #747474;
+    }
+  }
+  .uc-course-btns {
+    width: 150px;
+  }
+}
+
+.catalog-cell-state2 {
+  height: 24px;
+  width: 58px;
+  line-height: 20px;
+  border: 0px dotted #bed2f8;
+  padding: 3px 10px;
+  color: #ff8e00;
+  font-size: 12px;
+  border-radius: 6px;
+  margin-left: 2px;
+  background: #ffedd6;
+}
+.catalog-cell-state9 {
+  height: 24px;
+  width: 58px;
+  line-height: 20px;
+  border: 0px dotted #bed2f8;
+  padding: 3px 10px;
+  color: #3e7fff;
+  font-size: 12px;
+  border-radius: 6px;
+  margin-left: 2px;
+  background: #edf2fd;
+  // margin-left: 68%;
+  // background-color: #BED2F8;
+}
+.catalog-cell-state1 {
+  height: 24px;
+  width: 58px;
+  line-height: 20px;
+  border: 0px dotted #edf2fd;
+  border-radius: 6px;
+  padding: 3px 10px;
+  color: #ff3e3e;
+  font-size: 12px;
+  margin-left: 2px;
+  background: #fff0f0;
+}
+.catalog {
+  height: 500px;
+  max-width: 500px;
+  overflow: auto;
+  .catalog-row {
+    margin: 0px;
+    padding: 0px 10px 10px 10px;
+    .title-type {
+      width: 36px;
+      height: 24px;
+      padding: 2px 5px;
+      color: #666666;
+      border: 1px solid #666666;
+      margin-right: 8px;
+    }
+    ul {
+      padding: 0px;
+      margin: 0px;
+      li {
+        padding: 6px 0;
+      }
+    }
+    .catalog-cell {
+      line-height: 32px;
+      cursor: pointer;
+      list-style: none;
+      margin: 0px;
+      padding-left: 20px;
+      color: #5c5c5c;
+    }
+  }
+}
+.video-div {
+  position: absolute;
+  z-index: 999999999;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(101, 101, 101, 0.9);
+  .good {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-top: 200px;
+    div {
+      line-height: 1;
+      margin: 0 15px;
+      .svg-icon {
+        width: 30px;
+        height: 30px;
+      }
+    }
+    div:nth-of-type(2) {
+      .svg-icon {
+        transform: scaleX(-1);
+        transform: rotate(180deg);
+      }
+    }
+    // margin-bottom: 50px;
+    // line-height: 20px;
+    // .el-link{
+    //   font-size: 30px;
+    //   color: #70a5f4;
+    //   margin: 0 30px;
+    // }
+  }
+  // .score {
+  //   display: flex;
+  //   justify-content: center;
+  //   align-items: center;
+  //   padding-top: 20px
+  // }
+}
+
+::v-deep .el-tag {
+    background-color: #ecf5ff;
+    border-color: #409EFF;
+    display: inline-block;
+    height: 28px;
+    padding: 0 10px;
+    line-height: 28px;
+    font-size: 12px;
+    color: #3e7fff;
+    border-width: 1px;
+    border-style: solid;
+    border-radius: 0px;
+    box-sizing: border-box;
+    white-space: nowrap;
+}
+::v-deep .teacher .teacher-avator .teacher-text{
+  background: none;
+  border: none;
+}
+.teacher {
+  background-color: #ffffff;
+  display: flex;
+  border-top: 1px solid #e7e7e7;
+  padding: 10px 0px;
+  .teacher-avator {
+    ::v-deep .el-avatar {
+      width: 68px !important;
+      height: 68px !important;
+      border-radius: 0px;
+    }
+    .teacher-text {
+      width: 68px;
+      height: 68px;
+      div{
+        img{
+           width: 68px;
+           height: 68px;
+        }
+      }
+      // text-align: center;
+      // line-height: 68px;
+      // border-radius: 50%;
+      // color: #73adfe;
+      // border: 2px solid #73adfe;
+      // background: #d9e9ff;
+    }
+  }
+  .teacher-info {
+    flex: 1;
+    .teacher-name {
+      padding: 0px 5px 10px 10px;
+    }
+    .teacher-remark {
+      padding: 0px 5px 0 10px;
+      font-size: 14px;
+      color: #666666;
+      line-height: 20px;
+    }
+  }
+}
+.teachers {
+  background-color: #fff;
+  margin-top: 10px;
+  padding: 5px 15px 5px 10px;
+  .top {
+    font-size: 16px;
+    font-weight: 600;
+    line-height: 50px;
+  }
+}
+.breadname {
+  margin-bottom: 15px;
+}
+//目录的样式更改
+::v-deep .el-collapse-item{
+  .el-collapse-item__header{
+    // position: relative;
+    direction:rtl;
+    display: flex;
+    // justify-content;
+    justify-content: space-between;
+    // .el-collapse-item__arrow{
+    //   float:right;
+    // }
+    // span{
+    //   float:right;
+    // }
+    i{
+      display:none
+    }
+  }
+}
+</style>

From ef55032c44fd1c1b5963e14d67172af721f8bbdb Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Thu, 2 Jun 2022 12:26:48 +0800
Subject: [PATCH 16/19] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=97=A0=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E8=AF=BE=E7=A8=8B=E6=97=B6=EF=BC=8C=E5=8B=BE=E9=80=89?=
 =?UTF-8?q?=E6=A1=86=E5=BA=94=E8=AF=A5=E5=92=8C=E6=8F=90=E4=BA=A4=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=90=8C=E6=97=B6=E5=87=BA=E7=8E=B0=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Course/courseForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue
index 4536ddc3..d0df5854 100644
--- a/src/components/Course/courseForm.vue
+++ b/src/components/Course/courseForm.vue
@@ -180,7 +180,7 @@
 
       <div style="padding-right: 30px;"><div></div></div>
       <span slot="footer" class="dialog-footer">
-         <el-checkbox style="margin-right:10px" v-model="checked"></el-checkbox><span style="font-size:14px;color:#787878;">我已阅读并遵守<span style="color:#588afc;margin-right:10px;cursor: pointer;" @click="courseInfoFormCheckedShow = true">平台内容发布要求</span></span>
+         <el-checkbox style="margin-right:10px" v-if="curCourseId != ''" v-model="checked"></el-checkbox><span v-if="curCourseId != ''" style="font-size:14px;color:#787878;">我已阅读并遵守<span style="color:#588afc;margin-right:10px;cursor: pointer;" @click="courseInfoFormCheckedShow = true">平台内容发布要求</span></span>
         <!-- <el-button v-if="curCourseId!=''  && contentInfo.list.length>0">预览</el-button> -->
         <el-button :loading="btnLoading" v-if="curCourseId != ''" :disabled="!checked" @click="submitCourse()" type="primary">提交审核</el-button>
         <el-button @click="closeForm()">关闭</el-button>

From 1cb586d793f972639d725306e0632e6a1a368f6f Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Thu, 2 Jun 2022 13:52:08 +0800
Subject: [PATCH 17/19] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=AF=95=E5=8D=B7?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=95=B0=E6=8D=AE=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/exam/TestPaper.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/exam/TestPaper.vue b/src/views/exam/TestPaper.vue
index 399d537e..c0e3acfa 100644
--- a/src/views/exam/TestPaper.vue
+++ b/src/views/exam/TestPaper.vue
@@ -451,7 +451,10 @@ export default {
   this.resOwner = [];
   this.formTab = 'info';
   this.totalScore=0;
+  this.qlib.type= '';
+  this.qlib.title= '';
   this.paperLength=0;
+  this.question.all = false;
   this.question.list =[];
   this.question.checkQuest = [];
  },

From 5f358418e77c0a65f179a14da36cf022b82f36f6 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Thu, 2 Jun 2022 14:03:21 +0800
Subject: [PATCH 18/19] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/exam/TestPaper.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/exam/TestPaper.vue b/src/views/exam/TestPaper.vue
index c0e3acfa..5b6d27bb 100644
--- a/src/views/exam/TestPaper.vue
+++ b/src/views/exam/TestPaper.vue
@@ -155,7 +155,7 @@
                       <el-form-item>
                         <el-button type="primary" @click="selectQuery()">搜索</el-button>
                         <!-- <el-button type="primary" size="mini" @click="randomTest.showRandom = true">批量导入</el-button> -->
-                        <el-button @click="addPageBreak" type="primary" size="mini">分页符</el-button>
+                        <!-- <el-button @click="addPageBreak" type="primary" size="mini">分页符</el-button> -->
                       </el-form-item>
                       <el-form-item><el-checkbox v-model="qpaper.optShow">选项</el-checkbox></el-form-item>
                     </el-form>
@@ -454,7 +454,7 @@ export default {
   this.qlib.type= '';
   this.qlib.title= '';
   this.paperLength=0;
-  this.question.all = false;
+  this.question.all =
   this.question.list =[];
   this.question.checkQuest = [];
  },

From a1841fe7973cd6963d92201dad970d28f2c0e736 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Thu, 2 Jun 2022 15:01:25 +0800
Subject: [PATCH 19/19] =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=80=85=E8=BF=9B?=
 =?UTF-8?q?=E9=98=B6=E8=B7=B3=E5=88=B0=E5=AD=A6=E4=B9=A0=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/PortalHeader.vue | 2 +-
 src/views/Index.vue             | 1 +
 src/views/StudyIndex.vue        | 8 ++++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue
index dbd6a0d2..59fa073e 100644
--- a/src/components/PortalHeader.vue
+++ b/src/components/PortalHeader.vue
@@ -162,7 +162,7 @@ export default {
       let obj = {
         one: urlPre+'/web/teacherLesson',
         two: urlPre+'/grow180/login',
-        three: this.webBaseUrl + '/study/index',
+        three: this.webBaseUrl + '/study/index?study=1',
         four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
         five: urlPre+'/boe/new-employee/index.html'
       };
diff --git a/src/views/Index.vue b/src/views/Index.vue
index ce9b731e..3edae977 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -373,6 +373,7 @@ export default {
       };
       let isTopList = [];
       let data = [];
+      this.courseList.list = [];
       apiCoursePortal.pageList(course).then(res => {
 
         if (res.status == 200 && res.result.list.length > 0) {
diff --git a/src/views/StudyIndex.vue b/src/views/StudyIndex.vue
index ea70a1fb..3c44cc33 100644
--- a/src/views/StudyIndex.vue
+++ b/src/views/StudyIndex.vue
@@ -123,7 +123,7 @@
     },
     beforeCreate() {
       this.loading = true;
-                let params={
+      let params={
           // keyword:this.keyword,
           page:1,
           size:10,
@@ -138,7 +138,11 @@
            if(res.result.count > 0) {
               this.$router.push('/uc/study/task')
            } else {
-              this.$router.push('/uc/study/courses')
+             if(this.$route.query.study == '1') {
+                this.$router.push('/uc/study/task')
+             } else {
+                this.$router.push('/uc/study/courses')
+             }
            }
          }else{
             this.$router.push('/uc/study/courses')