From d5cfca7cb7df4bacff346e76175c4d304a955c95 Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Wed, 8 Jun 2022 19:13:28 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=A1=88=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/case/Detail.vue | 23 +++++++++++++++++++++-- src/views/portal/case/Index.vue | 18 +++++++++++++----- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue index af451c38..06ff0aa5 100644 --- a/src/views/portal/case/Detail.vue +++ b/src/views/portal/case/Detail.vue @@ -18,7 +18,11 @@ 工号：{{ authorInfo.code }} 部门：{{ authorInfo.orgInfo }} - {{ caseDetail.sysCreateTime.substring(0,10) }} + + + +
+ {{ caseDetail.sysCreateTime.substring(0,10) }}
@@ -148,6 +152,7 @@ export default { }, data() { return { + // orginfo:'京东方科技集团股份有限公司/北京中祥英科技有限公司/技术中心/成都开发部', toUsers:[], ankingList:[], Popularity:[], @@ -164,6 +169,7 @@ export default { }; }, mounted() { + //this.pdfPath=this.basePath+'/case/demo1.pdf'; this.resolveId = this.$route.query.id; if (this.resolveId) { @@ -178,6 +184,14 @@ export default { ); }, methods: { + // info(){ + // if(this.orginfo){ + // let idx=this.orginfo.indexOf('/'); + // if(idx>-1){ + // this.orginfo=this.orginfo.substring(idx+1); + // } + // } + // }, createPlayUrl(u){ let nowDate=new Date(); let ctime=parseInt(nowDate.getTime()/1000); @@ -253,7 +267,12 @@ export default { getCaseUserDetail() { apiUser.getByIds([this.caseDetail.authorId]).then(res => { if (res.status == 200 && res.result.length>0) { - this.authorInfo = res.result[0]; + this.authorInfo = res.result[0]; + console.log(this.authorInfo) + let idx=this.authorInfo.orgInfo.indexOf('/'); + if(idx>-1){ + this.authorInfo.orgInfo=this.authorInfo.orgInfo.substring(idx+1); + } this.toUsers = [ {name: res.result[0].name, aid:res.result[0].aid ,sex:res.result[0].sex} ]; diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue index eba4c178..f28256e2 100644 --- a/src/views/portal/case/Index.vue +++ b/src/views/portal/case/Index.vue @@ -78,8 +78,9 @@
-
+
+
@@ -88,13 +89,15 @@
- +
+
+
{{ item.keyword1 }} {{ item.keyword2 }} @@ -103,14 +106,19 @@ {{ item.keyword5 }}
+ +
- + {{displayAll(item)}} - - + + + + {{item.isAll?'收起':'展开'}}
+
From 0a864937dd5efb6fcbcd6998a6f48984d3433c5a Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Wed, 8 Jun 2022 19:27:30 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=88=86=E4=BA=AB=E7=BB=99=E6=88=91?= =?UTF-8?q?=E7=9A=84=E8=B7=B3=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Article/shareItems.vue | 8 ++++---- src/components/Course/shareItem.vue | 7 ++++++- src/views/portal/case/Detail.vue | 17 ++--------------- src/views/share/ToList.vue | 2 ++ 4 files changed, 14 insertions(+), 20 deletions(-) diff --git a/src/components/Article/shareItems.vue b/src/components/Article/shareItems.vue index 19e694fb..c1137264 100644 --- a/src/components/Article/shareItems.vue +++ b/src/components/Article/shareItems.vue @@ -6,9 +6,9 @@ 【已查看】 【未查看】 - +
-
+
@@ -72,7 +72,7 @@ export default { } }) } - this.$router.push({path:'/article/detail',query:{id:item.objId}}) + this.$router.push({path:'/article/detail',query:{id:item.objId || item.id}}) // window.open(`${this.webBaseUrl}/article/detail?id=${item.objId}`) }, deleteshares(item){ @@ -129,7 +129,7 @@ export default { font-weight: 400; display: flex; justify-content: flex-start; - + align-items: center; .readed{ font-size: 18px; diff --git a/src/components/Course/shareItem.vue b/src/components/Course/shareItem.vue index dd45b3b5..c40062a0 100644 --- a/src/components/Course/shareItem.vue +++ b/src/components/Course/shareItem.vue @@ -113,7 +113,12 @@ export default { } }) } - this.$router.push({path:'/course/detail',query:{id:item.objId}}) + if(item.contentType == 20) { + this.$router.push({path:'/course/detail',query:{id:item.objId || item.id}}) + } else { + this.$router.push({path:'/course/micro',query:{id:item.objId || item.id}}) + } + // window.open(`${this.webBaseUrl}/course/detail?id=${item.objId}`) }, }, diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue index 06ff0aa5..50deddab 100644 --- a/src/views/portal/case/Detail.vue +++ b/src/views/portal/case/Detail.vue @@ -42,7 +42,7 @@ - +
@@ -152,7 +152,6 @@ export default { }, data() { return { - // orginfo:'京东方科技集团股份有限公司/北京中祥英科技有限公司/技术中心/成都开发部', toUsers:[], ankingList:[], Popularity:[], @@ -169,7 +168,6 @@ export default { }; }, mounted() { - //this.pdfPath=this.basePath+'/case/demo1.pdf'; this.resolveId = this.$route.query.id; if (this.resolveId) { @@ -184,14 +182,6 @@ export default { ); }, methods: { - // info(){ - // if(this.orginfo){ - // let idx=this.orginfo.indexOf('/'); - // if(idx>-1){ - // this.orginfo=this.orginfo.substring(idx+1); - // } - // } - // }, createPlayUrl(u){ let nowDate=new Date(); let ctime=parseInt(nowDate.getTime()/1000); @@ -227,7 +217,6 @@ export default { apiCase.usernameList(5).then(res=>{ if(res.status==200){ this.ankingList=res.result - // console.log(res) } }) }, @@ -235,7 +224,6 @@ export default { apiCase.queryPraises(5).then(res=>{ if(res.status==200){ this.Popularity=res.result - // console.log(this.Popularity) } }) }, @@ -243,7 +231,6 @@ export default { apiCase.queryComments(5).then(res=>{ if(res.status==200){ this.Positive=res.result - console.log(res) } }) }, @@ -272,7 +259,7 @@ export default { let idx=this.authorInfo.orgInfo.indexOf('/'); if(idx>-1){ this.authorInfo.orgInfo=this.authorInfo.orgInfo.substring(idx+1); - } + } this.toUsers = [ {name: res.result[0].name, aid:res.result[0].aid ,sex:res.result[0].sex} ]; diff --git a/src/views/share/ToList.vue b/src/views/share/ToList.vue index d5336baf..34ae2b33 100644 --- a/src/views/share/ToList.vue +++ b/src/views/share/ToList.vue @@ -318,11 +318,13 @@ export default { item.question.title=item.title; item.question.content=item.content; item.question.bestAnswer=item.bestAnswer; + item.question.id=item.id; } if(item.type == 3){ item.cases = {title:'',summary:''}; item.cases.title=item.title; item.cases.title=item.summary; + item.cases.id=item.id; } }); this.dataList.list = res.result.list; From f4b88764a876379f8e4d32da9398aa85cc7cba48 Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Wed, 8 Jun 2022 19:30:11 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/article/Detail.vue | 2 +- src/views/portal/case/Detail.vue | 2 +- src/views/portal/case/Index.vue | 1 + src/views/portal/qa/Detail.vue | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/portal/article/Detail.vue b/src/views/portal/article/Detail.vue index 2912171e..9c3be34a 100644 --- a/src/views/portal/article/Detail.vue +++ b/src/views/portal/article/Detail.vue @@ -7,7 +7,7 @@ 文章详情
-
+
diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue index 50deddab..a3c8fe3b 100644 --- a/src/views/portal/case/Detail.vue +++ b/src/views/portal/case/Detail.vue @@ -7,7 +7,7 @@ 案例详情
-
+
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue index f28256e2..70fc3159 100644 --- a/src/views/portal/case/Index.vue +++ b/src/views/portal/case/Index.vue @@ -371,6 +371,7 @@ export default { }, //展示全部 displayAll(item) { + if (!item.isAll && item.summary && item.summary.length > 180) { return item.summary.slice(0, 180) + "..."; } diff --git a/src/views/portal/qa/Detail.vue b/src/views/portal/qa/Detail.vue index b7f87158..2408880f 100644 --- a/src/views/portal/qa/Detail.vue +++ b/src/views/portal/qa/Detail.vue @@ -7,7 +7,7 @@ 问答详情
-
+
From cd9c1e013a864f128c3e997935a54d71f3430589 Mon Sep 17 00:00:00 2001 From: lmj <3407000732@qq.com> Date: Wed, 8 Jun 2022 19:38:00 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=A1=88=E4=BE=8B=E6=8E=92=E8=A1=8C?= =?UTF-8?q?=E6=A6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/case/Detail.vue | 2 +- src/views/portal/case/Index.vue | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue index a3c8fe3b..c9db6c47 100644 --- a/src/views/portal/case/Detail.vue +++ b/src/views/portal/case/Detail.vue @@ -207,7 +207,7 @@ export default { } } if(scrollTop > 630) { - document.querySelector('#fixd-box').style.cssText = "position: fixed;top: -550px;width:245.5px"; + document.querySelector('#fixd-box').style.cssText = "position: fixed;top: -500px;width:245.5px"; } else { document.querySelector('#fixd-box').style.cssText = "position: static"; } diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue index 70fc3159..ccc5161c 100644 --- a/src/views/portal/case/Index.vue +++ b/src/views/portal/case/Index.vue @@ -458,7 +458,7 @@ export default { } if (scrollTop > 630) { document.querySelector("#fixd-box").style.cssText = - "position: fixed;top: -550px;width:245.5px"; + "position: fixed;top: -500px;width:245.5px"; } else { document.querySelector("#fixd-box").style.cssText = "position: static"; } @@ -637,6 +637,7 @@ export default { line-height: 25px; display: flex; .case-tittext{ + font-size: 18px; width: 80%; display: -webkit-box; overflow: hidden; From 911e4947ed8884475d9cb0d57f286dd71143d70f Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Wed, 8 Jun 2022 19:39:39 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/case/ManageList.vue | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/views/case/ManageList.vue b/src/views/case/ManageList.vue index 2bf648af..2898f85a 100644 --- a/src/views/case/ManageList.vue +++ b/src/views/case/ManageList.vue @@ -14,9 +14,9 @@
-
+
- 搜索 + 搜索 重置
@@ -28,9 +28,9 @@ {{ scope.row.title }} - - - + +