提交修改

This commit is contained in:
daihh
2022-05-30 23:25:01 +08:00
parent b050613020
commit b749df42e6
19 changed files with 481 additions and 307 deletions

View File

@@ -31,16 +31,10 @@
</el-form-item>
</el-form>
</el-row>
<el-dialog
class="checked-show"
:visible.sync="addFormCheckedShow"
width="800px"
:show-close="false"
:modal="false">
<el-dialog class="checked-show" :visible.sync="addFormCheckedShow" width="800px" :show-close="false" top="14vh" :modal="false">
<agreement></agreement>
<span slot="footer" class="dialog-footer">
<!-- <el-button @click="addFormCheckedShow = false"> </el-button> -->
<el-button type="primary" @click="addFormCheckedShow = false"> </el-button>
<el-button style="margin-right:10px" type="primary" @click="addFormCheckedShow = false"> </el-button>
</span>
</el-dialog>
</div>
@@ -205,11 +199,17 @@ export default {
.el-dialog__header{
padding:0;
}
.el-dialog__body {
padding: 30px 20px;
// overflow-y: auto;
}
.el-dialog__footer{
border-top: 1px solid #F5F5F6;
background-color: #F5F5F6;
border-top: 1px solid #fff;
background-color: #fff;
padding: 10px 20px 20px;
}
}
.nav {
margin-bottom: 10px;
}

View File

