diff --git a/src/api/modules/favorites.js b/src/api/modules/favorites.js index 1273fcf2..165bc5c1 100644 --- a/src/api/modules/favorites.js +++ b/src/api/modules/favorites.js @@ -34,7 +34,7 @@ const casePageList=function(query){ /*分页查询 收藏的文章信息 *@param {Object} query @param Integer type 根据什么类型搜索，这块暂时不传 - @param pageIndex 第几页 pageSize 每页展示多少行 + @param pageIndex 第几页 pageSize 每页展示多少行 keyword：对应关键字查询 */ const articlePageList=function(query){ @@ -45,7 +45,7 @@ const articlePageList=function(query){ @param Integer type 根据什么类型搜索，暂时不传 @param pageIndex 第几页 pageSize 每页展示多少行 keyword：对应关键字查询 - + */ const coursePageList=function(query){ return ajax.post('/xboe/m/favorite/mycourselist',query); @@ -85,16 +85,23 @@ const has=function(objType,objId){ */ const findAll=function(query){ return ajax.post('/xboe/m/favorite/findAll',query); -} +} /* 我的收藏 全部 @param pageIndex 第几页 @param pageSize 每页行数 -@param keyword 关键字 +@param keyword 关键字 */ 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 } diff --git a/src/api/modules/shares.js b/src/api/modules/shares.js index 9af4635a..07b5dfb7 100644 --- a/src/api/modules/shares.js +++ b/src/api/modules/shares.js @@ -112,7 +112,7 @@ const mymearticlelist=function(query){ */ const updateIsRead=function(id){ return ajax.get(`/xboe/m/share/updateIsRead?id=${id}`); -} +} /* 撤回分享 @@ -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 } diff --git a/src/components/Article/shareItems.vue b/src/components/Article/shareItems.vue index 3c9395df..19e694fb 100644 --- a/src/components/Article/shareItems.vue +++ b/src/components/Article/shareItems.vue @@ -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; diff --git a/src/components/Course/collectItem.vue b/src/components/Course/collectItem.vue index 1facdb19..80bbe847 100644 --- a/src/components/Course/collectItem.vue +++ b/src/components/Course/collectItem.vue @@ -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; diff --git a/src/components/Course/weikeContent.vue b/src/components/Course/weikeContent.vue index 9938c4a0..6608706a 100644 --- a/src/components/Course/weikeContent.vue +++ b/src/components/Course/weikeContent.vue @@ -36,11 +36,9 @@
+
- - - - +
@@ -103,9 +101,16 @@
-
如果pdf无法显示，请稍后再试，文档转化是异步处理，有可能是文档还未转化完成，您可以先提交课程内容
+
+
{{cware.content.contentName}}
+ 保存 +
+
+
如果pdf无法显示，请稍后再试，文档转化是异步处理，有可能是文档还未转化完成
+ +
@@ -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('上传课件失败'); diff --git a/src/components/Portal/interactBar.vue b/src/components/Portal/interactBar.vue index 22d3608e..1956870d 100644 --- a/src/components/Portal/interactBar.vue +++ b/src/components/Portal/interactBar.vue @@ -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(){ diff --git a/src/components/Qa/shareList.vue b/src/components/Qa/shareList.vue index bf68bc30..19693a1e 100644 --- a/src/components/Qa/shareList.vue +++ b/src/components/Qa/shareList.vue @@ -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; diff --git a/src/views/article/MyList.vue b/src/views/article/MyList.vue index df0e673e..80dbafc9 100644 --- a/src/views/article/MyList.vue +++ b/src/views/article/MyList.vue @@ -24,7 +24,7 @@
-
搜索
+
搜索
重置
@@ -35,7 +35,7 @@
-
+
+
+
没有查询到相关内容
+
暂无数据
+
+
+
@@ -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)=>{ diff --git a/src/views/feedback/Index.vue b/src/views/feedback/Index.vue index 6d243ca3..f54654db 100644 --- a/src/views/feedback/Index.vue +++ b/src/views/feedback/Index.vue @@ -185,7 +185,7 @@ export default { } -