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

Merge remote-tracking branch 'origin/bjy' into case

Browse Source 
# Conflicts:
#	src/components/Course/collectItem.vue
#	src/components/Course/weikeContent.vue
This commit is contained in:
86182
2022-06-07 16:22:47 +08:00
parent e84d83821e 2181df3903
commit 12b65316e4
11 changed files with 129 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/modules/favorites.js
View File

@@ -95,6 +95,13 @@ const findAll=function(query){
const queryAll=function(query){
return ajax.post('/xboe/m/favorite/queryAll',query);
}
/**
* 查看是否已收藏 批量
* @param {问答或者文章或者课程的id数组} data
* */
const isNoFavorite=function(date){
return ajax.postJson('/xboe/m/favorite/isNoFavorite',data);
}
export default{
has,
@@ -107,5 +114,6 @@ export default{
articlePageList,
coursePageList,
findAll,
queryAll
queryAll,
isNoFavorite
}

49
src/api/modules/shares.js
View File

@@ -121,6 +121,49 @@ const updateIsRead=function(id){
const deleteshares=function(id){
return ajax.get(`/xboe/m/share/delete-shares?id=${id}`);
}
/**
* 我分享的全部
* @param pageIndex 第几页
* @param pageSize 每页多少行
* @param keyword 关键字搜索
* @param isRead 是否已读
* */
const findMeShare=function (query){
return ajax.post('/xboe/m/share/findMeShare',query);
}
/**
* 分享给我的全部
* @param pageIndex 第几页
* @param pageSize 每页多少行
* @param keyword 关键字搜索
* @param isRead 是否已读
* */
const findShareMe=function (query){
return ajax.post('/xboe/m/share/findShareMe',query);
}
/**
* 我分享的案例
* @param pageIndex 第几页
* @param pageSize 每页多少行
* @param isRead 是否已读
* @param keyword 关键字搜索
* */
const myCaseList=function (query){
return ajax.post('/xboe/m/share/myCaseList',query);
}
/**
* 分享给我的案例
* @param pageIndex 第几页
* @param pageSize 每页多少行
* @param isRead 是否已读
* @param keyword 关键字搜索
* */
const myMeCaseList=function (query){
return ajax.post('/xboe/m/share/myMeCaseList',query);
}
/**
* */
export default{
save,
has,
@@ -134,5 +177,9 @@ const deleteshares=function(id){
mymecourselist,
mymearticlelist,
updateIsRead,
deleteshares
deleteshares,
findMeShare,
findShareMe,
myCaseList,
myMeCaseList
}

5
src/components/Article/shareItems.vue
View File

@@ -134,14 +134,15 @@ export default {
.readed{
font-size: 18px;
color: #3e7fff;
margin-bottom: 6px;
// margin-bottom: 6px;
}
.noRead{
font-size: 18px;
color:#FF3E3E;
margin-bottom: 6px;
// margin-bottom: 6px;
}
.title{
line-height: 25px;
margin-left: 10px;
font-size: 18px;
flex-shrink: 10000;

2
src/components/Course/collectItem.vue
View File

@@ -135,7 +135,7 @@ export default {
.one-line-ellipsis{
display: -webkit-box;
white-space:pre-wrap;
word-wrap: break-word;
// word-wrap: break-word;
word-break:break-all;
overflow: hidden;
text-overflow:ellipsis;

33
src/components/Course/weikeContent.vue
View File

@@ -36,11 +36,9 @@
</div>
</div>
<div v-else>
<div style="text-align: center;">
<!-- <div style="text-align: center;padding-top: 20px;"> -->
<!-- <el-button v-if="cware.content.id==''" @click="saveContent(1)" type="primary">保存</el-button> -->
<!-- <el-button @click="deleteContent(1)" type="danger">删除</el-button> -->
<!-- </div> -->
<!--展示内容区域-->
<!--视频-->
<div v-if="cware.content.contentType==10">
@@ -103,9 +101,16 @@
<el-image :src="fileBaseUrl+cware.content.content" fit="fill"></el-image>
</div>
<div v-if="cware.content.contentType==40">
<div style="padding: 10px;color: #767676; ">如果pdf无法显示，请稍后再试，文档转化是异步处理，有可能是文档还未转化完成，您可以先提交课程内容 </div>
<div style="text-align: center;padding-top: 20px;" v-if="courseFileShow">
<div style="padding: 20px;">{{cware.content.contentName}}</div>
<el-button @click="loadPdfFile();" type="primary">保存</el-button>
</div>
<div v-else>
<div style="padding: 10px;color: #767676; ">如果pdf无法显示，请稍后再试，文档转化是异步处理，有可能是文档还未转化完成 </div>
<pdfPreview v-if="cware.content.contentType == 40" :filePath="fileBaseUrl+cware.content.pdfPath"></pdfPreview>
</div>
</div>
</div>
</div>
@@ -548,6 +553,7 @@
},
data(){
return {
courseFileShow:false,
curContent:{id:'',contentType:0,contenRefId:''},
fileBaseUrl:process.env.VUE_APP_FILE_BASE_URL,
imageShowUrl: '',
@@ -580,7 +586,6 @@
setupTage:0,
},
},
pdfTip:'',//pdf文件的提示
hasCWare:{ keyword:'', count: 0, pageSize: 10, pageIndex: 1, list:[]},
homework:{
show:1,
@@ -693,7 +698,6 @@
},
methods:{
init(){
//console.log('初始化处理');
this.activeName='courseware';
this.cware.content={id:'',contentType:0,sortIndex:1,contentRefId:'',pdfPath:''};
this.cware.show=1;
@@ -716,9 +720,11 @@
let fname=this.cware.content.content;
if(fname && fname.indexOf('.pdf')>-1){
this.cware.content.pdfPath=this.cware.content.content;
this.courseFileShow = false;
}else{
apiCourseFile.detail(this.cware.content.contentRefId).then(rs=>{
if(rs.status==200){
this.courseFileShow = false;
this.cware.content.pdfPath=rs.result.previewFilePath;
}
});
@@ -756,7 +762,6 @@
},
loadAssessInfo(){
if(this.assess.content && this.assess.content.content!='' && this.assess.content.content.length>10){
//console.log(this.assess.content.content,'this.assess.content.content');
this.assess.json=JSON.parse(this.assess.content.content);
this.assess.show=2;
}
@@ -802,7 +807,6 @@
if(this.cware.content.contentType==40){
this.loadPdfFile();
}
//console.log(this.cware.content,'this.cware.content');
this.saveContent(1);
},
toCWareReChoose(){
@@ -940,6 +944,10 @@
}
})
},
// 调用pdf详情接口
getPPtDetail(){
this.loadPdfFile();
},
deleteContent(index){
let $this=this;
let postData={
@@ -1032,7 +1040,6 @@
handleUploadSuccess({error,result,status}){
if(status === 200) {
//上传到课件库
//console.log(result);
let courseWare={
fileName:result.displayName,
fileType:result.fileType,
@@ -1042,13 +1049,17 @@
}
apiCourseFile.saveUpload(courseWare).then(rs=>{
if(rs.status==200){
this.courseFileShow = true;
this.cware.content.contentRefId=rs.result.id;
this.cware.content.contentName=result.displayName;
//this.cware.content.content=result.filePath;
if(rs.result.resType === 40 && rs.result.resType != 'ppt') {
this.cware.curriculumData.url = rs.result.previewFilePath;
}
this.cware.curriculumData.url = rs.result.filePath;
this.cware.content.duration=rs.result.duration;//时长
this.courseFileShow=true;
this.saveContent(1);
}else{
this.$message.error('上传课件失败');

34
src/components/Portal/interactBar.vue
View File

@@ -238,21 +238,25 @@ export default {
})
},
checkHas(){
if(this.type>0){
apiPraises.has(this.type,this.data.id).then(rs=>{
if(rs.status==200 && rs.result){
this.isPraise=true;
}else{
this.isPraise=false;
}
});
apiFavorites.has(this.type,this.data.id).then(rs=>{
if(rs.status==200 && rs.result){
this.isFavorite=true;
}else{
this.isFavorite=false;
}
})
if(this.type>0 && !this.readonly && this.data.id){
if(this.favorites){
apiFavorites.has(this.type,this.data.id).then(rs=>{
if(rs.status==200 && rs.result){
this.isFavorite=true;
}else{
this.isFavorite=false;
}
})
}
if(this.praises){
apiPraises.has(this.type,this.data.id).then(rs=>{
if(rs.status==200 && rs.result){
this.isPraise=true;
}else{
this.isPraise=false;
}
});
}
}
},
addShare(){

2
src/components/Qa/shareList.vue
View File

@@ -158,7 +158,7 @@ export default {
justify-content: flex-start;
align-items: center;
span:first-of-type{
margin-top: -2px;
// margin-top: -2px;
}
.title{
margin-left: 8px;

21
src/views/article/MyList.vue
View File

@@ -24,7 +24,7 @@
</el-select>
</div>
<div style="padding: 0px 5px;"><el-input clearable placeholder="搜索名称" v-model="pageData.keyword"></el-input></div>
<div style="padding: 0px 5px;"><el-button icon="el-icon-search" type="primary" @click="getArticleList">搜索</el-button></div>
<div style="padding: 0px 5px;"><el-button icon="el-icon-search" type="primary" @click="search">搜索</el-button></div>
<div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary" @click="reset">重置</el-button></div>
</div>
</div>
@@ -35,7 +35,7 @@
</div>
<div style="padding: 10px 19px 0px 22px;">
<article-items @update="getArticleList" :items="pageData.list" v-if="pageData.list.length!=0"></article-items>
<div v-if="pageData.list.length > 0 " style="text-align: center; margin-top:57px"><el-pagination
<div v-if="pageData.list.length > 0 " style="text-align: center; margin-top:57px"><el-pagination
@size-change="handleSizeChange"
background
@current-change="handleCurrentChange"
@@ -45,6 +45,13 @@
layout="total, sizes, prev, pager, next, jumper"
:total="total"
></el-pagination></div>
<div v-else>
<div v-if="pageData.list.length == 0">
<div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
<div v-else class="zan-wu">暂无数据</div>
</div>
</div>
</div>
<el-dialog title="创建文章" :visible.sync="diagSync" :close-on-click-modal="false" width="900px" custom-class="g-dialog">
<editItems v-if="diagSync" :jumpLimit="false" :editForm="{}" @success="saveSuccess"></editItems>
@@ -67,6 +74,7 @@ export default {
},
data() {
return {
isSearh:false,
pageData: {
pageIndex: 1,
pageSize: 10,
@@ -81,7 +89,10 @@ export default {
this.getArticleList();
},
methods: {
search(){
this.isSearh = true;
this.getArticleList()
},
saveSuccess(data){
this.diagSync=false;
this.articleList.pageIndex = 1;
@@ -116,9 +127,11 @@ export default {
},
reset(){
this.pageData.keyword = '',
this.pageData.status = ''
this.getArticleList()
this.getArticleList();
this.isSearh = false;
},
getQaUserData(list){
let ids=list.map((item,index)=>{

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;

4
src/views/share/ToList.vue
View File

@@ -44,7 +44,7 @@
<div style="min-height: 500px;">
<course-items :keyword="keyword" type="toMy" @confirm="confirm" :items="courseList.list"></course-items>
<!-- v-if="courseList.count>courseList.pageSize" -->
<div v-if="caseList.list.length > 0" style="text-align: center; margin-top:57px">
<div v-if="courseList.list.length > 0" style="text-align: center; margin-top:57px">
<el-pagination
background
@size-change="handleSizeChange"
@@ -57,7 +57,7 @@
></el-pagination>
</div>
<div v-else>
<div v-if="caseList.list.length == 0">
<div v-if="courseList.list.length == 0">
<div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
<div v-else class="zan-wu">暂无数据</div>
</div>