Compare commits
39 Commits
master-202
...
master-072
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f91e2f12dd | ||
|
|
b8858348c0 | ||
|
|
6208caf4ca | ||
|
|
18324458f3 | ||
|
|
c24b54957a | ||
|
|
33c9d2140f | ||
|
|
afd1bec458 | ||
|
|
81602506c7 | ||
|
|
b9f23eb657 | ||
|
|
147366f738 | ||
|
|
3cfa3ffec3 | ||
|
|
a8bcd3832b | ||
|
|
d9f69001a5 | ||
|
|
93e769be42 | ||
|
|
206f0e825d | ||
|
|
3bb4b519f1 | ||
|
|
fe790389ca | ||
|
|
44a5baec18 | ||
|
|
ee8a76c4df | ||
|
|
12c1bdb1a8 | ||
|
|
df0e1ad0ed | ||
|
|
ea54ea2c20 | ||
|
|
5fe9d2eb96 | ||
|
|
b6562e5c9c | ||
|
|
a0dcd27f8c | ||
|
|
8bc2bc96a8 | ||
|
|
ab2ac961f5 | ||
|
|
6727dd838b | ||
|
|
28aa639e1c | ||
|
|
05d48f5313 | ||
|
|
505e3ce00c | ||
|
|
ff908554fd | ||
|
|
e031dcd935 | ||
|
|
2139e15813 | ||
|
|
8497deea52 | ||
|
|
8746904cb9 | ||
|
|
213e5abce3 | ||
|
|
dc7f942303 | ||
|
|
4c1c370879 |
@@ -114,6 +114,10 @@ const studyVideoTime = function(data) {
|
||||
return ajax.post('/xboe/school/study/course/study-video-time',data);
|
||||
}
|
||||
|
||||
const updateStudyVideoTime = function(data) {
|
||||
return ajax.post('/xboe/school/study/course/updateStudyVideoTime',data);
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取上一次的学习内容
|
||||
* @returns
|
||||
@@ -408,6 +412,7 @@ export default {
|
||||
studyIndex,
|
||||
studyInfo,
|
||||
studyVideoTime,
|
||||
updateStudyVideoTime,
|
||||
lastStudy,
|
||||
studyContent,
|
||||
appendStudyTime,
|
||||
|
||||
BIN
src/assets/images/grateful/gratefulFooter20250613.png
Normal file
|
After Width: | Height: | Size: 657 KiB |
BIN
src/assets/images/hotforum/2024.png
Normal file
|
After Width: | Height: | Size: 84 KiB |
BIN
src/assets/images/hotforum/2025.png
Normal file
|
After Width: | Height: | Size: 111 KiB |
BIN
src/assets/images/hotforum/2501.jpg
Normal file
|
After Width: | Height: | Size: 33 KiB |
BIN
src/assets/images/hotforum/2502.png
Normal file
|
After Width: | Height: | Size: 244 KiB |
BIN
src/assets/images/hotforum/2503.png
Normal file
|
After Width: | Height: | Size: 186 KiB |
BIN
src/assets/images/hotforum/back25.png
Normal file
|
After Width: | Height: | Size: 1.4 MiB |
BIN
src/assets/images/hotforum/line.png
Normal file
|
After Width: | Height: | Size: 3.0 KiB |
@@ -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,9 +560,15 @@ export default {
|
||||
},
|
||||
watch: {
|
||||
courseInfo: {
|
||||
handler(newVal) {
|
||||
//需要保存
|
||||
handler(newVal, oldVal) {
|
||||
// 需要保存
|
||||
this.requireSaveCourse = true;
|
||||
|
||||
console.log("--- watch比较 = ", oldVal.orgId, newVal.orgId);
|
||||
if (newVal.orgId !== oldVal.orgId) {
|
||||
console.log("--- watch newVal.orgId = ", newVal.orgId);
|
||||
this.checkOrgPermission(newVal.orgId);
|
||||
}
|
||||
},
|
||||
deep: true
|
||||
}
|
||||
@@ -581,6 +595,22 @@ 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;
|
||||
}
|
||||
this.isPermission = this.dicts.includes(orgId);
|
||||
this.courseInfo.device = 3;
|
||||
if(this.isPermission){
|
||||
this.courseInfo.device = 4;
|
||||
}
|
||||
console.log("--- 监听结束 this.isPermission = ",this.isPermission)
|
||||
},
|
||||
// 关键字的更改
|
||||
changeKeywords(option){
|
||||
if(option.target.value){
|
||||
@@ -889,7 +919,8 @@ export default {
|
||||
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 +937,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=>{
|
||||
|
||||
@@ -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()){
|
||||
|
||||
@@ -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);
|
||||
@@ -512,6 +517,7 @@ export default {
|
||||
this.currentProgress = progressVideo;
|
||||
this.barrageTimelineStart = newCurrentTime;
|
||||
this.videoDom.currentTime = newCurrentTime;
|
||||
this.updateProgressText();
|
||||
},
|
||||
/* 提高视频音量
|
||||
*/
|
||||
|
||||
@@ -86,10 +86,9 @@ export default {
|
||||
if(current<0) current = 0;
|
||||
var time = localStorage.getItem('videoProgressData');
|
||||
var arr = time&&JSON.parse(time) || {}
|
||||
//console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
|
||||
// 禁止拖动
|
||||
console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
|
||||
// 禁止拖动 true:禁止拖动,false:允许拖动
|
||||
if(!this.isDrag && time && arr[this.blobId] < current) return;
|
||||
|
||||
this.$emit("updateProgress", current);
|
||||
// }
|
||||
|
||||
@@ -103,7 +102,7 @@ export default {
|
||||
if(current<0) current = 0;
|
||||
var time = localStorage.getItem('videoProgressData');
|
||||
var arr = time&&JSON.parse(time) || {}
|
||||
//console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
|
||||
console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
|
||||
// 禁止拖动
|
||||
if(!this.isDrag && time && arr[this.blobId] < current) return;
|
||||
this.$emit("updateProgress", current);
|
||||
@@ -119,12 +118,12 @@ export default {
|
||||
if(current<0) current = 0;
|
||||
var time = localStorage.getItem('videoProgressData');
|
||||
var arr = time&&JSON.parse(time) || {}
|
||||
//console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
|
||||
console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
|
||||
this.$emit("getMouseDownStatus", false);
|
||||
// 禁止拖动
|
||||
if(!this.isDrag && time && arr[this.blobId] < current) return;
|
||||
this.$emit("updateProgress", current);
|
||||
|
||||
this.$emit("getMouseDownStatus", false);
|
||||
}
|
||||
},
|
||||
},
|
||||
|
||||
@@ -954,7 +954,7 @@ export default {
|
||||
},
|
||||
findPapers() {
|
||||
let params={
|
||||
pageSize:200,
|
||||
pageSize:10000,
|
||||
name:''
|
||||
}
|
||||
apiPaper.querypaper(params).then((res) => {
|
||||
|
||||
@@ -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>
|
||||
|
||||
179
src/views/hotforum/Index-bak.vue
Normal file
@@ -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>
|
||||
@@ -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-size: 100% 100%;
|
||||
background: url("../../assets/images/hotforum/back25.png") no-repeat;
|
||||
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) {
|
||||
.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;
|
||||
// @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;
|
||||
// .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;
|
||||
// .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;
|
||||
// .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;
|
||||
// .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;
|
||||
// .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; // 自动调整高度
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// .img {
|
||||
// width: 100%; // 图片宽度占满item宽度
|
||||
// height: auto; // 自动调整高度
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
</style>
|
||||
|
||||
@@ -225,7 +225,7 @@
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
|
||||
</div>
|
||||
<portal-footer></portal-footer>
|
||||
</div>
|
||||
@@ -653,7 +653,7 @@ export default {
|
||||
itemId:this.coursewareInfo.studyItemId,
|
||||
videoTime:intTime
|
||||
}
|
||||
apicourseStudy.studyVideoTime(postData).then(rs=>{
|
||||
apicourseStudy.updateStudyVideoTime(postData).then(rs=>{
|
||||
if(rs.status!=200){
|
||||
console.log('记录播放时间错误');
|
||||
}
|
||||
@@ -693,7 +693,7 @@ export default {
|
||||
itemId:this.coursewareInfo.studyItemId,
|
||||
videoTime:intTime
|
||||
}
|
||||
apicourseStudy.studyVideoTime(postData).then(rs=>{
|
||||
apicourseStudy.updateStudyVideoTime(postData).then(rs=>{
|
||||
if(rs.status!=200){
|
||||
console.log('记录播放时间错误');
|
||||
}
|
||||
|
||||
@@ -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">
|
||||
<!--先显示视频图片-->
|
||||
<course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
|
||||
</div>
|
||||
<div v-if="resType == 10" style="position: relative;">
|
||||
<videoPlayer ref="myVideoPlayer" id="myVideoPlayer" @progress="progress" :src="blobUrl" :blobId="blobId" @onPlayerPlaying="onPlayerPlaying"
|
||||
:initTime="contentData.lastStudyTime" :notePlay="notePlay" @onPlayerPlay="onPlayerPlay"
|
||||
:isDrag="curriculumData.isDrag" @onFullscreen="onFullscreen" @onPlayerPause="onPlayerPause"
|
||||
@onPlayerEnded="onPlayerEnded" :isCrowd="isCrowd" @onTimeUpdate="handleAudioTimeUpdate"></videoPlayer>
|
||||
<div class="player-box" v-if="playerBoxShow">
|
||||
<div class="player-praise" style="cursor: pointer;">
|
||||
<div @click="praiseContent">
|
||||
<img class="icon-small" v-if="isPraise" :src="require('@/assets/images/icon/praise-active.png')" />
|
||||
<img class="icon-small" v-else :src="require('@/assets/images/icon/zhan.png')" />
|
||||
<!-- {{ courseInfo.praises }} -->
|
||||
<div style="color:#fff;cursor: pointer;">赞</div>
|
||||
<div v-if="false">
|
||||
<div v-if="resType == null || resType == 0">
|
||||
<!--先显示视频图片-->
|
||||
<course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
|
||||
</div>
|
||||
<div v-if="resType == 10" style="position: relative;">
|
||||
<videoPlayer ref="myVideoPlayer" id="myVideoPlayer" @progress="progress" :src="blobUrl" :blobId="blobId" @onPlayerPlaying="onPlayerPlaying"
|
||||
:initTime="contentData.lastStudyTime" :notePlay="notePlay" @onPlayerPlay="onPlayerPlay"
|
||||
:isDrag="curriculumData.isDrag" @onFullscreen="onFullscreen" @onPlayerPause="onPlayerPause"
|
||||
@onPlayerEnded="onPlayerEnded" :isCrowd="isCrowd" @onTimeUpdate="handleAudioTimeUpdate"></videoPlayer>
|
||||
<div class="player-box" v-if="playerBoxShow">
|
||||
<div class="player-praise" style="cursor: pointer;">
|
||||
<div @click="praiseContent">
|
||||
<img class="icon-small" v-if="isPraise" :src="require('@/assets/images/icon/praise-active.png')" />
|
||||
<img class="icon-small" v-else :src="require('@/assets/images/icon/zhan.png')" />
|
||||
<!-- {{ 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">
|
||||
<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">
|
||||
<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>
|
||||
</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>
|
||||
<el-rate v-model="scoreInfo.score" text-color="#ff9900" score-template="{value}" void-color="#fff" @change="addScore"></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 class="con-audio">
|
||||
<div class="con-audio-title">{{ contentData.contentName }}</div>
|
||||
<div class="con-audio-player">
|
||||
<audioPlayer v-if="resType == 20" :url="blobUrl" :name="contentData.contentName" @onPlaying="audioPlaying" :isDrag="curriculumData.isDrag"
|
||||
@onPlay="audioPlay" @onPause="audioPause" @onPlayEnd="audioEnd"></audioPlayer>
|
||||
<div v-if="resType == 20">
|
||||
<div class="con-audio">
|
||||
<div class="con-audio-title">{{ contentData.contentName }}</div>
|
||||
<div class="con-audio-player">
|
||||
<audioPlayer v-if="resType == 20" :url="blobUrl" :name="contentData.contentName" @onPlaying="audioPlaying" :isDrag="curriculumData.isDrag"
|
||||
@onPlay="audioPlay" @onPause="audioPause" @onPlayEnd="audioEnd"></audioPlayer>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="resType == 40">
|
||||
<div style="padding: 10px;color: #ed0000; " v-if="curCFile.converStatus < 2 && !contentData.content">
|
||||
<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 v-if="resType == 40">
|
||||
<div style="padding: 10px;color: #ed0000; " v-if="curCFile.converStatus < 2 && !contentData.content">
|
||||
<div>此课程内容无法预览,请联系管理员</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 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"
|
||||
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">
|
||||
<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 v-if="true" style="margin:350px 250px" class="jianjie pdftext" id="pdfPreview">
|
||||
<div style="margin-top:40px;font-weight:700;font-size: 22px;color: #ccc">
|
||||
<span>十分抱歉,您当前的网络环境不符合观看要求。为了保障案例信息的安全,您需要接入公司内网才能观看。</span>
|
||||
</div>
|
||||
<div style="margin-top:20px;text-align:center" @click="getInternet" >
|
||||
<el-button type="primary">重新检测</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!--交互部分-->
|
||||
@@ -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">
|
||||
  {{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,
|
||||
@@ -454,6 +477,8 @@
|
||||
cumulativeDuration:0, //非音频累计时长
|
||||
maxDuration:0, //非音频最大时长
|
||||
defaultMaxTime:1800, //非音频默认最大时间
|
||||
warn:"测试内容",
|
||||
warnTitle:"测试标题",
|
||||
}
|
||||
},
|
||||
mounted() {
|
||||
@@ -467,7 +492,6 @@
|
||||
this.stopStudyTime();//先关闭
|
||||
this.cleanAppendTime();//
|
||||
this.loadData();
|
||||
//console.log(this.$xpage.constants.fileBaseUrl,'this.$xpage.constants.fileBaseUrl');
|
||||
},
|
||||
computed: {
|
||||
...mapGetters(['userInfo']),
|
||||
@@ -511,14 +535,12 @@
|
||||
},
|
||||
methods: {
|
||||
handleOpen(key,path){
|
||||
// console.log(key,path,'handleOpen')
|
||||
if(this.isFalse){
|
||||
this.defaultOpeneds = [key]
|
||||
}
|
||||
this.isFalse = false
|
||||
},
|
||||
handleClose(key,path){
|
||||
// console.log(key,path,'handleClose')
|
||||
},
|
||||
toUserHome(tea){
|
||||
this.$router.push({path:this.$xpage.getHomePath(tea.teacherId)})
|
||||
@@ -591,9 +613,7 @@
|
||||
let $this=this;
|
||||
if(this.contentData.id==contentId){
|
||||
this.onPlayerPause()
|
||||
//this.audioPause();
|
||||
this.contentData.lastStudyTime=time;
|
||||
//this.onPlayerPlay();
|
||||
setTimeout(() => {
|
||||
$this.$refs.myVideoPlayer.startPlay(time);
|
||||
}, 10)
|
||||
@@ -610,7 +630,6 @@
|
||||
if(toResContent){
|
||||
|
||||
this.changePlayRes(toResContent);
|
||||
//this.onPlayerPlay();
|
||||
setTimeout(() => {
|
||||
$this.$refs.myVideoPlayer.startPlay(time);
|
||||
}, 10)
|
||||
@@ -621,18 +640,9 @@
|
||||
}
|
||||
}
|
||||
this.playerBoxShow = false;
|
||||
//this.changePlayRes(r);
|
||||
// this.playerBoxShow = false;
|
||||
// this.notePlay = null;
|
||||
// let $this=this;
|
||||
// setTimeout(() => {
|
||||
// $this.notePlay = time;
|
||||
// }, 500)
|
||||
},
|
||||
//笔记组件触发,记录当前播放时间
|
||||
videoLocation() {
|
||||
//this.$store.dispatch("SetIntTimeNote", this.intTimeNote);
|
||||
//console.log(this.contentData.id+'='+this.intTimeNote,'设置视频播放时间')
|
||||
this.$refs.mynote.setVideoTime(this.contentData.id,this.intTimeNote);
|
||||
},
|
||||
coutab(n) {
|
||||
@@ -642,9 +652,7 @@
|
||||
let nowDate = new Date();
|
||||
let ctime = parseInt(nowDate.getTime() / 1000);
|
||||
let beforeUrl = parseInt(nowDate.getTime() / 1000) + '/' + fid;
|
||||
//console.log(beforeUrl,'beforeUrl');
|
||||
let urlSign = encodeURIComponent(encrypt(beforeUrl));
|
||||
//console.log(urlSign,'urlSign');
|
||||
cookies.set('PLAYSIGN_TIME', ctime); //写客户端的cookie保存
|
||||
//以下判断是为了区分本地环境和服务器环境
|
||||
if (process.env.NODE_ENV == 'development') {
|
||||
@@ -652,9 +660,7 @@
|
||||
} else {
|
||||
this.blobUrl = process.env.VUE_APP_BASE_API + '/xboe/m/course/cware/resource?sign=' + urlSign;
|
||||
}
|
||||
// console.log('this.contentData.id:',this.contentData.id)
|
||||
this.blobId = this.contentData.id
|
||||
//console.log(this.blobUrl,'this.blobUrl');
|
||||
},
|
||||
widthOpen(url) {
|
||||
window.open(url, '_blank');
|
||||
@@ -687,8 +693,6 @@
|
||||
this.curriculumData.url = r.content;
|
||||
}
|
||||
this.$refs.mynote.showVideoTimeBtn(true);
|
||||
//let url=process.env.VUE_APP_BASE_API+'/xboe/m/course/file/show?cf='+this.curriculumData.url;
|
||||
//let url=this.fileBaseUrl+this.curriculumData.url;
|
||||
this.createPlayUrl(r.contentRefId, this.curriculumData.url);
|
||||
} else if (r.contentType == 40) {
|
||||
// if (r.content != '' && r.content.indexOf('.pdf') == -1) {
|
||||
@@ -787,7 +791,6 @@
|
||||
});
|
||||
$this.appendStudyOtherTime();
|
||||
}, 15000); //非音视频课程学习,十五秒后记录
|
||||
//this.appendStudyTime();
|
||||
this.isContentType = this.contentData.contentType
|
||||
if (this.contentData.contentType != 50) {
|
||||
this.handleTimeout = setTimeout(function(){
|
||||
@@ -802,28 +805,23 @@
|
||||
|
||||
|
||||
this.$nextTick(function(){
|
||||
if(this.contentData.progressVideo){
|
||||
if (r.contentType == 10) {
|
||||
console.log('视频处理lastStudyTime',this.contentData.lastStudyTime)
|
||||
console.log('视频处理progressVideo',this.contentData.progressVideo)
|
||||
this.$refs.myVideoPlayer.updateProgressByClickBar2(this.contentData.lastStudyTime,this.contentData.progressVideo);
|
||||
// $this.notePlay = this.contentData.lastStudyTime;
|
||||
}
|
||||
|
||||
//let h0=document.getElementById('id_course_player').offsetHeight;
|
||||
let h=$this.$refs.coursePlayer.offsetHeight;
|
||||
//let h1=$this.$refs.coursePlayer.clientHeight;
|
||||
///console.log(h0,h,$this.controlHeight,'$this.controlHeight');
|
||||
//解决获取高度不正的问题
|
||||
if(h>400 && h<500){
|
||||
h=h+40;
|
||||
}else if(h>500){
|
||||
h=h+60;
|
||||
}
|
||||
//$this.controlHeight=h-99;
|
||||
$this.controlHeight=h-95;
|
||||
//console.log(h,$this.controlHeight,'$this.controlHeight');
|
||||
})
|
||||
|
||||
|
||||
//console.log('this.contentData11:',this.contentData,this.curriculumData)
|
||||
// 视频设置禁用处理逻辑,如果用户已全部观看完该视频,则设置为能全部拖动的逻辑,把isDrag设置为true即可,同时删除本地存储的数据
|
||||
if(this.contentData.progressVideo ===1){
|
||||
var obj = JSON.parse(this.contentData.content)
|
||||
@@ -1131,38 +1129,16 @@
|
||||
|
||||
});
|
||||
} else {
|
||||
//console.log('加载课程信息失败:'+res.error);
|
||||
//this.$message.error(res.message);
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
onPlayerPlay() {
|
||||
//console.log("开始播放");
|
||||
// if(this.contentData.contentType == 10){
|
||||
// if(this.contentData.status<2){
|
||||
// this.contentData.status = 2;
|
||||
// }
|
||||
// }
|
||||
this.playerBoxShow = false;
|
||||
// this.onPlayerPlayFullscreen()
|
||||
// this.$watermark.set(this.userInfo.name + this.userInfo.loginName);
|
||||
let $this = this;
|
||||
//这里有些不准备,如果文件未能加载,这个事件就是错误的
|
||||
this.isAppendTime=true;
|
||||
this.appendStudyTime();//启动追加学习时长
|
||||
//console.log(this.contentData.status,'this.contentData.status');
|
||||
// if(this.contentData.status<9){
|
||||
// let completeType=this.curriculumData.completeSetup;
|
||||
// //console.log(completeType,'completeType');
|
||||
// if(completeType==0){
|
||||
// //默认5秒后学习完成.
|
||||
// $this.handleTimeout= setTimeout(function() {$this.saveStudyInfo();}, 5000); //5秒后记录学习完成
|
||||
// }else{
|
||||
// //先记录进行中的学习内容
|
||||
// this.saveStudyItem();
|
||||
// }
|
||||
// }
|
||||
},
|
||||
|
||||
onFullscreen(full) {
|
||||
@@ -1194,7 +1170,6 @@
|
||||
}
|
||||
},
|
||||
onPlayerPause() {
|
||||
//console.log("暂停");
|
||||
this.stopStudyTime();
|
||||
},
|
||||
onPlayerEnded() {
|
||||
@@ -1207,8 +1182,6 @@
|
||||
onPlayerPlaying(itme) {
|
||||
this.isAppendTime = true;//可以追加学习时长
|
||||
this.intTimeNote = parseInt(itme);
|
||||
//console.log("当前播放"+itme);
|
||||
//console.log("当前播放11"+itme);
|
||||
if (this.contentData.contentType && this.contentData.contentType == 10) {
|
||||
let intTime = parseInt(itme);
|
||||
//判断是否完成
|
||||
@@ -1238,7 +1211,13 @@
|
||||
this.contentData.lastStudyTime = intTime;
|
||||
let postData = {
|
||||
itemId: this.contentData.studyItemId,
|
||||
videoTime: intTime
|
||||
videoTime: intTime,
|
||||
id: this.appentId,
|
||||
studyId: this.studyId,
|
||||
courseId: this.contentData.courseId,
|
||||
contentId: this.contentData.id,
|
||||
studyInfo: this.courseInfo.name +"-" +this.contentData.contentName,
|
||||
duration: 10
|
||||
};
|
||||
//console.log('this.courseInfo:',this.contentData)
|
||||
if(!this.curriculumData.isDrag && this.contentData.progressVideo !=1){
|
||||
@@ -1246,22 +1225,24 @@
|
||||
var arr = time&&JSON.parse(time) || {}
|
||||
if(arr[this.blobId] && this.contentData.progressVideo<arr[this.blobId]) {
|
||||
postData.progressVideo = arr[this.blobId]
|
||||
postData.contentId = this.contentData.id
|
||||
postData.courseId = this.contentData.courseId
|
||||
// postData.contentId = this.contentData.id
|
||||
// postData.courseId = this.contentData.courseId
|
||||
}
|
||||
}
|
||||
//console.log('记录播放时间')
|
||||
apiStudy.studyVideoTime(postData).then(rs => {
|
||||
apiStudy.updateStudyVideoTime(postData).then(rs => {
|
||||
if (rs.status != 200) {
|
||||
console.log('记录播放时间错误');
|
||||
}else{
|
||||
studyUtil.clearStudyDuration(); //清除本地存储
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
audioPlaying(item, currentTime) {
|
||||
//console.log("当前播放"+item);
|
||||
let intTime = parseInt(currentTime);
|
||||
console.log("======音频播放"+intTime);
|
||||
this.handleAudioTimeUpdate(intTime)
|
||||
//判断是否完成
|
||||
let completeType = this.curriculumData.completeSetup;
|
||||
@@ -1290,7 +1271,13 @@
|
||||
this.contentData.lastStudyTime = intTime;
|
||||
let postData = {
|
||||
itemId: this.contentData.studyItemId,
|
||||
videoTime: intTime
|
||||
videoTime: intTime,
|
||||
id: this.appentId,
|
||||
studyId: this.studyId,
|
||||
courseId: this.contentData.courseId,
|
||||
contentId: this.contentData.id,
|
||||
studyInfo: this.courseInfo.name +"-" +this.contentData.contentName,
|
||||
duration: 10
|
||||
};
|
||||
//console.log('this.courseInfo:',this.contentData)
|
||||
if(!this.curriculumData.isDrag && this.contentData.progressVideo !=1){
|
||||
@@ -1298,23 +1285,21 @@
|
||||
var arr = time&&JSON.parse(time) || {}
|
||||
if(arr[this.blobId] && this.contentData.progressVideo<arr[this.blobId]) {
|
||||
postData.progressVideo = arr[this.blobId]
|
||||
postData.contentId = this.contentData.id
|
||||
postData.courseId = this.contentData.courseId
|
||||
// postData.contentId = this.contentData.id
|
||||
// postData.courseId = this.contentData.courseId
|
||||
}
|
||||
}
|
||||
//console.log('记录播放时间')
|
||||
apiStudy.studyVideoTime(postData).then(rs => {
|
||||
apiStudy.updateStudyVideoTime(postData).then(rs => {
|
||||
if (rs.status != 200) {
|
||||
console.log('记录播放时间错误');
|
||||
}else{
|
||||
studyUtil.clearStudyDuration(); //清除本地存储
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
audioPlay() {
|
||||
//console.log("开始播放");
|
||||
// if(this.contentData.contentType == 20 && this.contentData.status < 2){
|
||||
// this.contentData.status = 2;
|
||||
// }
|
||||
let $this = this;
|
||||
this.isAppendTime=true;
|
||||
this.appendStudyTime();//启动追加学习时长
|
||||
@@ -1397,7 +1382,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 = [];
|
||||
@@ -1425,14 +1411,53 @@
|
||||
//处理内容的名称
|
||||
this.totalContent = rs.result.contents.length;
|
||||
//加载学习的数据
|
||||
//this.loadStudyData();
|
||||
this.loadStudyData(rs.result);
|
||||
|
||||
if (rs.result.isPermission){
|
||||
// if (true){
|
||||
this.getInternet()
|
||||
console.log('需要内网环境')
|
||||
}
|
||||
} else {
|
||||
this.$message.error(rs.message);
|
||||
}
|
||||
});
|
||||
},
|
||||
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();
|
||||
}, 5000);
|
||||
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;
|
||||
$this.protocolDialogVisible=true
|
||||
} else {
|
||||
clearTimeout(timer);
|
||||
$this.Internet = 2;
|
||||
}
|
||||
} else {
|
||||
if (timedOut) return;//忽略中止请求
|
||||
clearTimeout(timer);//取消等待的超时
|
||||
}
|
||||
}
|
||||
},
|
||||
loadStudyData(result) {
|
||||
let $this=this;
|
||||
this.loadScorePraiseAndTrample();
|
||||
@@ -1440,6 +1465,7 @@
|
||||
//对已学习的内容进行比对,重要的字段, 学习内容id,在后缀的
|
||||
let playIndex = -1;
|
||||
this.contentList.forEach((con, conIdx) => {
|
||||
con.progressVideo = con.progressVideo || 0;
|
||||
result.contentStudys.forEach((scon, sconIdx) => {
|
||||
if (scon.contentId == con.id) {
|
||||
//定位显示的内容
|
||||
@@ -1451,9 +1477,8 @@
|
||||
playIndex = conIdx;
|
||||
}
|
||||
}
|
||||
//console.log(scon.contentId,con.id);
|
||||
con.lastStudyTime = scon.lastStudyTime;
|
||||
con.progressVideo = scon.progressVideo;
|
||||
con.progressVideo = scon.progressVideo || 0;
|
||||
//以下判断是为了兼容之前的问题,学习状态
|
||||
if (scon.status) {
|
||||
con.status = scon.status;
|
||||
@@ -1461,23 +1486,17 @@
|
||||
con.status = 9;
|
||||
}
|
||||
con.studyItemId = scon.id; //这个就是学习内容(条目)的id
|
||||
//console.log(scon.id,"scon.id");
|
||||
//console.log(con,"scon.id");
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
if (this.courseInfo.type == 10) {
|
||||
///console.log(this.contentList[0],'ccccc11111')
|
||||
this.showRes(this.contentList[0]);
|
||||
} else {
|
||||
//如果没有,就定位第一项内容
|
||||
if (playIndex === -1) {
|
||||
// this.showRes(this.contentList[0]);
|
||||
//console.log(this.catalogTree,'ccccc22222')
|
||||
this.showRes(this.catalogTree[0].children[0])
|
||||
} else {
|
||||
//console.log(this.contentList[0],'ccccc3333')
|
||||
this.showRes(this.contentList[playIndex]);
|
||||
}
|
||||
}
|
||||
@@ -1592,22 +1611,23 @@
|
||||
console.log(rs.message);
|
||||
}
|
||||
});
|
||||
let postAppendData = {
|
||||
id: this.appentId,
|
||||
studyId: this.studyId,
|
||||
courseId: this.courseInfo.id,
|
||||
contentId: this.contentData.id,
|
||||
studyInfo: this.courseInfo.name +"-" +this.contentData.contentName,
|
||||
duration: duration
|
||||
};
|
||||
apiStudy.appendStudyTime(postAppendData).then(rs => {
|
||||
if (rs.status == 200) {
|
||||
this.appentId = rs.result;
|
||||
studyUtil.clearStudyDuration(); //清除本地存储
|
||||
} else {
|
||||
console.log(rs.message);
|
||||
}
|
||||
});
|
||||
// let postAppendData = {
|
||||
// id: this.appentId,
|
||||
// studyId: this.studyId,
|
||||
// courseId: this.courseInfo.id,
|
||||
// contentId: this.contentData.id,
|
||||
// studyInfo: this.courseInfo.name +"-" +this.contentData.contentName,
|
||||
// duration: duration,
|
||||
// type: 1
|
||||
// };
|
||||
// apiStudy.updateStudyVideoTime(postAppendData).then(rs => {
|
||||
// if (rs.status == 200) {
|
||||
// this.appentId = rs.result;
|
||||
// studyUtil.clearStudyDuration(); //清除本地存储
|
||||
// } else {
|
||||
// console.log(rs.message);
|
||||
// }
|
||||
// });
|
||||
}
|
||||
},
|
||||
//结束追加学习时长
|
||||
@@ -1647,60 +1667,6 @@
|
||||
this.saveStudyDuration(totalTime)
|
||||
}, this.appentInterval * 1000);
|
||||
},
|
||||
//追加学习时长, flag是否提交到后台
|
||||
// appendStudyTime() {
|
||||
// //console.log('开始追加学习时长',this.isAppendTime);
|
||||
// if (this.studyId == '') {
|
||||
// return;
|
||||
// }
|
||||
// if (!this.contentData.id) {
|
||||
// return;
|
||||
// }
|
||||
// if (!this.isAppendTime) {
|
||||
// this.appendStartTime = null;
|
||||
// return;
|
||||
// }
|
||||
|
||||
// if (this.appendHandle != null) {
|
||||
// window.clearTimeout(this.appendHandle);
|
||||
// }
|
||||
// //首先从本地读取
|
||||
// let duration = studyUtil.getStudyDuration();
|
||||
// //console.log('追加学习时长,当前本地积累的学习时长='+duration);
|
||||
// //追加学习长
|
||||
// let $this = this;
|
||||
// if (this.appendStartTime == null) {
|
||||
// this.appendStartTime = new Date();
|
||||
// this.appendHandle = setTimeout(function() {
|
||||
// $this.appendStudyTime();
|
||||
// }, $this.appentInterval); //设置定时追加学习时长
|
||||
// //保存之前的
|
||||
// if (duration >= 60 ) {
|
||||
// this.saveStudyDuration(duration);
|
||||
// }
|
||||
// return;
|
||||
// }
|
||||
// //如果当前追加开始时间不为空
|
||||
// let now = new Date();
|
||||
// let m = now.getTime() - this.appendStartTime.getTime(); //相差的毫秒数
|
||||
// // console.log(m/1000,'时间');
|
||||
|
||||
// let sen = Math.round(m / 1000); //计算秒数
|
||||
// // console.log('定时器时间',sen);
|
||||
// // 每次添加的是定时器计时的时间
|
||||
// duration = duration + sen;//追加的是秒
|
||||
// if (duration >= 60) { //一分钟保存一次
|
||||
// this.saveStudyDuration(duration);
|
||||
// } else {
|
||||
// studyUtil.setStudyDuration(duration); //添加到本地存储中
|
||||
// }
|
||||
// //重新覆盖时间
|
||||
// this.appendStartTime = new Date();
|
||||
// //启动下次追加学习时长
|
||||
// this.appendHandle = setTimeout(function() {
|
||||
// $this.appendStudyTime();
|
||||
// }, $this.appentInterval);
|
||||
// },
|
||||
|
||||
finishStudyItem() { //设置完成学习的内容,针对于音视频的内容
|
||||
if (!this.contentData.studyItemId) {
|
||||
@@ -1782,7 +1748,6 @@
|
||||
})
|
||||
this.trueFalse = false
|
||||
}
|
||||
// }
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -1825,6 +1790,7 @@
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
.course-player{ //内容播放区域
|
||||
background-color: rgb(238, 238, 238);
|
||||
flex:1;
|
||||
min-width: 700px;
|
||||
min-height: 400px;
|
||||
@@ -2469,4 +2435,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>
|
||||
|
||||