Skip to content

T
techbook
Commit 2ac351ad authored by zhangyanni's avatar zhangyanni
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 0e09abf1 5eb6317a
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 33 deletions
src/views/assistantpage/moderatorStatistics.vue
View file @ 2ac351ad
......@@ -61,11 +61,14 @@
<p>{{amountinfodata.senderName}}</p>
</el-form-item>
<el-form-item label="ID：">
<p>{{amountinfodata.empId}}</p>
<p>{{amountinfodata.discussId}}</p>
</el-form-item>
<el-form-item label="账号：">
<p>{{amountinfodata.empAccount}}</p>
</el-form-item>
<el-form-item label="昵称：">
<p>{{amountinfodata.nickName}}</p>
</el-form-item>
<el-form-item label="姓名：">
<p>{{amountinfodata.empName}}</p>
</el-form-item>
......@@ -81,9 +84,18 @@
<el-form-item label="星级：">
<p>{{amountinfodata.starRate}}颗星</p>
</el-form-item>
<el-form-item label="评级人：">
<p>{{amountinfodata.starCreatedBy}}</p>
</el-form-item>
<el-form-item label="评级时间：">
<p>{{amountinfodata.starCreatedTime}}</p>
</el-form-item>
<el-form-item label="评级理由：">
<p>{{amountinfodata.starRateReason}}</p>
</el-form-item>
<el-form-item label="发布的标题：">
<p>{{amountinfodata.topicTitle}}</p>
</el-form-item>
<el-form-item label="发布的讨论：">
<p v-html="amountinfodata.discussContent"></p>
</el-form-item>
......@@ -142,7 +154,7 @@
// 分页导航
handleCurrentChange(val) {
this.cur_page = val;
this.getRedPacketsAxios();
},
searchclk(){
this.cur_page = 1;
......
src/views/assistantpage/redenvelopes.vue
View file @ 2ac351ad
......@@ -83,6 +83,10 @@
<p><i v-for="item in scope.row.starRate" class="iconfont icon-xingxing" style="color: #FF5D5D;"></i></p>
</template>
</el-table-column>
<el-table-column prop="starCreatedBy" label="评级人" align="center" width="120">
</el-table-column>
<el-table-column prop="starCreatedTime" label="评级时间" align="center" width="120">
</el-table-column>
<el-table-column prop="starRateReason" label="评级理由" align="center" width="120">
</el-table-column>
<el-table-column label="状态" align="center">
......@@ -180,6 +184,12 @@
<el-form-item label="星级：">
<p>{{amountinfodata.starRate}}颗星</p>
</el-form-item>
<el-form-item label="评级人：">
<p>{{amountinfodata.starCreatedBy}}</p>
</el-form-item>
<el-form-item label="评级时间：">
<p>{{amountinfodata.starCreatedTime}}</p>
</el-form-item>
<el-form-item label="评级理由：">
<p>{{amountinfodata.starRateReason}}</p>
</el-form-item>
......@@ -384,6 +394,8 @@
api.sendTipsMsgBatch(authenticationIds).then(response => {
if(response.code == 0) {
this.$message.success('发送成功');
this.cur_page = 1;
this.getDiscussStarsAxios();
} else {
this.$message.error(response.msgCode);
}
......@@ -395,6 +407,10 @@
},
//批量发放固定红包
sendStarPackets(amount,row){
if(amount <= 1 || amount > 100){
this.$message.error('随机金额限制1-100，请重新输入');
return
}
this.$confirm('确定要给 '+(row?row.empName:(this.enticationlist.length+'人'))+' 发放 '+amount+' 元红包么?', {
cancelButtonText: '取消',
confirmButtonText: '确定',
......@@ -408,10 +424,6 @@
},
//发送红包
sendStarPacket(state,amount,row){
if(amount <= 0 || amount > 100){
this.$message.error('随机金额限制100，请重新输入');
return
}
let params = {
amount:amount,
};
......@@ -432,6 +444,8 @@
if(response.code == 0) {
this.$message.success('发送成功');
this.expertVisible = false;
this.cur_page = 1;
this.getDiscussStarsAxios();
} else {
this.$message.error(response.msg);
this.expertVisible = false;
......@@ -447,6 +461,8 @@
if(response.code == 0) {
this.$message.success('发送成功');
this.expertVisible = false;
this.cur_page = 1;
this.getDiscussStarsAxios();
} else {
this.$message.error(response.msg);
this.expertVisible = false;
......
src/views/index/pages/index.vue
View file @ 2ac351ad
......@@ -350,7 +350,7 @@
</div>
<div class="gendisplay" style="width: calc(100% - 210px);text-align: right;line-height: 34px;font-weight: normal;">
<p style="width: calc(100% - 80px);text-align: left;">胜率：<i style="font-weight: bold;">{{item.winRate}}%</i></p>
<p style="margin-left: 25px;width: 80px;text-align: right;"><i style="color: #FF5D5D;font-weight: bold;">{{item.guessNum}}</i> 参与次数</p>
<p style="margin-left: 15px;width: 110px;text-align: right;"><i style="color: #FF5D5D;font-weight: bold;">{{item.guessNum}}</i> 参与次数</p>
</div>
</div>
</div>
......
src/views/moderatorpage/moderatorlist.vue
View file @ 2ac351ad
......@@ -41,7 +41,7 @@
</el-table-column>
<el-table-column prop="empLogo" label="版主头像" align="center">
<template slot-scope="scope">
<img :src="scope.row.empLogo" style="width: 30px;height: 30px;border-radius: 50%;">
<img :src="scope.row.empLogo?scope.row.empLogo:require('../../assets/img/defaultlogo.png')" style="width: 30px;height: 30px;border-radius: 50%;">
</template>
</el-table-column>
<el-table-column :label="$t('listjson.action')" width="180" align='center'>
......@@ -80,7 +80,8 @@
<el-input @blur="isempAccountblur" :disabled="!iseditadd" v-model="expertData.account" placeholder="请输入账号"></el-input>
</el-form-item>
<el-form-item label="版主姓名：" prop="empName">
<el-input maxlength="36" :disabled="expertData.isUpdate == 2" v-model="expertData.empName" placeholder="请输入姓名"></el-input>
<el-input maxlength="36" v-if="isempName" v-model="expertData.empName" placeholder="请输入姓名"></el-input>
<el-input maxlength="36" v-else :disabled="expertData.isUpdate == 2" v-model="expertData.empName" placeholder="请输入姓名"></el-input>
</el-form-item>
<el-form-item label="版主昵称：">
<el-input maxlength="20" :disabled="expertData.isUpdate == 2" v-model="expertData.nickName" placeholder="请输入昵称"></el-input>
......@@ -94,7 +95,7 @@
<el-form-item label="版主头像：">
<p class="imgTitle">请确保图片清晰、完整，仅支持PNG，JPG,JPEG，最大不超过2M。</p>
<div v-if="expertData.isUpdate == 2">
<img :src="expertData.empLogo" style="width: 128px;height: 128px;border-radius: 3px;">
<img :src="expertData.empLogo?expertData.empLogo:require('../../assets/img/defaultlogo.png')" style="width: 128px;height: 128px;border-radius: 3px;">
</div>
<div v-else class="uploadImg">
<uploadCover
......@@ -158,6 +159,7 @@
},
iseditadd:true,
keyWord:null,
isempName:false,
}
},
components:{
......@@ -194,6 +196,11 @@
if(response.result){
this.expertData = response.result;
this.expertData.account = account;
if(this.expertData.empName == null){
this.isempName = true;
}else{
this.isempName = false;
}
}else{
this.expertData = {};
this.expertData.empLogo = '';
......
src/views/topicpage/commentdetail.vue
View file @ 2ac351ad
......@@ -20,6 +20,9 @@
<p style="margin-right: 5px;font-size: 12px;">
{{commentdata.userInfo.isProfessor?commentdata.userInfo.empName:commentdata.userInfo.nickName}}
</p>
<p v-if="commentdata.userInfo.isModerator" style="margin: -1px 5px 0;">
<img src="../../assets/img/mobile/moderator.png" alt="" style="width: 15px;">
</p>
<p>
<span style="margin-top: 0px" class="medal" :class="'medal'+itemMedal.id" v-if="commentdata.userInfo.empMedalList!=null&&commentdata.userInfo.empMedalList.length>0" v-for="itemMedal in commentdata.userInfo.empMedalList"
></span>
......@@ -135,6 +138,9 @@
<p style="margin-right: 5px;font-size: 12px;">
{{commentscommentdata.isProfessor == 1?commentscommentdata.empName:commentscommentdata.nickName}}
</p>
<p v-if="commentscommentdata.moderator" style="margin: -1px 5px 0;">
<img src="../../assets/img/mobile/moderator.png" alt="" style="width: 15px;">
</p>
<p>
<span style="margin-top: 0px" class="medal" :class="'medal'+itemMedal.id" v-if="commentscommentdata.empMedalList!=null&&commentscommentdata.empMedalList.length>0" v-for="itemMedal in commentscommentdata.empMedalList"
></span>
......@@ -271,11 +277,11 @@
<i style="margin-right: 5px;" class="iconfont icon-guzhangtousu"></i>
举报
</span>
<span @click="istopState(commentdata)" :style="empId!=commentdata.createdBy?'padding-left: 10px;border-left: 1px solid #FFFFFF;':''" style="cursor: pointer;" v-if="(publicFun.isgetUserRoleFunc(2)||(commentdata.baseModeratorList.length>=1&&empId==commentdata.baseModeratorList[0].empId))&&commentdata.isStar!=1">
<span @click="istopState(commentdata)" :style="empId!=commentdata.createdBy?'padding-left: 10px;':''" style="cursor: pointer;" v-if="(publicFun.isgetUserRoleFunc(2)||(commentdata.baseModeratorList.length>=1&&empId==commentdata.baseModeratorList[0].empId))&&commentdata.isStar!=1">
<i class="iconfont" :class="commentdata.topState==0?'icon-zhiding':'icon-quxiaozhiding'"></i>
{{commentdata.topState==0?'置顶':'取消置顶'}}
</span>
<span @click="isstarstate(commentdata)" style="padding-left: 10px;margin-left:10px;cursor: pointer;border-left: 1px solid #FFFFFF;" v-if="(publicFun.isgetUserRoleFunc(2)||(commentdata.baseModeratorList.length>=1&&empId==commentdata.baseModeratorList[0].empId))&&commentdata.topState!=1">
<span @click="isstarstate(commentdata)" style="padding-left: 10px;margin-left:10px;cursor: pointer;" v-if="(publicFun.isgetUserRoleFunc(2)||(commentdata.baseModeratorList.length>=1&&empId==commentdata.baseModeratorList[0].empId))&&commentdata.topState!=1">
<i class="iconfont" :class="commentdata.isStar==0?'icon-jiajinghuax':'icon-quxiaojinghua'"></i>
{{commentdata.isStar==0?'精华':'取消精华'}}
</span>
......@@ -345,7 +351,7 @@
</div>
</el-tab-pane>
</el-tabs>
<p @click="getProfessorpicId(professorUnfold?20:5)" v-if="professorlist&&professorlist.length>=6">
<p @click="getProfessorpicId(professorUnfold?20:5)" v-if="professorCount>=6">
{{professorUnfold?'展开':'收起'}} <i class="iconfont" :class="professorUnfold?'icon-xiala':'icon-xiala-copy'" style="font-size: 12px"></i>
</p>
</div>
......@@ -1055,6 +1061,20 @@
}
}
}
.y_moderator{
width: 400px;
background: #FFFFFF;
position: relative;
border: 1px solid #E8EAF3;
>p{
position: absolute;
top: 15px;
right: 20px;
color: #9197B4;
font-size: 14px;
cursor: pointer;
}
}
.medal1 {
background-position-y: -122px;
}
......
src/views/topicpage/discussall.vue
View file @ 2ac351ad
......@@ -104,7 +104,7 @@
<div style="margin:0 30px 20px 0;">
<div class="list_moderator" v-for="(item,index) in moderatorlist" :key="index">
<p>
<img :src="item.empLogo" alt="" style="width: 60px;height: 60px;border-radius: 50%;">
<img :src="item.empLogo?item.empLogo:require('../../assets/img/defaultlogo.png')" alt="" style="width: 60px;height: 60px;border-radius: 50%;">
</p>
<p class="ellipsisFont1" style="color: #1A1A1E;margin-top: 5px;width: 60px;height: 20px;overflow: hidden;">
{{item.empName}}
......@@ -144,7 +144,7 @@
<div style="margin:0 30px 20px 0;">
<div class="list_moderator" v-for="(item,index) in moderatorlist" :key="index">
<p>
<img :src="item.empLogo" alt="" style="width: 60px;height: 60px;border-radius: 50%;">
<img :src="item.empLogo?item.empLogo:require('../../assets/img/defaultlogo.png')" alt="" style="width: 60px;height: 60px;border-radius: 50%;">
</p>
<p class="ellipsisFont1" style="color: #1A1A1E;margin-top: 5px;width: 60px;height: 20px;overflow: hidden;">
{{item.empName}}
......@@ -257,9 +257,13 @@
closediscuss(){
this.isdiscussdialog = false;
},
pushdataEvent(id){
pushdataEvent(id,count,Pid){
this.isdiscussdialog = false;
this.$refs.childintegral.getintegralCode('ITV001',id,5);
let _this = this;
setTimeout(function () {
_this.$router.push({path:"/topicDetails",query:{id:Pid}});
},200);
},
//话题列表
getselectTopicList(){
......
src/views/topicpage/discussdialog.vue
View file @ 2ac351ad
......@@ -252,10 +252,7 @@
api.addTopicDiscuss(params).then(response => {
if(response.code == 0) {
this.$message.success('发表成功');
this.$emit('pushdataEvent',response.result.id);
if(!this.topicid){
this.$router.push({path:"/topicDetails",query:{id:this.topicId}});
}
this.$emit('pushdataEvent',response.result.id,response.result.count,params.topicId);
} else {
this.$message.error(response.msgCode);
}
......
src/views/topicpage/pushtopic.vue
View file @ 2ac351ad
......@@ -155,7 +155,7 @@
</el-table>
<div class="pagination" style="background: #ffffff;padding: 5px 0;text-align: center;">
<el-pagination
@current-change="handleCurrentChange"
@current-change="handleCurrentChangemoderator"
background
:page-sizes="[10, 20, 30, 40, 50]"
:page-size="10"
......@@ -412,6 +412,7 @@
//专家列表
closeexpert(){
this.modelexpert = '';
this.cur_page = 1;
},
// 分页导航
handleCurrentChange(val) {
......@@ -475,6 +476,11 @@
this.formData.topicModerator = val ;
this.moderatorVisible = false;
},
//版主分页
handleCurrentChangemoderator(val){
this.cur_page = val;
this.getsearchModerator();
},
//版主列表
getsearchModerator(){
let params = {
......
src/views/topicpage/topicdetail.vue
View file @ 2ac351ad
......@@ -160,6 +160,9 @@
<p style="margin-right: 5px;font-size: 12px;">
{{item.userInfo.isProfessor?item.userInfo.empName:item.userInfo.nickName}}
</p>
<p v-if="item.userInfo.isModerator" style="margin: -1px 5px 0;">
<img src="../../assets/img/mobile/moderator.png" alt="" style="width: 15px;">
</p>
<p>
<span style="margin-top: 0px" class="medal" :class="'medal'+itemMedal.id" v-if="item.userInfo.empMedalList!=null&&item.userInfo.empMedalList.length>0" v-for="itemMedal in item.userInfo.empMedalList"
></span>
......@@ -292,9 +295,12 @@
<p style="margin-right: 5px;font-size: 12px;">
{{commentsitem.isProfessor == 1?commentsitem.empName:commentsitem.nickName}}
</p>
<p v-if="commentsitem.isModerator" style="margin: -1px 5px 0;">
<img src="../../assets/img/mobile/moderator.png" alt="" style="width: 15px;">
</p>
<p>
<span style="margin-top: 0px" class="medal" :class="'medal'+itemMedal.id" v-if="commentsitem.empMedalList!=null&&commentsitem.empMedalList.length>0" v-for="itemMedal in commentsitem.empMedalList"
></span>
<span style="margin-top: 0px" class="medal" :class="'medal'+itemMedal.id" v-if="commentsitem.empMedalList!=null&&commentsitem.empMedalList.length>0" v-for="itemMedal in commentsitem.empMedalList"
></span>
</p>
</div>
<p v-html="publicFun.analyzeEmoji(commentsitem.commentsContent)"></p>
......@@ -432,15 +438,15 @@
<!-- <i style="margin-right: 5px;" class="iconfont icon-guzhangtousu"></i>-->
<!-- 删除-->
<!-- </span>-->
<span @click="istopState(item)" style="padding-left: 10px;margin-left:10px;cursor: pointer;border-left: 1px solid #FFFFFF;" v-if="(publicFun.isgetUserRoleFunc(2)||(contentdata.baseModeratorList[0]&&empId==contentdata.baseModeratorList[0].empId))&&item.isStar!=1">
<span @click="istopState(item)" style="padding-left: 10px;margin-left:10px;cursor: pointer;" v-if="(publicFun.isgetUserRoleFunc(2)||(contentdata.baseModeratorList[0]&&empId==contentdata.baseModeratorList[0].empId))&&item.isStar!=1">
<i class="iconfont" :class="item.topState==0?'icon-zhiding':'icon-quxiaozhiding'"></i>
{{item.topState==0?'置顶':'取消置顶'}}
</span>
<span @click="isstarstate(item)" style="padding-left: 10px;margin-left:10px;cursor: pointer;border-left: 1px solid #FFFFFF;" v-if="(publicFun.isgetUserRoleFunc(2)||(contentdata.baseModeratorList[0]&&empId==contentdata.baseModeratorList[0].empId))&&item.topState!=1">
<span @click="isstarstate(item)" style="padding-left: 10px;margin-left:10px;cursor: pointer;" v-if="(publicFun.isgetUserRoleFunc(2)||(contentdata.baseModeratorList[0]&&empId==contentdata.baseModeratorList[0].empId))&&item.topState!=1">
<i class="iconfont" :class="item.topState==0?'icon-jiajinghuax':'icon-quxiaojinghua'"></i>
{{item.isStar==0?'精华':'取消精华'}}
</span>
<span v-if="publicFun.isgetUserRoleFunc(2)||(contentdata.baseModeratorList[0]&&empId==contentdata.baseModeratorList[0].empId)||empId==item.createdBy" style="padding-left: 10px;margin-left:10px;cursor: pointer;border-left: 1px solid #FFFFFF;" @click="deletediscuss(item.id,index)">
<span v-if="publicFun.isgetUserRoleFunc(2)||(contentdata.baseModeratorList[0]&&empId==contentdata.baseModeratorList[0].empId)||empId==item.createdBy" style="padding-left: 10px;margin-left:10px;cursor: pointer;" @click="deletediscuss(item.id,index)">
<i style="margin-right: 5px;" class="iconfont icon-lajitongshanchu"></i>
删除
</span>
......@@ -518,7 +524,7 @@
</div>
</el-tab-pane>
</el-tabs>
<p @click="getProfessorpicId(professorUnfold?20:5)" v-if="professorlist&&professorlist.length>=6">
<p @click="getProfessorpicId(professorUnfold?20:5)" v-if="professorCount>=6">
{{professorUnfold?'展开':'收起'}} <i class="iconfont" :class="professorUnfold?'icon-xiala':'icon-xiala-copy'" style="font-size: 12px"></i>
</p>
</div>
......@@ -647,7 +653,7 @@
empId:this.publicFun.getUserInfoCookieType()?JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())).empId:undefined,
professorCount:0,//专家数量
professorlist:[],//专家列表
professorUnfold:true,//专家展开收起
professorUnfold:false,//专家展开收起
discussTopList:[],//置顶数据
NormalDiscussstate:0,//查询状态
isdiscussdialog:false,
......@@ -673,8 +679,9 @@
closediscuss(){
this.isdiscussdialog = false;
},
pushdataEvent(id){
pushdataEvent(id,count){
this.isdiscussdialog = false;
this.contentdata.topicDiscussStr = count;
this.$refs.childintegral.getintegralCode('ITV001',id,5);
this.contentList = [];
this.topicdatacur_page = 1;
......@@ -1118,7 +1125,8 @@
}).then(() => {
api.deleteDiscuss(val).then(response => {
if(response.code == 0) {
this.contentList.splice(index,1)
this.contentList.splice(index,1);
this.contentdata.topicDiscussStr = response.result;
} else {
this.$message.error(response.msgCode);
}
......@@ -1158,13 +1166,12 @@
}
this.starparams = this.starparams+'&starRate='+this.expertData.starRate+'&starRateReason='+this.expertData.starRateReason;
}
api.joinTopfic(this.starparams).then(response => {
if(response.code == 0) {
this.starvisible = false;
this.contentList = [];
this.topicdatacur_page = 1;
this.selectNormalDiscussList();
this.getselectHotAndTopList();
} else {
this.$message.error(response.msg);
}
......
src/views/topicpage/topictype.vue
View file @ 2ac351ad
......@@ -220,9 +220,13 @@
closediscuss(){
this.isdiscussdialog = false;
},
pushdataEvent(id){
pushdataEvent(id,count,Pid){
this.isdiscussdialog = false;
this.$refs.childintegral.getintegralCode('ITV001',id,5);
let _this = this;
setTimeout(function () {
_this.$router.push({path:"/topicDetails",query:{id:Pid}});
},200);
},
//查询版主
getModerator(count){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment