修改排行榜展示数据不对问题

# 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 slot="title">
-            <!-- <i class="el-icon-s-grid"></i> -->
-            <img src="../../assets/images/myGrowth.jpg" style="width: 1em;height: 1em;margin-right: 8px;"></img>
-            <span>我的必修</span>
-          </template>
-          <el-menu-item index="/growth/growthPage">
-            <!-- <i class="el-icon-menu"></i> -->
-            <span slot="title" class="study textl">专业力必修</span>
-          </el-menu-item>
-        </el-submenu>
+        <template v-if="showGrowthNav">
+          <el-submenu index="myGrowth" v-show="curIdentity == 1">
+            <template slot="title">
+              <!-- <i class="el-icon-s-grid"></i> -->
+              <img src="../../assets/images/myGrowth.jpg" style="width: 1em;height: 1em;margin-right: 8px;"></img>
+              <span>我的必修</span>
+            </template>
+            <el-menu-item index="/growth/growthPage">
+              <!-- <i class="el-icon-menu"></i> -->
+              <span slot="title" class="study textl">专业力必修</span>
+            </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/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 
-        custom-class="g-dialog" 
-        title="课程学习管理" 
+    <el-dialog
+        custom-class="g-dialog"
+        title="课程学习管理"
         width="900px"
-        height="900px" 
-        :visible.sync="manageStudy.dlgShow" 
+        height="900px"
+        :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/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>
@@ -801,6 +802,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 +1164,7 @@
         //   }
         // }
       },
-      
+
       onFullscreen(full) {
         let divId = 'videowatermark';
         var div = document.getElementById('myVideoPlayer')
@@ -1447,6 +1453,7 @@
               }
               //console.log(scon.contentId,con.id);
               con.lastStudyTime = scon.lastStudyTime;
+              con.progressVideo = scon.progressVideo;
               //以下判断是为了兼容之前的问题，学习状态
               if (scon.status) {
                 con.status = scon.status;

src/views/user/ranking.vue

@@ -380,15 +380,19 @@ export default {
     getExperience() {//经验值
       let data = {
         aid:this.userInfo.aid,// #用户id
-        statType:21, // #统计类型  10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
+        statType:20, // #统计类型  10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
         field:this.experience.field,// #统计周期 todays-当天,weeks-周,months-月,years-年 total-总计
         num:10,//  #显示的条数
       }
       if(data.field == 'now'){
+        data.statType = 20
+        data.field = 'years'
+        this.experience.field = 'years'
+        this.isNow = true
+      }else{
         data.statType = 20
         data.field = 'total'
         this.experience.field = 'total'
-        this.isNow = true
       }
       apiStat.getRanking(data).then(res=>{
         if(res.status==200){
@@ -402,12 +406,15 @@ export default {
             }
             this.getUserData([res.result.currentUserRankingData.aid],[res.result.currentUserRankingData])
             this.experience.data = res.result.currentUserRankingData;
-            if(this.experience.field == 'total') {
+            this.currentUserRankingTotalData.rankNo = res.result.currentUserRankingData.rankingNo;
+            this.currentUserRankingTotalData.endValue = this.current.endValue;
+            if(data.field == 'total') {
               this.current = this.experienceValue(res.result.currentUserRankingData.total);
-              this.currentUserRankingTotalData.rankNo = res.result.currentUserRankingData.rankingNo;
               this.currentUserRankingTotalData.rankValue = res.result.currentUserRankingData.total;
-              this.currentUserRankingTotalData.endValue = this.current.endValue;
+            }else if(data.field == 'years'){
+              this.currentUserRankingTotalData.rankValue = res.result.currentUserRankingData.years;
             }
+
           }
           this.current.total=res.result.currentUserRankingData.total;//当前用户的经验值是固定的
           const ids= [];
@@ -434,9 +441,15 @@ export default {
                   }
                 });
               });
-              this.experience.list = listData.sort((a,b)=>{
-                return b.total-a.total
-              }).slice(0,5);
+              if(data.field == 'total') {
+                this.experience.list = listData.sort((a,b)=>{
+                  return b.total-a.total
+                }).slice(0,5);
+              }else if(data.field == 'years'){
+                this.experience.list = listData.sort((a,b)=>{
+                  return b.years-a.years
+                }).slice(0,5);
+              }
             } else {
               this.$message.error(res.message);
             }
@@ -447,15 +460,19 @@ export default {
     getDuration() {//学习时长
       let data = {
         aid:this.userInfo.aid,// #用户id
-        statType:12, // #统计类型  10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
+        statType:10, // #统计类型  10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数
         field:this.learningDuration.field,// #统计周期 todays-当天,weeks-周,months-月,years-年 total-总计
         num:10,//  #显示的条数
       }
       if(data.field == 'now'){
-        data.statType = 10
-        data.field = 'total'
-        this.learningDuration.field = 'total'
-        this.isStudyTime = true
+        data.statType = 10;
+        data.field = 'years';
+        this.learningDuration.field = 'years';
+        this.isStudyTime = true;
+      }else{
+        data.statType = 10;
+        data.field = 'total';
+        this.learningDuration.field = 'total';
       }
       apiStat.getRanking(data).then(res=>{
         if(res.status==200){
@@ -469,9 +486,11 @@ export default {
             }
             this.getUserData([res.result.currentUserRankingData.aid],[res.result.currentUserRankingData])
             this.learningDuration.data = res.result.currentUserRankingData;
+            this.learningDurationTotalData.rankNo = res.result.currentUserRankingData.rankingNo;
             if(data.field == 'total'){
-              this.learningDurationTotalData.rankNo = res.result.currentUserRankingData.rankingNo;
               this.learningDurationTotalData.rankValue = res.result.currentUserRankingData.total;
+            } else if(data.field == 'years'){
+              this.learningDurationTotalData.rankValue = res.result.currentUserRankingData.years;
             }
           }
 
@@ -500,9 +519,16 @@ export default {
                   }
                 });
               });
-              this.learningDuration.list = listData.sort((a,b)=>{
-                return b.total-a.total
-              }).slice(0,5);
+              if(data.field == 'total'){
+                this.learningDuration.list = listData.sort((a,b)=>{
+                  return b.total-a.total
+                }).slice(0,5)
+              } else if(data.field == 'years'){
+                this.learningDuration.list = listData.sort((a,b)=>{
+                  return b.years-a.years
+                }).slice(0,5)
+              }
+              ;
             } else {
               this.$message.error(res.message);
             }