修改前端进度条

This reverts commit 6208caf4ca.

src/api/manage/manage.js

@@ -34,48 +34,9 @@ const userRsSginupCourse = function(data){
   return ajax.postJson(baseURL,'/stu/project/stuCancelEnrollment',data);
 }
 
-/**
- * 获取学员指定新员工转正项目的bpm审批状况
- * {studentId,pid}
- * add by zhengsongbo on 2025-07-12
- */
-const getStudntProjectInfo = function(pid){
-  return ajax.get(baseURL,`/stu/project/queryStudentInfo?pid=${pid}`);
-}
-
-/**
- * BPM项目：立即报名
- * pid
- * add by zhengsongbo on 2025-07-13
- */
-const signUpBpmProjectNow = function(pid){
-  return ajax.get(baseURL,`/stu/project/signUpBpmProjectNow?pid=${pid}`);
-}
-
-/**
- * BPM项目：重新报名
- * pid
- * add by zhengsongbo on 2025-07-13
- */
-const signUpBpmProjectAgain = function(pid){
-  return ajax.get(baseURL,`/stu/project/signUpBpmProjectAgain?pid=${pid}`);
-}
-
-/**
- * 社招新员工
- * add by zhengsongbo on 2025-07-14
- */
-const getNewSocialHireProject = function(){
-  return ajax.get(baseURL,'/stu/project/getNewSocialHireProject');
-}
-
 export default {
     getTaskNum,
     userTaskList,
     userDeleteStudy,
-    userRsSginupCourse,
-    getStudntProjectInfo,
-    signUpBpmProjectNow,
-    signUpBpmProjectAgain,
-    getNewSocialHireProject
+    userRsSginupCourse
 }

src/api/modules/course.js

