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

Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into stat

Browse Source
This commit is contained in:
daihh
2022-11-17 19:56:59 +08:00
parent af7f797253 176ba23b26
commit 6a6246aa2f
6 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/Index.vue
View File

@@ -1167,7 +1167,7 @@
.case-inter-orgin{
// width: 45%;
float: left;
// float: left;
margin-left: 5px;
line-height: 30px;
font-size: 14px;
@@ -1583,7 +1583,7 @@
width: 100%;
.case-inter-box{
display: flex;
margin-right: 35px;
margin-right: 46px;
.case-inter-left{
flex: 1;
@@ -1591,6 +1591,9 @@
}
.interact-bar-index{
margin-left: auto;
::v-deep .svg-icon{
padding-top: 6px;
}
}
}

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

@@ -104,8 +104,7 @@
<div class="portal-ranking ranking-bg">
<p class="ranking-title">好评榜</p>
<ul class="ranking-data">
<li v-for="(item, index) in Positive" :key="index" class="title-line-ellipsis" style="cursor: pointer;margin-top:30px;line-height: 22px;">
<router-link :to="'case/detail?id='+item.id">
<li v-for="(item, index) in Positive" :key="index" class="title-line-ellipsis" style="cursor: pointer;margin-top:30px;line-height: 22px;" @click="jumpRouter(item)">
<span class="portal-right-text blue-one" v-if="index==0">
<img :src="`${webBaseUrl}/images/listblue01.png`" alt="">
</span>
@@ -122,15 +121,13 @@
<img :src="`${webBaseUrl}/images/list05.png`" alt="">
</span>
<span class="portal-title-desc" style="font-size: 14px;">{{ item.title }}</span>
</router-link>
</li>
</ul>
</div>
<div style="margin-top:26px" class="portal-ranking ranking-bg1">
<p class="ranking-title">人气榜</p>
<ul class="ranking-data">
<li v-for="(item, index) in Popularity" :key="index" class="title-line-ellipsis" style="cursor: pointer;margin-top:30px;line-height: 22px;">
<router-link :to="'case/detail?id='+item.id">
<li v-for="(item, index) in Popularity" :key="index" class="title-line-ellipsis" style="cursor: pointer;margin-top:30px;line-height: 22px;" @click="jumpRouter(item)">
<span class="portal-right-text orange-one" v-if="index==0">
<img :src="`${webBaseUrl}/images/list-01.png`" alt="">
</span>
@@ -147,7 +144,6 @@
<img :src="`${webBaseUrl}/images/list05.png`" alt="">
</span>
<span class="portal-title-desc" style="font-size: 14px;">{{ item.title }}</span>
</router-link>
</li>
</ul>
</div>

12
src/views/portal/case/Index.vue
View File

@@ -78,9 +78,11 @@
</div>
</div>
</div>
</router-link>
<div style="height:58px;padding-top:14px ">
<author :avatar="item.authorInfo.avatar" :name="item.authorInfo.name" :info="item.authorInfo.orgInfo" :sex="item.authorInfo.sex"></author>
<author :avatar="item.authorInfo.avatar" :name="item.authorInfo.name" :info="item.authorInfo.orgInfo" :sex="item.authorInfo.sex" :aid="item.authorInfo.aid"></author>
</div>
<router-link :to="'/case/detail?id='+item.id">
<div class="keyword-text clearfix">
<div style="color:#2974D6;font-weight: 450;" v-if="item.orgDomain">{{ orgDomainTranslate(item.orgDomain) }}</div>
<div style="color:#2974D6;font-weight: 450;" v-if="item.orgDomain == '' && item.orgDomainParent">{{ orgDomainTranslate(item.orgDomainParent) }}</div>
@@ -91,7 +93,7 @@
<div v-if="item.keyword4">{{ item.keyword4 }}</div>
<div v-if="item.keyword5">{{ item.keyword5 }}</div>
</div>
</router-link>
</router-link>
<div class="case-info-summary two-line-ellipsis" @click="jumcasedet(item)">
{{ item.summary }}
<!-- <router-link :to="'/case/detail?id='+item.id"> -->
@@ -112,11 +114,11 @@
<div class="pagination-div">
<span class="pag-text" @click="loadMore()" v-if="moreState == 1">加载更多</span>
<span class="pag-text-msg" v-else-if="moreState == 2">数据加载中</span>
<span class="notcoures" v-else-if="moreState == 3 && !isSeach && caseList.count>0">
<img :src="`${webBaseUrl}/images/nocase.png`" alt="">
<span class="notcoures" v-else-if="caseList.list.length == 0">
<img :src="`${webBaseUrl}/images/nocase.png`" alt="">
<h5>暂无案例，请优先学习其它案例吧～</h5>
</span>
<span class="pag-text-msg" v-else-if="isSeach">没有查询到相关内容</span>
<!-- <span class="pag-text-msg" v-else-if="isSeach">没有查询到相关内容</span> -->
</div>
<div v-if="isSeach" style="height:382px">
</div>

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

@@ -316,11 +316,11 @@ computed: {
// this.$router.push({path:'/course/micro',query:{id:item.courseId}})
// }
// if(item.courseType==20){
if(item.progress>0 && item.progress<100) {
// if(item.progress>0 && item.progress<100) {
this.$router.push({path:'/course/studyindex',query:{id:item.courseId}})
} else {
this.$router.push({path:'/course/detail',query:{id:item.courseId}})
}
// } else {
// this.$router.push({path:'/course/detail',query:{id:item.courseId}})
// }
// }
}