增加乐享转向

# Conflicts:
#	src/views/Login.vue

.env.production

@@ -28,7 +28,7 @@ VUE_APP_FILE_BASE_URL='https://u.boe.com/upload'
 VUE_APP_FILE_RELATIVE_PATH = '/upload'
 
 # 受众批量导入人员信息URL
-VUE_APP_AUDIENCE_IMPORT_URL = 'http://10.251.132.177/userbasic/audience/import'
+VUE_APP_AUDIENCE_IMPORT_URL = 'https://u.boe.com/userbasic/audience/import'
 
 
 
@@ -40,10 +40,10 @@ VUE_APP_MANAGER_API_PATH='/manageApi'
 VUE_APP_GROWTH_API_PATH='/growth'
 
 # 登录地址
-VUE_APP_LOGIN_URL='http://10.251.132.177/web/'
+VUE_APP_LOGIN_URL='https://u.boe.com/web/'
 
 # scorm课件的播放url地址
-VUE_APP_SCORM_URL = 'http://10.251.132.177/newscorm/scorm-player'
+VUE_APP_SCORM_URL = 'https://u.boe.com/newscorm/scorm-player'
 
 #案例组织领域类型
 VUE_APP_CASE_TYPE = '155'

src/components/Course/exam.vue

@@ -329,6 +329,8 @@ export default {
       apiExamPaper.newPaperContent(this.info.id).then(res=>{
         if(!res.error&&res.result != ''){
           if(this.info.paperType==2){
+            //TODO1
+            console.log("调用开始考试 if paperType == 2")
             this.examPaper.json=res.result;
             let qitems=this.convertToItems(this.examPaper.json);
             this.paper ={items:qitems};
@@ -336,9 +338,11 @@ export default {
             this.curItem=qitems[this.curIndex];
             this.startTime=new Date();//记录开始时间
             this.timerValue=this.info.testDuration;
+            this.content.status=1;
             this.timer=setInterval(this.changeTimer,60000);
             this.testStart=true;
           }else{
+            console.log("调用开始考试 else paperType != 2")
             let paper= {items:res.result};
             paper.items.forEach(item=>{
               if(item.type==101){
@@ -585,8 +589,10 @@ export default {
             console.log("获取数据结果 考试 res ==>",res)
             this.records.push(res.result);
             //TODO 评分更改 最终完成
-            if(res.result.scope > res.result.passLine){
+            if(res.result.score > res.result.passLine){
               this.content.status=9;//表已学习完，判断上级的章是否已完成
+            }else{
+              this.content.status=1;
             }
 
             this.studyItemId=res.result.studyItemId;//第一次保存时是没有的，所以这里要赋值

src/components/UserCenter/menu.vue

@@ -242,17 +242,20 @@
           <svg-icon :icon-class="activeMenu == '/user/medal'?'myxunzhang-active':'myxunzhang'"></svg-icon>
           <span slot="title">我的勋章</span>
       </el-menu-item>
-        <el-submenu index="myGrowth" v-show="curIdentity == 1">
+        <template v-if="showGrowthNav">
-          <template slot="title">
+          <el-submenu index="myGrowth" v-show="curIdentity == 1">
-            <!-- <i class="el-icon-s-grid"></i> -->
+            <template slot="title">
-            <img src="../../assets/images/myGrowth.jpg" style="width: 1em;height: 1em;margin-right: 8px;"></img>
+              <!-- <i class="el-icon-s-grid"></i> -->
-            <span>我的必修</span>
+              <img src="../../assets/images/myGrowth.jpg" style="width: 1em;height: 1em;margin-right: 8px;"></img>
-          </template>
+              <span>我的必修</span>
-          <el-menu-item index="/growth/growthPage">
+            </template>
-            <!-- <i class="el-icon-menu"></i> -->
+            <el-menu-item index="/growth/growthPage">
-            <span slot="title" class="study textl">专业力必修</span>
+              <!-- <i class="el-icon-menu"></i> -->
-          </el-menu-item>
+              <span slot="title" class="study textl">专业力必修</span>
-        </el-submenu>
+            </el-menu-item>
+          </el-submenu>
+        </template>
+
         <el-submenu index="mystudy" v-show="curIdentity == 1">
           <template slot="title">
             <!-- <i class="el-icon-s-grid"></i> -->
@@ -396,6 +399,7 @@ import { mapGetters } from 'vuex';
 import apicourseStudy from "../../api/modules/courseStudy.js"
 import {pageList} from "@/api/modules/lecturer"
 import courseImage from "@/components/Course/courseImage.vue"
+import { listData } from "@/api/growth/growthpath"
 import testUser from '@/utils/testUsers.js'
 export default {
   name: 'UcMenu',
@@ -424,7 +428,8 @@ export default {
       isCollapse: false,
       lastStudy:{},
       overlayShow: false,
-      instructor:0
+      instructor:0,
+      showGrowthNav: false
     };
   },
   created() {
@@ -434,6 +439,10 @@ export default {
     //获取讲师认证中条数
     this.instructorCertification()
     console.log(this.userInfo,'userInfouserInfo')
+    //如果专业力必修没有学习任务则隐藏“我的必修按钮”
+    listData().then(res => {
+      this.showGrowthNav = !!res.data.length
+    })
   },
   mounted() {
     //console.log(this.userInfo.loginName,'this.userInfo.loginName');

src/components/VideoPlayer/index.vue

@@ -506,6 +506,13 @@ export default {
     updateProgressBySetTime(newCurrentTime) {
       this.currentProgress = newCurrentTime / this.videoDom.duration;
     },
+    /* 点击进度条更新视频播放进度2
+    */
+    updateProgressByClickBar2(newCurrentTime,progressVideo) {
+      this.currentProgress = progressVideo;
+      this.barrageTimelineStart = newCurrentTime;
+      this.videoDom.currentTime = newCurrentTime;
+    },
     /* 提高视频音量
      */
     increaseVolume() {
@@ -619,7 +626,7 @@ export default {
     handleFullscreenChange() {
       console.log("handleFullscreenChange gx this.isFullScreen()",this.isFullScreen())
       console.log("handleFullscreenChange gx this.isFullscreen",this.isFullscreen)
-    
+
       if(this.isFullscreen){
         this.isFullscreen = !!document.fullscreenElement;
         if (!this.isFullscreen) {
@@ -629,7 +636,7 @@ export default {
         }
       }
 
-     
+
     }
   },
   watch: {

src/router/index.js

@@ -341,6 +341,13 @@ export const constantRoutes = [{
     name: 'hotforum',
     meta: {title: '热点论坛', icon: 'dashboard', noCache: true, affix: true},
   },
+  {
+    path: '/lexiang',
+    hidden: true,
+    component: (resolve) => require(['@/views/sso/lexiang'], resolve),
+    name: 'lexiang',
+    meta: {title: '单点登录', icon: 'dashboard', noCache: true, affix: true},
+  },
   {
     path: '/404',
     component: (resolve) => require(['@/views/error/404'], resolve),

src/views/Login.vue

@@ -1,3 +1,4 @@
+<!--
 <template>
   <div class="login" :style="`background: url(${webBaseUrl}/temp/background.jpg) no-repeat`">
     <el-form :model="form" ref="form" :rules="rules">
@@ -24,7 +25,7 @@
       <el-form-item>
         <section>
           <el-checkbox v-model="rememberMe">记住密码</el-checkbox>
-          <!-- <span>忘记密码</span> -->
+          &lt;!&ndash; <span>忘记密码</span> &ndash;&gt;
         </section>
       </el-form-item>
       <el-form-item><el-button type="primary" @click="loginSubmit">点击登录</el-button></el-form-item>
@@ -194,3 +195,4 @@
   }
 }
 </style>
+-->

src/views/course/ManageList.vue

@@ -195,14 +195,14 @@
       </template>
     </el-dialog>
     <!--课程管理-->
-    <el-dialog 
+    <el-dialog
-        custom-class="g-dialog" 
+        custom-class="g-dialog"
-        title="课程学习管理" 
+        title="课程学习管理"
         width="900px"
-        height="900px" 
+        height="900px"
-        :visible.sync="manageStudy.dlgShow" 
+        :visible.sync="manageStudy.dlgShow"
         :close-on-click-modal="false"
-        
+
         >
       <manager :manageStudyData="manageStudyData" :isShowDialog="manageStudy.dlgShow"></manager>
       <template #footer>
@@ -676,8 +676,10 @@ export default {
       }
       apiCourse.pageList(this.params).then(rs=>{
           if(rs.status==200){
-            this.pageData = rs.result.list;
+            this.pageData = rs.result.list ? rs.result.list : [];
+            // this.pageData = rs.result.list;
             this.page.count = rs.result.count;
+            this.page.pageSize = rs.result.pageSize;
           }else{
             return this.$message.error(rs.message);
           }

src/views/sso/lexiang.vue

@@ -0,0 +1,53 @@
+<template>
+  <div>
+    <p v-if="loading">正在跳转，请稍候...</p>
+    <p v-if="error" class="error">{{ errorMessage }}</p>
+  </div>
+</template>
+
+<script>
+import axios from 'axios'
+
+export default {
+  data() {
+    return {
+      loading: true,
+      error: false,
+      errorMessage: ''
+    }
+  },
+  created() {
+    this.fetchCode()
+  },
+  methods: {
+    async fetchCode() {
+      try {
+        // 替换为你的实际API地址
+        const response = await axios.post('/userbasic/sso/getCode', {})
+        const code = response.data.result
+        if (code) {
+          // 替换为你的目标外部链接，并确保参数名称正确
+          const redirectUrl = `https://lexiangla.com?company_from=d1f3b156e9ed11ef9dc9720f77c5afa9&sso_auth_code=${encodeURIComponent(code)}`
+          window.location.href = redirectUrl
+        } else {
+          this.handleError('未获取到有效code')
+        }
+      } catch (error) {
+        this.handleError(`请求失败: ${error.message}`)
+      }
+    },
+    handleError(message) {
+      this.loading = false
+      this.error = true
+      this.errorMessage = message
+    }
+  }
+}
+</script>
+
+<style>
+.error {
+  color: red;
+  font-weight: bold;
+}
+</style>

src/views/study/coursenew.vue

@@ -291,7 +291,8 @@
                     <!-- <span style="font-size: 12px; color:#666666 ;">( {{cutOrgNamePath(item.authorInfo.orgInfo)}} )</span> -->
                 </div>
                 <!-- <div class="teacher-remark" v-html="item.authorInfo.sign"></div> -->
-                <div class="teacher-remark">{{cutOrgNamePath(item.authorInfo.orgInfo)}}</div>
+                <div v-if="item.teacherType === 1 " class="teacher-remark">{{cutOrgNamePath(item.authorInfo.orgInfo)}}</div>
+                <div v-else>{{item.supplier}}</div>
               </div>
               <div  style="padding-top:15px;width:70px;">
                 <followButton v-if="item.teacherName!=='BOE教师'" :auto="true" size="small" :aid="item.teacherId"></followButton>
@@ -592,7 +593,6 @@
            this.onPlayerPause()
            //this.audioPause();
            this.contentData.lastStudyTime=time;
-           //this.onPlayerPlay();
            setTimeout(() => {
              $this.$refs.myVideoPlayer.startPlay(time);
            }, 10)
@@ -609,7 +609,6 @@
             if(toResContent){
 
               this.changePlayRes(toResContent);
-              //this.onPlayerPlay();
               setTimeout(() => {
                 $this.$refs.myVideoPlayer.startPlay(time);
               }, 10)
@@ -801,6 +800,11 @@
 
 
         this.$nextTick(function(){
+            if(this.contentData.progressVideo){
+              this.$refs.myVideoPlayer.updateProgressByClickBar2(this.contentData.lastStudyTime,this.contentData.progressVideo);
+              // $this.notePlay = this.contentData.lastStudyTime;
+            }
+
             //let h0=document.getElementById('id_course_player').offsetHeight;
             let h=$this.$refs.coursePlayer.offsetHeight;
             //let h1=$this.$refs.coursePlayer.clientHeight;
@@ -1158,7 +1162,7 @@
         //   }
         // }
       },
-      
+
       onFullscreen(full) {
         let divId = 'videowatermark';
         var div = document.getElementById('myVideoPlayer')
@@ -1419,9 +1423,7 @@
             //处理内容的名称
             this.totalContent = rs.result.contents.length;
             //加载学习的数据
-            //this.loadStudyData();
             this.loadStudyData(rs.result);
-
           } else {
             this.$message.error(rs.message);
           }
@@ -1447,6 +1449,7 @@
               }
               //console.log(scon.contentId,con.id);
               con.lastStudyTime = scon.lastStudyTime;
+              con.progressVideo = scon.progressVideo;
               //以下判断是为了兼容之前的问题，学习状态
               if (scon.status) {
                 con.status = scon.status;
@@ -1637,63 +1640,9 @@
             this.appentInterval = 60
             let totalTime = Math.round((endTime - this.appendStartTime) / 1000);
             this.appendStudyTime();
-            this.saveStudyDuration(totalTime)
+            this.saveStudyDuration(totalTime);
         }, this.appentInterval * 1000);
       },
-      //追加学习时长， flag是否提交到后台
-      // appendStudyTime() {
-      //   //console.log('开始追加学习时长',this.isAppendTime);
-      //   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();
-      //   //console.log('追加学习时长，当前本地积累的学习时长='+duration);
-      //   //追加学习长
-      //   let $this = this;
-      //   if (this.appendStartTime == null) {
-      //     this.appendStartTime = new Date();
-      //     this.appendHandle = setTimeout(function() {
-      //       $this.appendStudyTime();
-      //     }, $this.appentInterval); //设置定时追加学习时长
-      //     //保存之前的
-      //     if (duration >= 60 ) {
-      //       this.saveStudyDuration(duration);
-      //     }
-      //     return;
-      //   }
-      //   //如果当前追加开始时间不为空
-      //   let now = new Date();
-      //   let m = now.getTime() - this.appendStartTime.getTime(); //相差的毫秒数
-      //   // console.log(m/1000,'时间');
-
-      //   let sen = Math.round(m / 1000); //计算秒数
-      //   // console.log('定时器时间',sen);
-      //   // 每次添加的是定时器计时的时间
-      //   duration = duration + sen;//追加的是秒
-      //   if (duration >= 60) { //一分钟保存一次
-      //       this.saveStudyDuration(duration);
-      //   } else {
-      //       studyUtil.setStudyDuration(duration); //添加到本地存储中
-      //   }
-      //   //重新覆盖时间
-      //   this.appendStartTime = new Date();
-      //   //启动下次追加学习时长
-      //   this.appendHandle = setTimeout(function() {
-      //       $this.appendStudyTime();
-      //   }, $this.appentInterval);
-      // },
 
       finishStudyItem() { //设置完成学习的内容,针对于音视频的内容
         if (!this.contentData.studyItemId) {