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

Merge branch 'dev'

Browse Source
This commit is contained in:
daihh
2022-06-21 00:40:25 +08:00
parent 7004e7032c 139f4896be
commit 2ccb6d0f72
17 changed files with 113 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,7 @@
<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 | timeFilter }}</span>
<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>

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

@@ -41,7 +41,7 @@
</div>
</div>
<div class="article-info-date" v-if="item.enabled == true">
<div class="article-info-date">
<el-button class="edit" @click.stop="editItem(item.id)" type="text" icon="el-icon-edit">编辑</el-button>
<el-button class="del" @click.stop="delItem(item)" type="text" icon="el-icon-delete">删除</el-button>
</div>
@@ -78,12 +78,14 @@ export default {
}
};
},
filters:{
sysCreateTimeFilter(item){
return item.split(' ')[0]
}
},
mounted() {
console.log(this.items)
},
methods: {
classFilter(status){

12
src/components/Portal/interactBar.vue
View File

@@ -7,33 +7,33 @@
</div>
<div v-show="theme==1" class="interact-bar-btns" :style="{'justify-content':showAlign}">
<div v-if="answers" @click="addAnswers()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly || clickAnswer}">
<el-tooltip effect="light" content="回答" placement="left">
<el-tooltip effect="light" content="回答" placement="left" :visible-arrow="false" popper-class="text-tooltip">
<!-- <svg-icon style="margin-right: 0;" icon-class="comment"></svg-icon> -->
<img style="width:16px;height:16px;vertical-align: middle;" :src="require('@/assets/images/icon/answers.png')">
</el-tooltip>
<span class="interact-bar-value"> {{ data.answers}}</span>
</div>
<div v-if="comments" class="interact-bar-btn" :style="`min-width: ${nodeWidth};`" :class="{cursor:!readonly}">
<el-tooltip effect="light" content="评论" placement="left">
<el-tooltip effect="light" content="评论" placement="left" :visible-arrow="false" popper-class="text-tooltip">
<svg-icon style="margin-right: 0;font-size: 16px;" icon-class="comment"></svg-icon>
</el-tooltip>
<span class="interact-bar-value"> {{data.comments}}</span>
</div>
<div v-if="shares" @click="addShare()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
<el-tooltip effect="light" content="分享" placement="top">
<el-tooltip effect="light" content="分享" placement="top" :visible-arrow="false" popper-class="text-tooltip">
<svg-icon icon-class="share" style="margin-right: 0;font-size: 16px;"></svg-icon>
</el-tooltip>
<span class="interact-bar-value"> {{data.shares}}</span>
</div>
<div v-if="praises" @click="addPraise()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
<el-tooltip effect="light" content="点赞" placement="top">
<el-tooltip effect="light" content="点赞" placement="top" :visible-arrow="false" popper-class="text-tooltip">
<svg-icon style="margin-right: 0;font-size: 20px;" :icon-class="isPraise?'praised':'like'"></svg-icon>
</el-tooltip>
<span class="interact-bar-value"> {{ data.praises}}</span>
</div>
<div v-if="favorites" @click="addFavorite()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
<el-tooltip effect="light" content="收藏" placement="top">
<el-tooltip effect="light" content="收藏" placement="top" :visible-arrow="false" popper-class="text-tooltip">
<svg-icon style="font-size: 16px;margin-right: 0;" :icon-class="isFavorite?'collected':'collection'"></svg-icon>
<!-- <svg-icon :icon-class="isFavorite?'collected':'dropdown_collected'"></svg-icon> -->
<!-- dropdown_collected -->
@@ -42,7 +42,7 @@
</div>
<div v-if="views" style="cursor: default;" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
<el-tooltip effect="light" content="浏览量" placement="top">
<el-tooltip effect="light" content="浏览量" placement="top" :visible-arrow="false" popper-class="text-tooltip">
<svg-icon style="margin-right: 0;font-size:20.5px;" icon-class="eyes"></svg-icon>
</el-tooltip>
<span class="interact-bar-value"> {{ data.views}}</span>

41
src/components/PortalHeader.vue
View File

@@ -41,7 +41,7 @@
<div class="person-action" >
<!-- 消息 -->
<el-badge :value="userMsg" :hidden="userMsg == 0" class="message-count">
<el-tooltip content="消息" placement="bottom" effect="light">
<el-tooltip content="消息" placement="bottom" effect="light" :visible-arrow="false" popper-class="text-tooltip">
<el-link type="primary" :href="`${webBaseUrl}/message`" icon="el-icon-bell" :underline="false"></el-link>
</el-tooltip>
</el-badge>
@@ -51,39 +51,12 @@
<div v-else class="uavatar">
<div v-if="sex === 1 "><img src="../../public/images/Avatarman.png" alt=""></div>
<div v-else><img src="../../public/images/Avatarwoman.png" alt=""></div>
</div>
</a>
</div>
<el-link type="primary" style="margin-right:10px;" :href="`${webBaseUrl}${isTiao ? '/uc/study/task' : '/uc/study/courses'}`" :underline="false">个人中心</el-link>
<!-- <el-button @click="logout()" type="text" icon="el-icon-switch-button">退出</el-button> -->
<el-link type="primary" @click="logout()" icon="el-icon-switch-button" :underline="false">退出</el-link>
</div>
<!-- <div style="margin-left: 60px;margin-right: 30px"> -->
<!-- <el-badge :value="userMsg" :hidden="userMsg == 0" class="message-count"> -->
<!-- <el-link type="primary" :href="`${webBaseUrl}/message`" icon="el-icon-bell" :underline="false">消息</el-link> -->
<!-- <el-link type="primary" :href="`${webBaseUrl}/message`" icon="el-icon-bell" :underline="false"></el-link> -->
<!-- </el-badge> -->
<!-- </div> -->
<!-- <div style="margin-left: 20px;"><el-avatar :src="userInfo.avatar" style="vertical-align: middle;width:28px;height:28px;margin-right:2px;"></el-avatar></div> -->
<!-- <div style="margin-left: 5px;"> -->
<!-- <el-dropdown @command="handleUcCommand">
<span class="el-dropdown-link">
{{ userInfo.name }}
<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="uc">个人中心</el-dropdown-item>
<el-dropdown-item command="logout" divided>退出</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown> -->
<!--管理员-->
<!-- <el-link type="primary" :href="`${webBaseUrl}/course/manage`" :underline="false">个人中心</el-link> -->
<!--学员-->
<!-- <el-link type="primary" :href="`${webBaseUrl}${isTiao ? '/uc/study/task' : '/uc/study/courses'}`" :underline="false">个人中心</el-link> -->
<!-- </div> -->
<!-- <div style="margin-left: 20px;"><el-button @click="logout()" type="text" icon="el-icon-switch-button">退出</el-button></div> -->
</div>
</div>
</div>
@@ -145,14 +118,11 @@ export default {
// cmtask_name:this.cmtask_name,
};
apiBoeCourse.cmtaskList(params).then(res => {
if (res.result.count > 0) {
if (res.status == 200 && res.result.count > 0) {
this.isTiao = true;
// this.$router.push('/uc/study/task');// 学习任务
} else {
this.isTiao = false;
// this.$router.push('/uc/study/courses')// 自主学习
}
// this.pageData.list = res.result.list;
});
},
handleCommand(val) {
@@ -355,21 +325,16 @@ export default {
div{
border-radius: 50%;
img{
border-radius: 50%;
border-radius: 50%;
width: 40px;
height: 40px;
}
}
// border: 1px solid #73adfe;
// color: #73adfe;
// text-align: center;
width: 40px;
height: 40px;
line-height: 40px;
font-size: 14px;
margin-right: 8px;
border-radius: 50%;
// background: #d9e9ff;
}
</style>

2
src/components/UserCenter/menu.vue
View File

@@ -320,7 +320,7 @@
<span v-if="lastStudy.contentType=='face-course'" class="course-type-title course-type">线下课</span>
<span v-if="lastStudy.contentType=='project'" class="course-type-title course-type">学习项目</span>
</div>
<el-tooltip :content="lastStudy.courseName" placement="bottom-start" effect="light">
<el-tooltip :content="lastStudy.courseName" placement="bottom-start" effect="light" :visible-arrow="false" popper-class="text-tooltip">
<div class="course-title two-line-ellipsis">{{lastStudy.courseName}}
</div>
</el-tooltip>