hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-22 09:16:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
zhaofang
2022-06-06 16:31:26 +08:00
parent 2716c5ba0e 62747f9fa6
commit 5cee232e4d
29 changed files with 379 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/Index.vue
View File

@@ -293,7 +293,7 @@ import ad from '@/components/Portal/adFloat.vue';
import interactRowBar from '@/components/Portal/interactRowBar.vue';
import courseImage from '@/components/Course/courseImage.vue';
import articleImage from '@/components/Article/articleImage.vue';
import { toScore } from '@/utils/tools.js';
import { toScore} from '@/utils/tools.js';
export default {
name: 'index',
components: { portalHeader,ad, portalFooter, articleImage, portalFloatTools, authorInfo, interactRowBar, interactBar, courseImage },
@@ -331,6 +331,7 @@ export default {
};
},
mounted() {
//console.log(this.$Constants.fileBaseUrl,'fileBaseUrl地址');
this.getCourseData(1);
this.getCaseData();
this.getArticleData();

1
src/views/Login.vue
View File

@@ -67,6 +67,7 @@
}
},
mounted() {
//console.log(process.env,'process.env');
this.refreshCode();
if(this.portalLoginRememberMe && this.portalLoginRememberMe.rememberMe){
this.rememberMe = true;

2
src/views/feedback/Index.vue
View File

@@ -185,7 +185,7 @@ export default {
}
</script>
<style lang="scss">
<style lang="scss" scoped>
.problem{
margin: 10px;
border: 1px solid #e4e4e4;

2
src/views/feedback/Manager.vue
View File

@@ -186,7 +186,7 @@ export default {
}
</script>
<style lang="scss">
<style lang="scss" scoped>
.problem{
margin: 10px;
border: 1px solid #f0f0f0;

6
src/views/portal/case/Detail.vue
View File

@@ -6,7 +6,7 @@
<el-breadcrumb-item :to="{ path: '/case' }">案例列表</el-breadcrumb-item>
<el-breadcrumb-item>案例详情</el-breadcrumb-item>
</el-breadcrumb>
<div class="xrow" style="display: flex;justify-content: space-between;">
<div class="xrow" style="display: flex;justify-content: space-between;">
<div style="flex: 1;">
<el-row :gutter="10">
<el-col :span="24">
@@ -70,7 +70,7 @@
import { mapGetters } from 'vuex';
import portalHeader from '@/components/PortalHeader.vue';
import portalFooter from '@/components/PortalFooter.vue';
import pdfPreview from '@/components/PdfPreview/index.vue';
import pdfPreview from '@/components/PdfPreview/view.vue';
import interactBar from '@/components/Portal/interactBar.vue';
import comments from '@/components/Portal/comments.vue';
@@ -195,7 +195,7 @@ export default {
.jianjie {
margin: 15px 0;
background-color: #fff;
padding: 20px 100px 10px 100px;
padding: 0px 2px 10px 2px;
.content {
padding: 10px 0;
line-height: 25px;

18
src/views/portal/course/Micro.vue
View File

@@ -1,4 +1,3 @@
<<<<<<< HEAD
<template>
<div>
<portal-header current="course" :goSearch="1"></portal-header>
@@ -78,10 +77,10 @@
<img :src="fileBaseUrl+coursewareInfo.content.content" alt="图片">
</div>
<div v-if="coursewareInfo.content.contentType == 40">
<div style="padding: 10px;color: #ed0000; " v-if="curCFile.converStatus < 2">
<div style="padding: 10px;color: #ed0000; " v-if="curCFile.converStatus < 2 && !coursewareInfo.content.content">
<div>此课程内容无法预览，请联系管理员</div>
</div>
<div style="padding: 10px;color: #ed0000; " v-if="curCFile.converStatus == 3">
<div style="padding: 10px;color: #ed0000; " v-if="curCFile.converStatus == 3 && !coursewareInfo.content.content">
此课程内容无法预览，请联系管理员
</div>
<pdfPreview :autoScroll="true" v-if="coursewareInfo.content.contentType == 40" :filePath="fileBaseUrl+coursewareInfo.content.content"></pdfPreview>
@@ -326,7 +325,7 @@ export default {
tags: [],
numberToLetter: numberToLetter,
// resOwnerListMap: resOwnerIndexName,
fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
fileBaseUrl: this.$Constants.fileBaseUrl,
blobUrl:'',//播放的文件地址，新添加，采用blob方式
getType: getType,
courseType,
@@ -450,8 +449,10 @@ export default {
$this.curCFile = cfrs.result;
if(cfrs.result.previewFilePath){
$this.coursewareInfo.content.content=cfrs.result.previewFilePath;
$this.curCFile=2;
}else if(cfrs.result.filePath.indexOf('.pdf')>-1){
$this.coursewareInfo.content.content=cfrs.result.filePath;
$this.curCFile=2;
}
}else{
@@ -501,13 +502,14 @@ export default {
let ctime=parseInt(nowDate.getTime()/1000);
let beforeUrl=parseInt(nowDate.getTime()/1000)+u;
//console.log(beforeUrl,'beforeUrl');
let urlSign=encodeURIComponent(encrypt(beforeUrl));
//let urlSign=encodeURIComponent(encrypt(beforeUrl));
//console.log(urlSign,'urlSign');
cookies.set('PLAYSIGN_TIME', ctime);//写客户端的cookie保存
//this.blobUrl=process.env.VUE_APP_BASE_API+'/xboe/m/course/play/resource?sign='+urlSign;
//this.blobUrl=process.env.VUE_APP_BASE_API+'/xboe/course/resource?fid='+fid;
//this.blobUrl='http://localhost:9090/xboe/course/resource?fid='+fid;
this.blobUrl=this.fileBaseUrl+u;
this.blobUrl=process.env.VUE_APP_BASE_API+'/xboe/course/resource?fid='+fid;
//this.blobUrl='http://127.0.0.1:9090/xboe/course/resource?fid='+fid;
//this.blobUrl=this.fileBaseUrl+u;
//console.log(this.blobUrl,'this.blobUrl');
},
createVideoBlob(url){
let $this=this;

17
src/views/study/Courses.vue
View File

@@ -290,30 +290,15 @@ computed: {
},
jumpRouter(item) {
if(item.isOld){
// this.$router.push({path:'/course/boeframe',query:{id:item.id,type:item.courseType}})
location.href=`${this.webBaseUrl}/course/boeframe?id=${item.id}&type=${item.courseType}`
//window.open(`${this.webBaseUrl}/course/boeframe?id=${item.id}&type=${item.courseType}`,'_self' )
} else {
if(item.courseType==10){
// let routeData = this.$router.resolve({ path: '/course/micro?id='+item.courseId}); // , query: { id: 1 }
// console.log(routeData,'routeData');
// window.open(this.webBaseUrl+routeData.href, '_blank');
// window.open('/pc/course/micro?id='+item.courseId,'_blank')
this.$router.push({path:'/course/micro',query:{id:item.courseId}})
}
if(item.courseType==20){
if(item.progress>0 && item.progress<100) {
//let routeData = this.$router.resolve({ path: '/course/studyindex?id='+item.courseId}); // , query: { id: 1 }
// console.log(routeData,'routeData');
//window.open(this.webBaseUrl+routeData.href, '_blank');
// window.open('/pc/course/studyindex?id='+item.courseId,'_blank')
this.$router.push({path:'/course/studyindex',query:{id:item.courseId}})
this.$router.push({path:'/course/studyindex',query:{id:item.courseId}})
} else {
//let routeData = this.$router.resolve({ path: '/course/detail?id='+item.courseId}); // , query: { id: 1 }
// console.log(routeData,'routeData');
// window.open(this.webBaseUrl+routeData.href, '_blank');
// window.open('/pc/course/detail?id='+item.courseId,'_blank')
this.$router.push({path:'/course/detail',query:{id:item.courseId}})
}
}

29
src/views/study/PortalIndex.vue
View File

@@ -83,10 +83,10 @@
</div>
</div>
<div v-if="resType == 40">
<div style="padding: 10px;color: #ed0000; " v-if="curCFile.converStatus < 2">
<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">
<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>
@@ -160,7 +160,7 @@
<el-collapse-item v-for="(item, index) in catalogTree" :key="index" :name="index">
<!-- <template class="collapse-title" slot="title" > -->
<div style="display:flex;margin-bottom:18px;">
<!-- 标题 -->
<div style="flex:1;line-height:20px" class="mltit">
@@ -168,16 +168,16 @@
<span style="font-size:16px;font-weight: 700;color: #343434;margin-left: 15px;">
{{ item.section.name }}</span>
</el-tooltip>
</div>
<!-- 状态 -->
<div style="text-align: right;">
<span :class="statusToContent(item.section.status).class">{{ statusToContent(item.section.status).text }}</span>
</div>
</div>
<!-- </template> -->
<ul>
<li @click="showRes(ele,i,index)" v-for="(ele, i) in item.children" :key="i" class="catalog-cell" style="display: flex;justify-content: space-between;">
@@ -286,7 +286,7 @@ export default {
totalContent: 0, //课程内容数量
pageCount: 0,
currentPage: 0,
fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
fileBaseUrl: this.$Constants.fileBaseUrl,
contentList: [],
sectionList: [],
teachers: [],
@@ -821,11 +821,14 @@ export default {
// if (r.content != '' && r.content.indexOf('.pdf') == -1) {
apiCourseFile.detail(r.contentRefId).then(cfrs => {
if (cfrs.status == 200) {
r.content = cfrs.result.previewFilePath;
r.content = cfrs.result.previewFilePath;
this.curCFile = cfrs.result;
if(cfrs.result.previewFilePath == '' && cfrs.result.filePath.indexOf('pdf') > -1) {
r.content = cfrs.result.filePath;
} else {
this.curCFile = cfrs.result;
r.content = cfrs.result.filePath;
this.curCFile.converStatus=2;
}
if(r.content && r.content.indexOf('.pdf')>-1){
this.curCFile.converStatus=2;
}
} else {
$this.$message.error('加载pdf课件文件失败');
@@ -1039,7 +1042,7 @@ export default {
<style scoped lang="scss">
.mltit{
// width: 70%;
// width: ;
word-break:break-all;

2
src/views/study/TaskList.vue
View File

@@ -36,9 +36,7 @@
<div class="uc-course-time">推送时间：{{ formatsec(Number(item.updated_at) * 1000 )}}</div>
</div>
<div class="uc-course-btns">
<!-- <a :href="item.type == 1 ? '/pc/course/recorded' : '/pc/course/micro'" target="_blank"> -->
<el-button @click="jumpRouter(item)" type="primary" size="small">开始学习</el-button>
<!-- </a> -->
</div>
</div>
<div style="height:150px; text-align: center; margin-top:57px;" >