Merge branch '202599-da' into 20250909-hz

# Conflicts:
#	src/api/phase2/index.js
#	src/router/index.js
#	src/views/Index.vue

src/api/boe/courseRecord.js

@@ -62,15 +62,62 @@ const courseRecordList = function(data) {
     return ajax.postJson('/b1/system/teacher/teacher-course-list',data);
 }
 const getListByToken = function(data) {
-  return ajax2.get('/manageApi',`/admin/teacherRecord/getListByToken?courseName=${data.courseName}&page=${data.page}&pageSize=${data.pageSize}`);
+  return ajax2.get('/manageApi',`/admin/teacherRecord/getListByToken?courseName=${data.courseName}&pageNo=${data.pageNo}&pageSize=${data.pageSize}`);
+}
+
+/**
+ * 导出授课记录
+ *
+ * @param {Object} data
+ */
+const courseRecordExport2 = function(data) {
+  return axios.request({
+    baseURL: "/manageApi",
+    url: '/admin/export/exportInTeacherRecord',
+    method: 'get',
+    data:data,
+    headers:{'Content-Type':'application/json;charset=utf-8'},
+    responseType: 'blob'
+  })
+}
+
+/**
+ * 导出课程下的学员信息
+ *
+ */
+const exportStudentOfCourse2 = function(courseId,courseType) {
+  return axios.request({
+    baseURL: "/manageApi",
+    url: '/admin/export/exportTeacherRecordStudentInfo?courseId='+courseId+'&courseType='+courseType,
+    method: 'get'
+    // headers:{'Content-Type':'application/json;charset=utf-8'},
+    // responseType: 'blob'
+  })
+}
+
+/**
+ * 导出教师下的所有授课记录下的学员信息
+ *
+ */
+const exportStudentOfTearcher2 = function(userId) {
+  return axios.request({
+    baseURL: "/manageApi",
+    url: '/b1/system/teacher/teacher-course-student-export?userId='+userId,
+    method: 'post',
+    headers:{'Content-Type':'application/json;charset=utf-8'},
+    responseType: 'blob'
+  })
 }
 
 
 export default {
     courseRecordExport,
+    courseRecordExport2,
     courseRecordList,
     getListByToken,
     exportStudentOfCourse,
-    exportStudentOfTearcher
+    exportStudentOfCourse2,
+    exportStudentOfTearcher,
+    exportStudentOfTearcher2,
 
 }

src/api/httpAjax.js

@@ -0,0 +1,208 @@
+import axios from 'axios'
+import qs from 'qs'
+import {Notification, MessageBox, Message} from 'element-ui'
+import store from '@/store'
+import {getToken} from '@/utils/token'
+import errorCode from '@/utils/errorCode'
+
+/**
+ *request请求 axios.request(config)
+ *requestJson请求 axios.request(config)
+ *get请求 axios.get(url[, config])
+ *post请求 axios.post(url[, data[, config]])
+ *postJson请求 axios.post(url[, data[, config]])
+ *put请求 axios.put(url[, data[, config]])
+ *putJson请求 axios.put(url[, data[, config]])
+ *patch请求 axios.patch(url[, data[, config]])
+ *patchJson请求 axios.patch(url[, data[, config]])
+ *delete请求 axios.delete(url[, config])
+ */
+
+
+// const ReLoginUrl=process.env.VUE_APP_LOGIN_URL;
+const TokenName = 'token';
+/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
+//只是用于发送json对象数据时使用post,put,patch
+/**axios.defaults.headers['Content-Type'] = 'application/x-www-form-urlencoded'**/
+//只是用于发送json对象数据时使用post,put,patch
+//用于普通的发送请求
+const formRequest = axios.create({
+  //headers:{'Content-Type':'application/x-www-form-urlencoded'},
+  // axios中请求配置有baseURL选项，表示请求URL公共部分
+  // baseURL: process.env.VUE_APP_CESOURCE_BASE_API,
+  //超时
+  timeout: 10000,
+})
+//发送json对象的拦截器
+formRequest.interceptors.request.use(config => {
+  //是否需要设置 token
+  const isToken = (config.headers || {}).isToken === false
+  let curToken = getToken();
+  //curToken='eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzIzMTE2MTIsImV4cCI6MTY3MjMxODgxMiwiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.a4f41376e994c5fcd3ab537ce17572ef4c633863f87785cf7b6ffa353e2ed51c';
+  if (curToken && !isToken) {
+    config.headers[TokenName] = curToken // 让每个请求携带自定义token 请根据实际情况自行修改
+  }
+  return config
+}, error => {
+  console.log(error)
+  Promise.reject(error)
+});
+formRequest.interceptors.response.use(res => {
+    //console.log(res);
+    const code = res.data.status || 200;
+    if (code === 200) {
+      return res.data
+    } else {
+      if (code === 401) {
+        // store.dispatch('LogOut').then(() => {
+        //    location.href = this.webBaseUrl + ReLoginUrl;
+        // })
+        console.error('', res.data);
+        return Promise.reject(new Error('接口返回未登录'))
+      } else if (code === 403) {
+        var msg = '当前操作没有权限';
+        Message({message: msg, type: 'error'});
+        return Promise.reject(new Error(msg))
+      } else {
+        //Message({message: res.data.message, type: 'error'});
+        //console.log('err' + res.data.error);
+        return res.data
+      }
+    }
+  },
+  error => {
+    console.log('err', error)
+    let {message} = error;
+    if (message == "Network Error") {
+      message = "网络异常，请稍后重试";
+    } else if (message.includes("timeout")) {
+      message = "网络异常或接口错误，请求超时";
+    } else if (message.includes("Request failed with status code")) {
+      message = "系统接口" + message.substr(message.length - 3) + "异常";
+    }
+    Message({
+      message: message,
+      type: 'error',
+      duration: 5 * 1000
+    })
+    return Promise.reject(error)
+  }
+)
+
+/**
+ * request请求,可以自定义参数
+ */
+const request = formRequest.request;
+
+/**
+ * get请求 ,只有url
+ */
+const get = function (baseURL, url) {
+  return request({
+    baseURL,
+    url: url,
+    method: 'get',
+    headers: {'Content-Type': 'application/json'}
+  })
+}
+
+/**
+ * post请求
+ * @param {Object} url
+ * @param {Object} postData
+ */
+const post = function (baseURL, url, postData) {
+  // if (postData) {
+  //   postData = qs.stringify(postData);
+  // }
+  return request({
+    baseURL,
+    url: url,
+    method: 'post',
+    data: postData,
+    headers: {'Content-Type': 'application/json'}
+  })
+}
+//post请求
+const postForm = function (baseURL, url, data) {
+  return request({
+    baseURL,
+    url,
+    data,
+    method: 'post',
+    headers: {'Content-Type': 'application/x-www-form-urlencoded'}
+  });
+}
+//  const postJson=jsonRequest.post;
+
+const postJson = function (baseURL, url, postData) {
+  return request({
+    baseURL,
+    url: url,
+    method: 'post',
+    data: postData,
+    headers: {'Content-Type': 'application/json;charset=utf-8'},
+  })
+}
+
+// 导出文件请求定义
+const postJsonToFile = function (baseURL, url, postData) {
+  return request({
+    baseURL,
+    url: url,
+    method: 'post',
+    data: postData,
+    headers: {'Content-Type': 'application/json;charset=utf-8'},
+    responseType: 'blob'
+  })
+}
+
+const getJsonToFile = function (baseURL, url, postData) {
+  return request({
+    baseURL,
+    url: url,
+    method: 'get',
+    data: postData,
+    headers: {'Content-Type': 'application/json;charset=utf-8'},
+    responseType: 'blob'
+  })
+}
+
+/**
+ * put请求
+ */
+const put = function (baseURL, url, data) {
+  if (data) {
+    data = qs.stringify(data);
+  }
+  return request({
+    baseURL,
+    url: url,
+    method: 'put',
+    data: data,
+    headers: {'Content-Type': 'application/x-www-form-urlencoded'}
+  })
+}
+
+const putJson = function (baseURL, url, data) {
+  return request({
+    baseURL,
+    url: url,
+    method: 'put',
+    data: data,
+    headers: {'Content-Type': 'application/json;charset=utf-8'},
+  })
+}
+
+
+export default {
+  tokenName: TokenName,
+  request,
+  get,
+  post,
+  postJson,
+  postJsonToFile,
+  put,
+  putJson,
+  getJsonToFile
+}

src/api/modules/course.js

@@ -1,7 +1,7 @@
 /**
  * 课程的操作，课程的添加，修改，列表查询，课程的审核发布等操作。
  * 针对于管理员，教师的功能
- * 
+ *
  **/
 import ajax from '@/utils/xajax.js'
 
@@ -170,7 +170,9 @@ 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
@@ -274,7 +276,7 @@ const countWaitAudit = function() {
 }
 
 /**
- * [已用courseAudit中的hrbpAuditList替换]
+ * [已用courseAudit中的hrbpAuditList替换]
  * 当前用户需要审核的课程列表
  * @param {Object} query 同pageList
  */
@@ -283,9 +285,9 @@ const auditList = function(query) {
 }
 
 
