Compare commits
69 Commits
master-062
...
master-062
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e8fe7b4fd3 | ||
|
|
029d5b0791 | ||
|
|
12a6ed8fea | ||
|
|
363492866f | ||
|
|
d237dc99ee | ||
|
|
995933ae56 | ||
|
|
dff81df91d | ||
|
|
0864704c4c | ||
|
|
58fc6264fe | ||
|
|
5276813eba | ||
|
|
3485435c9e | ||
|
|
2ee3daedf6 | ||
|
|
5d0d64abbf | ||
|
|
ea97aee4af | ||
|
|
a968062936 | ||
|
|
6d11475456 | ||
|
|
a7396e0a6a | ||
|
|
ac236e8d7c | ||
|
|
f537608e4f | ||
|
|
c7f4a224ff | ||
|
|
a4d088a3ae | ||
|
|
3cd2c5f433 | ||
|
|
8c69fac9be | ||
|
|
4033eb2294 | ||
|
|
ec469db72a | ||
|
|
5e1ea2469b | ||
|
|
2baa5c61a4 | ||
|
|
b627398b7d | ||
|
|
7be5c072d9 | ||
|
|
de14f9f561 | ||
|
|
44f79c93a5 | ||
|
|
e501b8d23f | ||
|
|
ea8143db2b | ||
|
|
89277f8868 | ||
|
|
13af8ba4e0 | ||
|
|
e3735e4b92 | ||
|
|
f4c9b921bb | ||
|
|
ed899cdd2c | ||
|
|
c24b54957a | ||
|
|
1dc9c941d7 | ||
|
|
33c9d2140f | ||
|
|
afd1bec458 | ||
|
|
202bf7b123 | ||
|
|
ce1d662350 | ||
|
|
81602506c7 | ||
|
|
053a2a60b2 | ||
|
|
b9f23eb657 | ||
|
|
ceeb3efcf5 | ||
|
|
147366f738 | ||
|
|
4ac09a8793 | ||
|
|
9c768337c6 | ||
|
|
e202946fe7 | ||
|
|
fbddf6806a | ||
|
|
3cfa3ffec3 | ||
|
|
a8bcd3832b | ||
|
|
d9f69001a5 | ||
|
|
93e769be42 | ||
|
|
206f0e825d | ||
|
|
3bb4b519f1 | ||
|
|
fe790389ca | ||
|
|
44a5baec18 | ||
|
|
ee8a76c4df | ||
|
|
12c1bdb1a8 | ||
|
|
df0e1ad0ed | ||
|
|
ea54ea2c20 | ||
|
|
5fe9d2eb96 | ||
|
|
b6562e5c9c | ||
|
|
a0dcd27f8c | ||
|
|
8bc2bc96a8 |
@@ -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
|
||||
@@ -446,6 +448,7 @@ export default {
|
||||
findUpdateLogs,
|
||||
getUpdateLog,
|
||||
detail,
|
||||
getDictIds,
|
||||
saveContent,
|
||||
pageList,
|
||||
setEnabled,
|
||||
|
||||
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,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,10 +910,26 @@ 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='';
|
||||
this.isPermission = false;
|
||||
let $this = this;
|
||||
try {
|
||||
const { result, status } = await apiCourse.detail(id);
|
||||
@@ -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=>{
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -37,7 +37,6 @@ export default {
|
||||
},
|
||||
isDrag:{
|
||||
type: Boolean,
|
||||
default: true,
|
||||
},
|
||||
blobId:{
|
||||
type: String,
|
||||
|
||||
@@ -954,7 +954,7 @@ export default {
|
||||
},
|
||||
findPapers() {
|
||||
let params={
|
||||
pageSize:200,
|
||||
pageSize:10000,
|
||||
name:''
|
||||
}
|
||||
apiPaper.querypaper(params).then((res) => {
|
||||
|
||||
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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
<div class="course-playbox" ref="coursePlayerBox" id="id_course_player_box">
|
||||
<div class="course-player" ref="coursePlayer" id="id_course_player">
|
||||
<div>
|
||||
<div v-if="renderCourse">
|
||||
<div v-if="resType == null || resType == 0">
|
||||
<!--先显示视频图片-->
|
||||
<course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
|
||||
@@ -109,6 +110,15 @@
|
||||
</assess>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="!renderCourse && Internet ==2" 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="refreshPage">
|
||||
<el-button type="primary">重新检测</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!--交互部分-->
|
||||
<div>
|
||||
<div class="course-interact">
|
||||
@@ -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,
|
||||
@@ -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){
|
||||
@@ -1299,6 +1322,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;
|
||||
@@ -1357,7 +1391,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 +1421,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();
|
||||
@@ -1684,6 +1760,10 @@
|
||||
}
|
||||
},
|
||||
},
|
||||
destroyed(){
|
||||
this.cleanAppendTime();
|
||||
this.stopStudyTime();
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
@@ -1723,20 +1803,43 @@
|
||||
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;
|
||||
max-height: 800px;
|
||||
//height: 100%;
|
||||
// min-height: 400px;
|
||||
// max-height: 800px;
|
||||
height: 80%;
|
||||
border: 1px solid #ffffff;
|
||||
padding-right: 20px;
|
||||
background-color: rgb(238, 238, 238);
|
||||
// overflow: auto;
|
||||
}
|
||||
.course-control{ //内容控制区域
|
||||
width: 420px;
|
||||
}
|
||||
}
|
||||
|
||||
@media screen and (max-width: 1200px) {
|
||||
.course-playbox,
|
||||
.course-infobox {
|
||||
flex-direction: column;
|
||||
}
|
||||
.course-player,
|
||||
.course-info {
|
||||
min-width: 100%;
|
||||
padding-right: 0;
|
||||
}
|
||||
.course-control,
|
||||
.course-teacher {
|
||||
width: 100%;
|
||||
margin-top: 20px;
|
||||
}
|
||||
}
|
||||
.course-infobox {
|
||||
margin-top: 20px;
|
||||
display: flex;
|
||||
@@ -1856,13 +1959,10 @@
|
||||
}
|
||||
|
||||
.player-box {
|
||||
position: absolute;
|
||||
// top: 62px;
|
||||
// left: 184px;
|
||||
width: 300px;
|
||||
left: 50%;
|
||||
top: 50%;
|
||||
transform: translate(-50%, -50%);
|
||||
position: relative;
|
||||
width: 100%;
|
||||
max-width: 300px;
|
||||
margin: 20px auto;
|
||||
height: 187px;
|
||||
background: rgba(74, 74, 74, .5);
|
||||
border-radius: 33px;
|
||||
@@ -2005,6 +2105,7 @@
|
||||
}
|
||||
|
||||
.course-interact {
|
||||
flex: 1; // 20%高度
|
||||
height: 54px;
|
||||
// padding-top: 10px;
|
||||
// padding-right: 10px;
|
||||
@@ -2368,4 +2469,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>
|
||||
|
||||