@@ -170,9 +170,7 @@ const updateContentOrders = function(cid,items) {
 const detail = function(id) {
     return ajax.get('/xboe/m/course/manage/detail?id=' + id);
 }
-const getDictIds = function(pid,type) {
-  return ajax.get(`/xboe/m/course/manage/getDictIds?pid=${pid}&type=${type}`);
-}
+
 /**
  * 更新内容的名称
  * @param {Object} data
@@ -448,7 +446,6 @@ export default {
     findUpdateLogs,
     getUpdateLog,
     detail,
-    getDictIds,
     saveContent,
     pageList,
     setEnabled,

src/components/Course/courseForm.vue

@@ -565,13 +565,15 @@ export default {
         this.requireSaveCourse = true;
 
         console.log("--- watch比较 = ", oldVal.orgId, newVal.orgId);
-        this.checkOrgPermission(newVal.orgId);
+        if (newVal.orgId !== oldVal.orgId) {
+          console.log("--- watch newVal.orgId = ", newVal.orgId);
+          this.checkOrgPermission(newVal.orgId);
+        }
       },
       deep: true
     }
   },
   mounted() {
-    this.getDictIds();
     let extendFlag=this.$route.query.f; //是否是管理端过来的
     this.extendRefId=this.$route.query.refId;
     this.extendRefType=this.$route.query.refType;
@@ -602,8 +604,11 @@ export default {
         this.isPermission = false;
         return;
       }
-      console.log("--- this.dicts  = ",this.dicts)
       this.isPermission = this.dicts.includes(orgId);
+      this.courseInfo.device = 3;
+      if(this.isPermission){
+        this.courseInfo.device = 4;
+      }
       console.log("--- 监听结束 this.isPermission  = ",this.isPermission)
     },
     // 关键字的更改
@@ -910,21 +915,6 @@ export default {
       this.courseCoverurl = '';
       this.courseInfo.coverImg = '';
     },
-    //获取字典信息
-    async getDictIds() {
-      console.log("--- 获取字典信息 1  = ", this.dicts);
-      try {
-        const response = await apiCourse.getDictIds(637, 1); // 确保返回 Promise
-        console.log("--- 获取字典信息 2 result= ", response);
-
-        if (response.status === 200) {
-          this.dicts = response.result.dicts; // 正确提取 dicts
-          console.log("--- 获取字典信息 3 = ", this.dicts);
-        }
-      } catch (error) {
-        console.error("获取字典信息失败：", error);
-      }
-    },
     //获取课程信息
     async getDetail(id) {
       this.curCourseId = id;

src/components/PortalHeader.vue

@@ -137,30 +137,6 @@
             </div>
           </div>
         </div>
-      <!-- "社招新员工转正培训项目简介"弹框 -->
-      <el-dialog width="733px"
-                 :visible.sync="projectDialogVisible"
-                 :append-to-body="true"
-                 >
-        <div class="el-dialog__header">
-            <span style="font-size: 35px; font-weight: bold; color: white; margin: 60px;line-height: 100px;">项目简介</span>
-        </div>
-        <div style="height: 280px;margin: 0px 40px 0px 40px;">
-          <span v-html="studentInfo.introduction"></span>
-        </div>
-        <div>
-          <span style="font-size: 14px; margin: 40px;" v-if="studentInfo.bpmStatus!=0">审批编号：<span style="font-weight: bold;">{{studentInfo.bpmNumber}}</span></span>
-          <br/>
-          <span style="font-size: 14px; margin: 40px;">审批状态：<span style="font-weight: bold; color: #efbf82">{{studentInfo.bpmStatusName}}</span></span>
-        </div>
-        <template #footer>
-            <span class="dialog-footer">
-              <el-button type="primary" @click="signUpNow" v-if="studentInfo.bpmStatus==0">立即报名</el-button>
-              <el-button v-if="studentInfo.bpmStatus==1" disabled>审批中</el-button>
-              <el-button type="primary" @click="signUpAgain" v-if="studentInfo.bpmStatus==3">重新报名</el-button>
-            </span>
-        </template>
-      </el-dialog>
     </div>
     <popup></popup><yearMedal></yearMedal>
   </div>
@@ -168,7 +144,6 @@
 <script>
 import { mapGetters, mapActions } from 'vuex';
 import apiMessage from '@/api/system/message.js';
-import apiManage from '@/api/manage/manage.js';
 import popup from '@/components/AlertPopup.vue';
 import yearMedal from '@/components/Popup/China2023.vue';
 import apiBoeCourse from '@/api/boe/course.js';
@@ -229,8 +204,6 @@ export default {
       keyword: '',
       isTiao: false,
       sex:'',
-      projectDialogVisible: false,
-      studentInfo: {},
     };
   },
   mounted() {
@@ -241,26 +214,7 @@ export default {
     //this.loadPopupConfig();
   },
   methods: {
-    //BPM项目:立即报名
-    signUpNow(){
-      const pid = this.studentInfo.projectId;
-      apiManage.signUpBpmProjectNow(pid).then(res=>{
-        if (res.status == 200){
-          this.projectDialogVisible = false;
-          this.$message.success('报名成功')
-        }else {
-          this.projectDialogVisible = false;
-          this.$message.error('报名失败')
-        }
-      })
-    },
-    //BPM项目：重新报名
-    signUpAgain(){
-      const pid = this.studentInfo.projectId;
-      apiManage.signUpBpmProjectAgain(pid).then(res=>{
-        this.projectDialogVisible = false;
-      })
-    },
+
     setCurIdentity(iden){
         this.$store.dispatch('SetCurIdentity',iden);
       },
@@ -301,29 +255,7 @@ export default {
       if (val === "four") {
         window.open("https://m.qingxuetang.com/x/?appId=qxtcorp306130")
           // this.$emit('showClass',true)
-      } else if(val === "five"){//new社招新员工项目(需BPM审批报名--唯一，如果不唯一，取发布时间最新的)
-        let studentPath = process.env.VUE_APP_STUDENT_PATH;
-        apiManage.getNewSocialHireProject().then(res=>{
-          this.studentInfo = res.data;
-          const bpmStatus = this.studentInfo.bpmStatus;
-          if (bpmStatus == 0){//未报名--则弹窗含“立即报名”
-            this.studentInfo.bpmStatusName="未报名";
-            this.projectDialogVisible=true;
-
-          }else if (bpmStatus == 1){//已报名待审核(审批中)--仅弹窗展示
-            this.studentInfo.bpmStatusName="审批中";
-            this.projectDialogVisible=true;
-
-          }else if (bpmStatus == 2){//bpm报名审核通过,则直接进入项目进行学习
-            let params = encodeURIComponent('projectId=' + this.studentInfo.projectId);
-            this.$router.push('/forward?to=' + studentPath + '/projectdetails&params=' + params);
-          }else if(bpmStatus == 3){//已拒绝--则弹窗含“重新报名”
-            this.studentInfo.bpmStatusName="已拒绝(含个人撤回)";
-            this.projectDialogVisible=true;
-
-          }
-        })
-      } else {
+      }  else {
         let urlPre = window.location.protocol + "//" + window.location.host;
         // process.env.VUE_APP_BOE_WEB_URL
         let obj = {
@@ -332,7 +264,7 @@ export default {
           two: urlPre + "/grow180/login",
           three: this.webBaseUrl + "/study/index?study=1",
           // four: 'https://m.qingxuetang.com/x/?appId=qxtcorp306130',
-          // five: urlPre + "/boe/new-employee/index.html", //old社招新员工 zhengsongbo 注释掉 2025-07-14
+          five: urlPre + "/boe/new-employee/index.html",
           six: urlPre + "/web/contributor/index",
           seven: this.webBaseUrl + '/grateful/index'
         };
@@ -666,27 +598,4 @@ text-align: center;
      margin-right: 8px;
      border-radius: 50%;
    }
-  /* 项目简介 弹窗  ---start--- */
-  ::v-deep .el-dialog__header {
-    padding: 0 !important;
-  }
-  ::v-deep .el-dialog {
-    border-radius: 3% 3% 1% 1%;
-  }
- .el-dialog__header {
-    height: 100px;
-    margin: 0 !important;
-    background-image: url('../assets/images/project/title-bg.png');
-    background-size: 100% 100%;  /* 完全填充 */
-    display: block;             /* 避免行内元素空隙 */
- }
-  ::v-deep .el-dialog__title {
-    margin: 0 !important;
-    padding: 0 !important;
-  }
-  ::v-deep .el-dialog__body {
-    margin: 0 !important;
-    padding: 0 !important;
-  }
-/* 项目简介 弹窗  ---end--- */
 </style>

src/components/VideoPlayer/progress-bar.vue

@@ -37,6 +37,7 @@ export default {
     },
     isDrag:{
       type: Boolean,
+      default: true,
     },
     blobId:{
       type: String,
@@ -85,10 +86,9 @@ export default {
         if(current<0) current = 0;
         var time = localStorage.getItem('videoProgressData');
         var arr = time&&JSON.parse(time) || {}
-        //console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
-        // 禁止拖动
+        console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
+        // 禁止拖动 true:禁止拖动，false:允许拖动
         if(!this.isDrag && time && arr[this.blobId] < current) return;
-
         this.$emit("updateProgress", current);
       // }
 
@@ -102,7 +102,7 @@ export default {
         if(current<0) current = 0;
         var time = localStorage.getItem('videoProgressData');
         var arr = time&&JSON.parse(time) || {}
-        //console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
+        console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
         // 禁止拖动
         if(!this.isDrag && time && arr[this.blobId] < current) return;
         this.$emit("updateProgress", current);
@@ -118,12 +118,12 @@ export default {
         if(current<0) current = 0;
         var time = localStorage.getItem('videoProgressData');
         var arr = time&&JSON.parse(time) || {}
-        //console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
+        console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
         this.$emit("getMouseDownStatus", false);
         // 禁止拖动
         if(!this.isDrag && time && arr[this.blobId] < current) return;
         this.$emit("updateProgress", current);
-
+        this.$emit("getMouseDownStatus", false);
       }
     },
   },

src/views/grateful/GratefulHomePage.vue

@@ -5,8 +5,8 @@
         <!-- 当轮播图等于一张时 -->
         <swiper :options="swiperOptiontwo">
           <swiper-slide style="margin: 0 auto" v-for="(item, idx) in resonimg" :key="'a' + idx"
-            class="swiper-slide games pointer"  >
-            <div class="bannbox" @click="handleCarouselClick(item)" :style="{
+            class="swiper-slide games pointer">
+            <div class="bannbox" :style="{
               background: `url(${fileBaseUrl + item.image
                 }) center center no-repeat`,
             }"></div>
@@ -17,8 +17,8 @@
       <div id="container" style="z-index: 99" v-else>
         <swiper :options="swiperOption" ref="mySwiper" v-if="resonimg.length > 1">
           <swiper-slide style="margin: 0 auto" v-for="(item, idx) in resonimg" :key="'b' + idx"
-            class="swiper-slide games pointer"  >
-            <div class="bannbox" @click="handleCarouselClick(item)"  :style="{
+            class="swiper-slide games pointer">
+            <div class="bannbox" :style="{
               background: `url(${fileBaseUrl + item.image
                 })  center center no-repeat`,
             }"></div>