-/**
+/**
- * 【已移到courseAudit中】
+ * 【已移到courseAudit中】
- * 教师需要审核的课程列表
+ * 教师需要审核的课程列表
  */
 const teacherAuditList = function(query) {
     return ajax.post('/xboe/m/course/audit/teacher-course', query);
@@ -446,6 +448,7 @@ export default {
     findUpdateLogs,
     getUpdateLog,
     detail,
+    getDictIds,
     saveContent,
     pageList,
     setEnabled,

src/api/modules/teacher.js

@@ -38,7 +38,7 @@ const detailTeacher=function (id){
  * tlevelId级别
  * salaryId发薪地
  * tsystemId
- 
+
  * } query
  * @returns
  */

src/api/phase2/index.js

@@ -1,5 +1,7 @@
 import ajax from '@/utils/xajax.js'
 import http from '../unionAjax'
+import httpAjax from '../httpAjax'
+
 const baseURL = process.env.VUE_APP_MANAGER_API_PATH;
 
 
@@ -47,6 +49,18 @@ const articlelist=function (type){
 const courselist=function (data){
   return ajax.post('/xboe/portal/index/courselist',data);
 }
+// 精品课信息列表
+const qualitylist=function (data){
+  return httpAjax.post(baseURL,'/quality/home/qualityItem',data);
+}
+// 精品课分页查询
+export const qualityPageList=function (data){
+  return httpAjax.post(baseURL,'/quality/home/qualityPages',data);
+}
+// 课程精品课标记时间年份列表
+export const qualityCourseTimeMark=function (){
+  return httpAjax.post(baseURL,'/quality/manage/createYearList',{});
+}
 /**
  * 首页新课程推荐列表
  */
@@ -61,5 +75,7 @@ export default {
   articlelist,
   courselist,
   newCases,
-  getRecommendList
+  getRecommendList,
+  qualitylist,
+  qualityPageList
 }

src/components/Course/courseForm.vue

@@ -141,6 +141,7 @@
               <el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="1">PC端可见</el-radio>
               <el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="2">移动端可见</el-radio>
               <el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="3">多端可见</el-radio>
+              <el-radio style="margin-right: 10px;" v-model="courseInfo.device" v-if="isPermission" :label="4">仅内网访问</el-radio>
             </el-form-item>
             <el-form-item v-if="!weike.onlyRequired" label="课程来源">
               <el-radio-group v-model="courseInfo.source">
@@ -305,6 +306,7 @@
                 <el-radio v-model="courseInfo.device" :label="1">PC端可见</el-radio>
                 <el-radio v-model="courseInfo.device" :label="2">移动端可见</el-radio>
                 <el-radio v-model="courseInfo.device" :label="3">多端可见</el-radio>
+                <el-radio style="margin-right: 10px;" v-model="courseInfo.device" v-if="isPermission" :label="4">仅内网访问</el-radio>
               </el-col>
               <el-col :span="10">
                 <el-form-item label="课程来源">
@@ -488,6 +490,8 @@ export default {
         refType:''
       },
       visibleShow:false,
+      isPermission:false,
+      dicts:[],
       extendRefId:'',
       extendRefType:'',
       courseTeachers: [], //课程的老师
@@ -527,7 +531,11 @@ export default {
         dlgShow: false
       },
       rightTypeId: {},
-      catalogSortDialogShow: false
+      catalogSortDialogShow: false,
+      selectedOrg: {
+        orgId: null,
+        name: ''
+      }
     };
   },
   created() {
@@ -552,14 +560,18 @@ export default {
   },
   watch: {
     courseInfo: {
-      handler(newVal) {
+      handler(newVal, oldVal) {
-        //需要保存
+        // 需要保存
         this.requireSaveCourse = true;
+
+        console.log("--- watch比较 = ", oldVal.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;
@@ -581,6 +593,19 @@ export default {
     this.loadUserGroup();
   },
   methods: {
+    // 检查机构权限
+    checkOrgPermission(orgId) {
+      console.log("--- 监测组织id orgId  = ",orgId)
+      console.log("--- this.isPermission  = ",this.isPermission)
+      console.log("--- device  = ",this.courseInfo.device)
+      if (!orgId) {
+        this.isPermission = false;
+        return;
+      }
+      console.log("--- this.dicts  = ",this.dicts)
+      this.isPermission = this.dicts.includes(orgId);
+      console.log("--- 监听结束 this.isPermission  = ",this.isPermission)
+    },
     // 关键字的更改
     changeKeywords(option){
       if(option.target.value){
@@ -885,11 +910,27 @@ 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;
       this.orgName='';
-      let $this = this;
+      this.isPermission = false;
+        let $this = this;
       try {
         const { result, status } = await apiCourse.detail(id);
         if (status === 200) {
@@ -906,7 +947,10 @@ export default {
           this.contentInfo.list = result.contents;
           this.sectionInfo.list = result.sections;
           this.courseTeachers = result.teachers; //课程的老师信息
-
+          this.isPermission = result.isPermission; //课程的老师信息
+          this.dicts = result.dicts; //课程的老师信息
+          console.log("--- 编辑查看 this.isPermission  = ",this.isPermission)
+          console.log("--- 编辑查看 this.dicts  = ",this.dicts)
           if(!this.courseInfo.orgId){
             //根据课程创建者获取机构id
             apiUser.getOrgSimpleByUserId(result.course.sysCreateAid).then(ors=>{

src/components/Course/homework.vue

@@ -109,7 +109,7 @@ export default {
          if(res.status==200){
              this.info=res.result;
              //检查是否过期
-            if(res.result.deadTime!=''){
+            if(res.result.deadTime!='' && res.result.deadTime != null){
                var d = new Date(res.result.deadTime);
                var now=new Date();
                if(now.getTime() > d.getTime()){

src/components/Portal/interactBar.vue

@@ -44,7 +44,7 @@
           <!-- <svg-icon v-else style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}" :icon-class="isFavorite?'scactive2':'xihuan'"></svg-icon> -->
            <div v-else class="is_favorite" :class="isFavorite?'is_favorite_a':'is_favorite'"></div>
         </el-tooltip>
-        <span v-if="!courseExclusive" class="interact-bar-value"> {{ data.favorites? data.favorites:0}}</span>
+        <span v-if="!courseExclusive" class="interact-bar-value"> {{ data.favorites? data.favorites:data.hasCollect?number(data.hasCollect):1}}</span>
       </div>
       <div v-if="shares" @click="addShare()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
         <el-tooltip effect="light" content="分享" placement="top" :visible-arrow="false" popper-class="text-tooltip">
@@ -114,6 +114,8 @@ export default {
             shares:0,
             praises:0,
             views:0,
+             courseId:'',
+            courseName:''
           }
       }
     },
@@ -234,7 +236,7 @@ export default {
   created(){
   },
   mounted() {
-    if(this.data && this.data.id && !this.readonly){
+    if(this.data && (this.data.id||this.data.courseId) && !this.readonly){
        this.checkHas();
     }
 
@@ -308,7 +310,7 @@ export default {
         }
       let msgPageParams=this.pageParams;
       if(!msgPageParams){
-        msgPageParams=this.data.id;
+        msgPageParams=this.data.id ?this.data.id: this.data.courseId;
       }
       let message={
         content,
@@ -331,9 +333,9 @@ export default {
       })
     },
     checkHas(){
-      if(this.type>0 && !this.readonly && this.data.id){
+      if(this.type>0 && !this.readonly && (this.data.id||this.data.courseId)){
         if(this.favorites){
-          apiFavorites.has(this.type,this.data.id).then(rs=>{
+          apiFavorites.has(this.type,(this.data.id || this.data.courseId)).then(rs=>{
             if(rs.status==200 && rs.result){
               this.isFavorite=true;
             }else{
@@ -506,9 +508,11 @@ export default {
         return;
        }
       //需要判断是否已点赞，已点赞的不再加
+      console.log(this.data,'---------------');
+      
       let postData={
         objType:this.type,
-        objId:this.data.id,
+        objId:this.data.id ?this.data.id: this.data.courseId,
         title:'',
       }
       if(this.loading) {
@@ -516,7 +520,7 @@ export default {
         }
         this.loading=true;
       if(this.type==1){
-        postData.title=this.data.name;
+        postData.title=this.data.name?this.data.name:this.data.courseName;
       }else if(this.type==60){
         postData.title=this.data.content;
       } else if(this.type==5){
@@ -525,7 +529,7 @@ export default {
         postData.title=this.data.title;
       }
       if(this.isFavorite) {// 已经收藏，再次点击取消收藏
-        apiFavorites.remove(this.type,this.data.id).then(res=>{
+        apiFavorites.remove(this.type,this.data.id ?this.data.id: this.data.courseId).then(res=>{
           this.loading=false;
         if(res.status==200){
           this.isFavorite=false;
@@ -554,7 +558,7 @@ export default {
             this.$store.dispatch("unicomFavorites",true)
           }
           //if(this.type===2||this.type===4){
-            this.messageSave(this.data.id,this.data.title,this.userInfo.name,this.data.sysCreateBy,this.data.sysCreateAid,'收藏了我发布的');
+            this.messageSave(this.data.id ?this.data.id: this.data.courseId,this.data.title,this.userInfo.name,this.data.sysCreateBy,this.data.sysCreateAid,'收藏了我发布的');
           //}
           this.$message({message:'已加入收藏',type:'success'});
           //this.$emit('addFavorite',res.result);//添加收藏,如果是true代表添加成功，false代表已存在

src/components/PortalHeader.vue

@@ -13,9 +13,9 @@
               </router-link>
             </div>
             <div class="top-nav" :style="{color:textColor}" :class="current == 'course' ? activeNav : ''">
-              <router-link to="/course">课程
+              <a @click="handleChangeCourse">课程
                 <div :class="current == 'course' ? 'nav-bottbor' : ''"></div>
-              </router-link>
+              </a>
             </div>
             <div class="top-nav" :style="{color:textColor}" :class="current == 'case' ? activeNav : ''">
               <router-link to="/case">案例
@@ -214,6 +214,12 @@ export default {
     //this.loadPopupConfig();
   },
   methods: {
+    handleChangeCourse() {
+      const paths = ["/course","/qualityCourse"]
+      // 如果是 课程 和 精品课程， 那么就不再重定向
+      const needReload = paths.findIndex(e=> e === this.$route.path) === -1
+      if (needReload) this.$router.push({path: paths[0]})
+    },
 
     setCurIdentity(iden){
         this.$store.dispatch('SetCurIdentity',iden);

src/components/VideoPlayer/index.vue

@@ -317,7 +317,7 @@ export default {
     }
 
     setInterval(() => {
-          //console.log('this.currentProgress::',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.duration)
+          console.log('当前状态:',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.duration)
           // 视频播放时本地记录视频实时播放时长,视频设置了禁止拖动时执行
           if(!this.isDrag){
             var time = localStorage.getItem('videoProgressData')
@@ -364,6 +364,11 @@ export default {
       }
       // 根据视频的readyState判断下一帧是否已加载，并控制loading的显示
       this.isShowLoading = this.videoDom.readyState < 3;
+      console.log("当前缓存:"+this.videoDom.readyState)
+      if (this.videoDom.readyState < 3){
+        console.log("详细信息",this.videoDom)
+        console.log("卡了",this.videoDom.readyState)
+      }
       //if()
       //console.log(this.videoDom.readyState,'this.videoDom.readyState');
     }, 1000);

src/components/VideoPlayer/progress-bar.vue

@@ -37,7 +37,6 @@ export default {
     },
     isDrag:{
       type: Boolean,
-      default: true,
     },
     blobId:{
       type: String,

src/router/index.js

@@ -2,7 +2,6 @@ import Vue from 'vue'
 import VueRouter from 'vue-router'
 /* Layout */
 import Layout from '@/layout/index'
-import LayoutPortal from '@/layout/portal'
 import Grateful from '@/views/grateful'
 
 Vue.use(VueRouter)
@@ -362,7 +361,15 @@ export const constantRoutes = [{
     path: '/500',
     component: (resolve) => require(['@/views/error/500'], resolve),
     hidden: true
+  },
+  {
+    path: '/qualityCourse',
+    hidden: true,
+    component: (resolve) => require(['@/views/portal/course/qualityCourse'], resolve),
+    name: 'qualityCourse',
+    meta: {title: '精品课课程', keepAlive: true, icon: 'dashboard', noCache: true, affix: false},
   }
+
 ]
 
 const router = new VueRouter({

src/views/Index.vue

@@ -153,11 +153,87 @@
       </div>
     </div>
     <div class="xindex-content">
+
       <!-- 推荐课程 -->
       <div class="modules xcontent2">
-        <div class="xcontent2-main">
+        <!-- <div class="xcontent2-main"> -->
           <!--内容块-->
-          <div class="modules-title xindex-main">
+
+          <!-- </div> -->
+           <!-- 精品课模块 -->
+        <div class="xcontent2-main">
+          <div class="modules-title xindex-main" v-if="this.qusisityList.list.length>0">
+            <!-- <span class="modules-text" style="color: #3D86F4;">精品课</span> -->
+            <span class="quyer-tag" style="margin-left: 0px;">
+              <!-- <img src="../assets/images/tutoring1.pn" alt=""> -->
+              <img class="modules-text" style="height: 24px;" src="../assets/images/course/courseTitle.png" alt="">
+            </span>
+            <span class="more">
+              <router-link to="/quailtyCourse">查看更多>></router-link>
+            </span>
+          </div>
+
+
+
+          <div
+              v-for="(course, eIndex) in exquisiteList"
+              :key="'cc' + eIndex"
+              class="xindex-course courseBg"
+              style="position: relative;margin-top: 20px;"
+            >
+              <div style="position: absolute; right: 25px; bottom: 72px">
+                <interactBar
+                  nodeWidth="20px"
+                  :courseExclusive="true"
+                  :type="1"
+                  :data="course"
+                  :comments="false"
+                  :praises="false"
+                  :shares="false"
+                  :views="false"
+                >
+                </interactBar>
+                <!-- <svg-icon style="font-size: 32px;margin-top: -5px;" icon-class="collectedCourse"></svg-icon> -->
+              </div>
+              <a @click="toCourseDetail(course)">
+                <div class="xindex-course-image">
+                  <course-image :course="course"></course-image>
+                  <!-- <span v-if="course.type == 20 || 10" class="course-type"
+                    >录播课</span
+                  > -->
+                  <img v-if="course.type == 20 || 10" src="../assets/images/course/courseTag.png" class="course-type" style="background: none;" alt="">
+                </div>
+                <div
+                  style="width: 80%"
+                  :title="course.courseName"
+                  class="course-title portal-title-tow two-line-ellipsis"
+                >
+                  {{ course.courseName }}
+                </div>
+                <div class="course-author">
+                  <div class="course-author-left">
+                    {{ course.authorInfo.teacherName }}
+
+                    <span class="study-num"
+                      >{{ formatNum(course.studyNum) }}人学习</span
+                    >
+                  </div>
+                  <div style="display: flex">
+                    <div v-if="course.courseScore">
+                      <span class="course-score-value" style="margin-left: 10px"
+                        >{{ toScore(course.courseScore) }}分</span
+                      >
+                    </div>
+                    <div v-else class="course-score-no">未评分</div>
+                  </div>
+                </div>
+              </a>
+            </div>
+
+
+
+          <!--内容块-->
+          <div class="modules-title xindex-main" v-if="courseComputedOneList.length > 0">
             <span class="modules-text">推荐课程</span>
             <span class="quyer-tag">
               <a
@@ -1137,6 +1213,9 @@ export default {
         orderType: 2,
         list: [],
       },
+      qusisityList: {
+        list: [],
+      },
       // 推荐课程
       recommendedList:{
         list: [],
@@ -1164,6 +1243,7 @@ export default {
   },
   mounted() {
     this.getCourseData(1);
+    this.getEsqusiteList();
     this.getRecommendList();
     this.getPositive()
     this.getCaseData();
@@ -1227,6 +1307,10 @@ export default {
     courseComputedTwoList(){
       return this.courseList.list.slice(3)
     },
+    // 精品课展示
+    exquisiteList() {
+      return this.qusisityList.list.slice(0,3)
+    },
   },
   methods: {
     getPositive() {
@@ -1424,15 +1508,15 @@ export default {
       if (item.type == 10) {
         //return this.webBaseUrl + "/course/studyindex?id=" + item.id;
         //console.log("直接进入学习页面");
-        this.$router.push("/course/studyindex?id=" + item.id);
+        this.$router.push("/course/studyindex?id=" + item.id?item.id:item.courseId);
       } else if (item.type == 20) {
-        apiCourseStudy.hasSignup(item.id).then((rs) => {
+        apiCourseStudy.hasSignup(item.id?item.id:item.courseId).then((rs) => {
           if (rs.status == 200) {
             //return $this.webBaseUrl + "/course/studyindex?id=" + item.id;
-            this.$router.push("/course/studyindex?id=" + item.id);
+            this.$router.push("/course/studyindex?id=" + item.id?item.id:item.courseId);
           } else {
             //return $this.webBaseUrl + "/course/detail?id=" + item.id;
-            this.$router.push("/course/detail?id=" + item.id);
+            this.$router.push("/course/detail?id=" + item.id?item.id:item.courseId);
           }
         });
         //return $this.webBaseUrl + "/course/detail?id=" + item.id;
@@ -1472,6 +1556,16 @@ export default {
         }
       })
     },
+    //精品课展示
+    getEsqusiteList(){
+      let course = {
+        aid: this.userInfo.aid,
+      }
+      apiIndex.qualitylist(course).then((res) => {
+        console.log(res,'jinpinsjfhhfjash--------------------------');
+        this.qusisityList.list = res.data.result;
+      })
+    },
     getCourseData(pageIndex) {
       this.isNext = false;
       let { orderType, num } = this.courseList;
@@ -2661,6 +2755,7 @@ export default {
     // padding-bottom: 10px;
     display: flex;
     justify-content: space-between;
+    margin-bottom: 20px;
 
     .course-author-left {
       font-size: 14px;
@@ -3009,4 +3104,17 @@ export default {
     }
   }
 }
+.courseBg{
+  // width: 332px;
+  // height: 323px;
+  // background: url("../assets/images/course/courseBackground.png") no-repeat;
+  // background-size: 100% 100%; /* 或 use 'contain' */
+  // background-position: center;
+  // border: none;
+  border-radius: 12px;
+  background: linear-gradient(135deg, #e6f7ff, #f0f8ff, #ffffff);
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.05);
+  border: 1px solid #d9edf7;
+  overflow: hidden;
+}
 </style>

src/views/course/Mylecnotes.vue

@@ -1,206 +1,276 @@
 <template>
   <div style="padding: 12px 32px 10px 12px;">
-   <div style="display: flex;justify-content: flex-start;">
+    <div style="display: flex;justify-content: flex-start;">
 
-     <div><el-input v-model="keyword" placeholder="输入课程名称搜索" clearable></el-input></div>
+      <div>
-     <div style="padding-left: 10px;"><el-button @click="recordList()" type="primary" icon="el-icon-search">搜索</el-button></div>
+        <el-input v-model="keyword" placeholder="输入课程名称搜索" clearable></el-input>
-     <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" @click="keyword = ''" type="primary" >重置</el-button></div>
+      </div>
-     <div style="padding: 0px 5px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div>
+      <div style="padding-left: 10px;">
-     <div style="padding: 0px 5px;"><el-button type="primary" @click="exportStudentOfTearcher()" icon="el-icon-search" size="small" round>导出学员信息</el-button></div>
+        <el-button @click="recordList()" type="primary" icon="el-icon-search">搜索</el-button>
-   </div>
+      </div>
-   <div class="Export">
+      <div style="padding: 0px 5px;">
-     <!-- <div style="padding-left: 10px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div> -->
+        <el-button icon="el-icon-refresh-right" @click="keyword = ''" type="primary">重置</el-button>
-     <!-- <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary" size="small" round>导出学员信息</el-button></div> -->
+      </div>
-   </div>
+      <div style="padding: 0px 5px;">
-   <div style="margin-top:20px;">
+        <el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button>
-     <el-table :data="pageData" border stripe>
+      </div>
-         <el-table-column
+<!--      <div style="padding: 0px 5px;">-->
-         label="课程时间"
+<!--        <el-button type="primary" @click="exportStudentOfTearcher()" icon="el-icon-search" size="small" round>-->
-         prop="courseTime"
+<!--          导出学员信息-->
-         width="200px">
+<!--        </el-button>-->
-         </el-table-column>
+<!--      </div>-->
-         <el-table-column
+    </div>
-         label="课程名称"
+    <div class="Export">
-         prop="courseName"
+      <!-- <div style="padding-left: 10px;"><el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button></div> -->
-         width="200px">
+      <!-- <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary" size="small" round>导出学员信息</el-button></div> -->
-         </el-table-column>
+    </div>
-         <el-table-column
+    <div style="margin-top:20px;">
-         label="开课场地"
+      <el-table :data="pageData" border stripe>
-         prop="address"
+        <el-table-column
-         width="240px">
+          label="序号"
-         </el-table-column>
+          prop="index"
-         <el-table-column
+          width="100px">
-         label="所属课程"
-         prop="parentCourse"
-         width="120px">
-         </el-table-column>
-         <el-table-column
-         label="所属项目"
-         prop="parentProject"
-         ></el-table-column>
-         <el-table-column
-         label="所属路径"
-         prop="parentRoute"
-         width="200px"
-         ></el-table-column>
-         <el-table-column
-         label="学习总人数"
-         prop="studentNumber"
-         width="100px"
-         ></el-table-column>
-         <el-table-column
-         label="时长(分钟)"
-         width="100px"
-         prop="period"
-         ></el-table-column>
-         <el-table-column
-         label="评分"
-         width="100px"
-         prop="score"
-          ></el-table-column>
-         <el-table-column
-         label="操作"
-         align="center"
-         width="150px"
-         prop="cz"
-         fixed="right"
-          >
           <template v-slot="scope">
-           <el-button type="text" @click="exportStudentOfCourse(scope.row.courseId)" size="small">导出学员信息</el-button>
+            <span>{{ scope.$index + 1 }}</span>
-         </template>
+          </template>
-       </el-table-column>
+        </el-table-column>
-     </el-table>
+        <el-table-column
-   </div>
+          label="讲师工号"
+          prop="userNo"
+          width="100px">
+        </el-table-column>
+        <el-table-column
+          label="讲师姓名"
+          prop="teacherName"
+          width="200px">
+        </el-table-column>
+        <el-table-column
+          label="课程名称"
+          prop="courseName"
+          width="200px">
+        </el-table-column>
+        <el-table-column
+          label="培训发生组织"
+          prop="trainOrgName"
+          width="200px">
+        </el-table-column>
+        <el-table-column label="课程类型" prop="type" width="120px">
+          <template v-slot="scope">
+                <span>{{
+                    {
+                      "0": "在线课",
+                      "1": "面授课",
+                      "2": "课程开发",
+                      "3": "作业员入模培训",
+                      "4": "其他",
+                    }[scope.row.type + '']
+                  }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="授课/课程日期"
+          prop="teachingDate"
+          width="200px">
+        </el-table-column>
 
- <div style="text-align: center; margin-top:57px">
+        <el-table-column
-  <el-pagination
+          label="内容分类"
-   background
+          prop="courseTypeName"
-     @size-change="handleSizeChange"
+          width="200px">
-     @current-change="handleCurrentChange"
+        </el-table-column>
-     :current-page="pageInfo.page"
+        <el-table-column label="开课状态" width="100px" prop="courseStatus">
-     :page-sizes="[10, 20, 30, 40]"
+          <template v-slot="scope">
-     :page-size="pageInfo.pageSize"
+                <span>{{
-     layout="total, sizes, prev, pager, next, jumper"
+                    {
-     :total="pageInfo.total"
+                      "0": "未开课",
-   ></el-pagination>
+                      "1": "已开课",
-   </div>
+                    }[scope.row.courseStatus + '']
+                  }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="授课时长(分钟)"
+          prop="teaching"
+          width="120px"
+        ></el-table-column>
+        <el-table-column
+          label="参训人数"
+          prop="studys"
+          width="120px"
+        ></el-table-column>
+        <el-table-column
+          label="评分"
+          prop="score"
+          width="100px"
+        ></el-table-column>
+        <el-table-column
+          label="是否生成讲师费"
+          prop="createdFee"
+          width="100px"
+        >
+          <template v-slot="scope">
+                <span>{{
+                    {
+                      "0": "否",
+                      "1": "是",
+                    }[scope.row.createdFee + '']
+                  }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="备注"
+          width="200px"
+          prop="remark"
+        ></el-table-column>
+        <el-table-column
+          label="操作"
+          align="center"
+          width="150px"
+          prop="cz"
+          fixed="right"
+        >
+          <template v-slot="scope">
+            <el-button type="text" @click="exportStudentOfCourse(scope.row.courseId, scope.row.type)"
+                       size="small">导出学员信息
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
 
- </div>
+    <div style="text-align: center; margin-top:57px">
+      <el-pagination
+        background
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="pageInfo.page"
+        :page-sizes="[10, 20, 30, 40]"
+        :page-size="pageInfo.pageSize"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="pageInfo.total"
+      ></el-pagination>
+    </div>
+
+  </div>
 </template>
 
 <script>
 import apiCourse from '../../api/boe/courseRecord.js';
-import { mapGetters } from 'vuex';
+import {mapGetters} from 'vuex';
+
 export default {
-data(){
+  data() {
- return {
+    return {
-     pageData:[],
+      pageData: [],
-     keyword:'',
+      keyword: '',
-     pageInfo:{},
+      pageInfo: {
- }
+        pageIndex:1,
-},
+        pageSize:10,
+      },
+    }
+  },
+  mounted() {
+    this.recordList();
+  },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  methods: {
+    // 导出所有记录
+    exportFile() {
+      // let req = {
+      // }
+      // apiCourse.courseRecordExport2(req).then(res => {
+      //   const link = document.createElement('a');// 创建a标签
+      //   let blob = new Blob([res.data], {type: 'application/vnd.ms-excel'}); // 设置文件类型
+      //   link.style.display = "none";
+      //   link.href = URL.createObjectURL(blob); // 创建URL
+      //   link.setAttribute("download", "授课记录.xls");
+      //   document.body.appendChild(link);
+      //   link.click();
+      //   document.body.removeChild(link);
+      // })
+      // 取pageData记录第一条
+      if (this.pageData.length > 0) {
+        let teacherId = this.pageData[0].teacherId;
+        window.open(
+          `/manageApi/admin/export/exportInTeacherRecord?teacherId=${teacherId}`
+        );
+      }
+    },
 
-mounted() {
+    // 导出课程下的学员信息
- this.recordList(1);
+    exportStudentOfCourse(courseId, courseType) {
+      // apiCourse.exportStudentOfCourse2(courseId, courseType).then(res => {
+      //   const link = document.createElement('a');// 创建a标签
+      //   let blob = new Blob([res.data], {type: 'application/vnd.ms-excel'}); // 设置文件类型
+      //   link.style.display = "none";
+      //   link.href = URL.createObjectURL(blob); // 创建URL
+      //   link.setAttribute("download", "授课记录.xls");
+      //   document.body.appendChild(link);
+      //   link.click();
+      //   document.body.removeChild(link);
+      // })
 
-},
+      window.open(
-computed: {
+        `/manageApi/admin/export/exportTeacherRecordStudentInfo?courseId=${courseId}&courseType=${courseType}`
- ...mapGetters(['userInfo'])
+      );
-},
+    },
 
-methods: {
+    // 导出教师下的所有授课记录下的学员信息
+    exportStudentOfTearcher() {
+      let userId = this.userInfo.sysId;
+      apiCourse.exportStudentOfTearcher2(userId).then(res => {
+        const link = document.createElement('a');// 创建a标签
+        let blob = new Blob([res.data], {type: 'application/vnd.ms-excel'}); // 设置文件类型
+        link.style.display = "none";
+        link.href = URL.createObjectURL(blob); // 创建URL
+        link.setAttribute("download", "授课记录.xls");
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+      })
+    },
 
-   // 导出所有记录
+    recordList() {
-   exportFile(){
+      let req = {
-     let req = {
+        courseName: this.keyword,
-       userId: this.userInfo.sysId
+        pageNo: this.pageInfo.pageIndex,
-       // userId:"70F80F4E-34BA-10AB-894A-8FA812B19637"
+        pageSize: this.pageInfo.pageSize
-     }
+      }
-     apiCourse.courseRecordExport(req).then(res=>{
+      apiCourse.getListByToken(req).then(res => {
-         const link = document.createElement('a');// 创建a标签
+        if (res.status == 200) {
-         let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); // 设置文件类型
+          this.pageData = res.data.records;
-         link.style.display = "none";
+          this.pageInfo.pageSize = Number(res.data.size);
-         link.href = URL.createObjectURL(blob); // 创建URL
+          this.pageInfo.total = Number(res.data.total);
-         link.setAttribute("download", "授课记录.xls");
+          this.pageInfo.page = Number(res.data.current);
-         document.body.appendChild(link);
+        } else {
-         link.click();
-         document.body.removeChild(link);
-     })
-   },
-
-
-   // 导出课程下的学员信息
-   exportStudentOfCourse(courseId){
-     let userId = this.userInfo.sysId;
-     apiCourse.exportStudentOfCourse(userId,courseId).then(res=>{
-         const link = document.createElement('a');// 创建a标签
-         let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); // 设置文件类型
-         link.style.display = "none";
-         link.href = URL.createObjectURL(blob); // 创建URL
-         link.setAttribute("download", "授课记录.xls");
-         document.body.appendChild(link);
-         link.click();
-         document.body.removeChild(link);
-     })
-   },
-
-   // 导出教师下的所有授课记录下的学员信息
-   exportStudentOfTearcher(){
-     let userId = this.userInfo.sysId;
-     // let userId = '5D36C207-64F4-C512-312D-C9598257695C';
-     apiCourse.exportStudentOfTearcher(userId).then(res=>{
-         const link = document.createElement('a');// 创建a标签
-         let blob = new Blob([res.data],{type: 'application/vnd.ms-excel'}); // 设置文件类型
-         link.style.display = "none";
-         link.href = URL.createObjectURL(blob); // 创建URL
-         link.setAttribute("download", "授课记录.xls");
-         document.body.appendChild(link);
-         link.click();
-         document.body.removeChild(link);
-     })
-   },
-
-
-   recordList(pageIndex){
-     let req = {
-     //     userId:"6B049FAF-C314-7CCF-0D28-0D23F4C42531",
-         userId: this.userInfo.sysId,
-         keyword:this.keyword,
-         page:pageIndex,
-         pageSize:10
-     }
-     apiCourse.courseRecordList(req).then(res=>{
-       if(res.status == 200) {
-         this.pageData = res.result.list;
-         this.pageInfo = res.result.pageInfo;
-       } else {
           this.$message({
-           type: 'error',
+            type: 'error',
-           message: res.message
+            message: res.message
-         });
+          });
-       }
+        }
-     })
+      })
-   },
+    },
-
-   // 每页显示的条数事件
-   handleSizeChange(val){
-     this.pageInfo.pageSize = val;
-     this.recordList(1);
-   },
-   // 显示制定页的数据
-   handleCurrentChange(val){
-     this.pageInfo.pageIndex = val;
-     this.recordList(this.pageInfo.pageIndex);
-   },
-
-},
 
+    // 每页显示的条数事件
+    handleSizeChange(val) {
+      this.pageInfo.pageIndex = 1;
+      this.pageInfo.pageSize = val;
+      this.recordList();
+    },
+    // 显示制定页的数据
+    handleCurrentChange(val) {
+      this.pageInfo.pageIndex = val;
+      this.recordList(this.pageInfo.pageIndex);
+    },
+  },
 }
 </script>
 
 <style lang="scss" scoped>
-.Export{
+.Export {
-display: flex;
+  display: flex;
-padding-top: 10px;
+  padding-top: 10px;
 }
 </style>

src/views/exam/ExamList.vue

@@ -954,7 +954,7 @@ export default {
     },
     findPapers() {
       let params={
-        pageSize:200,
+        pageSize:10000,
         name:''
       }
       apiPaper.querypaper(params).then((res) => {

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">
+            class="swiper-slide games pointer"  >
-            <div class="bannbox" :style="{
+            <div class="bannbox" @click="handleCarouselClick(item)" :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">
+            class="swiper-slide games pointer"  >
-            <div class="bannbox" :style="{
+            <div class="bannbox" @click="handleCarouselClick(item)"  :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,6 +249,13 @@ 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">认证讲师库（2023）</span>
+              <span style="cursor: pointer;" class="nav">认证讲师库</span>
             </div>
             <div style="position: relative;">
               <el-input class="portal-input" placeholder="请输入课程名称" style="border-radius: 20px !important; "

src/views/grateful/index.vue

@@ -5,7 +5,7 @@
     <!-- </div> -->
     <!-- 底部 -->
     <div class="grateful">
-      <img src="../../assets/images/grateful/gratefulFooter.png" alt="" />
+      <img src="../../assets/images/grateful/gratefulFooter20250613.png" alt="" />
     </div>
   </div>
 </template>

src/views/hotforum/Index-bak.vue

@@ -0,0 +1,179 @@
+<template>
+  <div class="hot">
+    <div>
+      <div class="center">
+        <div class="item" :style="{marginRight:(i%2==0||i==0)?'49px':'0'}" v-for="item,i in imgData" :key="i">
+          <img class="img" @click="goLearn(item.url)" :src="require(`../../assets/images/hotforum/${item.img}.png`)" alt="">
+        </div>
+      </div>
+      <div style="display: flex;justify-content: center;margin-bottom: 52px;">
+        <img src="../../assets/images/hotforum/foot.png" alt="">
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "hotforum",
+    data() {
+      return {
+        imgData:[
+          {img:'01',url:'1265897142383042560'},
+          {img:'02',url:'1265697724606210048'},
+          {img:'003',url:'1280185851054231552'},
+          {img:'04',url:'1321778585966247936'},
+        ],
+      }
+    },
+    methods: {
+      goLearn(item){
+        if(item){
+          // this.$router.push({path:'/course/detail',query:{id:item}})
+          window.open(`https://u.boe.com/pc/course/detail?id=${item}`)
+        }
+      },
+    },
+  }
+</script>
+
+<style lang="scss" scoped>
+.hot{
+  width: 100%;
+  // max-width: 1920px;
+  min-height: 100%;
+  // min-height: 1373px;
+  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  justify-content: center;
+  .center{
+    max-width: 1270px;
+    max-height: 700px;
+    margin-bottom: 5%;
+    margin-top: 22%;
+    display: flex;
+    flex-wrap: wrap;
+    .item{
+      width: 610px;
+      height: 330px;
+      background: url("../../assets/images/hotforum/border.png") no-repeat;
+      background-size: 100%;
+      padding: 14px;
+      padding-top: 31px;
+      margin-bottom: 59px;
+      cursor: pointer;
+      .img{
+        width: 581px;
+        height: 283px;
+      }
+    }
+  }
+  /* 当窗口宽度大于3068px时的样式 */
+}
+@media (min-width: 3000px) {
+.hot{
+  width: 100%;
+  // max-width: 1920px;
+  min-height: 100%;
+  // min-height: 1373px;
+  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  justify-content: center;
+  .center {
+    max-width: 2560px;
+    max-height: 1300px;
+    margin-bottom: 5%;
+    margin-top: 30vh;
+    display: flex;
+    flex-wrap: wrap;
+
+    .item {
+      width: 1220px;
+      height: 660px;
+      background: url("../../assets/images/hotforum/border.png") no-repeat;
+      background-size: 100%;
+      padding: 28px;
+      padding-top: 62px;
+      margin-bottom: 59px;
+
+      .img {
+        width: 100%; // 图片宽度占满item宽度
+        height: auto; // 自动调整高度
+      }
+    }
+  }
+}
+}
+@media (min-height: 1500px) {
+.hot{
+  width: 100%;
+  // max-width: 1920px;
+  min-height: 100%;
+  // min-height: 1373px;
+  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  justify-content: center;
+  .center {
+    max-width: 1068px;
+    max-height: 580px;
+    margin-bottom: 5%;
+    margin-top: 30vh;
+    display: flex;
+    flex-wrap: wrap;
+
+    .item {
+      width: 500px;
+      height: 271px;
+      background: url("../../assets/images/hotforum/border.png") no-repeat;
+      background-size: 100%;
+      padding: 14px;
+      padding-top: 26px;
+      margin-bottom: 30px;
+
+      .img {
+        width: 100%; // 图片宽度占满item宽度
+        height: auto; // 自动调整高度
+      }
+    }
+  }
+}
+}
+@media (min-width: 1928px) and (max-width: 3000px) {
+.hot{
+  width: 100%;
+  // max-width: 1920px;
+  min-height: 100%;
+  // min-height: 1373px;
+  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background-size: 100% 100%;
+  display: flex;
+  justify-content: center;
+  .center {
+    max-width: 1800px;
+    max-height: 1100px;
+    margin-bottom: 5%;
+    margin-top: 35vh;
+    display: flex;
+    flex-wrap: wrap;
+
+    .item {
+      width: 860px;
+      height: 466px;
+      background: url("../../assets/images/hotforum/border.png") no-repeat;
+      background-size: 100%;
+      padding: 28px;
+      padding-top: 48px;
+      margin-bottom: 70px;
+
+      .img {
+        width: 100%; // 图片宽度占满item宽度
+        height: auto; // 自动调整高度
+      }
+    }
+  }
+}
+}
+</style>

src/views/hotforum/Index.vue

@@ -1,7 +1,24 @@
 <template>
-  <div class="hot">
+  <div class="hot25">
     <div>
-      <div class="center">
+      <div class="title25" style="">
+          <img class="img" src="../../assets/images/hotforum/2025.png" alt="">
+      </div>
+      <div class="center" style="margin-top: 60px;">
+        <div class="item" style="margin-right: 49px;">
+          <img class="img" @click="goLearn('1351506180295131136')" src="../../assets/images/hotforum/2501.jpg" alt="">
+        </div>
+        <div class="item">
+          <img class="img" @click="goLearn('1375146833375027200')" src="../../assets/images/hotforum/2503.png" alt="">
+        </div>
+      </div>
+      <div class="line" style="margin: 0 auto;margin-top: 60px;width: 100%;text-align: center;">
+        <img class="img" src="../../assets/images/hotforum/line.png" alt="">
+      </div>
+      <div class="title24" style="margin: 0 auto;margin-top: 60px;width: 100%;text-align: center;">
+        <img class="img" src="../../assets/images/hotforum/2024.png" alt="">
+      </div>
+      <div class="center" style="margin-top: 60px;">
         <div class="item" :style="{marginRight:(i%2==0||i==0)?'49px':'0'}" v-for="item,i in imgData" :key="i">
           <img class="img" @click="goLearn(item.url)" :src="require(`../../assets/images/hotforum/${item.img}.png`)" alt="">
         </div>
@@ -11,11 +28,12 @@
       </div>
     </div>
   </div>
+
 </template>
 
 <script>
   export default {
-    name: "hotforum",
+    name: "hotforumNew",
     data() {
       return {
         imgData:[
@@ -24,6 +42,10 @@
           {img:'003',url:'1280185851054231552'},
           {img:'04',url:'1321778585966247936'},
         ],
+        imgData25:[
+          {img:'2501',url:'1351506180295131136'},
+          {img:'2503',url:'1375146833375027200'},
+        ],
       }
     },
     methods: {
@@ -38,20 +60,22 @@
 </script>
 
 <style lang="scss" scoped>
-.hot{
+.hot25{
   width: 100%;
   // max-width: 1920px;
   min-height: 100%;
   // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+  background: url("../../assets/images/hotforum/back25.png") no-repeat;
-  background-size: 100% 100%;
+  background-size: cover;
   display: flex;
   justify-content: center;
+  .title25{
+    margin: 0 auto;margin-top: 100px;width: 100%;text-align: center;
+  }
   .center{
     max-width: 1270px;
     max-height: 700px;
     margin-bottom: 5%;
-    margin-top: 22%;
     display: flex;
     flex-wrap: wrap;
     .item{
@@ -71,109 +95,109 @@
   }
   /* 当窗口宽度大于3068px时的样式 */
 }
-@media (min-width: 3000px) {
+// @media (min-width: 3000px) {
-.hot{
+// .hot{
-  width: 100%;
+//   width: 100%;
-  // max-width: 1920px;
+//   // max-width: 1920px;
-  min-height: 100%;
+//   min-height: 100%;
-  // min-height: 1373px;
+//   // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+//   background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-  background-size: 100% 100%;
+//   background-size: 100% 100%;
-  display: flex;
+//   display: flex;
-  justify-content: center;
+//   justify-content: center;
-  .center {
+//   .center {
-    max-width: 2560px;
+//     max-width: 2560px;
-    max-height: 1300px;
+//     max-height: 1300px;
-    margin-bottom: 5%;
+//     margin-bottom: 5%;
-    margin-top: 30vh;
+//     margin-top: 30vh;
-    display: flex;
+//     display: flex;
-    flex-wrap: wrap;
+//     flex-wrap: wrap;
 
-    .item {
+//     .item {
-      width: 1220px;
+//       width: 1220px;
-      height: 660px;
+//       height: 660px;
-      background: url("../../assets/images/hotforum/border.png") no-repeat;
+//       background: url("../../assets/images/hotforum/border.png") no-repeat;
-      background-size: 100%;
+//       background-size: 100%;
-      padding: 28px;
+//       padding: 28px;
-      padding-top: 62px;
+//       padding-top: 62px;
-      margin-bottom: 59px;
+//       margin-bottom: 59px;
 
-      .img {
+//       .img {
-        width: 100%; // 图片宽度占满item宽度
+//         width: 100%; // 图片宽度占满item宽度
-        height: auto; // 自动调整高度
+//         height: auto; // 自动调整高度
-      }
+//       }
-    }
+//     }
-  }
+//   }
-}
+// }
-}
+// }
-@media (min-height: 1500px) {
+// @media (min-height: 1500px) {
-.hot{
+// .hot{
-  width: 100%;
+//   width: 100%;
-  // max-width: 1920px;
+//   // max-width: 1920px;
-  min-height: 100%;
+//   min-height: 100%;
-  // min-height: 1373px;
+//   // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+//   background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-  background-size: 100% 100%;
+//   background-size: 100% 100%;
-  display: flex;
+//   display: flex;
-  justify-content: center;
+//   justify-content: center;
-  .center {
+//   .center {
-    max-width: 1068px;
+//     max-width: 1068px;
-    max-height: 580px;
+//     max-height: 580px;
-    margin-bottom: 5%;
+//     margin-bottom: 5%;
-    margin-top: 30vh;
+//     margin-top: 30vh;
-    display: flex;
+//     display: flex;
-    flex-wrap: wrap;
+//     flex-wrap: wrap;
 
-    .item {
+//     .item {
-      width: 500px;
+//       width: 500px;
-      height: 271px;
+//       height: 271px;
-      background: url("../../assets/images/hotforum/border.png") no-repeat;
+//       background: url("../../assets/images/hotforum/border.png") no-repeat;
-      background-size: 100%;
+//       background-size: 100%;
-      padding: 14px;
+//       padding: 14px;
-      padding-top: 26px;
+//       padding-top: 26px;
-      margin-bottom: 30px;
+//       margin-bottom: 30px;
 
-      .img {
+//       .img {
-        width: 100%; // 图片宽度占满item宽度
+//         width: 100%; // 图片宽度占满item宽度
-        height: auto; // 自动调整高度
+//         height: auto; // 自动调整高度
-      }
+//       }
-    }
+//     }
-  }
+//   }
-}
+// }
-}
+// }
-@media (min-width: 1928px) and (max-width: 3000px) {
+// @media (min-width: 1928px) and (max-width: 3000px) {
-.hot{
+// .hot{
-  width: 100%;
+//   width: 100%;
-  // max-width: 1920px;
+//   // max-width: 1920px;
-  min-height: 100%;
+//   min-height: 100%;
-  // min-height: 1373px;
+//   // min-height: 1373px;
-  background: url("../../assets/images/hotforum/back.jpg") no-repeat;
+//   background: url("../../assets/images/hotforum/back.jpg") no-repeat;
-  background-size: 100% 100%;
+//   background-size: 100% 100%;
-  display: flex;
+//   display: flex;
-  justify-content: center;
+//   justify-content: center;
-  .center {
+//   .center {
-    max-width: 1800px;
+//     max-width: 1800px;
-    max-height: 1100px;
+//     max-height: 1100px;
-    margin-bottom: 5%;
+//     margin-bottom: 5%;
-    margin-top: 35vh;
+//     margin-top: 35vh;
-    display: flex;
+//     display: flex;
-    flex-wrap: wrap;
+//     flex-wrap: wrap;
 
-    .item {
+//     .item {
-      width: 860px;
+//       width: 860px;
-      height: 466px;
+//       height: 466px;
-      background: url("../../assets/images/hotforum/border.png") no-repeat;
+//       background: url("../../assets/images/hotforum/border.png") no-repeat;
-      background-size: 100%;
+//       background-size: 100%;
-      padding: 28px;
+//       padding: 28px;
-      padding-top: 48px;
+//       padding-top: 48px;
-      margin-bottom: 70px;
+//       margin-bottom: 70px;
 
-      .img {
+//       .img {
-        width: 100%; // 图片宽度占满item宽度
+//         width: 100%; // 图片宽度占满item宽度
-        height: auto; // 自动调整高度
+//         height: auto; // 自动调整高度
-      }
+//       }
-    }
+//     }
-  }
+//   }
-}
+// }
-}
+// }
 </style>

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"></author>
+                  :sex="authorInfo.sex" :name="authorInfo.name"></author>
                 <span>案主：{{ authorInfo.name }} ({{ authorInfo.orgInfo }})</span>
                 <!-- <span>案主：{{ authorInfo.name }}</span>
                     <span>工号：{{ authorInfo.code }}</span>
@@ -651,6 +651,9 @@ export default {
       });
     },
     getCaseData() {
+      // 清空pdf数据
+      this.pdfPath = '';
+
       let $this = this;
       apiCase.details(this.resolveId, true).then(res => {
         if (res.status == 200) {

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/study/coursenew.vue

@@ -22,91 +22,101 @@
       <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="resType == null || resType == 0">
+            <div v-if="renderCourse">
-              <!--先显示视频图片-->
+              <div v-if="resType == null || resType == 0">
-              <course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
+                <!--先显示视频图片-->
-            </div>
+                <course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
-            <div v-if="resType == 10" style="position: relative;">
+              </div>
-              <videoPlayer ref="myVideoPlayer" id="myVideoPlayer" @progress="progress" :src="blobUrl" :blobId="blobId" @onPlayerPlaying="onPlayerPlaying"
+              <div v-if="resType == 10" style="position: relative;">
-                :initTime="contentData.lastStudyTime" :notePlay="notePlay" @onPlayerPlay="onPlayerPlay"
+                <videoPlayer ref="myVideoPlayer" id="myVideoPlayer" @progress="progress" :src="blobUrl" :blobId="blobId" @onPlayerPlaying="onPlayerPlaying"
-                :isDrag="curriculumData.isDrag" @onFullscreen="onFullscreen" @onPlayerPause="onPlayerPause"
+                             :initTime="contentData.lastStudyTime" :notePlay="notePlay" @onPlayerPlay="onPlayerPlay"
-                @onPlayerEnded="onPlayerEnded" :isCrowd="isCrowd" @onTimeUpdate="handleAudioTimeUpdate"></videoPlayer>
+                             :isDrag="curriculumData.isDrag" @onFullscreen="onFullscreen" @onPlayerPause="onPlayerPause"
-              <div class="player-box" v-if="playerBoxShow">
+                             @onPlayerEnded="onPlayerEnded" :isCrowd="isCrowd" @onTimeUpdate="handleAudioTimeUpdate"></videoPlayer>
-                <div class="player-praise" style="cursor: pointer;">
+                <div class="player-box" v-if="playerBoxShow">
-                  <div @click="praiseContent">
+                  <div class="player-praise" style="cursor: pointer;">
-                    <img class="icon-small" v-if="isPraise" :src="require('@/assets/images/icon/praise-active.png')" />
+                    <div @click="praiseContent">
-                    <img class="icon-small" v-else :src="require('@/assets/images/icon/zhan.png')" />
+                      <img class="icon-small" v-if="isPraise" :src="require('@/assets/images/icon/praise-active.png')" />
-                    <!-- {{ courseInfo.praises }} -->
+                      <img class="icon-small" v-else :src="require('@/assets/images/icon/zhan.png')" />
-                    <div style="color:#fff;cursor: pointer;">赞</div>
+                      <!-- {{ 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 style="margin-left: 15px;cursor: pointer;" @click="treadContent">
+                  <div v-if="!scoreInfo.has" class="player-rate">
-                    <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>
+                    <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">
+                  <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>
+              <div v-if="resType == 20">
-            <div v-if="resType == 20">
+                <div class="con-audio">
-              <div class="con-audio">
+                  <div class="con-audio-title">{{ contentData.contentName }}</div>
-                <div class="con-audio-title">{{ contentData.contentName }}</div>
+                  <div class="con-audio-player">
-                <div class="con-audio-player">
+                    <audioPlayer v-if="resType == 20" :url="blobUrl" :name="contentData.contentName" @onPlaying="audioPlaying" :isDrag="curriculumData.isDrag"
-                  <audioPlayer v-if="resType == 20" :url="blobUrl" :name="contentData.contentName" @onPlaying="audioPlaying" :isDrag="curriculumData.isDrag"
+                                 @onPlay="audioPlay" @onPause="audioPause" @onPlayEnd="audioEnd"></audioPlayer>
-                    @onPlay="audioPlay" @onPause="audioPause" @onPlayEnd="audioEnd"></audioPlayer>
+                  </div>
                 </div>
               </div>
-            </div>
+              <div v-if="resType == 40">
-            <div v-if="resType == 40">
+                <div style="padding: 10px;color: #ed0000; " v-if="curCFile.converStatus < 2 && !contentData.content">
-              <div style="padding: 10px;color: #ed0000; " v-if="curCFile.converStatus < 2 && !contentData.content">
+                  <div>此课程内容无法预览，请联系管理员</div>
-                <div>此课程内容无法预览，请联系管理员</div>
-              </div>
-              <div style="padding: 10px;color: #ed0000;" v-if="curCFile.converStatus == 3 && !contentData.content">
-                此课程内容无法预览，请联系管理员
-              </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 == 50" style="min-height: 500px;">
-              <iframe v-if="scormUrl" :src="scormUrl" frameborder="0"  border="0px" style="width:100%;height:500px;border:0px;"></iframe>
-            </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"
+                <div style="padding: 10px;color: #ed0000;" v-if="curCFile.converStatus == 3 && !contentData.content">
-                    style="width: 100%;border:0px;min-height: 473px;" frameborder="0"></iframe></div>
+                  此课程内容无法预览，请联系管理员
+                </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 == 50" style="min-height: 500px;">
+                <iframe v-if="scormUrl" :src="scormUrl" frameborder="0"  border="0px" style="width:100%;height:500px;border:0px;"></iframe>
+              </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 @submit="homeWorkSubmit" v-if="resType == 60 && studyId != ''" :studyId="studyId" :content="contentData"></homework>
+              </div>
+              <div v-if="resType == 61">
+                <exam @startTest="startTest" 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 v-if="resType == 60">
+            <div v-if="!renderCourse && Internet ==2" style="margin:350px 250px" class="jianjie pdftext" id="pdfPreview">
-              <homework @submit="homeWorkSubmit" v-if="resType == 60 && studyId != ''" :studyId="studyId" :content="contentData"></homework>
+              <div style="margin-top:40px;font-weight:700;font-size: 22px;color: #ccc">
-            </div>
+                <span>十分抱歉，您当前的网络环境不符合观看要求。为了保障课程信息的安全，您需要接入公司内网才能观看。</span>
-            <div v-if="resType == 61">
+              </div>
-              <exam @startTest="startTest" v-if="resType == 61 && studyId != '' " :studyId="studyId" :content="contentData"></exam>
+              <div style="margin-top:20px;text-align:center" @click="refreshPage">
-            </div>
+                <el-button type="primary">重新检测</el-button>
-            <div v-if="resType == 62" style="padding:5px">
+              </div>
-              <assess v-if="resType == 62 && studyId != '' && contentData.id" :studyId="studyId" :content="contentData">
-              </assess>
             </div>
           </div>
           <!--交互部分-->
@@ -167,7 +177,7 @@
             </div>
             <!-- 课程单元  -->
             <div class="course-units" v-if="tab == 1">
-              <div :style="`height: ${controlHeight}px;overflow-y: auto;`">
+              <div style="min-height: 350px;max-height: 650px ;overflow-y: auto;">
                 <div class="catalog" v-if="courseInfo.type == 20">
                   <div  v-for="(item, index) in catalogTree" :key="index" :name="index">
                     <el-menu
@@ -303,6 +313,17 @@
         </div>
       </div>
     </div>
+    <el-dialog class="protocol" :close-on-click-modal="false" :visible="protocolDialogVisible" width="30%"
+               :show-close="false">
+      <div class="protocol-title">{{warnTitle}}</div>
+      <div class="protocol-content">
+        &emsp;&emsp;{{warn}}
+      </div>
+      <span slot="footer" class="dialog-footer">
+          <el-button type="primary" @click="protocolDialogVisible = false">确
+                定</el-button>
+      </span>
+    </el-dialog>
     <!-- <div><portal-footer></portal-footer></div> -->
   </div>
 </template>
@@ -369,6 +390,7 @@
     },
     data() {
       return {
+        protocolDialogVisible: false,
         tentative: false,
         isContentTypeTwo: null,
         isContentType: null,
@@ -390,6 +412,7 @@
         curCFile: {
           converStatus: 4,
         },
+        Internet: 3,//1是成功 2是是失败 3是检测中
         radio: '',
         interactRuning: false,
         playerBoxShow: false,
@@ -431,6 +454,7 @@
         getType: getType,
         ctabName: 'catalog',
         resType: null,
+        renderCourse: true,
         activeNames: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9],
         scoreInfo: {
           dlgShow: false,
@@ -454,9 +478,12 @@
         cumulativeDuration:0, //非音频累计时长
         maxDuration:0, //非音频最大时长
         defaultMaxTime:1800, //非音频默认最大时间
+        warn:"测试内容",
+        warnTitle:"测试标题",
       }
     },
     mounted() {
+      this.getInternet();
       // 增加的用户受众id
       let localKey = "user_" + this.userInfo.sysId + "_gids";
       let hasIds = sessionStorage.getItem(localKey);
@@ -504,10 +531,6 @@
         return treeList;
       }
     },
-    destroyed(){
-      this.cleanAppendTime();
-      this.stopStudyTime();
-    },
     methods: {
       handleOpen(key,path){
         if(this.isFalse){
@@ -522,13 +545,13 @@
       },
       noteChange(){
         //视频点定位，直接到播放的视频位置
-         this.timer = new Date().getTime()
+        this.timer = new Date().getTime()
       },
       //清空追加学习时长事件
       cleanAppendTime(){
-         if(this.appendStudyOtherHandle){
+        if(this.appendStudyOtherHandle){
-            window.clearTimeout(this.appendStudyOtherHandle);
+          window.clearTimeout(this.appendStudyOtherHandle);
-         }
+        }
       },
       //非音视频课学习时长的增加,每一分钟保存一次
       appendStudyOtherTime() {
@@ -539,46 +562,46 @@
         if (!this.contentData.id) {
           return;
         }
-          //每一分钟保存一次
+        //每一分钟保存一次
-          // 取消阅读的每分钟六十秒的计时，最多是设置的时间或默认时间
+        // 取消阅读的每分钟六十秒的计时，最多是设置的时间或默认时间
-          let $this=this;
+        let $this=this;
-          let startTime = new Date().getTime();
+        let startTime = new Date().getTime();
-          this.appendStudyOtherHandle = setTimeout(function() {
+        this.appendStudyOtherHandle = setTimeout(function() {
-            let endTime = new Date().getTime();
+          let endTime = new Date().getTime();
-            let totalTime = Math.round((endTime - startTime) / 1000);
+          let totalTime = Math.round((endTime - startTime) / 1000);
-            $this.cumulativeDuration += totalTime;
+          $this.cumulativeDuration += totalTime;
-            if($this.cumulativeDuration <= $this.maxDuration){
+          if($this.cumulativeDuration <= $this.maxDuration){
-              //发送时长
+            //发送时长
-              $this.sendStudyOtherTime(totalTime);
+            $this.sendStudyOtherTime(totalTime);
-              //递归调用
+            //递归调用
-              $this.appendStudyOtherTime();
+            $this.appendStudyOtherTime();
-            }else{
+          }else{
-              clearTimeout(this.appendStudyOtherHandle);
+            clearTimeout(this.appendStudyOtherHandle);
-              $this.cumulativeDuration = 0;
+            $this.cumulativeDuration = 0;
-              $this.maxDuration = 0;
+            $this.maxDuration = 0;
-            }
+          }
-          }, 1000*60);
+        }, 1000*60);
 
       },
       sendStudyOtherTime(totalTime){
         //静默处理
         apiStat.sendEvent({
-            "key": "StudyCourseOther",//课程学习的key
+          "key": "StudyCourseOther",//课程学习的key
-            "title": "非音视频课内容",//事件的标题
+          "title": "非音视频课内容",//事件的标题
-            "parameters":"second:" + totalTime,//second:value 本次的学习时长
+          "parameters":"second:" + totalTime,//second:value 本次的学习时长
-            "content": "学习课程",//事件的内容
+          "content": "学习课程",//事件的内容
-            "objId": this.courseInfo.id,//课程的id
+          "objId": this.courseInfo.id,//课程的id
-            "objType": "1",//类型
+          "objType": "1",//类型
-            "source":"page",
+          "source":"page",
-            "objInfo": ""+this.courseInfo.name,
+          "objInfo": ""+this.courseInfo.name,
-            "aid":this.userInfo.aid, //当前登录人的id
+          "aid":this.userInfo.aid, //当前登录人的id
-            "aname":this.userInfo.name,//当前人的姓名
+          "aname":this.userInfo.name,//当前人的姓名
-            "status": 1 //状态
+          "status": 1 //状态
-          }).then(rs=>{
+        }).then(rs=>{
-              if(rs.status != 200) {
+          if(rs.status != 200) {
-                console.log(rs.message);
+            console.log(rs.message);
-              }
+          }
-          });
+        });
       },
       //笔记组件触发，播放指定时间
       onPlayVideo(contentId,time){
@@ -587,32 +610,32 @@
         console.log(contentId,this.contentData.id,'两个内容id');
         let $this=this;
         if(this.contentData.id==contentId){
-           this.onPlayerPause()
+          this.onPlayerPause()
-           this.contentData.lastStudyTime=time;
+          this.contentData.lastStudyTime=time;
-           setTimeout(() => {
+          setTimeout(() => {
-             $this.$refs.myVideoPlayer.startPlay(time);
+            $this.$refs.myVideoPlayer.startPlay(time);
-           }, 10)
+          }, 10)
-           console.log('开始播放1');
+          console.log('开始播放1');
         }else{
-           //通过contentId
+          //通过contentId
-           let toResContent=null;
+          let toResContent=null;
-            this.contentList.forEach(c => {
+          this.contentList.forEach(c => {
-              if(c.id==contentId){
+            if(c.id==contentId){
-                 c.lastStudyTime=time;
+              c.lastStudyTime=time;
-                 toResContent=c;
+              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;
       },
@@ -690,23 +713,23 @@
         }else if(r.contentType==50){ //scorm
           this.scormUrl='';
           apiCourseFile.detail(r.contentRefId).then(cfrs => {
-             if(cfrs.status==200){
+            if(cfrs.status==200){
-                this.curCFile = cfrs.result;
+              this.curCFile = cfrs.result;
-                //this.scormUrl=cfrs
+              //this.scormUrl=cfrs
-                let pars='?mode=normal&r='+Math.random();
+              let pars='?mode=normal&r='+Math.random();
-                pars+='&scormId='+this.curCFile.id;
+              pars+='&scormId='+this.curCFile.id;
-                pars+='&courseId='+this.courseId;
+              pars+='&courseId='+this.courseId;
-                pars+='&contentId='+r.id;
+              pars+='&contentId='+r.id;
-                pars+='&studentId='+this.userInfo.aid;
+              pars+='&studentId='+this.userInfo.aid;
-                pars+='&studentName='+encodeURIComponent(this.userInfo.name);
+              pars+='&studentName='+encodeURIComponent(this.userInfo.name);
-                pars+='&lmsId='+this.studyId;
+              pars+='&lmsId='+this.studyId;
-                pars+='&scoId=';//不指定，scorm模块自动根据学习记录定位
+              pars+='&scoId=';//不指定，scorm模块自动根据学习记录定位
-                let urlPre=window.location.protocol;
+              let urlPre=window.location.protocol;
-                let configUrl=process.env.VUE_APP_SCORM_URL;
+              let configUrl=process.env.VUE_APP_SCORM_URL;
-                configUrl=urlPre+configUrl.substring(configUrl.indexOf(':')+1);
+              configUrl=urlPre+configUrl.substring(configUrl.indexOf(':')+1);
 
-                this.scormUrl=configUrl+pars;//播放的首页
+              this.scormUrl=configUrl+pars;//播放的首页
-             }
+            }
           });
 
         }else if (r.contentType == 52) {
@@ -737,12 +760,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() {
@@ -752,18 +775,18 @@
             // 没有设置默认时长三十分钟，
             $this.maxDuration =  r.duration !== 0 ? r.duration * 2 : $this.defaultMaxTime;
             $this.$store.dispatch("userTrigger", {
-                "key": "StudyCourseOther",//课程学习的key
+              "key": "StudyCourseOther",//课程学习的key
-                "title": "非音视频课内容",//事件的标题
+              "title": "非音视频课内容",//事件的标题
-                "parameters":"second:15",//second:value 本次的学习时长
+              "parameters":"second:15",//second:value 本次的学习时长
-                "content": "学习课程",//事件的内容
+              "content": "学习课程",//事件的内容
-                "objId": $this.courseInfo.id,//课程的id
+              "objId": $this.courseInfo.id,//课程的id
-                "objType": "1",//类型
+              "objType": "1",//类型
-                "source":"page",
+              "source":"page",
-                "objInfo": ""+$this.courseInfo.name,
+              "objInfo": ""+$this.courseInfo.name,
-                "aid":$this.userInfo.aid, //当前登录人的id
+              "aid":$this.userInfo.aid, //当前登录人的id
-                "aname":$this.userInfo.name,//当前人的姓名
+              "aname":$this.userInfo.name,//当前人的姓名
-                "status": 1 //状态
+              "status": 1 //状态
-             });
+            });
             $this.appendStudyOtherTime();
           }, 15000); //非音视频课程学习,十五秒后记录
           this.isContentType = this.contentData.contentType
@@ -780,20 +803,21 @@
 
 
         this.$nextTick(function(){
-            if (r.contentType == 10) {
+          if (r.contentType == 10) {
-              console.log('视频处理lastStudyTime',this.contentData.lastStudyTime)
+            console.log('视频处理lastStudyTime',this.contentData.lastStudyTime)
-              console.log('视频处理progressVideo',this.contentData.progressVideo)
+            console.log('视频处理progressVideo',this.contentData.progressVideo)
-              this.$refs.myVideoPlayer.updateProgressByClickBar2(this.contentData.lastStudyTime,this.contentData.progressVideo);
+            this.$refs.myVideoPlayer.updateProgressByClickBar2(this.contentData.lastStudyTime,this.contentData.progressVideo);
-            }
+          }
 
-            let h=$this.$refs.coursePlayer.offsetHeight;
+          let h=$this.$refs.coursePlayer.offsetHeight;
-            //解决获取高度不正的问题
+          //解决获取高度不正的问题
-            if(h>400 && h<500){
+          if(h>400 && h<500){
-              h=h+40;
+            h=h+40;
-            }else if(h>500){
+          }else if(h>500){
-              h=h+60;
+            h=h+60;
-            }
+          }
-            $this.controlHeight=h-95;
+          // 移除高度控制 防止内容塌陷
+            // $this.controlHeight=h-95;
         })
 
 
@@ -935,9 +959,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,
@@ -1078,7 +1102,7 @@
               class: 'catalog-cell-state1'
             };
           }
-          break;
+            break;
         }
         return data;
       },
@@ -1139,8 +1163,8 @@
           var markDiv = div.querySelector("#" + divId);
           console.log("去除水印 ---- gx markDiv ----",markDiv);
           if (markDiv) {
-              console.log("执行去除水印 ---- gx markDiv ----",markDiv);
+            console.log("执行去除水印 ---- gx markDiv ----",markDiv);
-      	      div.removeChild(markDiv);
+            div.removeChild(markDiv);
           }
         }
       },
@@ -1199,9 +1223,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.progressVideo = arr[this.blobId]
-              // postData.contentId = this.contentData.id
+                // postData.contentId = this.contentData.id
-              // postData.courseId = this.contentData.courseId
+                // postData.courseId = this.contentData.courseId
               }
             }
             //console.log('记录播放时间')
@@ -1259,9 +1283,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.progressVideo = arr[this.blobId]
-            // postData.contentId = this.contentData.id
+              // postData.contentId = this.contentData.id
-            // postData.courseId = this.contentData.courseId
+              // postData.courseId = this.contentData.courseId
             }
           }
           //console.log('记录播放时间')
@@ -1299,6 +1323,17 @@
           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;
@@ -1309,11 +1344,11 @@
             }
             //设置必须的字段
             if(rs.result.contents.length==1){
-               $this.tab=2;
+              $this.tab=2;
-               //console.log('内容只有一个');
+              //console.log('内容只有一个');
             }
             if(!rs.result.isCrowd){
-                $this.$message.error('您没有查看该课程的权限');
+              $this.$message.error('您没有查看该课程的权限');
             }
             // 是否播放
             this.isCrowd = rs.result.isCrowd
@@ -1357,7 +1392,8 @@
               }
             }
             this.courseInfo = rs.result.course;
-
+            this.warn = rs.result.warn;
+            this.warnTitle = rs.result.warnTitle;
             if (rs.result.teachers && rs.result.teachers.length > 0) {
               let userIds = [];
               let ctoUsers = [];
@@ -1386,12 +1422,53 @@
             this.totalContent = rs.result.contents.length;
             //加载学习的数据
             this.loadStudyData(rs.result);
-
           } else {
             this.$message.error(rs.message);
           }
+
         });
       },
+      refreshPage() {
+        location.reload();
+        // this.getInternet();
+        // this.loadData();
+      },
+      getXmlHttpRequest() {
+        if (window.XMLHttpRequest) {
+          return new XMLHttpRequest();
+        }
+        else if (window.ActiveXObject) {
+          return new ActiveXObject("Microsoft.XMLHTTP");
+        }
+      },
+      // 检测是否为内网
+      getInternet() {
+        this.Internet = 3;
+        let $this = this;
+        let xmlhttp = this.getXmlHttpRequest();
+        let timedOut = false;
+        let timer = setTimeout(function () {
+          timedOut = true;
+          xmlhttp.abort();
+        }, 1000);
+        xmlhttp.open("HEAD", window.location.protocol + "//uapi.boe.com.cn/500.html", true);
+        xmlhttp.send();
+        xmlhttp.onreadystatechange = function () {
+          if (xmlhttp.readyState == 4) {
+            if (xmlhttp.status == 200) {
+              clearTimeout(timer);
+              $this.Internet = 1;
+            } else {
+              clearTimeout(timer);
+              // $this.protocolDialogVisible=true
+              $this.Internet = 2;
+            }
+          } else {
+            if (timedOut) return;//忽略中止请求
+            clearTimeout(timer);//取消等待的超时
+          }
+        }
+      },
       loadStudyData(result) {
         let $this=this;
         this.loadScorePraiseAndTrample();
@@ -1514,37 +1591,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
+            "key": "StudyCourse",//课程学习的key
-              "title": "学习课程",//事件的标题
+            "title": "学习课程",//事件的标题
-              "parameters":"second:"+duration,//second:value,total:value 本次的学习时长
+            "parameters":"second:"+duration,//second:value,total:value 本次的学习时长
-              "content": "学习课程【"+this.courseInfo.name+"】",//事件的内容
+            "content": "学习课程【"+this.courseInfo.name+"】",//事件的内容
-              "objId": this.courseInfo.id,//课程的id
+            "objId": this.courseInfo.id,//课程的id
-              "objType": "1",//类型
+            "objType": "1",//类型
-              "source":"page",
+            "source":"page",
-              "objInfo": ""+this.courseInfo.name,
+            "objInfo": ""+this.courseInfo.name,
-              "aid":this.userInfo.aid, //当前登录人的id
+            "aid":this.userInfo.aid, //当前登录人的id
-              "aname":this.userInfo.name,//当前人的姓名
+            "aname":this.userInfo.name,//当前人的姓名
-              "status": 1, //状态
+            "status": 1, //状态
-              "contentId": this.contentData.id,
+            "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);
             }
-            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,
@@ -1566,13 +1643,13 @@
       },
       //结束追加学习时长
       stopStudyTime(){
-          //console.log('停止追加学习时长');
+        //console.log('停止追加学习时长');
-          this.isAppendTime=false;
+        this.isAppendTime=false;
-          //暂停让他为空 从新计时
+        //暂停让他为空 从新计时
-          this.appendStartTime = null
+        this.appendStartTime = null
-          if (this.appendHandle != null) {
+        if (this.appendHandle != null) {
-              window.clearTimeout(this.appendHandle);
+          window.clearTimeout(this.appendHandle);
-          }
+        }
       },
       appendStudyTime() {
         // 暂停的时候重新从十五秒开始计时
@@ -1594,11 +1671,11 @@
         this.appendHandle &&  window.clearTimeout(this.appendHandle);
         //启动下次追加学习时长
         this.appendHandle = setTimeout(() => {
-            let endTime = new Date().getTime();
+          let endTime = new Date().getTime();
-            this.appentInterval = 60
+          this.appentInterval = 60
-            let totalTime = Math.round((endTime - this.appendStartTime) / 1000);
+          let totalTime = Math.round((endTime - this.appendStartTime) / 1000);
-            this.appendStudyTime();
+          this.appendStudyTime();
-            this.saveStudyDuration(totalTime)
+          this.saveStudyDuration(totalTime)
         }, this.appentInterval * 1000);
       },
 
@@ -1664,26 +1741,30 @@
       },
       handleAudioTimeUpdate(currentTime) {
         // if(this.contentStudysLength.length == 0){
-          let params = {
+        let params = {
-            studyId: this.studyId, //学习id,
+          studyId: this.studyId, //学习id,
-            courseId: this.courseId, //课程id,
+          courseId: this.courseId, //课程id,
-            contentId: this.contentData.id, //内容id,
+          contentId: this.contentData.id, //内容id,
-            contentType: this.contentData.contentType,
+          contentType: this.contentData.contentType,
-            contentName: this.contentData.contentName, //内容名称
+          contentName: this.contentData.contentName, //内容名称
-            progress: 1,
+          progress: 1,
-            status: 2,
+          status: 2,
-            contentTotal: this.totalContent
+          contentTotal: this.totalContent
-          };
+        };
-          if(currentTime > 2 && this.trueFalse){
+        if(currentTime > 2 && this.trueFalse){
-            apiStudy.studyContent(params).then(()=>{
+          apiStudy.studyContent(params).then(()=>{
-              if(this.contentData.status<2){
+            if(this.contentData.status<2){
-                this.contentData.status = 2;
+              this.contentData.status = 2;
-              }
+            }
-            })
+          })
-            this.trueFalse = false
+          this.trueFalse = false
-          }
+        }
       },
     },
+    destroyed(){
+      this.cleanAppendTime();
+      this.stopStudyTime();
+    },
   }
 </script>
 
@@ -1720,21 +1801,44 @@
     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:1;
+        flex: 4; // 80%高度
         min-width: 700px;
-        min-height: 400px;
+        // min-height: 400px;
-        max-height: 800px;
+        // max-height: 800px;
-        //height: 100%;
+        height: 80%;
         border: 1px solid #ffffff;
         padding-right: 20px;
+        background-color: rgb(238, 238, 238);
         // overflow: auto;
       }
       .course-control{ //内容控制区域
-         width: 420px;
+        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;
       }
     }
     .course-infobox {
@@ -1856,13 +1960,10 @@
   }
 
   .player-box {
-    position: absolute;
+    position: relative;
-    // top: 62px;
+    width: 100%;
-    // left: 184px;
+    max-width: 300px;
-    width: 300px;
+    margin: 20px auto;
-    left: 50%;
-    top: 50%;
-    transform: translate(-50%, -50%);
     height: 187px;
     background: rgba(74, 74, 74, .5);
     border-radius: 33px;
@@ -2005,6 +2106,7 @@
   }
 
   .course-interact {
+    flex: 1; // 20%高度
     height: 54px;
     // padding-top: 10px;
     // padding-right: 10px;
@@ -2368,4 +2470,18 @@
     height: 200px;
     background: url('../../../public/images/couresdetail.png');
   }
+
+.protocol {
+  .protocol-title {
+    font-size: 20px;
+    font-weight: 600;
+    text-align: center;
+    margin-bottom: 25px;
+  }
+
+  .protocol-content {
+    font-size: 14px;
+    line-height: 25px;
+  }
+}
 </style>