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

提交

Browse Source
This commit is contained in:
zhaofang
2022-09-29 17:10:21 +08:00
parent 01105a425e
commit 501e850540
4 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/Portal/noteComment.vue
View File

@@ -28,7 +28,7 @@
</div>
<div class="comment-time portal-time">
<showTime :time="com.sysCreateTime"></showTime>
<interactBar :type="10" :shares="false" :data="com" @addAnswers="showReply(com)" :favorites="false" :views="false" :comments="false" :answers="true"></interactBar>
<interactBar :type="10" :shares="false" :data="com" @addAnswers="showReply(com)" :views="false" :comments="false" :answers="true"></interactBar>
</div>
<div v-if="replyInfo.parentId==com.id" class="comment-reply" style="padding-bottom: 5px;">
<div style="width:100%;display:flex;">
@@ -63,7 +63,7 @@
</div>
<div class="comment-time portal-time">
<showTime :time="reply.sysCreateTime"></showTime>
<interactBar :type="10" :shares="false" :data="reply" @addAnswers="showReply(reply)" :favorites="false" :views="false" :comments="false" :answers="true"></interactBar>
<interactBar :type="10" :shares="false" :data="reply" @addAnswers="showReply(reply)" :views="false" :comments="false" :answers="true"></interactBar>
</div>
</div>
<!--发布回复-->
@@ -176,6 +176,10 @@
readonly:{
type:Boolean,
default:false
},
name:{
type:String,
default:''
}
},
components:{showTime,authorInfo,interactBar},
@@ -324,6 +328,7 @@
let ids=[];
let allList=[];
res.result.list.forEach(item=>{
item.title = this.name;
item.replyList = [];
item.avatar='';
item.orgInfo='';
@@ -334,6 +339,7 @@
ids.push(item.sysCreateAid);
if(item.replyList && item.replyList!=''){
item.replyList.forEach(reply=>{
reply.title=this.name;
reply.avatar='';
reply.orgInfo='';
reply.name='';
@@ -412,6 +418,7 @@
if(res.status==200){
// this.list.unshift(res.result);
// this.sex =
res.result.title = this.name;
res.result.sex=null;
res.result.isAll=false;
this.list.unshift(res.result);

2
src/views/study/coursenew.vue
View File

@@ -114,7 +114,7 @@
<comments v-if="courseInfo.id && courseInfo.id != ''" :obj-type="1" :obj-id="courseInfo.id" :toUsers="toUsers"></comments>
</div>
<div v-show="!courestab" class="coures-note">
<note-comments v-if="courseInfo.id && courseInfo.id != ''" :obj-type="6" :obj-id="courseInfo.id"></note-comments>
<note-comments v-if="courseInfo.id && courseInfo.id != ''" :obj-type="6" :obj-id="courseInfo.id" :name="courseInfo.name"></note-comments>
</div>
</div>
</div>

23
src/views/user/Mynotes.vue
View File

@@ -138,10 +138,10 @@
<div class="Exportbox">
<div class="export-dialog-top">
<div class="export-dialog-left">
<author-img :avatar="userInfo.avatar" :aid="userInfo.aid" :sex="userInfo.sex"></author-img>
<author-img :avatar="userData.avatar" :aid="userData.aid" :sex="userData.sex"></author-img>
<div class="userInfo-info">
<p><span style="font-weight: 500;font-size: 22px;">{{userInfo.name}}</span><span style="font-size: 12px;margin-left:10px">{{userInfo.departFullName}}</span></p>
<p>{{userInfo.sign}}</p>
<p><span style="font-weight: 500;font-size: 22px;">{{userData.name}}</span><span style="font-size: 12px;margin-left:10px">{{userInfo.departFullName}}</span></p>
<p>{{userData.sign}}</p>
</div>
</div>
<div class="export-dialog-right">
@@ -184,7 +184,8 @@ import interactBar from '@/components/Portal/interactBar.vue';
import FileUpload from '@/components/NoteUpload/index.vue';
import AuthorImg from '@/components/Portal/authorImg.vue';
import { mapGetters } from 'vuex';
import {formatDate} from '@/utils/tools.js'
import {formatDate} from '@/utils/tools.js';
import apiUser from "@/api/system/user.js";
export default {
components:{interactBar,FileUpload,AuthorImg},
computed: {
@@ -192,6 +193,7 @@ export default {
},
data(){
return{
userData:{},
formatDate,
noteFile:{
contentType:null,
@@ -245,6 +247,13 @@ export default {
mounted(){
this.noteData(null);
this.allcoures();
apiUser.getByIds([this.userInfo.aid]).then(res => {
if (res.status == 200) {
this.userData = res.result[0];
} else {
this.$message.error(res.message);
}
});
},
methods: {
exportCommand(e) {
@@ -258,10 +267,10 @@ export default {
}
})
let data = {
name:this.userInfo.name,
sign:'abcd',
name:this.userData.name,
sign:this.userData.sign,
ids:ids,
author:this.userInfo.avatar,//this.userInfo.avatar,
author:this.userData.avatar,//this.userInfo.avatar,
}
if(this.exportType == '1') {
apiNote.exportPdf(data).then(res=>{

7
src/views/user/Setting.vue
View File

@@ -443,12 +443,13 @@
.personSetting{
background-color: #fff;
box-sizing: border-box;
padding: 30px 0px 0px 247px;
// padding: 30px 0px 0px 247px;
padding: 30px 0 10% 20%;
// margin: 0 auto;
position: relative;
.avatar{
position: absolute;
left: 86px;
left: 5%;
top:56px;
}
.passWard-btn{
@@ -469,6 +470,8 @@
box-shadow: -1px 0 0 0 #387DF7;
}
.informationItem{
min-width: 600px;
padding-right: 10%;
margin-bottom: 82px;
.information-header{
// display: flex;