@@ -220,7 +220,7 @@ export default {
         autoplay: false,
         // noSwiping: true,
       },
-      // resonimg: [],
+      resonimg: [],
       swiperOption: {
         autoplay: {
           delay: 2000,
@@ -249,13 +249,6 @@ export default {
     this.getToolData()
   },
   methods: {
-    // 添加点击轮播图跳转的方法
-    handleCarouselClick(item) {
-      if (item.url) {
-        window.open(item.url, '_blank');
-      }
-    },
-
     downTool(toolInfo) {
       console.log(toolInfo);
       window.open(`/activityApi/xboe/m/boe/tools/url/download?urlStr=${process.env.VUE_APP_BOE_WEB_URL}/upload${toolInfo.filePath}&fileName=${toolInfo.name}`)

src/views/grateful/TeacherOpinion.vue

@@ -8,7 +8,7 @@
           <div class="navTop">
             <div>
               <router-link to="/grateful" class="nav">首页</router-link>&nbsp;>&nbsp;
-              <span style="cursor: pointer;" class="nav">认证讲师库</span>
+              <span style="cursor: pointer;" class="nav">认证讲师库（2023）</span>
             </div>
             <div style="position: relative;">
               <el-input class="portal-input" placeholder="请输入课程名称" style="border-radius: 20px !important; "

src/views/portal/case/Detail.vue

@@ -20,7 +20,7 @@
               </div>
               <div class="label">
                 <author :aid="caseDetail.sysCreateAid" :onlyAvatar="true" :avatar="authorInfo.avatar"
-                  :sex="authorInfo.sex" :name="authorInfo.name"></author>
+                  :sex="authorInfo.sex"></author>
                 <span>案主：{{ authorInfo.name }} ({{ authorInfo.orgInfo }})</span>
                 <!-- <span>案主：{{ authorInfo.name }}</span>
                     <span>工号：{{ authorInfo.code }}</span>

src/views/portal/case/Index.vue

@@ -1609,7 +1609,7 @@ export default {
           })
           console.log(res?.result?.list ,'有没有数据2');
           this.caseList.list = res.result.list
-          this.getCaseUserData(res.result.list);
+          // this.getCaseUserData(res.result.list);
           // 给所有的赋值
           this.caseList.count = res.result.count;
           this.caseList.showPagCount = res.result.count;

src/views/portal/course/Index.vue

@@ -486,32 +486,6 @@
           </div>
         </div>
       </el-dialog>
-      <!-- "新员工项目简介""弹框 -->
-      <el-dialog width="733px" title="项目简介" top="80px"
-                 :visible.sync="projectDialogVisible"
-                 class="custom-class">
-        <div slot="header" class="el-dialog__header">
-        </div>
-        <div style="height: 300px;margin: 20px 40px 0px 40px;">
-          <span v-html="studentInfo.introduction"></span>
-        </div>
-        <div>
-          <span style="margin: 40px; font-size: 14px" v-if="studentInfo.bpmStatus!=0">
-            审批编号：<span style="font-weight: bold;">{{studentInfo.bpmNumber}}</span>
-          </span>
-          <br/>
-          <span style="margin: 40px; font-size: 14px">
-            审批状态：<span v-html="studentInfo.bpmStatusName"></span>
-          </span>
-        </div>
-        <template #footer>
-            <span class="dialog-footer">
-              <el-button type="primary" @click="signUpNow" v-if="studentInfo.bpmStatus==0">立即报名</el-button>
-              <el-button v-if="studentInfo.bpmStatus==1" disabled>审批中</el-button>
-              <el-button type="primary" @click="signUpAgain" v-if="studentInfo.bpmStatus==3">重新报名</el-button>
-            </span>
-        </template>
-      </el-dialog>
     </div>
   </div>
 </template>
@@ -533,7 +507,6 @@ import apiTeacher from "@/api/modules/teacher.js";
 import apiUser from "@/api/system/user.js";
 import scene from "@/api/modules/scene.js";
 import apiUserbasic from "@/api/boe/userbasic.js";
-import apiManage from '@/api/manage/manage.js';
 import interactBar from "@/components/Portal/interactBar.vue";
 import courseImage from "@/components/Course/courseImage.vue";
 import { courseType, getType, toScore, formatDate, formatUserNumber, formatDateByFmt } from "@/utils/tools.js";
@@ -646,7 +619,6 @@ export default {
       twoId: '',
       count: 0,//分页总条条数
       showUClass: false,
-      projectDialogVisible: false,
       ctypeList: [
         { type: 1, id: 20, name: '录播课', checked: false },
         { type: 1, id: 30, name: '线下课', checked: false },
@@ -657,7 +629,7 @@ export default {
       twoList: [], //二级分类{type:12}
       threeList: [],//三级分类{type:13}
       searching: false,//是否正在搜索中
-      studentInfo: {},
+
       resonimg: {},
       formatDate,
       formatNum: formatUserNumber,
@@ -797,24 +769,6 @@ export default {
     // window.removeEventListener("scroll", this.handleScroll);
   },
   methods: {
-    //BPM项目:立即报名
-    signUpNow(){
-      const pid = this.studentInfo.projectId;
-      apiManage.signUpBpmProjectNow(pid).then(res=>{
-          this.projectDialogVisible = false;
-      })
-    },
-
-    //BPM项目：重新报名
-    signUpAgain(){
-      const pid = this.studentInfo.projectId;
-      const studentId=this.studentInfo.studentId;
-      const data = {"pid":pid,"studentId":studentId};
-      apiManage.signUpBpmProjectAgain(data).then(res=>{
-        this.projectDialogVisible = false;
-      })
-    },
-
     // 改变分页
     currentChange(val) {
       this.course.pageIndex = val
@@ -1262,33 +1216,9 @@ export default {
           let params = encodeURIComponent('courseId=' + courseId);
           this.$router.push('/forward?to=' + manageApi + '/stu/project/redirectDetail&params=' + params);
         } else if (item.type == 40) { //学习项目
-          if (item.bpmFlag == 1) { //是否是需要BPM审批的项目(新员工转正项目)
-            //检查当前用户是否已经报名该项目(“未报名”、“审批中”和“审核拒绝”--则弹窗！--“立即报名”和“重新报名"调BPM接口)
-            apiManage.getStudntProjectInfo(courseId).then(res=>{
-                this.studentInfo = res.data;
-                const bpmStatus = this.studentInfo.bpmStatus;
-                if (bpmStatus == 0){//未报名--则弹窗含“立即报名”
-                  this.projectDialogVisible=true;
-                  this.studentInfo.bpmStatusName="<span style='color: #ddc507;font-weight: bold;'>未报名</span>";
-
-                }else if (bpmStatus == 1){//已报名待审核(审批中)--仅弹窗展示
-                  this.projectDialogVisible=true;
-                  this.studentInfo.bpmStatusName="<span style='color: #ddc507;font-weight: bold;'>审批中</span>";
-
-                }else if (bpmStatus == 2){//bpm报名审核通过,则直接进入项目进行学习
-                  let params = encodeURIComponent('projectId=' + courseId);
-                  this.$router.push('/forward?to=' + studentPath + '/projectdetails&params=' + params);
-                }else if(bpmStatus == 3){//已拒绝--则弹窗含“重新报名”
-                  this.projectDialogVisible=true;
-                  this.studentInfo.bpmStatusName="<span style='color: red;font-weight: bold;'>已拒绝(含个人撤回)</span>";
-
-                }
-            })
-          }else {
-            let params = encodeURIComponent('projectId=' + courseId);
-            this.$router.push('/forward?to=' + studentPath + '/projectdetails&params=' + params);
-            //this.$router.push('/forward?to='+manageApi+'/stu/project/redirectDetail&params='+params);
-          }
+          let params = encodeURIComponent('projectId=' + courseId);
+          this.$router.push('/forward?to=' + studentPath + '/projectdetails&params=' + params);
+          //this.$router.push('/forward?to='+manageApi+'/stu/project/redirectDetail&params='+params);
         }
       } else {
         if (item.type == 10) {
@@ -2491,31 +2421,4 @@ console.log(res.result.list,'data')
 
 .option-active {
   color: #387DF7;
-}
-  /* 项目简介 方法一：外部 CSS 类 */
-::v-deep.el-dialog {
-  border-radius: 3% 3% 1% 1%;
-  padding: 0;
-}
-::v-deep.custom-class .el-dialog__header {
-  height: 100px;
-  margin: 0 !important;
-  padding: 0 !important;
-  background-image: url('../../../assets/images/project/title-bg.png');
-  background-size: 100% 100%;  /* 完全填充 */
-  display: block;             /* 避免行内元素空隙 */
-}
-::v-deep.custom-class .el-dialog__header .el-dialog__title {
-  padding: 0 !important;
-  font-size: 35px;
-  font-weight: bold;
-  color: white;
-  margin: 60px;
-  line-height: 100px;
-}
-::v-deep.custom-class .el-dialog__body {
-  margin: 0 !important;
-  padding: 0 !important;
-}
-/* ---end--- */
-</style>
+}</style>

src/views/study/coursenew.vue

@@ -22,7 +22,7 @@
       <div class="course-playbox" ref="coursePlayerBox" id="id_course_player_box">
         <div class="course-player" ref="coursePlayer" id="id_course_player">
           <div>
-            <div v-if="renderCourse">
+            <div v-if="false">
               <div v-if="resType == null || resType == 0">
                 <!--先显示视频图片-->
                 <course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
@@ -110,11 +110,11 @@
                 </assess>
               </div>
             </div>
-            <div v-if="!renderCourse && Internet ==2" style="margin:350px 250px" class="jianjie pdftext" id="pdfPreview">
+            <div v-if="true" style="margin:350px 250px" class="jianjie pdftext" id="pdfPreview">
               <div style="margin-top:40px;font-weight:700;font-size: 22px;color: #ccc">
-                <span>十分抱歉，您当前的网络环境不符合观看要求。为了保障课程信息的安全，您需要接入公司内网才能观看。</span>
+                <span>十分抱歉，您当前的网络环境不符合观看要求。为了保障案例信息的安全，您需要接入公司内网才能观看。</span>
               </div>
-              <div style="margin-top:20px;text-align:center" @click="refreshPage">
+              <div style="margin-top:20px;text-align:center" @click="getInternet" >
                 <el-button type="primary">重新检测</el-button>
               </div>
             </div>
@@ -177,7 +177,7 @@
             </div>
             <!-- 课程单元  -->
             <div class="course-units" v-if="tab == 1">
-              <div style="min-height: 350px;max-height: 650px ;overflow-y: auto;">
+              <div :style="`height: ${controlHeight}px;overflow-y: auto;`">
                 <div class="catalog" v-if="courseInfo.type == 20">
                   <div  v-for="(item, index) in catalogTree" :key="index" :name="index">
                     <el-menu
@@ -454,7 +454,6 @@
         getType: getType,
         ctabName: 'catalog',
         resType: null,
-        renderCourse: true,
         activeNames: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
         scoreInfo: {
           dlgShow: false,
@@ -483,7 +482,6 @@
       }
     },
     mounted() {
-      this.getInternet();
       // 增加的用户受众id
       let localKey = "user_" + this.userInfo.sysId + "_gids";
       let hasIds = sessionStorage.getItem(localKey);
@@ -531,6 +529,10 @@
         return treeList;
       }
     },
+    destroyed(){
+      this.cleanAppendTime();
+      this.stopStudyTime();
+    },
     methods: {
       handleOpen(key,path){
         if(this.isFalse){
@@ -545,13 +547,13 @@
       },
       noteChange(){
         //视频点定位，直接到播放的视频位置
-        this.timer = new Date().getTime()
+         this.timer = new Date().getTime()
       },
       //清空追加学习时长事件
       cleanAppendTime(){
-        if(this.appendStudyOtherHandle){
-          window.clearTimeout(this.appendStudyOtherHandle);
-        }
+         if(this.appendStudyOtherHandle){
+            window.clearTimeout(this.appendStudyOtherHandle);
+         }
       },
       //非音视频课学习时长的增加,每一分钟保存一次
       appendStudyOtherTime() {
@@ -562,46 +564,46 @@
         if (!this.contentData.id) {
           return;
         }
-        //每一分钟保存一次
-        // 取消阅读的每分钟六十秒的计时，最多是设置的时间或默认时间
-        let $this=this;
-        let startTime = new Date().getTime();
-        this.appendStudyOtherHandle = setTimeout(function() {
-          let endTime = new Date().getTime();
-          let totalTime = Math.round((endTime - startTime) / 1000);
-          $this.cumulativeDuration += totalTime;
-          if($this.cumulativeDuration <= $this.maxDuration){
-            //发送时长
-            $this.sendStudyOtherTime(totalTime);
-            //递归调用
-            $this.appendStudyOtherTime();
-          }else{
-            clearTimeout(this.appendStudyOtherHandle);
-            $this.cumulativeDuration = 0;
-            $this.maxDuration = 0;
-          }
-        }, 1000*60);
+          //每一分钟保存一次
+          // 取消阅读的每分钟六十秒的计时，最多是设置的时间或默认时间
+          let $this=this;
+          let startTime = new Date().getTime();
+          this.appendStudyOtherHandle = setTimeout(function() {
+            let endTime = new Date().getTime();
+            let totalTime = Math.round((endTime - startTime) / 1000);
+            $this.cumulativeDuration += totalTime;
+            if($this.cumulativeDuration <= $this.maxDuration){
+              //发送时长
+              $this.sendStudyOtherTime(totalTime);
+              //递归调用
+              $this.appendStudyOtherTime();
+            }else{
+              clearTimeout(this.appendStudyOtherHandle);
+              $this.cumulativeDuration = 0;
+              $this.maxDuration = 0;
+            }
+          }, 1000*60);
 
       },
       sendStudyOtherTime(totalTime){
         //静默处理
         apiStat.sendEvent({
-          "key": "StudyCourseOther",//课程学习的key
-          "title": "非音视频课内容",//事件的标题
-          "parameters":"second:" + totalTime,//second:value 本次的学习时长
-          "content": "学习课程",//事件的内容
-          "objId": this.courseInfo.id,//课程的id
-          "objType": "1",//类型
-          "source":"page",
-          "objInfo": ""+this.courseInfo.name,
-          "aid":this.userInfo.aid, //当前登录人的id
-          "aname":this.userInfo.name,//当前人的姓名
-          "status": 1 //状态
-        }).then(rs=>{
-          if(rs.status != 200) {
-            console.log(rs.message);
-          }
-        });
+            "key": "StudyCourseOther",//课程学习的key
+            "title": "非音视频课内容",//事件的标题
+            "parameters":"second:" + totalTime,//second:value 本次的学习时长
+            "content": "学习课程",//事件的内容
+            "objId": this.courseInfo.id,//课程的id
+            "objType": "1",//类型
+            "source":"page",
+            "objInfo": ""+this.courseInfo.name,
+            "aid":this.userInfo.aid, //当前登录人的id
+            "aname":this.userInfo.name,//当前人的姓名
+            "status": 1 //状态
+          }).then(rs=>{
+              if(rs.status != 200) {
+                console.log(rs.message);
+              }
+          });
       },
       //笔记组件触发，播放指定时间
       onPlayVideo(contentId,time){
@@ -610,32 +612,32 @@
         console.log(contentId,this.contentData.id,'两个内容id');
         let $this=this;
         if(this.contentData.id==contentId){
-          this.onPlayerPause()
-          this.contentData.lastStudyTime=time;
-          setTimeout(() => {
-            $this.$refs.myVideoPlayer.startPlay(time);
-          }, 10)
-          console.log('开始播放1');
+           this.onPlayerPause()
+           this.contentData.lastStudyTime=time;
+           setTimeout(() => {
+             $this.$refs.myVideoPlayer.startPlay(time);
+           }, 10)
+           console.log('开始播放1');
         }else{
-          //通过contentId
-          let toResContent=null;
-          this.contentList.forEach(c => {
-            if(c.id==contentId){
-              c.lastStudyTime=time;
-              toResContent=c;
+           //通过contentId
+           let toResContent=null;
+            this.contentList.forEach(c => {
+              if(c.id==contentId){
+                 c.lastStudyTime=time;
+                 toResContent=c;
+              }
+            });
+            if(toResContent){
+
+              this.changePlayRes(toResContent);
+              setTimeout(() => {
+                $this.$refs.myVideoPlayer.startPlay(time);
+              }, 10)
+
+              console.log('开始播放2');
+            }else{
+              this.$message.error('资源已不存在或更换过，已无法定位');
             }
-          });
-          if(toResContent){
-
-            this.changePlayRes(toResContent);
-            setTimeout(() => {
-              $this.$refs.myVideoPlayer.startPlay(time);
-            }, 10)
-
-            console.log('开始播放2');
-          }else{
-            this.$message.error('资源已不存在或更换过，已无法定位');
-          }
         }
         this.playerBoxShow = false;
       },
@@ -713,23 +715,23 @@
         }else if(r.contentType==50){ //scorm
           this.scormUrl='';
           apiCourseFile.detail(r.contentRefId).then(cfrs => {
-            if(cfrs.status==200){
-              this.curCFile = cfrs.result;
-              //this.scormUrl=cfrs
-              let pars='?mode=normal&r='+Math.random();
-              pars+='&scormId='+this.curCFile.id;
-              pars+='&courseId='+this.courseId;
-              pars+='&contentId='+r.id;
-              pars+='&studentId='+this.userInfo.aid;
-              pars+='&studentName='+encodeURIComponent(this.userInfo.name);
-              pars+='&lmsId='+this.studyId;
-              pars+='&scoId=';//不指定，scorm模块自动根据学习记录定位
-              let urlPre=window.location.protocol;
-              let configUrl=process.env.VUE_APP_SCORM_URL;
-              configUrl=urlPre+configUrl.substring(configUrl.indexOf(':')+1);
+             if(cfrs.status==200){
+                this.curCFile = cfrs.result;
+                //this.scormUrl=cfrs
+                let pars='?mode=normal&r='+Math.random();
+                pars+='&scormId='+this.curCFile.id;
+                pars+='&courseId='+this.courseId;
+                pars+='&contentId='+r.id;
+                pars+='&studentId='+this.userInfo.aid;
+                pars+='&studentName='+encodeURIComponent(this.userInfo.name);
+                pars+='&lmsId='+this.studyId;
+                pars+='&scoId=';//不指定，scorm模块自动根据学习记录定位
+                let urlPre=window.location.protocol;
+                let configUrl=process.env.VUE_APP_SCORM_URL;
+                configUrl=urlPre+configUrl.substring(configUrl.indexOf(':')+1);
 
-              this.scormUrl=configUrl+pars;//播放的首页
-            }
+                this.scormUrl=configUrl+pars;//播放的首页
+             }
           });
 
         }else if (r.contentType == 52) {
@@ -760,12 +762,12 @@
             setTimeout(() => {
               this.isContentTypeTwo = r.contentType
               $this.isShowTime()
-            }, 2000);
-          }
+              }, 2000);
+            }
         }
         //以下是学习记录,50是scorm项目
         if (this.contentData.contentType > 20 && this.contentData.contentType !== 50) { //非视频类的
-          //用户的学习时长，非音视频课程学习,单独的处理
+         //用户的学习时长，非音视频课程学习,单独的处理
           this.isAppendTime = false;
 
           this.appendStudyOtherHandle = setTimeout(function() {
@@ -775,18 +777,18 @@
             // 没有设置默认时长三十分钟，
             $this.maxDuration =  r.duration !== 0 ? r.duration * 2 : $this.defaultMaxTime;
             $this.$store.dispatch("userTrigger", {
-              "key": "StudyCourseOther",//课程学习的key
-              "title": "非音视频课内容",//事件的标题
-              "parameters":"second:15",//second:value 本次的学习时长
-              "content": "学习课程",//事件的内容
-              "objId": $this.courseInfo.id,//课程的id
-              "objType": "1",//类型
-              "source":"page",
-              "objInfo": ""+$this.courseInfo.name,
-              "aid":$this.userInfo.aid, //当前登录人的id
-              "aname":$this.userInfo.name,//当前人的姓名
-              "status": 1 //状态
-            });
+                "key": "StudyCourseOther",//课程学习的key
+                "title": "非音视频课内容",//事件的标题
+                "parameters":"second:15",//second:value 本次的学习时长
+                "content": "学习课程",//事件的内容
+                "objId": $this.courseInfo.id,//课程的id
+                "objType": "1",//类型
+                "source":"page",
+                "objInfo": ""+$this.courseInfo.name,
+                "aid":$this.userInfo.aid, //当前登录人的id
+                "aname":$this.userInfo.name,//当前人的姓名
+                "status": 1 //状态
+             });
             $this.appendStudyOtherTime();
           }, 15000); //非音视频课程学习,十五秒后记录
           this.isContentType = this.contentData.contentType
@@ -803,21 +805,20 @@
 
 
         this.$nextTick(function(){
-          if (r.contentType == 10) {
-            console.log('视频处理lastStudyTime',this.contentData.lastStudyTime)
-            console.log('视频处理progressVideo',this.contentData.progressVideo)
-            this.$refs.myVideoPlayer.updateProgressByClickBar2(this.contentData.lastStudyTime,this.contentData.progressVideo);
-          }
+            if (r.contentType == 10) {
+              console.log('视频处理lastStudyTime',this.contentData.lastStudyTime)
+              console.log('视频处理progressVideo',this.contentData.progressVideo)
+              this.$refs.myVideoPlayer.updateProgressByClickBar2(this.contentData.lastStudyTime,this.contentData.progressVideo);
+            }
 
-          let h=$this.$refs.coursePlayer.offsetHeight;
-          //解决获取高度不正的问题
-          if(h>400 && h<500){
-            h=h+40;
-          }else if(h>500){
-            h=h+60;
-          }
-          // 移除高度控制 防止内容塌陷
-            // $this.controlHeight=h-95;
+            let h=$this.$refs.coursePlayer.offsetHeight;
+            //解决获取高度不正的问题
+            if(h>400 && h<500){
+              h=h+40;
+            }else if(h>500){
+              h=h+60;
+            }
+            $this.controlHeight=h-95;
         })
 
 
@@ -959,9 +960,9 @@
         this.interactRuning = true;
         let teacherId='';
         if(this.teachers.length>0){
-          teacherId=this.teachers[0].teacherId;
+        	teacherId=this.teachers[0].teacherId;
         }else{
-          teacherId=this.courseInfo.sysCreateAid
+        	teacherId=this.courseInfo.sysCreateAid
         }
         let postData = {
           objType: 1,
@@ -1102,7 +1103,7 @@
               class: 'catalog-cell-state1'
             };
           }
