hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-11 11:56: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-10-11 20:02:16 +08:00
parent 243a137765 0781cc0f7c
commit d0a02809b0
17 changed files with 231 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/assets/styles/index.scss
View File

@@ -351,6 +351,9 @@ li{
width: 68px !important;
height: 68px !important;
border-radius: 0px;
img{
width: 100% !important;
}
}
.teacher-text{
width: 68px;

12
src/assets/styles/portal-index.scss
View File

@@ -624,6 +624,9 @@
.el-avatar{
width: 26px !important;
height: 26px !important;
img{
width: 100% !important;
}
}
}
.article-card-right{
@@ -666,6 +669,9 @@
.el-avatar{
width: 26px;
height: 26px;
img{
width: 100% !important;
}
}
}
.article-info-time{
@@ -888,6 +894,9 @@
.el-avatar{
width: 34px;
height: 34px;
img{
width: 100% !important;
}
}
}
}
@@ -1067,6 +1076,9 @@
.el-avatar{
width: 32px !important;
height: 32px !important;
img{
width: 100% !important;
}
}
}
.article-card-right{

44
src/components/Article/collectList.vue
View File

@@ -4,16 +4,22 @@
<div class="article-info-date"></div>
<div @click="jump(item)">
<div class="article-info">
<div class="article-info-title one-line-ellipsis">
{{ item.title }}
<div class="art-hear one-line-ellipsis">
<span class="article-info-title">
{{ item.title }}
<span class="art-tit">#文章#</span>
</span>
<el-button @click.stop="delItem(item)" type="text" style="color: #8590A6" icon="el-icon-star-on">取消收藏</el-button>
</div>
<div class="article-info-tools">
<authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo" :sex="item.sex"> </authorInfo>
<!-- <span>发布时间：{{ item.sysCreateTime || item.publishTime || item.favoritesTime | timeFilter }}</span> -->
<!-- <span>收藏时间：{{ item.time || item.favoritesTime | timeFilter }}</span> -->
</div>
<div class="article-info-summary two-line-ellipsis">{{ item.summary || item.content}}</div>
<div class="article-info-tools">
<authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo" :sex="item.sex"> </authorInfo>
<span>发布时间：{{ item.sysCreateTime || item.publishTime || item.favoritesTime | timeFilter }}</span>
<span>收藏时间：{{ item.time || item.favoritesTime | timeFilter }}</span>
<el-button @click.stop="delItem(item)" type="text" style="color: #8590A6" icon="el-icon-remove">取消收藏</el-button>
</div>
<interactBar :type="2" :readonly="true" :data="items" :views="false" :shares="false"></interactBar>
</div>
</div>
</div>
@@ -68,6 +74,18 @@ export default {
</script>
<style lang="scss" scoped>
.art-hear{
display: flex;
button{
margin-left: auto;
}
}
.art-tit{
font-size: 16px;
color: #333333;
margin-left: 5px;
font-weight: 400;
}
.article-status1 {
padding: 3px;
border: 1px dotted #1ea0fa;
@@ -108,18 +126,18 @@ export default {
}
.article-info {
.article-info-title {
font-size: 18px;
font-weight: 400;
font-size: 16px;
font-weight: 600;
margin-bottom: 5px;
color: #333;
}
.article-info-summary {
// height: 65px;
color: #999999;
color: #333;
margin-bottom: 15px;
margin-top: 10px;
line-height: 25px;
font-size: 14px;
line-height: 20px;
}
.article-info-tools {
color: #999999;

12
src/components/Article/ucItems.vue
View File

@@ -12,8 +12,8 @@
<div class="article-info">
<div class="article-info-title one-line-ellipsis"
>
<span v-if="item.enabled" :class="classFilter(item.status).className">{{classFilter(item.status).text}}</span>
<span v-else class="article-status8">【已下架】</span>
<!-- <span v-if="item.enabled" :class="classFilter(item.status).className">{{classFilter(item.status).text}}</span> -->
<!-- <span v-else class="article-status8">【已下架】</span> -->
<span class="titleContent " >
{{ item.title }}
</span>
@@ -282,15 +282,17 @@ width: 100%;
.titleContent{
// padding-left: 5px;
cursor: pointer;
font-size: 16px;
color: #333333;
font-weight: 600;
}
}
.article-info-summary {
// height: 65px;
margin-bottom: 20px;
color: #666;
color: #333333;
margin-top: 10px;
font-size: 16px;
font-size: 14px;
}

42
src/components/Case/collectList.vue
View File

@@ -3,23 +3,28 @@
<div class="article-list" v-for="(item,idx) in items" :key="idx">
<div class="article-info ">
<div class="article-info-title " >
<div style="width:85%" class="title-line-ellipsis">
<router-link :to="'/case/detail?id='+item.cases.id" >{{item.cases.title}}</router-link>
<div style="width:85%" class=" ">
<router-link :to="'/case/detail?id='+item.cases.id" ><div class="case-tit title-line-ellipsis">{{item.cases.title}} <span class="bq-case">#案例#</span> </div> </router-link>
</div>
<div class="article-info-date">
<el-button @click="delItem(item)" type="text" style="color: #8590A6" icon="el-icon-remove">取消收藏</el-button>
<el-button @click="delItem(item)" type="text" style="color: #8590A6;font-size:14px" icon="el-icon-star-on">取消收藏</el-button>
</div>
</div>
<div class="article-info-tools">
<authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo" :sex="item.sex"></authorInfo>
<!-- <span style="margin-top:2px">发布时间：{{ item.cases.sysCreateTime || item.publishTime | timeFilter }}</span> -->
<!-- <span style="margin-top:2px">收藏时间：{{ item.time || item.favoritesTime | timeFilter }}</span> -->
<!-- <interactBar :type="0" :data="item.cases" :shares="false" :views="false"></interactBar> -->
</div>
<div class="article-info-summary three-line-ellipsis">
<router-link :to="'/case/detail?id='+item.cases.id" > {{item.cases.summary}}</router-link>
</div>
<div class="article-info-tools">
<authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo" :sex="item.sex"></authorInfo>
<span style="margin-top:2px">发布时间：{{ item.cases.sysCreateTime || item.publishTime | timeFilter }}</span>
<span style="margin-top:2px">收藏时间：{{ item.time || item.favoritesTime | timeFilter }}</span>
<!-- <interactBar :type="0" :data="item.cases" :shares="false" :views="false"></interactBar> -->
<div>
<interactBar :type="3" :readonly="true" :data="items" :views="false" :shares="false"></interactBar>
</div>
</div>
</div>
</div>
@@ -27,7 +32,7 @@
<script>
import authorInfo from '@/components/Portal/authorInfo.vue';
import interactBar from '@/components/Portal/interactBar.vue'
import interactBar from '@/components/Portal/interactBar.vue';
export default {
name: 'articleItems',
props: {
@@ -61,6 +66,17 @@
</script>
<style lang="scss" scoped>
.case-tit{
color: #333333;
font-size: 18px;
font-weight: 600;
}
.bq-case{
font-size: 16px;
color: #333333;
font-weight: normal;
margin-left: 5px;
}
.title-line-ellipsis{
display: -webkit-box;
overflow: hidden;
@@ -99,6 +115,7 @@
margin: 5px 0;
border-bottom: 1px solid #dddddd;
padding: 0px;
padding-bottom: 25px;
}
.article-info {
@@ -123,9 +140,10 @@
}
}
.article-info-summary {
color: #333330;
font-size: 14px;
line-height: 25px;
color: #999999;
margin-bottom: 15px;
}
.article-info-tools {
height: 45px;

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

@@ -2,23 +2,30 @@
<div style="cursor: pointer;">
<div class="uc-course" v-for="(item, idx) in items" :key="idx" @click="coudetail(item)">
<div class="uc-course-img" style="width: 212px;height: 119px;" @click="jump(item)">
<div class="uc-course-img" style="width: 212px;height: 119px;margin-right:23px;" @click="jump(item)">
<course-image :course="item"></course-image>
<!-- <img :src="imageUrl(item)" /><span v-if="isShow" class="two-line-ellipsis">{{item.title}}</span> -->
<span class="course-type">{{ contentTypeFilter(item.contentType).text }}</span>
</div>
<div class="flex-between" @click="jump(item)">
<div class="uc-course-name one-line-ellipsis">
<span :class="contentTypeFilter(item.contentType).class">{{ contentTypeFilter(item.contentType).text }}</span>
<span>{{ item.title }}</span>
</div>
<div class="uc-course-text">讲师：{{ item.authorName}}</div>
<div class="uc-course-text">收藏时间：{{ item.time || item.favoritesTime}}</div>
</div>
<div class="flex-between">
<el-button v-if="remove" @click.stop="delItem(item)" type="text" icon="el-icon-remove" style="color:#8590A6;font-size:14px;">
<div class="uc-course-name ">
<div class="uc-coures-name-left one-line-ellipsis">
<span >{{ item.title }} <span class="bq-coures">#课程#</span> </span>
</div>
<div class="canfavo">
<el-button v-if="remove" @click.stop="delItem(item)" type="text" icon="el-icon-star-on" style="color:#8590A6;font-size:14px;">
取消收藏
</el-button>
</div>
</div>
<div class="uc-bpttom">
<div class="uc-course-text"> <i class="el-icon-time"></i> 报名时间：{{ item.time || item.favoritesTime}}</div>
<div class="uc-coures-button">
<el-button type="primary">去上课</el-button>
</div>
</div>
</div>
<!-- <div class="uc-course-info">
<div style="display: flex;justify-content: space-between;">
<router-link target="_blank" :to="'/course/detail?id='+item.objId" class="uc-course-name">
@@ -137,6 +144,46 @@ export default {
</script>
<style lang="scss" scoped>
.bq-coures{
font-size: 16px;
color: #333333;
margin-left: 5px;
}
.uc-bpttom{
display: flex;
.uc-coures-button{
margin-left: auto;
margin-top: 55px;
}
}
.uc-course-text{
flex: 1;
font-size: 14px;
color: #666666;
margin-top: 70px;
}
.course-type {
position: absolute;
top: 0px;
right: 0px;
width: 60px;
height: 24px;
line-height: 24px;
text-align: center;
background-color: #f99000;
border-radius: 2px 4px 0px 14px;
font-size: 12px;
color: #ffffff;
-moz-user-select: none;
/*火狐*/
-webkit-user-select: none;
/*webkit浏览器*/
-ms-user-select: none;
/*IE10*/
-khtml-user-select: none;
/*早期浏览器*/
user-select: none;
}
.one-line-ellipsis{
display: -webkit-box;
@@ -157,26 +204,7 @@ export default {
padding-left: 0px;
padding-bottom: 20px;
padding-top: 15px;
// margin-bottom: 10px;
// margin-left: 10px;
.flex-between {
display: flex;
flex-direction: column;
justify-content: space-between;
margin-left: 10px;
.uc-course-text {
color: #747474;
margin-right: 20px;
}
&:last-of-type{
margin-left: auto;
justify-content: flex-end;
}
// &:last-of-type {
// align-items: flex-start;
// }
}
.uc-course-img {
position: relative;
::v-deep img {
@@ -184,21 +212,26 @@ export default {
height: 119px;
border: 1px solid #f4f4f5;
}
> span {
position: absolute;
top: 30px;
left: 10px;
width: 100%;
height: 100%;
color: #ffffff;
font-size: 16px;
}
}
.flex-between{
flex: 1;
}
.uc-course-name {
font-size: 16px;
font-weight: 400;
> span:last-of-type {
margin-left: 8px;
display: flex;
width: 100%;
line-height: 30px;
height: 30px;
.uc-coures-name-left{
flex: 1;
}
.canfavo{
margin-left:auto;
// width: 100px;
button{
font-size: 12px;
}
}
}
}

5
src/components/PortalHeader.vue
View File

@@ -399,8 +399,11 @@ export default {
// right: 48px;
// }
}
.el-avatar{
::v-deep.el-avatar{
margin-right: 8px;
img{
width: 100% !important;
}
}
.el-button{
margin-left: 15px;

39
src/components/Qa/favoritesQaList.vue
View File

@@ -3,23 +3,25 @@
<div class="article-list" v-for="(item, idx) in items" :key="idx" @click="qadetail(item)">
<div class="article-info">
<!-- <div class="article-info-title"> -->
<div class="article-info-title" style="line-height: 30px;">
<span class="qa-basic" :class="item.question.isResolve ? 'qa-solve' : 'qa-unSolve'">{{ item.question.isResolve ? '【已解决】' : '【待解决】' }}</span>
<span style="padding-left: 5px">{{ item.question.title }}</span>
<div class="art-head article-info-title" style="line-height: 30px;">
<!-- <span class="qa-basic" :class="item.question.isResolve ? 'qa-solve' : 'qa-unSolve'">{{ item.question.isResolve ? '【已解决】' : '【待解决】' }}</span> -->
<span style="padding-left: 5px">{{ item.question.title }} <span class="qa-bq">#问答#</span> </span>
<el-button @click.stop="delCollectItem(item)" type="text" icon="el-icon-star-on" style="color:#8590A6">取消收藏</el-button>
</div>
<!-- </div> -->
<div class="article-info-summary two-line-ellipsis">{{ item.question.content }}</div>
<div v-if="item.question.isResolve" style=";color: #5a5a5a;display:flex;margin-bottom:10px">
<div style="width:90px"><span>最佳回答:</span></div>
<div v-if="item.question.isResolve" style=";color: #333330;display:flex;margin-bottom:10px">
<!-- <div style="width:90px"><span>最佳回答:</span></div> -->
<div class="one-line-ellipsis" style="color: #5a5a5a;padding-top:1px">{{ item.question.bestAnswer }}</div>
</div>
<div class="article-info-tools">
<authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo" :sex="item.sex"></authorInfo>
<span>发布时间：{{ item.question.sysCreateTime || item.publishTime | timeFilter }}</span>
<span>收藏时间：{{ item.time || item.favoritesTime | timeFilter }}</span>
<el-button @click.stop="delCollectItem(item)" type="text" icon="el-icon-remove" style="color:#8590A6">取消收藏</el-button>
<div class="one-line-ellipsis" style="color: #333330;font-size: 14px;padding-top:1px">{{ item.question.bestAnswer }}</div>
</div>
<interactBar :type="4" :readonly="true" :data="items" :views="false" :shares="false"></interactBar>
<!-- <div class="article-info-tools"> -->
<!-- <authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo" :sex="item.sex"></authorInfo> -->
<!-- <span>发布时间：{{ item.question.sysCreateTime || item.publishTime | timeFilter }}</span> -->
<!-- <span>收藏时间：{{ item.time || item.favoritesTime | timeFilter }}</span> -->
<!-- </div> -->
</div>
</div>
</div>
@@ -94,6 +96,16 @@ export default {
</script>
<style lang="scss" scoped>
.qa-bq{
font-size: 16px;
color: #333333;
}
.art-head{
display: flex;
button{
margin-left: auto;
}
}
// .one-line-ellipsis {
// display: -webkit-box;
// white-space:pre-wrap;
@@ -161,8 +173,9 @@ export default {
}
.article-info-summary {
line-height: 25px;
font-size: 14px;
margin: 10px 0;
color: #666;
color: #333;
}
.article-info-tools {
color: #999999;

10
src/layout/components/TopNav/Index.vue
View File

@@ -251,6 +251,12 @@ export default {
</script>
<style lang="scss" scoped>
::v-deep .el-avatar{
margin-right: 8px;
img{
width: 100% !important;
}
}
::v-deep.xtop .xtop-right .person-action[data-v-5bcef51e] .message-count i{
color: #fff !important;
}
@@ -424,9 +430,7 @@ export default {
color:#409EFF;
}
}
.el-avatar{
margin-right: 8px;
}
.el-button{
margin-top: 1px;
// margin-left: 20px;

7
src/views/Index.vue
View File

@@ -1079,15 +1079,16 @@
.course-type {
position: absolute;
left: 0;
bottom: 0;
// left: 0;
top: 0;
right: 0;
height: 20;
line-height: 20px;
font-size: 12px;
color: #FFFFFF;
padding: 0px 8px;
background: #f99000;
border-radius: 0px 12px 0px 0px;
border-radius: 0px 0px 0px 10px;
}
}

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

@@ -15,6 +15,7 @@
<div style="display: flex;justify-content:space-around;padding: 12px 22px 10px 17px;">
<!-- <div style="padding: 0px 5px;"><el-cascader clearable v-model="params.type" :options="typeList"></el-cascader></div> -->
<div style="padding: 0px 5px;">
<span style="font-size: 18px;color: #333333;font-weight: 600;margin-right:30px" >我的文章</span>
<el-select v-model="pageData.status" placeholder="状态" style="width: 110px;" clearable>
<el-option v-for="item in selectData" :label="item.label" :value="item.value" :key="item.value"></el-option>
<!-- <el-option label="草稿" :value='0'></el-option>
@@ -28,10 +29,9 @@
<div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary" @click="reset">重置</el-button></div>
</div>
</div>
<div style="padding:12px 20px; " class="write">
<!-- <a :href="`${webBaseUrl}/article/add`" target="_blank"><el-button type="primary" icon="el-icon-plus" >写文章</el-button></a> -->
<!-- <div style="padding:12px 20px; " class="write">
<el-button type="primary" @click="diagSync=true" icon="el-icon-plus" >写文章</el-button>
</div>
</div> -->
</div>
<div style="padding: 10px 19px 0px 22px;">
<article-items @update="getArticleList" :items="pageData.list" v-if="pageData.list.length!=0"></article-items>

22
src/views/portal/user/Message.vue
View File

@@ -9,7 +9,7 @@
<div class="xcontent portal-content">
<div class="msg-nav">
<div style="display: flex;align-items: center;">
<div><el-checkbox v-model="checkAll" :indeterminate="isIndeterminate">全选</el-checkbox></div>
<div><el-checkbox v-model="checkAll" :indeterminate="isIndeterminate">多选</el-checkbox></div>
<!-- <el-radio-group style="padding-left: 20px;" @change="queryMessage(true)" v-model="queryData.isRead">
<el-radio :label="null">全部</el-radio>
<el-radio :label="false">未读</el-radio>
@@ -17,8 +17,8 @@
</el-radio-group> -->
</div>
<div>
<!-- <el-button type="text" icon="el-icon-remove" @click="isReadChooseList">设置已读</el-button> -->
<el-button type="text" icon="el-icon-remove" @click="delChooseList">删除所选</el-button>
<el-button class="navbut" type="text" @click="isReadChooseList">设置已读</el-button>
<el-button class="navbut" type="text" @click="delChooseList">删除所选</el-button>
</div>
</div>
<div style="background-color: #FFFFFF;min-height: 600px;">
@@ -27,8 +27,8 @@
<div class="msg-top">
<div>
<span style="padding-right: 10px;"><el-checkbox v-model="item.checked" @change="setCheckAll"></el-checkbox></span>
<span v-if="!item.isRead" style="font-size:14px;padding:2px;border: 1px dotted #ff0000;color: #ff0000;margin-right: 5px">未读</span>
<span v-else style="font-size:14px;padding:2px;border: 1px dotted #1EA0FA;color: #1EA0FA;margin-right: 5px">已读</span>
<span v-if="!item.isRead" style="font-size:12px;padding:5px 7px; border-radius: 2px;background: #FF6562;color: #fff;margin-right: 5px">未读</span>
<span v-else style="font-size:14px;padding:5px 7px; background: #eee; border-radius: 2px; color: #666666;margin-right: 5px">已读</span>
<span>{{ item.title }}</span>
<!-- <span class="msg-time"></span> -->
</div>
@@ -241,9 +241,19 @@ export default {
</script>
<style lang="scss" scoped>
.navbut{
width: 110px;
height: 30px;
border-radius: 2px;
margin-left: 25px;
text-align: center;
border: 1px solid #0078FC;
padding: 0;
color: #0078FC ;
}
.msg-nav {
display: flex;
justify-content: space-between;
// justify-content: space-between;
border-bottom: 1px solid #f5f5f5;
line-height: 40px;
background-color: #ffffff;

3
src/views/study/PortalIndex.vue
View File

@@ -1424,6 +1424,9 @@ export default {
width: 68px !important;
height: 68px !important;
border-radius: 0px;
img{
width: 100% !important;
}
}
.teacher-text {
width: 68px;

3
src/views/study/coursenew.vue
View File

@@ -1724,6 +1724,9 @@
width: 60px !important;
height: 60px !important;
border-radius: 50%;
img{
width: 100% !important;
}
}
.teacher-text {
width: 68px;

1
src/views/ucurrency/Index.vue
View File

@@ -497,6 +497,7 @@
.u-currency{
padding:26px 40px;
display:flex;
overflow-x: auto;
}
.ubi-hear{

3
src/views/user/Mynotes.vue
View File

@@ -514,6 +514,9 @@ export default {
.el-avatar{
width: 60px;
height: 60px;
img{
width: 100% !important;
}
}
.userInfo-info{
margin-left: 40px;

2
src/views/user/ranking.vue
View File

@@ -3,7 +3,7 @@
<div class="experience" style="margin-right:72px">
<div class="exp-hear">
<div class="exp-hear-text">
<div class="exp-hear-text">
经验值排行榜<svg-icon style="margin-left: 14px;font-size:20px;padding-top: 4px;" icon-class="doubt"></svg-icon>
<span class="exp-hear-textbor"></span>
</div>