Compare commits

..

4 Commits

Author SHA1 Message Date
670788339
1bd77d3d5b 外部讲师的默认头像 2025-07-11 15:50:45 +08:00
670788339
21d1dffa7b 外部讲师图片显示3 2025-06-23 11:23:23 +08:00
670788339
231e9ed09b 外部讲师图片显示 2025-06-23 11:06:03 +08:00
670788339
f13a77f075 外部讲师图片显示 2025-06-23 10:49:46 +08:00
15 changed files with 202 additions and 521 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 111 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 244 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 186 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

View File

@@ -141,7 +141,6 @@
<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">
@@ -306,7 +305,6 @@
<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="课程来源">
@@ -490,8 +488,6 @@ export default {
refType:''
},
visibleShow:false,
isPermission:false,
dicts:[],
extendRefId:'',
extendRefType:'',
courseTeachers: [], //课程的老师
@@ -531,11 +527,7 @@ export default {
dlgShow: false
},
rightTypeId: {},
catalogSortDialogShow: false,
selectedOrg: {
orgId: null,
name: ''
}
catalogSortDialogShow: false
};
},
created() {
@@ -560,15 +552,9 @@ export default {
},
watch: {
courseInfo: {
handler(newVal, oldVal) {
handler(newVal) {
//需要保存
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
}
@@ -595,22 +581,6 @@ 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){
@@ -919,7 +889,6 @@ export default {
async getDetail(id) {
this.curCourseId = id;
this.orgName='';
this.isPermission = false;
let $this = this;
try {
const { result, status } = await apiCourse.detail(id);
@@ -937,10 +906,7 @@ 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=>{

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,179 +0,0 @@
<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>

View File

@@ -1,24 +1,7 @@
<template>
<div class="hot25">
<div class="hot">
<div>
<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="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>
@@ -28,12 +11,11 @@
</div>
</div>
</div>
</template>
<script>
export default {
name: "hotforumNew",
name: "hotforum",
data() {
return {
imgData:[
@@ -42,10 +24,6 @@
{img:'003',url:'1280185851054231552'},
{img:'04',url:'1321778585966247936'},
],
imgData25:[
{img:'2501',url:'1351506180295131136'},
{img:'2503',url:'1375146833375027200'},
],
}
},
methods: {
@@ -60,22 +38,20 @@
</script>
<style lang="scss" scoped>
.hot25{
.hot{
width: 100%;
// max-width: 1920px;
min-height: 100%;
// min-height: 1373px;
background: url("../../assets/images/hotforum/back25.png") no-repeat;
background-size: cover;
background: url("../../assets/images/hotforum/back.jpg") no-repeat;
background-size: 100% 100%;
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{
@@ -95,109 +71,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>

View File

@@ -22,7 +22,6 @@
<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="false">
<div v-if="resType == null || resType == 0">
<!--先显示视频图片-->
<course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
@@ -110,15 +109,6 @@
</assess>
</div>
</div>
<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>
<!--交互部分-->
<div>
<div class="course-interact">
@@ -287,12 +277,15 @@
<div class="teacher" v-for="(item, idx) in teachers" :key="idx">
<div class="teacher-avator" @click="toUserHome(item)" title="点击进入他的主页">
<!-- <div class="teacher-text" v-if="item.authorInfo.avatar == ''">{{userAvatarText(item.teacherName)}}</div> -->
<div v-if="item.authorInfo.avatar !== ''">
<div v-if="item.authorInfo && item.authorInfo.avatar">
<el-avatar :src="fileBaseUrl + item.authorInfo.avatar" shape="circle" :size="50"></el-avatar>
</div>
<div v-else-if="item.photo">
<el-avatar :src="item.photo" shape="circle" :size="50"></el-avatar>
</div>
<div v-else class="teacher-text">
<div v-if="item.authorInfo.sex === 1 "><img src="../../../public/images/Avatarman.png" alt=""></div>
<div v-else><img src="../../../public/images/Avatarwoman.png" alt=""></div>
<div v-if="item.authorInfo && item.authorInfo.sex === 1"><img src="../../../public/images/Avatarwoman.png" alt=""></div>
<div v-else><img src="../../../public/images/Avatarman.png" alt=""></div>
</div>
</div>
<div class="teacher-info">
@@ -313,17 +306,6 @@
</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>
@@ -390,7 +372,6 @@
},
data() {
return {
protocolDialogVisible: false,
tentative: false,
isContentTypeTwo: null,
isContentType: null,
@@ -412,7 +393,6 @@
curCFile: {
converStatus: 4,
},
Internet: 3,//1是成功 2是是失败 3是检测中
radio: '',
interactRuning: false,
playerBoxShow: false,
@@ -477,8 +457,6 @@
cumulativeDuration:0, //非音频累计时长
maxDuration:0, //非音频最大时长
defaultMaxTime:1800, //非音频默认最大时间
warn:"测试内容",
warnTitle:"测试标题",
}
},
mounted() {
@@ -1382,8 +1360,7 @@
}
}
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 = [];
@@ -1412,52 +1389,12 @@
this.totalContent = rs.result.contents.length;
//加载学习的数据
this.loadStudyData(rs.result);
if (rs.result.isPermission){
// if (true){
this.getInternet()
console.log('需要内网环境')
}
} else {
this.$message.error(rs.message);
}
});
},
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();
@@ -1790,7 +1727,6 @@
display: flex;
justify-content: space-between;
.course-player{ //内容播放区域
background-color: rgb(238, 238, 238);
flex:1;
min-width: 700px;
min-height: 400px;
@@ -2435,18 +2371,4 @@
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>