-            break;
+          break;
         }
         return data;
       },
@@ -1163,8 +1164,8 @@
           var markDiv = div.querySelector("#" + divId);
           console.log("去除水印 ---- gx markDiv ----",markDiv);
           if (markDiv) {
-            console.log("执行去除水印 ---- gx markDiv ----",markDiv);
-            div.removeChild(markDiv);
+              console.log("执行去除水印 ---- gx markDiv ----",markDiv);
+      	      div.removeChild(markDiv);
           }
         }
       },
@@ -1223,9 +1224,9 @@
               var time = localStorage.getItem('videoProgressData')
               var arr = time&&JSON.parse(time) || {}
               if(arr[this.blobId] && this.contentData.progressVideo<arr[this.blobId]) {
-                postData.progressVideo = arr[this.blobId]
-                // postData.contentId = this.contentData.id
-                // postData.courseId = this.contentData.courseId
+              postData.progressVideo = arr[this.blobId]
+              // postData.contentId = this.contentData.id
+              // postData.courseId = this.contentData.courseId
               }
             }
             //console.log('记录播放时间')
@@ -1283,9 +1284,9 @@
             var time = localStorage.getItem('videoProgressData')
             var arr = time&&JSON.parse(time) || {}
             if(arr[this.blobId] && this.contentData.progressVideo<arr[this.blobId]) {
-              postData.progressVideo = arr[this.blobId]
-              // postData.contentId = this.contentData.id
-              // postData.courseId = this.contentData.courseId
+            postData.progressVideo = arr[this.blobId]
+            // postData.contentId = this.contentData.id
+            // postData.courseId = this.contentData.courseId
             }
           }
           //console.log('记录播放时间')
