This commit is contained in:
zhangsir
2024-09-10 16:07:18 +08:00
parent a59d1cea93
commit 1278260812
24 changed files with 176 additions and 41 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 467 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 412 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 474 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 427 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 471 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 424 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 461 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 689 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 625 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 514 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 665 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 576 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 475 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 528 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 476 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 540 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 387 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 413 B

View File

@@ -15,7 +15,7 @@
<div v-if="!onlyAvatar" style="padding-left: 14px;padding-top: 6px;font-size: 14px;">
<span style="color: #333333;font-weight: 600;font-size: 16px;">{{userName}}</span>
<span class="author-text" v-if="userInfo && userInfo!=''"> {{userInfo}} </span>
<span style="margin-right: 15px;" class="comWords" v-if="authorTags.length != 0" v-for="tag in authorTags">{{tag}}</span>
<span style="margin-left: 15px;" class="comWords" v-if="authorTags.length != 0" v-for="tag in authorTags">{{tag}}</span>
</div>
<slot />
</div>

View File

@@ -92,11 +92,19 @@
<div class="comment-btns">
<!-- <a><svg-icon icon-class="like"></svg-icon><span>66</span></a> -->
<div v-show="btnsShowRowId==com.id">
<div style="display: flex" v-show="btnsShowRowId==com.id">
<a @click="showReply(com)"><svg-icon icon-class="comment" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>回复</span></a>
<a style="display: flex;align-items: center;" @click="showReply(com)">
<!-- <svg-icon icon-class="comment" style="margin-right: 0px;font-size: 16px;"></svg-icon> -->
<div class="is_comment"></div>
<span>回复</span>
</a>
<!--必须当前登录人是一个人-->
<a v-if="userInfo.aid==com.sysCreateAid" @click="delCommnet(com,comIdx)"><svg-icon icon-class="remove" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>删除</span></a>
<a style="display: flex;align-items: center;" v-if="userInfo.aid==com.sysCreateAid" @click="delCommnet(com,comIdx)">
<!-- <svg-icon icon-class="remove" style="margin-right: 0px;font-size: 16px;"></svg-icon> -->
<div class="is_remove"></div>
<span>删除</span>
</a>
<a v-if="com.replyList && com.replyList.length==5" @click="showMoreReply(com)" ><svg-icon icon-class="all" style="margin-right: 0px;font-size: 16px;"></svg-icon><span>全部</span></a>
</div>
</div>
@@ -960,6 +968,28 @@
line-height: 35px;
a{
margin-right:15px;
&:hover{
.is_comment{
background: url('../../assets/images/case/Frame(9).png');
background-size: 100%;
}
.is_remove{
background: url('../../assets/images/case/Frame(15).png');
background-size: 100%;
}
}
.is_comment{
width: 16px;
height: 16px;
background: url('../../assets/images/case/Frame.png');
background-size: 100%;
}
.is_remove{
width: 16px;
height: 16px;
background: url('../../assets/images/case/Frame(8).png');
background-size: 100%;
}
span{
margin-left: 6px;
color: #8590A6;

View File

@@ -10,7 +10,8 @@
<el-tooltip effect="light" :content="type == 4 || type == 5 ?'回答':'回复'" 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:14px;vertical-align: middle;" :src="require('@/assets/images/icon/answers.png')"> -->
<svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon>
<!-- <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon> -->
<div class="is_comment"></div>
</el-tooltip>
<span class="interact-bar-value"> {{ data.answers? data.answers:0}}</span>
</div>
@@ -23,14 +24,16 @@
</div>
<div v-if="comments" class="interact-bar-btn" :style="`min-width: ${nodeWidth};`" :class="{cursor:!readonly}">
<el-tooltip effect="light" content="评论" placement="left" :visible-arrow="false" popper-class="text-tooltip">
<svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon>
<!-- <svg-icon style="margin-right: 0;font-size: 14px;" icon-class="comment"></svg-icon> -->
<div class="is_comment"></div>
</el-tooltip>
<span class="interact-bar-value"> {{data.comments? data.comments:0}}</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" :visible-arrow="false" popper-class="text-tooltip">
<svg-icon style="margin-right: 0;font-size: 14px;" :icon-class="isPraise?'praised':'like'"></svg-icon>
<!-- <svg-icon style="margin-right: 0;font-size: 14px;" :icon-class="isPraise?'praised':'like'"></svg-icon> -->
<div class="is_praise" :class="isPraise?'is_praise_a':'is_praise'"></div>
</el-tooltip>
<span class="interact-bar-value"> {{ data.praises? data.praises:0}}</span>
</div>
@@ -38,19 +41,22 @@
<div v-if="favorites" @click.stop="addFavorite()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
<el-tooltip effect="light" content="收藏" placement="top" :visible-arrow="false" popper-class="text-tooltip">
<svg-icon v-if="courseExclusive" style="font-size: 32px;margin-right: 0;" :icon-class="isFavorite?'collectedCourse':'collectionCourse'"></svg-icon>
<svg-icon v-else style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}" :icon-class="isFavorite?'scactive2':'xihuan'"></svg-icon>
<!-- <svg-icon v-else style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}" :icon-class="isFavorite?'scactive2':'xihuan'"></svg-icon> -->
<div v-else class="is_favorite" :class="isFavorite?'is_favorite_a':'is_favorite'"></div>
</el-tooltip>
<span v-if="!courseExclusive" class="interact-bar-value"> {{ data.favorites? data.favorites:0}}</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" :visible-arrow="false" popper-class="text-tooltip">
<svg-icon icon-class="share" style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}"></svg-icon>
<!-- <svg-icon icon-class="share" style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}"></svg-icon> -->
<div class="is_share"></div>
</el-tooltip>
<span class="interact-bar-value"> {{data.shares}}</span>
</div>
<div v-if="views" style="cursor: default;" :style="`min-width: ${nodeWidth};margin-left:${data.views>1000? '20px':'20px'}`" class="interact-bar-btn ese-view" :class="{cursor:!readonly}">
<el-tooltip effect="light" content="浏览量" placement="top" :visible-arrow="false" popper-class="text-tooltip">
<svg-icon style="margin-right: 0; font-size:22px;" icon-class="eyes"></svg-icon>
<!-- <svg-icon style="margin-right: 0; font-size:22px;" icon-class="eyes"></svg-icon> -->
<div class="is_view"></div>
</el-tooltip>
<!-- <div style="float:right;margin-left:8px"> -->
<span class="interact-bar-value eyes-view" > {{ formatNum(data.views)}}</span>
@@ -713,6 +719,77 @@ export default {
justify-content: flex-end;
.interact-bar-btn {
margin: 0 0 0 15px;
display: flex;
justify-content: end;
align-items: center;
&:hover{
.is_praise{
background: url('../../assets/images/case/Frame\(10\).png');
}
.is_favorite{
background: url('../../assets/images/case/Frame\(11\).png');
background-size: 100%;
}
.is_share{
background: url('../../assets/images/case/Frame\(14\).png');
background-size: 100%;
}
.is_view{
background: url('../../assets/images/case/Frame\(12\).png');
background-size: 100%;
}
.is_comment{
background: url('../../assets/images/case/Frame\(9\).png');
background-size: 100%;
}
}
.is_comment{
width: 16px;
height: 16px;
background: url('../../assets/images/case/Frame.png');
background-size: 100%;
margin-right: 4px;
}
.is_view{
width: 17px;
height: 17px;
background: url('../../assets/images/case/Frame\(5\).png');
background-size: 100%;
margin-right: 4px;
}
.is_share{
width: 16px;
height: 16px;
background: url('../../assets/images/case/Frame\(7\).png');
background-size: 100%;
margin-right: 4px;
}
.is_praise{
width: 14px;
height: 14px;
background: url('../../assets/images/case/Frame\(1\).png');
margin-right: 4px;
}
.is_praise_a{
width: 14px;
height: 14px;
background: url('../../assets/images/case/Frame\(10\).png');
margin-right: 4px;
}
.is_favorite{
width: 16px;
height: 16px;
background: url('../../assets/images/case/Frame\(2\).png');
background-size: 100%;
margin-right: 4px;
}
.is_favorite_a{
width: 16px;
height: 16px;
background: url('../../assets/images/case/Frame\(11\).png');
background-size: 100%;
margin-right: 4px;
}
}
.interact-bar-value{
// color:#6E7B84; ui图给的颜色但是效果于ui图效果不一样也没有透明度所以找一个相近的和谐的颜色

View File

@@ -137,20 +137,20 @@
<div class="card_item">
<div class="card_title">
<i class="icon"></i>
<i class="text">年度</i>
<span class="text">年度</span>
</div>
<el-input style="width:190px" disabled v-model="bestYear" placeholder="请输入年度"></el-input>
</div>
<div class="card_item">
<div class="card_title">
<i class="icon"></i>
<i class="text">组织领域</i>
<span class="text">组织领域</span>
</div>
<el-input disabled v-model="bestOrg" placeholder="请输入组织领域"></el-input>
</div>
<div class="card_item">
<div class="card_title">
<i class="text">最佳理由</i>
<span class="text">最佳理由</span>
</div>
<el-input type="textarea"
placeholder="请输入内容"
@@ -172,7 +172,8 @@
<el-table :data="tableData" border stripe>
<el-table-column
type="index"
width="50">
width="50"
label="排序">
</el-table-column>
<el-table-column label="案例标题" prop="caseTitle"></el-table-column>
<el-table-column label="作者名称" prop="caseAuthor"></el-table-column>
@@ -200,6 +201,7 @@
<script>
import apiCase from '@/api/modules/cases.js';
import apiUser from '@/api/system/user.js'
import apiType from "@/api/modules/type.js";
export default {
name: 'articleItems',
data() {
@@ -255,9 +257,9 @@ export default {
mounted() {
this.getData();
this.getList();
apiCase.treeList(1,Number(this.caseType ?? 155),1).then(res=>{
apiType.treeList(1,Number(this.caseType ?? 155),1).then(res=>{
if(res.code == 200){
this.adminList = res.result;
this.adminList = res.data.records;
}
})
},
@@ -368,7 +370,7 @@ export default {
}else{
this.$message({
type: 'error',
message: '设置最佳案例失败!'
message: res.message
});
}
this.notBest()
@@ -583,6 +585,7 @@ export default {
this.bestValue = true
this.bestId = item.id
this.bestOrg = this.orgDomainTranslate(item.orgDomainParent)
console.log(item.orgDomainParent,'item.orgDomainParent')
this.bestYear = item.sysCreateTime.split('-')[0]
},
//添加推荐
@@ -711,7 +714,7 @@ export default {
padding-right: 20px;
}
::v-deep .el-dialog__header{
border-bottom: 1px solid #909399;
border-bottom: 1px solid #f0f0f1;
}
::v-deep .el-textarea__inner{
height: 100px !important;

View File

@@ -190,9 +190,6 @@ import apiPlace from "@/api/phase2/place.js"
this.majorValue = this.$route.query.majorName
this.monthValue = this.$route.query.riseRankTime.split('-')[1] + '月'
this.getCaseData()
apiCase.majorTypes().then(res=>{
this.speciData = res.result;
})
Promise.all([apiType.treeList(1,Number(this.caseType ?? 155),1), apiCase.majorTypes()]).then(rs => {
if (rs[0].code == 200) {
const {records} = rs[0].data

View File

@@ -182,7 +182,7 @@
</div>
</div>
</div>
<div class="back_num">
<div class="back_num" v-if="numIsFalse">
<div class="search_div_num">
当前已检索 <span style="color:#FF4040 ;">
{{ caseList.count }}</span> 条数据
@@ -197,7 +197,7 @@
<div class="case-info-title">
<div class="case-titdiv">
<div class="case-tittext">
<span class="title-line-ellipsis" v-html="item.title"></span>
<span :style="{maxWidth:item.excellentTag&&item.viewRankTags.length != 0?'400px':item.viewRankTags.length != 0?'500px':''}" class="title-line-ellipsis" v-html="item.title"></span>
</div>
<div class="case-activeText">
<!-- <span v-if="item.breCommend" class="comWords"
@@ -239,11 +239,11 @@
<div style="color:#2974D6;font-weight: 450;" v-for="(item, idx) in item.majorType" :key="idx">
{{ majorTypeTranslate(item) }}
</div>
<div v-if="item.keyword1">{{ item.keyword1 }}</div>
<div v-if="item.keyword2">{{ item.keyword2 }}</div>
<div v-if="item.keyword3">{{ item.keyword3 }}</div>
<div v-if="item.keyword4">{{ item.keyword4 }}</div>
<div v-if="item.keyword5">{{ item.keyword5 }}</div>
<div v-if="item.keyword1 && item.keyword1 != 'null'">{{ item.keyword1 }}</div>
<div v-if="item.keyword2 && item.keyword2 != 'null'">{{ item.keyword2 }}</div>
<div v-if="item.keyword3 && item.keyword3 != 'null'">{{ item.keyword3 }}</div>
<div v-if="item.keyword4 && item.keyword4 != 'null'">{{ item.keyword4 }}</div>
<div v-if="item.keyword5 && item.keyword5 != 'null'">{{ item.keyword5 }}</div>
</div>
</div>
<!-- </router-link> -->
@@ -481,13 +481,14 @@ export default {
},
data() {
return {
numIsFalse: true,
switch: {
'total': '总',
'quarter': '季度',
},
favorableName: '季度',
popularityName: '季度',
pubTimeNum: 0,
pubTimeNum: 1,
pageViewNum: 0,
twoId:'',
treeList:[],
@@ -1247,18 +1248,27 @@ export default {
this.search(true);
},
searchexcellent(num) {
if(this.queryCondition.type==num){
this.queryCondition.excellent =false;
this.queryCondition.type = '';
this.search(true)
return
}
this.pubTimeNum = 0
this.pageViewNum = 0
this.queryCondition.orderField = ''
this.queryCondition.orderAsc = ''
// if(this.queryCondition.type==num){
// this.queryCondition.excellent =false;
// this.queryCondition.type = '';
// this.search(true)
// return
// }
this.queryCondition.excellent =false;
this.queryCondition.type = num;
if(num == 'excellent'){
this.queryCondition.excellent =true;
this.queryCondition.type = num;
}
if(num == 'all'){
this.pubTimeNum = 1
this.queryCondition.orderField = 'sysCreateTime'
this.queryCondition.orderAsc = false
}
this.search(true);
// this.getCaseData();
},
@@ -1418,6 +1428,7 @@ export default {
this.moreState = 2;
// this.queryCondition.pubTimeNum = this.pubTimeNum
// this.queryCondition.pageViewNum = this.pageViewNum
this.numIsFalse = true
if(this.queryCondition.type == 'collect'){
const params = {
pageIndex:this.queryCondition.pageIndex,
@@ -1446,6 +1457,9 @@ export default {
// 给所有的赋值
this.caseList.count = res.result.count;
this.caseList.showPagCount = res.result.count;
setTimeout(() => {
this.numIsFalse = false
}, 3000);
}
}
})
@@ -1479,6 +1493,9 @@ export default {
// 给所有的赋值
this.caseList.count = res.result.count;
this.caseList.showPagCount = res.result.count;
setTimeout(() => {
this.numIsFalse = false
}, 3000);
}
}
})
@@ -1513,6 +1530,9 @@ export default {
// 给所有的赋值
this.caseList.count = res.result.count;
this.caseList.showPagCount = res.result.count;
setTimeout(() => {
this.numIsFalse = false
}, 3000);
} else {
this.$message.error(res.message);
}
@@ -2382,9 +2402,13 @@ export default {
border-radius: 4px;
// background: #04243C;
&:hover{
background: #387DF7;
// background: #387DF7;
border: 1px solid #387DF7;
.text{
color: #fff;
// color: #fff;
}
.png{
background: url('../../../assets/images/case/Frame(17).png') no-repeat;
}
}
.png{
@@ -2423,7 +2447,7 @@ export default {
.png{
width: 20px;
height: 20px;
background: url('../../../../public/images/browse.png') no-repeat;
background: url('../../../assets/images/case/Frame(17).png') no-repeat;
background-size: 100%;
margin-right: 9px;
}
@@ -2443,9 +2467,13 @@ export default {
border-radius: 4px;
// background: #04243C;
&:hover{
background: #387DF7;
// background: #387DF7;
border: 1px solid #387DF7;
.text{
color: #fff;
// color: #fff;
}
.png{
background: url('../../../assets/images/case/Frame(4).png') no-repeat;
}
}
.png{
@@ -2484,7 +2512,7 @@ export default {
.png{
width: 18px;
height: 18px;
background: url('../../../../public/images/collect.png') no-repeat;
background: url('../../../assets/images/case/Frame(4).png') no-repeat;
background-size: 100%;
margin-right: 9px;
}