@@ -7,7 +7,7 @@
<!-- <img :src="imageUrl(item)" /><span v-if="isShow" class="two-line-ellipsis">{{item.title}}</span> -->
</div>
<div class="flex-between" @click="jump(item)">
<div class="uc-course-name">
<div class="uc-course-name one-line-ellipsis">
<span :class="contentTypeFilter(item.contentType).class">{{ contentTypeFilter(item.contentType).text }}</span>
<span>{{ item.title }}</span>
</div>
@@ -132,6 +132,16 @@ export default {
</script>
<style lang="scss" scoped>
.one-line-ellipsis{
display: -webkit-box;
// white-space:pre-wrap;
word-wrap: break-word;
word-break:break-all;
overflow: hidden;
text-overflow:ellipsis;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
}
.uc-course {
position: relative;
cursor: pointer;
@@ -163,9 +173,9 @@ export default {
}
.uc-course-img {
position: relative;
img {
width: 160px;
height: 90px;
::v-deep img {
width: 212px;
height: 119px;
border: 1px solid #f4f4f5;
}
> span {

View File

@@ -42,7 +42,7 @@
</span> -->
</el-dialog>
<!--微课-->
<el-dialog width="980px" :title="curCourseId == '' ? '新建课程' : '编辑课程'" :visible.sync="weike.dlgShow" :close-on-click-modal="false" custom-class="g-dialog" top="8%">
<el-dialog width="980px" :title="curCourseId == '' ? '新建课程' : '编辑课程'" :visible.sync="weike.dlgShow" :close-on-click-modal="false" custom-class="g-dialog" top="8vh">
<el-form label-width="100px" size="small" class="wei-from" style="min-height: 600px;">
<el-row :gutter="10">
<el-col :span="10">
@@ -187,7 +187,7 @@
</span>
</el-dialog>
<!--录播课-->
<el-dialog width="980px" :title="curCourseId == '' ? '新建课程' : '编辑课程'" :visible.sync="biaoke.dlgShow" :close-on-click-modal="false" custom-class="g-dialog" top="8%">
<el-dialog width="980px" :title="curCourseId == '' ? '新建课程' : '编辑课程'" :visible.sync="biaoke.dlgShow" :close-on-click-modal="false" custom-class="g-dialog" top="8vh">
<el-tabs v-model="biaoke.tabIndex" @tab-click="changeBiaokeTab" style="min-height: 600px;">
<el-tab-pane label="课程信息" name="base" style="width: 90%;">
<!-- :rules="rulesTwo" -->
@@ -366,11 +366,10 @@
<el-button @click="saveCatalogSort" type="primary">确定</el-button>
</span>
</el-dialog>
<el-dialog class="checked-show" :visible.sync="courseInfoFormCheckedShow" top="10%" width="800px" :show-close="false" :modal="false">
<el-dialog class="checked-show" :visible.sync="courseInfoFormCheckedShow" top="14vh" width="800px" :show-close="false" :modal="false">
<agreement></agreement>
<span slot="footer" class="dialog-footer">
<!-- <el-button @click="courseInfoFormCheckedShow = false"> </el-button> -->
<el-button type="primary" @click="courseInfoFormCheckedShow = false"> </el-button>
<el-button style="margin-right:10px" type="primary" @click="courseInfoFormCheckedShow = false"> </el-button>
</span>
</el-dialog>
<!--选择图片-->
@@ -1255,10 +1254,6 @@ export default {
.el-dialog__header{
padding:0;
}
.el-dialog__footer{
border-top: 1px solid #F5F5F6;
background-color: #F5F5F6;
}
}
.el-dialog__body {
padding: 10px 10px;
@@ -1326,7 +1321,7 @@ export default {
border-bottom: 1px solid #dddddd;
padding: 0px 6px;
display: flex;
}
.cctree-chapter-cells {
margin: 0px;

View File

@@ -1,12 +1,12 @@
<template>
<div class="item-agr">
<div style="padding: 40px 20px 0 20px;color: #8a8a8a;">
<div style="text-align: center;font-size: 26px;padding-bottom:40px ;">京东方大学堂内容发布须知</div>
<div style="min-height: 300px;max-height: 500px;overflow-y: auto;">
<div style="line-height: 30px; white-space:pre-line" v-html="context" ></div>
<div style="padding: 0 10px 0 10px;color:#626262;;">
<div style="text-align: center;font-size: 26px;padding-bottom:20px ;">京东方大学堂内容发布须知</div>
<div class="agr-content" style="min-height: 320px;max-height: 320px;overflow-y: auto;">
<div style="" >
<p style="margin-bottom:10px;line-height: 24px; white-space:pre-line" v-for="(item,index) in context" :key="index">{{item}}</p>
</div>
</div>
<!-- <div style="height: 100px;"></div> -->
</div>
</div>
</template>
@@ -16,7 +16,7 @@ import apiProtocol from '@/api/modules/protocol.js';
data(){
return {
baseUrl:process.env.VUE_APP_FILE_BASE_URL,
context:'',
context:[],
}
},
created() {
@@ -33,7 +33,8 @@ import apiProtocol from '@/api/modules/protocol.js';
getprotocol(){
apiProtocol.query(1).then(res=>{
if(res.status == 200){
this.context = res.result.content;
let list = res.result.content.split('\n');
this.context = list;
}
})
}
@@ -42,5 +43,9 @@ import apiProtocol from '@/api/modules/protocol.js';
</script>
<style scoped lang="scss">
.agr-content{
background: #f7f7f7;
padding: 20px;
color: #626262;
}
</style>

View File

@@ -65,7 +65,7 @@
<div class="zan-wu" v-if="list.length == 0">暂无评论</div>
<div class="comment" v-for="(com,comIdx) in list" :key="com.id">
<div class="comment-top">
<div class="comment-">
<div class="comment-author">
<authorInfo :avatar="com.avatar" :name="com.sysCreateBy" :sex="com.sex"></authorInfo>
</div>
<div class="comment-time">
@@ -74,14 +74,19 @@
</div>
<div class="comment-body" >
<div class="comment-info" @mouseover="showButtons(com.id)" @mouseout="hideButtons()">
<div class="comment-content" @click="cancelReply()">{{com.content}}</div>
<div class="comment-content" @click="cancelReply()">
{{displayAll(com)}}
<span v-if="com.content.length>170" @click="changeIsAll(com)">
{{com.isAll?'收起':'全文'}}
</span>
</div>
<div class="comment-btns">
<!-- <a><svg-icon icon-class="like"></svg-icon><span>66</span></a> -->
<div 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 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 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>
<!-- <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>
<div v-if="replyInfo.parentId==com.id" class="comment-reply" style="padding-bottom: 5px;">
@@ -110,7 +115,12 @@
</div>
<div class="comment-body" @mouseover="showButtons(reply.id)" @mouseout="hideButtons()">
<div class="comment-info" >
<div class="comment-content" @click="cancelReply()">{{reply.content}}</div>
<div class="comment-content" @click="cancelReply()">
{{displayAll(reply)}}
<span v-if="reply.content.length>170" @click="changeIsAll(reply)">
{{reply.isAll?'收起':'全文'}}
</span>
</div>
<div class="comment-btns">
<!-- <a><svg-icon icon-class="like"></svg-icon><span>66</span></a> -->
<div v-show="btnsShowRowId==reply.id">
@@ -405,7 +415,8 @@
res.result.list.forEach(item=>{
item.avatar='';
item.orgInfo='';
// item.sex=null;
item.isAll=false;
//item.sex=null;
allList.push(item);
ids.push(item.sysCreateAid);
if(item.replyList && item.replyList!=''){
@@ -413,6 +424,7 @@
reply.avatar='';
reply.orgInfo='';
reply.sex=null;
reply.isAll=false;
allList.push(reply);
ids.push(reply.sysCreateAid);
})
@@ -457,13 +469,14 @@
}
apiComment.add(cdata).then(res=>{
apiComment.add(cdata).then(res=>{
if(res.status==200){
// this.list.unshift(res.result);
// this.sex =
res.result.sex=null;
res.result.isAll=false;
this.list.unshift(res.result);
this.loadAuthorInfo([res.result],[res.result.sysCreateAid]);
this.loadAuthorInfo([res.result],[res.result.sysCreateAid]);
this.$message.success('发布成功');
//
@@ -488,6 +501,17 @@
hideButtons(){
this.btnsShowRowId='';
},
//展示全部
displayAll(item) {
//console.log(item,'item');
if(!item.isAll && item.content && item.content.length > 170) {
return item.content.slice(0, 170) + "...";
}
return item.content;
},
changeIsAll(item) {
item.isAll=!item.isAll;
},
showReply(item){
this.replyInfo.objType=this.objType;
this.replyInfo.objId=this.objId;
@@ -513,7 +537,8 @@
}
apiComment.reply(this.replyInfo).then(res=>{
if(res.status==200){
res.result.sex = null;
res.result.sex = null;
res.result.isAll=false;
this.loadAuthorInfo([res.result],[res.result.sysCreateAid]);
comment.replyList.push(res.result);
this.replyInfo.parentId='';
@@ -617,6 +642,7 @@
apiComment.reply(this.replyInfo).then(res=>{
if(res.status==200){
res.result.sex = null;
res.result.isAll=false;
this.loadAuthorInfo([res.result],[res.result.sysCreateAid]);
this.replyDiaglog.list.push(res.result);
this.replyInfo.parentId='';
@@ -820,7 +846,13 @@
padding-left: 40px;
.comment-content{
padding-bottom: 0px;
white-space: pre-wrap;
word-break:break-all;
span {
color: #409eff;
cursor: pointer;
margin-left: 5px;
}
}
.comment-btns{
// padding: 5px 10px 10px 0px;

View File

@@ -178,7 +178,10 @@ export default {
}
},
created(){
if(this.data && this.data.id!='' && !this.readonly){
},
mounted() {
if(this.data && this.data.id && !this.readonly){
this.checkHas();
}
},

View File

@@ -106,7 +106,7 @@
</span>
</el-dialog>
<addQuestion ref="addQuestion" @sure="sure"></addQuestion>
<el-dialog title="创建文章" :visible.sync="diagSync" :close-on-click-modal="false" width="900px" custom-class="g-dialog">
<el-dialog title="创建文章" :visible.sync="diagSync" top="14vh" :close-on-click-modal="false" width="900px" custom-class="g-dialog">
<editItems v-if="diagSync" :jumpLimit="false" :editForm="{}" @success="saveSuccess"></editItems>
</el-dialog>
</div>

View File

@@ -31,11 +31,11 @@
<el-button @click="askQuestionDialog = false"> </el-button>
<el-checkbox style="margin-left:10px" v-model="askForm.checked"> </el-checkbox><span style="font-size:14px;color:#787878;margin-left:10px">我已阅读并遵守</span><span style="font-size:14px;color:#588afc;margin-right:10px;cursor: pointer;" @click="askFormCheckedShow = true">平台内容发布要求</span>
</div>
<el-dialog class="checked-show" :visible.sync="askFormCheckedShow" width="800px" :show-close="false" :modal="false">
<el-dialog class="checked-show" :visible.sync="askFormCheckedShow" top="14vh" width="800px" :show-close="false" :modal="false">
<agreement></agreement>
<span slot="footer" class="dialog-footer">
<!-- <el-button @click="askFormCheckedShow = false"> </el-button> -->
<el-button type="primary" @click="askFormCheckedShow = false"> </el-button>
<el-button style="margin-right:10px" type="primary" @click="askFormCheckedShow = false"> </el-button>
</span>
</el-dialog>
</el-dialog>
@@ -117,9 +117,5 @@
.el-dialog__header{
padding:0;
}
.el-dialog__footer{
border-top: 1px solid #F5F5F6;
background-color: #F5F5F6;
}
}
</style>