@@ -1323,17 +1324,6 @@
           audiences:this.audiences
         }).then(rs => {
           if (rs.status == 200) {
-            if(rs.result.isPermission){
-              this.protocolDialogVisible=true
-            }
-            if (!rs.result.isPermission || (rs.result.isPermission && this.Internet==1)){
-              // this.getInternet()
-              this.renderCourse = true
-            }else{
-              // this.Internet=1;
-              this.renderCourse = false
-              this.protocolDialogVisible=true
-            }
             if(rs.result.contents.length==0){
               $this.$message.error('课程内容已删除或课程已不再使用');
               return;
@@ -1344,11 +1334,11 @@
             }
             //设置必须的字段
             if(rs.result.contents.length==1){
-              $this.tab=2;
-              //console.log('内容只有一个');
+               $this.tab=2;
+               //console.log('内容只有一个');
             }
             if(!rs.result.isCrowd){
-              $this.$message.error('您没有查看该课程的权限');
+                $this.$message.error('您没有查看该课程的权限');
             }
             // 是否播放
             this.isCrowd = rs.result.isCrowd
@@ -1422,17 +1412,16 @@
             this.totalContent = rs.result.contents.length;
             //加载学习的数据
             this.loadStudyData(rs.result);
+            if (rs.result.isPermission){
+            // if (true){
+              this.getInternet()
+              console.log('需要内网环境')
+            }
           } else {
             this.$message.error(rs.message);
           }
-
         });
       },
