hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-09 19:06:43 +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-13 17:02:40 +08:00
parent 8fa4f7d762 7727d3a2ba
commit feb9c04293
6 changed files with 181 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/components/Article/shareItems.vue
View File

@@ -1,6 +1,24 @@
<template>
<div style="">
<div class="article-list" v-for="(item, idx) in items" :key="idx">
<!-- 新版 -->
<div class="art-box" v-for="(item, idx) in items" :key="idx">
<div class="coures-head">
<div class="share-name" v-if="type=='myShare'">
分享给了<span>{{ item.toAname }}</span>
</div>
<div v-else class="share-name">
<span>{{ item.toAname }}</span>分享给了我
</div>
<div class="islook" v-if="item.isRead">已查看</div>
<div class="isunlook" v-else>未查看</div>
<div class="share-time">{{ item.time }}</div>
</div>
<div class="coures-content">
<span>【文章】</span>{{item.title}}
</div>
</div>
<!-- 旧版 -->
<!-- <div class="article-list" v-for="(item, idx) in items" :key="idx">
<div class="article-info" @click="jumpRouter(item)">
<div class="article-info-title">
<span v-if="item.isRead" class="readed">【已查看】</span>
@@ -10,21 +28,20 @@
</div>
<div v-html="$keywordActiveShow(item.summary || item.content,keyword)" class="article-info-summary two-line-ellipsis">
</div>
<!-- v-html="$keywordActiveShow(item.summary,keyword)" -->
<div style="display:flex;justify-content: space-between;">
<div class="article-info-tools">
<!-- <authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo"></authorInfo> -->
<authorInfo :avatar="item.avatar" :name="item.name" :info="item.orgInfo"></authorInfo>
<span style="color: #999999;">{{ item.time }}</span>
<span v-if="type=='myShare'" style="color: #999999;font-size: 14px;">分享给{{item.toAname}}</span>
<span v-else>{{item.sysCreateBy}}分享给我</span>
<!-- <interactBar ref="shareDialog" :type="0" :data="item" :shares="false" :views="false"></interactBar> -->
<interactBar ref="shareDialog" :type="0" :data="item" :shares="false" :views="false"></interactBar>
</div>
<div>
<el-button style="color: #8590A6;" v-if="!item.isRead&&type=='myShare'" type="text" icon="el-icon-refresh-right" @click.stop="deleteshares(item)">撤回</el-button>
</div>
</div>
</div>
</div>
</div> -->
</div>
</template>
@@ -109,6 +126,57 @@ export default {
</script>
<style lang="scss" scoped>
.art-box{
width: 100%;
padding: 30px 0;
border-bottom:1px solid #e9e9e9 ;
.coures-content{
margin-top: 20px;
font-size: 16px;
color: #333333;
font-weight: 600;
span{
font-size: 16px;
margin-left: -9px;
}
}
.coures-head{
display: flex;
.share-name{
font-size: 14px;
color: #666666;
margin-right: 17px;
}
.share-time{
font-size: 14px;
color: #666666;
line-height: 25px;
margin-left: auto;
}
.islook{
width: 46px;
height: 24px;
background: #eee;
font-size: 12px;
color: #666666;
line-height: 24px;
text-align: center;
border-radius: 2px;
}
.isunlook{
width: 46px;
height: 24px;
background: #FF6562;
border-radius: 2px;
font-size: 12px;
color: #fff;
line-height: 24px;
text-align: center;
}
}
}
.article-status1 {
padding: 3px;
border: 1px dotted #1ea0fa;

5
src/components/Case/caseItems.vue
View File

@@ -3,7 +3,10 @@
<!-- 最新 -->
<div class="case-box" v-for="(item, idx) in items" :key="idx">
<div class="coures-head">
<div class="share-name">
<div class="share-name" v-if="type=='myShare'">
分享给了<span>{{ item.toAname }}</span>
</div>
<div v-else class="share-name">
<span>{{ item.toAname }}</span>分享给了我
</div>
<div class="islook" v-if="item.isRead">已查看</div>

5
src/components/Course/shareItem.vue
View File

@@ -3,7 +3,10 @@
<!-- 最新版设计 -->
<div class="coures-box" @click="jumpRouter(item)" v-for="(item, idx) in items" :key="idx">
<div class="coures-head">
<div class="share-name">
<div class="share-name" v-if="type=='myShare'">
分享给了<span>{{ item.toAname }}</span>
</div>
<div class="share-name" v-else>
<span>{{ item.toAname }}</span>分享给了我
</div>
<div class="islook" v-if="item.isRead">已查看</div>

83
src/components/Qa/shareList.vue
View File

@@ -1,6 +1,24 @@
<template>
<div style="">
<div class="article-list" v-for="(item, idx) in items" :key="idx">
<!-- 新版 -->
<div class="qa-box" v-for="(item, idx) in items" :key="idx">
<div class="coures-head">
<div class="share-name" v-if="type=='myShare'">
分享给了<span>{{ item.toAname }}</span>
</div>
<div v-else class="share-name">
<span>{{ item.toAname }}</span>分享给了我
</div>
<div class="islook" v-if="item.isRead">已查看</div>
<div class="isunlook" v-else>未查看</div>
<div class="share-time">{{ item.time }}</div>
</div>
<div class="coures-content">
<span>【问答】</span>{{item.title}}
</div>
</div>
<!-- 旧版 -->
<!-- <div class="article-list" v-for="(item, idx) in items" :key="idx">
<div class="article-info" @click="jumpRouter(item)">
<div class="article-info-title">
<span class="qa-basic" :class="item.question.isResolve ? 'qa-solve' : 'qa-unSolve'">{{ item.question.isResolve ? '【已解决】' : '【未解决】' }}</span>
@@ -12,14 +30,7 @@
<div class="bestAnswer one-line-ellipsis " v-if="item.question.isResolve">
<span>最佳回答:</span>
<span class="one-line-ellipsi" style="color: #999999;" v-html="$keywordActiveShow(item.question.bestAnswer,keyword)"></span>
<!-- v-if="item.question.isResolve" -->
<!-- v-if="item.question.isResolve" -->
<!-- <div style="margin-right:15px;width: 80px">
</div>
<div class="one-line-ellipsis" v-if="item.question.isResolve" style="color: #999999;padding:2px 0 0 0;width:90%" v-html="$keywordActiveShow(item.question.bestAnswer,keyword)"> -->
</div>
</div>
<div style="display:flex;justify-content: space-between;color: rgb(153, 153, 153);font-size: 14px;">
@@ -35,8 +46,7 @@
</div>
</div>
</div>
</div>
</div> -->
</div>
</template>
@@ -117,6 +127,57 @@ export default {
</script>
<style lang="scss" scoped>
.qa-box{
width: 100%;
padding: 30px 0;
border-bottom:1px solid #e9e9e9 ;
.coures-content{
margin-top: 20px;
font-size: 16px;
color: #333333;
font-weight: 600;
span{
font-size: 16px;
margin-left: -9px;
}
}
.coures-head{
display: flex;
.share-name{
font-size: 14px;
color: #666666;
margin-right: 17px;
}
.share-time{
font-size: 14px;
color: #666666;
line-height: 25px;
margin-left: auto;
}
.islook{
width: 46px;
height: 24px;
background: #eee;
font-size: 12px;
color: #666666;
line-height: 24px;
text-align: center;
border-radius: 2px;
}
.isunlook{
width: 46px;
height: 24px;
background: #FF6562;
border-radius: 2px;
font-size: 12px;
color: #fff;
line-height: 24px;
text-align: center;
}
}
}
.one-line-ellipsis{
display: -webkit-box;
// white-space:pre-wrap;

13
src/views/portal/course/Index.vue
View File

@@ -891,12 +891,13 @@ export default {
::v-deep .course-image-box :hover .el-image{
// transition: all 0.5s;
z-index: 999;
position: absolute;
top: -50px;
left: -35px;
width: 420px !important;
height: 236px !important;
//z-index: 999;
//position: absolute;
//top: -50px;
//left: -35px;
//width: 420px !important;
//height: 236px !important;
}

39
src/views/share/MyList.vue
View File

@@ -4,7 +4,8 @@
</Remark>
<div style="position: relative;" class="my-list">
<el-row :gutter="20">
<span class="title">分享给我的</span>
<!-- <el-row :gutter="20">
<el-col :span="4">
<el-select v-model="isRead" clearable placeholder="状态" style="width:100%">
<el-option label="全部" :value="null"></el-option>
@@ -19,13 +20,13 @@
<el-button type="primary" icon="el-icon-search" @click="queryData" style="margin-right: 10px;padding: 10px 15px;">搜索</el-button>
<el-button type="primary" @click="resData" icon="el-icon-refresh-right" style="padding: 10px 15px;">重置</el-button>
</el-col>
</el-row>
</el-row> -->
<el-tabs v-model="tabName" @tab-click="changeTab" style="margin-top:14px">
<!-- <el-tabs v-model="tabName" @tab-click="changeTab" style="margin-top:14px"> -->
<!-- 全部 -->
<el-tab-pane label="全部" name="all">
<div v-for="(item, index) in dataList.list">
<!-- <el-tab-pane label="全部" name="all"> -->
<div v-for="(item, index) in dataList.list" :key="index">
<course-items type="myShare" v-if="item.type==1" :items="[item]" @confirm="confirm"></course-items>
<case-items type="myShare" v-if="item.type==3" :items="[item]" @confirm="confirm" ></case-items>
<article-items type="myShare" v-if="item.type==2" @confirm="confirm" :items="[item]"></article-items>
@@ -50,13 +51,12 @@
<div v-else class="zan-wu">暂无数据</div>
</div>
</div>
</el-tab-pane>
<!-- </el-tab-pane> -->
<el-tab-pane label="课程" name="course">
<!-- <el-tab-pane label="课程" name="course">
<div style="min-height: 500px;">
<course-items @confirm="confirm" type="myShare" :items="courseList.list"></course-items>
<!-- v-if="courseList.count>courseList.pageSize" -->
<div v-if="courseList.list.length > 0" style="text-align: center;margin-top:57px">
<el-pagination
background
@@ -78,8 +78,8 @@
</div>
</div>
</el-tab-pane>
<el-tab-pane label="案例" name="case">
</el-tab-pane> -->
<!-- <el-tab-pane label="案例" name="case">
<div style="min-height: 500px;">
<case-items @confirm="confirm" type="myShare" :items="caseList.list"></case-items>
<div v-if="caseList.list.length > 0" style="text-align: center;margin-top:57px;">
@@ -101,11 +101,10 @@
</div>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="文章" name="article">
</el-tab-pane> -->
<!-- <el-tab-pane label="文章" name="article">
<div style="min-height: 500px;">
<article-items @confirm="confirm" type="myShare" :items="articleList.list"></article-items>
<!-- v-if="articleList.count>articleList.pageSize" -->
<div v-if="articleList.list.length > 0" style="text-align: center;margin-top:57px;">
<el-pagination
background
@@ -125,11 +124,10 @@
</div>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="问答" name="qa">
</el-tab-pane> -->
<!-- <el-tab-pane label="问答" name="qa">
<div>
<qa-items @confirm="confirm" type="myShare" :items="qaList.list"></qa-items>
<!-- v-if="qaList.count>qaList.pageSize" -->
<div v-if="qaList.list.length > 0" style="text-align: center;margin-top:57px;">
<el-pagination
background
@@ -149,8 +147,8 @@
</div>
</div>
</div>
</el-tab-pane>
</el-tabs>
</el-tab-pane> -->
<!-- </el-tabs> -->
<!-- <div style="height: 100px;"></div> -->
</div>
@@ -505,6 +503,11 @@
</script>
<style scoped lang="scss">
.title{
font-size: 18px;
color: #333333;
font-weight: 600;
}
.el-col {
padding: 0 0 0 10px !important;
}