去掉无用日志

# 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/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() {

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

@@ -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;
@@ -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;