-      refreshPage() {
-        location.reload();
-        // this.getInternet();
-        // this.loadData();
-      },
       getXmlHttpRequest() {
         if (window.XMLHttpRequest) {
           return new XMLHttpRequest();
@@ -1450,7 +1439,7 @@
         let timer = setTimeout(function () {
           timedOut = true;
           xmlhttp.abort();
-        }, 1000);
+        }, 5000);
         xmlhttp.open("HEAD", window.location.protocol + "//uapi.boe.com.cn/500.html", true);
         xmlhttp.send();
         xmlhttp.onreadystatechange = function () {
@@ -1458,9 +1447,9 @@
             if (xmlhttp.status == 200) {
               clearTimeout(timer);
               $this.Internet = 1;
+              $this.protocolDialogVisible=true
             } else {
               clearTimeout(timer);
-              // $this.protocolDialogVisible=true
               $this.Internet = 2;
             }
           } else {
@@ -1591,37 +1580,37 @@
       progress(val) {
         const progressValue = parseFloat(val) * 100;
         this.sendEventProgress = Number(progressValue.toFixed(2));
-      },
+       },
       saveStudyDuration(duration) { //保存本地存储的学习时长
         if (duration > 0) {
           //发送用户学习事件
           //console.log('保存到后台学习时长='+duration);
           let postData={
-            "key": "StudyCourse",//课程学习的key
-            "title": "学习课程",//事件的标题
-            "parameters":"second:"+duration,//second:value,total:value 本次的学习时长
-            "content": "学习课程【"+this.courseInfo.name+"】",//事件的内容
-            "objId": this.courseInfo.id,//课程的id
-            "objType": "1",//类型
-            "source":"page",
-            "objInfo": ""+this.courseInfo.name,
-            "aid":this.userInfo.aid, //当前登录人的id
-            "aname":this.userInfo.name,//当前人的姓名
-            "status": 1, //状态
-            "contentId": this.contentData.id,
-          }
-          if(this.resType == 10){
-            postData.progress = this.sendEventProgress;
-          }
-          //静默处理
-          apiStat.sendEvent(postData).then(rs=>{
-            if(rs.status == 200) {
-              // this.appendStartTime = new Date();//重新计时
-              // studyUtil.clearStudyDuration(); //清除本地存储
-            } else {
-              console.log(rs.message);
+              "key": "StudyCourse",//课程学习的key
+              "title": "学习课程",//事件的标题
+              "parameters":"second:"+duration,//second:value,total:value 本次的学习时长
+              "content": "学习课程【"+this.courseInfo.name+"】",//事件的内容
+              "objId": this.courseInfo.id,//课程的id
+              "objType": "1",//类型
+              "source":"page",
+              "objInfo": ""+this.courseInfo.name,
+              "aid":this.userInfo.aid, //当前登录人的id
+              "aname":this.userInfo.name,//当前人的姓名
+              "status": 1, //状态
+              "contentId": this.contentData.id,
             }
-          });
+            if(this.resType == 10){
+              postData.progress = this.sendEventProgress;
+            }
+            //静默处理
+            apiStat.sendEvent(postData).then(rs=>{
+                if(rs.status == 200) {
+                  // this.appendStartTime = new Date();//重新计时
+                  // studyUtil.clearStudyDuration(); //清除本地存储
+                } else {
+                  console.log(rs.message);
+                }
+            });
           // let postAppendData = {
           //   id: this.appentId,
           //   studyId: this.studyId,
@@ -1643,13 +1632,13 @@
       },
       //结束追加学习时长
       stopStudyTime(){
-        //console.log('停止追加学习时长');
-        this.isAppendTime=false;
-        //暂停让他为空 从新计时
-        this.appendStartTime = null
-        if (this.appendHandle != null) {
-          window.clearTimeout(this.appendHandle);
-        }
+          //console.log('停止追加学习时长');
+          this.isAppendTime=false;
+          //暂停让他为空 从新计时
+          this.appendStartTime = null
+          if (this.appendHandle != null) {
+              window.clearTimeout(this.appendHandle);
+          }
       },
       appendStudyTime() {
         // 暂停的时候重新从十五秒开始计时
@@ -1671,11 +1660,11 @@
         this.appendHandle &&  window.clearTimeout(this.appendHandle);
         //启动下次追加学习时长
         this.appendHandle = setTimeout(() => {
-          let endTime = new Date().getTime();
-          this.appentInterval = 60
-          let totalTime = Math.round((endTime - this.appendStartTime) / 1000);
-          this.appendStudyTime();
-          this.saveStudyDuration(totalTime)
+            let endTime = new Date().getTime();
+            this.appentInterval = 60
+            let totalTime = Math.round((endTime - this.appendStartTime) / 1000);
+            this.appendStudyTime();
+            this.saveStudyDuration(totalTime)
         }, this.appentInterval * 1000);
       },
 
@@ -1741,30 +1730,26 @@
       },
       handleAudioTimeUpdate(currentTime) {
         // if(this.contentStudysLength.length == 0){
-        let params = {
-          studyId: this.studyId, //学习id,
-          courseId: this.courseId, //课程id,
-          contentId: this.contentData.id, //内容id,
-          contentType: this.contentData.contentType,
-          contentName: this.contentData.contentName, //内容名称
-          progress: 1,
-          status: 2,
-          contentTotal: this.totalContent
-        };
-        if(currentTime > 2 && this.trueFalse){
-          apiStudy.studyContent(params).then(()=>{
-            if(this.contentData.status<2){
-              this.contentData.status = 2;
-            }
-          })
-          this.trueFalse = false
-        }
+          let params = {
+            studyId: this.studyId, //学习id,
+            courseId: this.courseId, //课程id,
+            contentId: this.contentData.id, //内容id,
+            contentType: this.contentData.contentType,
+            contentName: this.contentData.contentName, //内容名称
+            progress: 1,
+            status: 2,
+            contentTotal: this.totalContent
+          };
+          if(currentTime > 2 && this.trueFalse){
+            apiStudy.studyContent(params).then(()=>{
+              if(this.contentData.status<2){
+                this.contentData.status = 2;
+              }
+            })
+            this.trueFalse = false
+          }
       },
     },
