From ed584aa49a7f83cff28e985219154215d1f10712 Mon Sep 17 00:00:00 2001 From: daihh Date: Tue, 8 Nov 2022 12:49:59 +0800 Subject: [PATCH 01/21] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E9=9D=A2=E6=9D=BF=20?= =?UTF-8?q?=E7=82=B9=E5=87=BB=20=E5=AD=A6=E4=B9=A0=E6=97=B6=E9=95=BF=20?= =?UTF-8?q?=E4=BC=9A=E8=B7=B3=E8=BD=AC=E5=88=B0=E6=8E=92=E8=A1=8C=E6=A6=9C?= =?UTF-8?q?=20=20=20=E2=80=9C=E6=9A=82=E6=97=B6=E2=80=9D=20=20=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=B8=8D=E5=8F=AF=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PortalHeader.vue | 35 +++++++++++++++++++-------------- src/views/Index.vue | 4 ++-- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue index 86556ca9..146028d0 100644 --- a/src/components/PortalHeader.vue +++ b/src/components/PortalHeader.vue @@ -155,7 +155,7 @@ export default { components:{gonggao}, computed: { - ...mapGetters(['userInfo', 'userMsg','identity']), + ...mapGetters(['userInfo', 'userMsg','identity','studyTaskCount']), avatarText(){ return userAvatarText(this.userInfo.name); @@ -190,20 +190,25 @@ export default { console.log('lll') }, loadBoeData() { - let params = { - // keyword:this.keyword, - page: 1, - size: 10 - // cmtask_status:this.cmtask_status, - // cmtask_name:this.cmtask_name, - }; - apiBoeCourse.cmtaskList(params).then(res => { - if (res.status == 200 && res.result.count > 0) { - this.isTiao = true; - } else { - this.isTiao = false; - } - }); + if(this.studyTaskCount>0){ + this.isTiao = true; + }else{ + this.isTiao = false; + } + // let params = { + // // keyword:this.keyword, + // page: 1, + // size: 10 + // // cmtask_status:this.cmtask_status, + // // cmtask_name:this.cmtask_name, + // }; + // apiBoeCourse.cmtaskList(params).then(res => { + // if (res.status == 200 && res.result.count > 0) { + // this.isTiao = true; + // } else { + // this.isTiao = false; + // } + // }); }, handleCommand(val) { let urlPre=window.location.protocol+'//'+window.location.host; diff --git a/src/views/Index.vue b/src/views/Index.vue index b89aae89..0d46542b 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -64,10 +64,10 @@ -
+
diff --git a/src/components/HomePage/caseList.vue b/src/components/HomePage/caseList.vue index 80a98859..8c7273c8 100644 --- a/src/components/HomePage/caseList.vue +++ b/src/components/HomePage/caseList.vue @@ -55,11 +55,11 @@ -
+
diff --git a/src/components/HomePage/noteList.vue b/src/components/HomePage/noteList.vue index 1343056f..002bfd58 100644 --- a/src/components/HomePage/noteList.vue +++ b/src/components/HomePage/noteList.vue @@ -24,11 +24,11 @@ -
+
diff --git a/src/components/HomePage/putTo.vue b/src/components/HomePage/putTo.vue index 9e49c5f5..6a285b05 100644 --- a/src/components/HomePage/putTo.vue +++ b/src/components/HomePage/putTo.vue @@ -23,11 +23,11 @@ -
+
diff --git a/src/views/homepage/page.vue b/src/views/homepage/page.vue index 4198706c..39950caf 100644 --- a/src/views/homepage/page.vue +++ b/src/views/homepage/page.vue @@ -20,26 +20,50 @@ 课程 +
+ +

还没有课程

+
案例 +
+ +

还没有案例

+
笔记 +
+ +

还没有笔记

+
提问 +
+ +

还没有提问

+
回答 +
+ +

还没有回答

+
文章 +
+ +

还没有文章

+
关注 diff --git a/src/views/portal/follow/index.vue b/src/views/portal/follow/index.vue index 4c4035ea..5102b2e9 100644 --- a/src/views/portal/follow/index.vue +++ b/src/views/portal/follow/index.vue @@ -29,21 +29,45 @@ +
+ +

暂时没有动态

+
+
+ +

暂时没有动态

+
+
+ +

暂时没有动态

+
+
+ +

暂时没有动态

+
+
+ +

暂时没有动态

+
+
+ +

暂时没有动态

+
- 回复 + 回复
-
+
@@ -111,23 +111,14 @@ }, delReplySon(item,index) { //子级的删除手动删掉，调用保存接口 //修改后，替换为下面的情况 - // apiGuestbook.del(item.id).then(res=>{ - // if(res.status==200){ - // item.replysList.splice(index,1); - // }else{ - // this.$message.error('删除失败'+res.message); - // } - // }); - item.replysList.splice(index,1); - let replysData = { - id:item.id, - reply:JSON.stringify(item.replysList) - } - apiGuestbook.answer(replysData).then(res=>{ - if(res.status == 200) { - this.$message.success('删除留言成功'); + apiGuestbook.del(item.id).then(res=>{ + if(res.status==200){ + item.replyList.splice(index,1); + this.$message.success('删除成功'); + }else{ + this.$message.error('删除失败'+res.message); } - }) + }); }, delReply(item) { this.$confirm('此操作将永久删除该留言, 是否继续?', '提示', { @@ -145,28 +136,36 @@ this.$message({type: 'info', message: '已取消删除'}); }); }, - isReplys(item,idx) { + showReplyInput(item,idx) { item.isReplys = true; this.replysData.id = item.id; - this.replysData.reply = item.replysList; + //this.replysData.reply = item.replyList; }, - addReplys() { + addReplys(top,p) { if(this.replysContent.trim().length == 0) { return this.$message.warning('请填写内容！'); } - this.replysData.reply.push({ - content: this.replysContent, - authorInfo:this.userInfo, - praises:0, - }) - this.replysData.reply = JSON.stringify(this.replysData.reply); - apiGuestbook.answer(this.replysData).then(res=>{ + let postData={ + content:this.replysContent, + topId:top.id, + parentId:p.id, + level:2, + replys:0 + } + let $this=this; + apiGuestbook.answer(postData).then(res=>{ this.replysContent = ''; if(res.status == 200) { - this.$message.success('留言发布成功'); - this.leavingList.forEach(item=>{ - item.isReplys = false; - }) + this.$message.success('回复留言成功'); + p.isReplys = false; + res.result.authorInfo=$this.userInfo; + p.replyList.push(res.result); + //直接追加到列表后面 + // this.leavingList.forEach(item=>{ + // item.isReplys = false; + // }) + }else{ + this.$message.error('回复留言失败'); } }) }, @@ -175,19 +174,22 @@ apiGuestbook.givelist(this.page).then(res=>{ if(res.status == 200) { this.count = res.result.count; + let ids=[]; res.result.list.forEach(item=>{ - if(!item.replysList){ - item.replysList = []; + if(!item.replyList){ + item.replyList = []; } + ids.push(item.sysCreateAid); item.isReplys = false; item.authorInfo = { aid: "",name: "",orgInfo: "",avatar: "",sex: null,sign:'' } - if(item.replys != '' && item.replys.length>10) { - item.replysList = JSON.parse(item.replys); - } - //if() + item.replyList.forEach(child=>{ + child.isReplys=false; + child.authorInfo= { aid: "",name: "",orgInfo: "",avatar: "",sex: null,sign:'' } + ids.push(child.sysCreateAid); + }) }) this.leavingList = res.result.list; - this.getUserData(res.result.list); + this.getUserData(ids,this.leavingList); } }) }, @@ -210,46 +212,37 @@ } }) }, - getUserData(list) { - if(this.pageId == this.userInfo.aid) { - let ids = list.map(item=> item.aid); - const noReapetIds = [...new Set(ids)]; - apiUser.getByIds(noReapetIds).then(res => { - if (res.status == 200) { - list.forEach((item, index) => { - res.result.some(author => { - if (author.aid == item.aid) { - item.authorInfo = author; - return true; - } else { - return false; - } - }); - }); - } else { - this.$message.error(res.message); - } - }); - } else { - let ids = list.map(item=> item.sysCreateAid); - const noReapetIds = [...new Set(ids)]; - apiUser.getByIds(noReapetIds).then(res => { - if (res.status == 200) { - list.forEach((item, index) => { - res.result.some(author => { - if (author.aid == item.sysCreateAid) { - item.authorInfo = author; - return true; - } else { - return false; - } - }); - }); - } else { - this.$message.error(res.message); - } - }); - } + getUserData(ids,list) { + + const noReapetIds = [...new Set(ids)]; + apiUser.getByIds(noReapetIds).then(res => { + if (res.status == 200) { + list.forEach((item, index) => { + res.result.some(author => { + if (author.aid == item.sysCreateAid) { + item.authorInfo = author; + return true; + } else { + return false; + } + }); + item.replyList.forEach(child=>{ + res.result.some(author => { + if (author.aid == child.sysCreateAid) { + child.authorInfo = author; + return true; + } else { + return false; + } + }); + }) + }); + } else { + this.$message.error(res.message); + } + }); + + }, handleSizeChange(val) { this.page.pageSize = val; From 5b7235304955598041ce3578f5131672544d0f47 Mon Sep 17 00:00:00 2001 From: daihh Date: Tue, 8 Nov 2022 14:49:09 +0800 Subject: [PATCH 05/21] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/phase2/guestbook.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/phase2/guestbook.js b/src/api/phase2/guestbook.js index 6b256a9b..0ac6c278 100644 --- a/src/api/phase2/guestbook.js +++ b/src/api/phase2/guestbook.js @@ -30,7 +30,7 @@ const del=function (id){ * } * */ const answer=function (data){ - return ajax.post(baseURL,'/xboe/subgroup/m/guest/answer',data); + return ajax.postJson(baseURL,'/xboe/subgroup/m/guest/answer',data); } /** From ccb4c462934a89371b1c63f92098e1c934d197e7 Mon Sep 17 00:00:00 2001 From: daihh Date: Tue, 8 Nov 2022 14:56:52 +0800 Subject: [PATCH 06/21] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=95=99=E8=A8=80?= =?UTF-8?q?=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/homepage/leavingMessage.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/homepage/leavingMessage.vue b/src/views/homepage/leavingMessage.vue index 78d6a60d..13b65ce1 100644 --- a/src/views/homepage/leavingMessage.vue +++ b/src/views/homepage/leavingMessage.vue @@ -19,11 +19,11 @@

{{item.content}}

-
回复
+
回复
-
删除
+
删除
@@ -41,7 +41,7 @@
-
删除
+
删除
@@ -213,7 +213,7 @@ }) }, getUserData(ids,list) { - + const noReapetIds = [...new Set(ids)]; apiUser.getByIds(noReapetIds).then(res => { if (res.status == 200) { @@ -241,8 +241,8 @@ this.$message.error(res.message); } }); - - + + }, handleSizeChange(val) { this.page.pageSize = val; From 81c25f30459b0137fea1870578ebe5a0689beb00 Mon Sep 17 00:00:00 2001 From: daihh Date: Tue, 8 Nov 2022 16:01:41 +0800 Subject: [PATCH 07/21] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=9C=AC=E5=91=A8?= =?UTF-8?q?=EF=BC=8C=E6=9C=AC=E6=9C=88=EF=BC=8C=E6=9C=AC=E5=B9=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ucurrency/Index.vue | 4 ++-- src/views/user/Noteedit.vue | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/views/ucurrency/Index.vue b/src/views/ucurrency/Index.vue index 3bbdb24f..cbc477a9 100644 --- a/src/views/ucurrency/Index.vue +++ b/src/views/ucurrency/Index.vue @@ -53,9 +53,9 @@ 累计 - 本周 + diff --git a/src/views/user/Noteedit.vue b/src/views/user/Noteedit.vue index 823816d1..6d7817fb 100644 --- a/src/views/user/Noteedit.vue +++ b/src/views/user/Noteedit.vue @@ -200,12 +200,10 @@ export default { this.timer = null; this.$router.go(-1); } - } + } }).catch(()=>{ - this.isShowTip = '当前网络异常，内容已离线保存，请尝试连接网络后重新自动上传！'; - setTimeout(()=>{ - this.isShowTip = ''; - },10000 * 2) + this.isShowTip = '当前网络异常，内容已离线保存，请尝试连接网络后重新保存！'; + setTimeout(()=>{ this.isShowTip = ''; },10000 * 2) sessionStorage.setItem('isShowTip',this.editdata.content); }) } From 7428a57ebcc554cf5fbb401d0d5d6d8f6a555722 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 9 Nov 2022 09:17:44 +0800 Subject: [PATCH 08/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=B8=E4=B8=AD?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=B7=AF=E5=BE=84=E7=9A=84=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/auditCourse1.vue | 2 +- src/components/Course/catalogCourseware.vue | 2 +- src/security.js | 6 ++++-- src/views/portal/course/Micro.vue | 2 +- src/views/study/PortalIndex.vue | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/components/Course/auditCourse1.vue b/src/components/Course/auditCourse1.vue index e9f62b81..a9cc71c9 100644 --- a/src/components/Course/auditCourse1.vue +++ b/src/components/Course/auditCourse1.vue @@ -305,7 +305,7 @@ export default { homeworkInfo: {}, examInfo: {}, assessInfo: {}, - fileBaseUrl: this.$xpage.constants.fileBaseUrl, + fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL, btnLoading: false, curCFile:{},//课件内容 coursewareInfo: { diff --git a/src/components/Course/catalogCourseware.vue b/src/components/Course/catalogCourseware.vue index ac2e0cb6..620a127b 100644 --- a/src/components/Course/catalogCourseware.vue +++ b/src/components/Course/catalogCourseware.vue @@ -366,7 +366,7 @@ data(){ return { converStatus:4, - fileBaseUrl:this.$xpage.constants.fileBaseUrl, + fileBaseUrl:process.env.VUE_APP_FILE_BASE_URL, curPdfPath:'', curCFile:{},//当前课件的内容 comTypes:[ diff --git a/src/security.js b/src/security.js index 4abfcb01..31c11c9e 100644 --- a/src/security.js +++ b/src/security.js @@ -17,9 +17,11 @@ router.beforeEach((to, from, next) => { //动态计算文件的路径 let configPath=process.env.VUE_APP_FILE_RELATIVE_PATH; if(configPath.startsWith('http')){ - xpage.fileBaseUrl=configPath; + //xpage.fileBaseUrl=configPath; + xpage.constants.fileBaseUrl=configPath; }else{ - xpage.fileBaseUrl = window.location.protocol+'//'+window.location.host+configPath; + //xpage.fileBaseUrl = window.location.protocol+'//'+window.location.host+configPath; + xpage.constants.fileBaseUrl=window.location.protocol+'//'+window.location.host+configPath; } diff --git a/src/views/portal/course/Micro.vue b/src/views/portal/course/Micro.vue index 3b1ed95d..9d725e98 100644 --- a/src/views/portal/course/Micro.vue +++ b/src/views/portal/course/Micro.vue @@ -293,7 +293,7 @@ export default { studyId: "", tags: [], numberToLetter: numberToLetter, - fileBaseUrl: this.$xpage.constants.fileBaseUrl, + fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL, blobUrl:'',//播放的文件地址，新添加，采用blob方式 getType: getType, courseType, diff --git a/src/views/study/PortalIndex.vue b/src/views/study/PortalIndex.vue index 5eda8a1e..e80649ba 100644 --- a/src/views/study/PortalIndex.vue +++ b/src/views/study/PortalIndex.vue @@ -292,7 +292,7 @@ export default { totalContent: 0, //课程内容数量 pageCount: 0, currentPage: 0, - fileBaseUrl: this.$xpage.constants.fileBaseUrl, + fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL, contentList: [], sectionList: [], teachers: [], From c25ea1eb74c636b815b469c8f22c183ed5b8b533 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 9 Nov 2022 09:18:23 +0800 Subject: [PATCH 09/21] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=B8=AD=E5=8E=BB=E6=8E=89=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/xpage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/xpage.js b/src/utils/xpage.js index aa69ed59..0f1da9fd 100644 --- a/src/utils/xpage.js +++ b/src/utils/xpage.js @@ -1,6 +1,6 @@ /**页面设置的一些常量,方便，用于一个处理只写一处，不要多处写*/ const constants={ - fileBaseUrl:'http://192.168.0.11/cdn/upload', + fileBaseUrl:'', newLoginKey:'boe_new_login' } From 077db5fa07cff145d238e831b697e0baa1935a18 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 9 Nov 2022 12:18:14 +0800 Subject: [PATCH 10/21] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=A2=9E=E5=8A=A0ifram?= =?UTF-8?q?e=E5=B5=8C=E5=85=A5=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/data/pages.js | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/src/data/pages.js b/src/data/pages.js index 5a3f784b..f105308c 100644 --- a/src/data/pages.js +++ b/src/data/pages.js @@ -89,7 +89,20 @@ export const pages=[ ]}, {title:'消息中心',path:'/message/center',hidden:false,children:[ {title:'消息中心',path:'index',component:'portal/user/Message',hidden:false} - ]}, + ]} + +]; +export const iframes=[ + {title:'课件管理', path:'/iframe/course/coursewares',hidden:false,component:'course/Courseware'}, + {title:'课程管理', path:'/iframe/course/manages',hidden:false,component:'course/ManageList'}, + {title:'考试试题管理', path:'/iframe/exam/questions',hidden:false,component:'exam/Question'}, + {title:'考试试卷管理', path:'/iframe/exam/papers',hidden:false,component:'exam/TestPaper'}, + {title:'考试管理', path:'/iframe/exam/tests',hidden:false,component:'exam/ExamList'}, + {title:'案例管理', path:'/iframe/cases/manages',hidden:false,component:'case/ManageList'}, + {title:'文章管理', path:'/iframe/article/manages',hidden:false,component:'article/ManageList'}, + {title:'问答管理', path:'/iframe/qa/manages',hidden:false,component:'qa/ManageList'}, + {title:'待审核课程', path:'/iframe/course/noapproved',hidden:false,component:'examine/NotApproved'}, + {title:'已审核课程', path:'/iframe/course/reviewed',hidden:false,component:'examine/Reviewed'} ] export function routers(){ @@ -110,10 +123,17 @@ export function routers(){ delete sub.title; }) }; - - myrouters.push(item); n++; }); + //增加iframe的页面 + + iframes.forEach((item,index)=>{ + item.name='iframe'+index; + item.alwaysShow=true; + item.meta={title:item.title,icon:"menu",noCache:true}, + delete item.title; + myrouters.push(item); + }) return myrouters; } From 56b5a486e9dc142ca8b3f53d5c8668506f316459 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 9 Nov 2022 14:18:40 +0800 Subject: [PATCH 11/21] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E9=9D=9E=E7=BC=96=E8=BE=91=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/user/Setting.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/user/Setting.vue b/src/views/user/Setting.vue index 186f5218..1e74de98 100644 --- a/src/views/user/Setting.vue +++ b/src/views/user/Setting.vue @@ -35,7 +35,7 @@

{{form.sign}} - +

取消 @@ -47,9 +47,9 @@

个人主页设置

-
- 关闭个人主页 - 打开个人主页 +
+ 关闭个人主页 + 打开个人主页 取消 保存 @@ -61,9 +61,9 @@

动态可见范围

- 全部动态 - 最近半年动态 - 最近三个月动态 + 全部动态 + 最近半年动态 + 最近三个月动态 取消 保存 From 998bd6b527d289518760c5e37faabac608a21bd3 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 9 Nov 2022 16:00:05 +0800 Subject: [PATCH 12/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9=E5=B7=B2=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/HomePage/articleList.vue | 4 ++++ src/components/HomePage/courseList.vue | 10 +++++++--- src/components/Portal/interactBar.vue | 2 +- src/views/homepage/page.vue | 4 ++++ src/views/study/Courses.vue | 2 +- 5 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/components/HomePage/articleList.vue b/src/components/HomePage/articleList.vue index 2efdeac8..5179f568 100644 --- a/src/components/HomePage/articleList.vue +++ b/src/components/HomePage/articleList.vue @@ -78,6 +78,10 @@ }, methods:{ jumpDetail(item){ + if(item.info.deleted){ + this.$message.warning("此文章已删除"); + return; + } this.$router.push('/article/detail?id='+item.contentId) }, emitHide(id) { diff --git a/src/components/HomePage/courseList.vue b/src/components/HomePage/courseList.vue index 70b5e0a6..2e6981bb 100644 --- a/src/components/HomePage/courseList.vue +++ b/src/components/HomePage/courseList.vue @@ -39,11 +39,11 @@ -
+
@@ -98,7 +98,11 @@ if(!data.contentId){ return; } - + console.log(data.info,'data.info') + if(!data.info.enabled || data.info.deleted){ + this.$message.warning("此课程已停用或已删除"); + return; + } this.$router.push({ path: '/course/detail?id=', query: { id: data.contentId } }); } } diff --git a/src/components/Portal/interactBar.vue b/src/components/Portal/interactBar.vue index ba6c7a3e..28a5b22e 100644 --- a/src/components/Portal/interactBar.vue +++ b/src/components/Portal/interactBar.vue @@ -48,7 +48,7 @@ {{data.shares}}
-
+
diff --git a/src/views/homepage/page.vue b/src/views/homepage/page.vue index 39950caf..6f4c26ef 100644 --- a/src/views/homepage/page.vue +++ b/src/views/homepage/page.vue @@ -16,6 +16,10 @@ +
+ +

还没有动态

+
课程 diff --git a/src/views/study/Courses.vue b/src/views/study/Courses.vue index bd1b01a5..72d681bb 100644 --- a/src/views/study/Courses.vue +++ b/src/views/study/Courses.vue @@ -2,7 +2,7 @@
-
我的报名
+
我报名的
From fccb4b4cc090ef28fea0ed1c45d3f77abea3ebbf Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 9 Nov 2022 16:11:41 +0800 Subject: [PATCH 13/21] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=BC=96=E8=BE=91=EF=BC=8C=E5=88=A0=E9=99=A4=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Article/ucItems.vue | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/components/Article/ucItems.vue b/src/components/Article/ucItems.vue index 9c2ed7ad..3944fe8e 100644 --- a/src/components/Article/ucItems.vue +++ b/src/components/Article/ucItems.vue @@ -3,9 +3,15 @@
- + +
+ + 编辑 + 删除 + {{ item.title }} - +
+
@@ -65,7 +71,7 @@ export default { } }, mounted() { - console.log(this.items) + }, methods: { classFilter(status){ @@ -197,6 +203,11 @@ export default { font-size: 14px; } } + +.btncolor{ + color: #8590A6; + font-size: 14px; +} .one-line-ellipsis { width: 100%; text-overflow: ellipsis; @@ -285,7 +296,7 @@ export default { } } } - + .article-info-tools { height: 30px; display: flex; From c1c7cc6c0b929d55f29dd617489ae5f839ec5988 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 9 Nov 2022 16:15:13 +0800 Subject: [PATCH 14/21] =?UTF-8?q?=E5=B7=B2=E5=8A=A0=E4=B8=8A=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/HomePage/answerList.vue | 4 ++++ src/components/HomePage/caseList.vue | 7 +++++++ src/components/HomePage/noteList.vue | 4 ++++ src/components/HomePage/putTo.vue | 19 +++++++++++-------- 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/components/HomePage/answerList.vue b/src/components/HomePage/answerList.vue index 26c1a844..f5b7977d 100644 --- a/src/components/HomePage/answerList.vue +++ b/src/components/HomePage/answerList.vue @@ -78,6 +78,10 @@ }, methods:{ jumpDetail(item){ + if(item.deleted){ + this.$message.warning("此内容已删除"); + return; + } this.$router.push('/qa/answer?id='+item.contentId) }, emitHide(id) { diff --git a/src/components/HomePage/caseList.vue b/src/components/HomePage/caseList.vue index 8c7273c8..52b0562d 100644 --- a/src/components/HomePage/caseList.vue +++ b/src/components/HomePage/caseList.vue @@ -124,6 +124,13 @@ if(code==''|| code==undefined){return '';} return this.orgDomainMap.get(code); }, + jumpDetail(item){ + if(item.info.deleted){ + this.$message.warning("此案例已删除"); + return; + } + this.$router.push('/case/detail?id='+item.contentId) + }, } } diff --git a/src/components/HomePage/noteList.vue b/src/components/HomePage/noteList.vue index 002bfd58..6e7ebd16 100644 --- a/src/components/HomePage/noteList.vue +++ b/src/components/HomePage/noteList.vue @@ -74,6 +74,10 @@ }, methods:{ jumpDetail(item){ + if(item.info.deleted){ + this.$message.warning("此笔记已删除"); + return; + } this.$router.push('/course/detail?id='+item.info.courseId) }, emitHide(id) { diff --git a/src/components/HomePage/putTo.vue b/src/components/HomePage/putTo.vue index 6a285b05..efa2ff5c 100644 --- a/src/components/HomePage/putTo.vue +++ b/src/components/HomePage/putTo.vue @@ -3,8 +3,8 @@

  • - {{item.aname}}{{item.cusInfo}} - {{item.eventTime}} + {{item.aname}}{{item.cusInfo}} + {{item.eventTime}}

-->
- + - + - \ No newline at end of file From 32925e5e0412f2ade86647f47cb15535acc9b7d6 Mon Sep 17 00:00:00 2001 From: weinan2087 Date: Wed, 9 Nov 2022 16:34:09 +0800 Subject: [PATCH 15/21] =?UTF-8?q?=E5=B0=86=E7=BB=8F=E9=AA=8C=E5=80=BC?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=94=B9=E4=B8=BA=E5=AD=A6=E4=B9=A0=E5=A4=A9?= =?UTF-8?q?=E6=95=B0=E6=8E=92=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ucurrency/Index.vue | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/src/views/ucurrency/Index.vue b/src/views/ucurrency/Index.vue index cbc477a9..9129087a 100644 --- a/src/views/ucurrency/Index.vue +++ b/src/views/ucurrency/Index.vue @@ -31,16 +31,23 @@
+ + + +
- 经验值排行榜 + 学习天数排行榜
+ + 所有用户学习天数TOP排行榜单，每活跃学习1天可累计学习天数
@@ -65,7 +72,7 @@ 累计排名 : {{currentUserRankingTotalData.rankNo}}
- 累计经验值 : {{currentUserRankingTotalData.rankValue}} + 累计学习天数 : {{currentUserRankingTotalData.rankValue}}
@@ -87,7 +94,7 @@
排名
姓名
部门
-
经验值
+
学习天数
+ + + + + + + + +
@@ -334,7 +350,7 @@ getRanking() { let data = { aid: this.userInfo.aid, // #用户id - statType: 20, // #统计类型 10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数 + statType: 11, // #统计类型 10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数 field: this.cycle, // #统计周期 todays-当天,weeks-周,months-月,years-年 total-总计 num: 5, // #显示的条数 } @@ -351,10 +367,10 @@ this.getUserData([res.result.currentUserRankingData.aid], [res.result.currentUserRankingData]) this.currentUserRankingData = res.result.currentUserRankingData; if(this.cycle == 'total'){ - this.current = this.experienceValue(res.result.currentUserRankingData.total); + // this.current = this.experienceValue(res.result.currentUserRankingData.total); this.currentUserRankingTotalData.rankNo = res.result.currentUserRankingData.rankingNo; this.currentUserRankingTotalData.rankValue = res.result.currentUserRankingData.total; - this.currentUserRankingTotalData.endValue = this.current.endValue; + // this.currentUserRankingTotalData.endValue = this.current.endValue; } } From 7ff8d0d49015be859d0cf42757864d6ebed2a4b4 Mon Sep 17 00:00:00 2001 From: weinan2087 Date: Wed, 9 Nov 2022 16:51:17 +0800 Subject: [PATCH 16/21] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/user/ranking.vue | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/src/views/user/ranking.vue b/src/views/user/ranking.vue index 3da9b764..ca80bb42 100644 --- a/src/views/user/ranking.vue +++ b/src/views/user/ranking.vue @@ -1,5 +1,6 @@