-    destroyed(){
-      this.cleanAppendTime();
-      this.stopStudyTime();
-    },
   }
 </script>
 
@@ -1801,44 +1786,22 @@
     margin: 20px auto;
     .course-playbox {
       background-color: #fff;
-      //min-height: 400px;
+      min-height: 400px;
       display: flex;
       justify-content: space-between;
-      .course-player-container {
-        display: flex;
-        flex-direction: column;
-        height: 100%;
-      }
       .course-player{ //内容播放区域
-        flex: 4; // 80%高度
+        background-color: rgb(238, 238, 238);
+        flex:1;
         min-width: 700px;
-        // min-height: 400px;
-        // max-height: 800px;
-        height: 80%;
+        min-height: 400px;
+        max-height: 800px;
+        //height: 100%;
         border: 1px solid #ffffff;
         padding-right: 20px;
-        background-color: rgb(238, 238, 238);
         // overflow: auto;
       }
       .course-control{ //内容控制区域
-        width: 420px;
-      }
-    }
-
-    @media screen and (max-width: 1200px) {
-      .course-playbox,
-      .course-infobox {
-        flex-direction: column;
-      }
-      .course-player,
-      .course-info {
-        min-width: 100%;
-        padding-right: 0;
-      }
-      .course-control,
-      .course-teacher {
-        width: 100%;
-        margin-top: 20px;
+         width: 420px;
       }
     }
     .course-infobox {
@@ -1960,10 +1923,13 @@
   }
 
   .player-box {
-    position: relative;
-    width: 100%;
-    max-width: 300px;
-    margin: 20px auto;
+    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;
@@ -2106,7 +2072,6 @@
   }
 
   .course-interact {
-    flex: 1; // 20%高度
     height: 54px;
     // padding-top: 10px;
     // padding-right: 10px;