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

Merge branch 'master' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/portal

Browse Source
This commit is contained in:
dongruihua
2022-11-14 15:26:16 +08:00
parent c7194e95f6 6bf3f6d850
commit 331a046858
27 changed files with 652 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/Course/weikeContent.vue
View File

@@ -737,7 +737,6 @@
this.homework.info.id='';
this.exam.content={id:'',contentType:61,sortIndex:3};
this.exam.show=1;
this.exam.content='';
this.exam.paperJson={items:[]};
this.exam.info.id='';
this.exam.info.paperContent='';

4
src/components/HomePage/answerList.vue
View File

@@ -11,10 +11,10 @@
</p>
<h6 class="answer-title-info follow-home-title">
<span class="pointer" @click="jumpDetail(item)">{{item.contentInfo}}</span>
<span class="follow-hide" style="float:right" v-if="!isDynamic && personal">
<!-- <span class="follow-hide" style="float:right" v-if="!isDynamic && personal">
<span v-if="item.hidden">已隐藏</span>
<span v-else @click="emitHide(item.id)"> <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 </span>
</span>
</span> -->
</h6>
<p class="answer-text">
{{displayAll(item)}}

4
src/components/HomePage/articleList.vue
View File

@@ -11,10 +11,10 @@
</span>
</p>
<h6 class="article-title-info follow-home-title"><span @click="jumpDetail(item)">{{item.info.title || item.contentInfo}}</span>
<span class="follow-hide pointer" style="float:right" v-if="!isDynamic && personal">
<!-- <span class="follow-hide pointer" style="float:right" v-if="!isDynamic && personal">
<span v-if="item.hidden">已隐藏</span>
<span v-else @click="emitHide(item.id)"> <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 </span>
</span>
</span> -->
</h6>
<div style="height:58px;padding-top:14px ">
<author :avatar="item.authorInfo.avatar" :name="item.authorInfo.name" :info="item.authorInfo.orgInfo" :sex="item.authorInfo.sex" :aid="item.authorInfo.aid"></author>

4
src/components/HomePage/caseList.vue
View File

@@ -17,10 +17,10 @@
<router-link :to="'/case/detail?id='+item.info.id">
<span class="case-tittext" v-html="item.info.title || item.contentInfo"></span>
</router-link>
<span class="follow-hide pointer" v-if="!isDynamic && personal">
<!-- <span class="follow-hide pointer" v-if="!isDynamic && personal">
<span v-if="item.hidden">已隐藏</span>
<span v-else @click="emitHide(item.id)"> <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 </span>
</span>
</span> -->
</div>
</div>
<router-link :to="'/case/detail?id='+item.info.id">

4
src/components/HomePage/courseList.vue
View File

@@ -26,10 +26,10 @@
<p class="portal-time">最新一次学习时间：{{item.eventTime}}</p>
</div>
<div style="width:150px">
<div class="follow-hide pointer" style="text-align: right;" v-if="!isDynamic && personal">
<!-- <div class="follow-hide pointer" style="text-align: right;" v-if="!isDynamic && personal">
<span v-if="item.hidden">已隐藏</span>
<span v-else @click="emitHide(item.id)"> <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 </span>
</div>
</div> -->
<div class="btn-right">
<!-- <el-button class="btn" type="primary" @click="jumpDetail(item)">{{item.eventKey == 'Praise' ? '我也去学' : item.aid == userInfo.aid? '继续学习' : '我也去学'}}</el-button> -->
<el-button class="btn" type="primary" @click="jumpDetail(item)">{{personal? '继续学习' : '我也去学'}}</el-button>

15
src/components/HomePage/homePage.vue
View File

@@ -14,7 +14,7 @@
<div style="display: flex;justify-content: start;margin-left:25px">
<div style="min-width: 240px;">
<div class="content-top">
<h6> {{userData.name}}<span style="margin-left:8px;color: #999999;font-weight: 400;">{{orgInfo}}</span> </h6>
<h6> {{userData.name}}<span style="margin-left:8px;color: #999999;font-weight: 400;">{{userData.orgInfo}}</span> </h6>
</div>
<div class="grade" style="margin-top:5px">
<div class="level" style="margin-top:4px">{{statData.level}}</div>
@@ -26,7 +26,7 @@
<spap class="Followed" @click="cancelFollow()" v-if="isFollowHas">已关注</spap>
<el-button type="text" round class="btn-user" > <router-link :to="'/home/'+pageId+'/leaving'">{{pageId == userInfo.aid ? '留言板':'去留言'}}<i class="el-icon-arrow-right"></i> </router-link> </el-button>
<!-- <div style="height: 30px;margin-top: 10px;"> -->
<!-- </div> -->
<!-- </div> -->
@@ -35,11 +35,11 @@
<p v-if="userData.sign" class="portal-summary-text">{{userData.sign}} </p>
<p v-else class="portal-summary-text">暂无签名</p>
</div>
</div>
<!-- <div style="text-align: center;"> -->
<!-- </div> -->
</div>
</div>
@@ -147,6 +147,7 @@
apiUser.getByIds([this.pageId]).then(res => {
if (res.status == 200) {
this.userData = res.result[0];
this.userData.orgInfo=cutFullName(this.userData.orgInfo);
} else {
this.$message.error(res.message);
}
@@ -359,7 +360,7 @@
border: 1px solid #619DFF;
font-size: 14px;
color: #387DF7;
}
.Followed{
width: 80px;
@@ -468,7 +469,7 @@
}
}
.content-bottom{
.medalbutt{
margin-right: 20px;
}

4
src/components/HomePage/noteList.vue
View File

@@ -11,10 +11,10 @@
</span>
</p>
<h6 style="word-break:break-all;" class="note-title-info follow-home-title pointer"><span @click="jumpDetail(item)">{{item.contentInfo}}</span> <span style="color: #333333;font-weight: 400;font-size: 14px;margin-left: 20px;"></span>
<span class="follow-hide pointer" style="float:right" v-if="(item.aid == userInfo.aid) && !isDynamic">
<!-- <span class="follow-hide pointer" style="float:right" v-if="(item.aid == userInfo.aid) && !isDynamic">
<span v-if="item.hidden">已隐藏</span>
<span v-else @click="emitHide(item.id)"> <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 </span>
</span>
</span> -->
</h6>
<p class="note-text" style="word-break:break-all;word-wrap:break-word;margin-bottom:18px">
{{item.info.content}}

4
src/components/HomePage/putTo.vue
View File

@@ -12,10 +12,10 @@
</p>
<h6 class="put-title-info follow-home-title">
<span class="pointer" @click="jumpDetail(item.info)">{{item.info.title || item.contentInfo}}</span>
<span class="portal-time follow-hide pointer" style="float:right" v-if="!isDynamic && personal">
<!-- <span class="portal-time follow-hide pointer" style="float:right" v-if="!isDynamic && personal">
<span v-if="item.hidden">已隐藏</span>
<span v-else @click="emitHide(item.id)"> <svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏 </span>
</span>
</span> -->
</h6>
<div class="put-footer">
<div style="margin-top:20px;font-size: 14px;color: #666666;">{{item.info.answers}}个回答</div>

10
src/components/Portal/interactBar.vue
View File

@@ -50,7 +50,7 @@
</div>
<div v-if="views" style="cursor: default;" :style="`min-width: ${nodeWidth};margin-left:${data.views>1000? '40px':'20px'}`" 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:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>
<svg-icon style="margin-right: 0;font-size:22px;" icon-class="eyes"></svg-icon>
</el-tooltip>
<span class="interact-bar-value"> {{ formatNum(data.views)}}</span>
</div>
@@ -235,7 +235,6 @@ export default {
// if(type=='praise'){
// typeText='点赞了我的'
// }
let content;
let conType;
if(this.type==1){
@@ -283,6 +282,9 @@ export default {
content,
refId,
refType:this.type,
source:1,
pageUrl:location.href,
sendAid:this.userInfo.aid,
sendName,
acceptName,
acceptId,
@@ -291,9 +293,7 @@ export default {
conType,
}
apiMessage.save(message).then(res=>{
if(res.status==200){
}
if(res.status!=200){ console.log('发送消息失败') }
})
},
checkHas(){

2
src/components/System/chooseOrg.vue
View File

@@ -1,7 +1,7 @@
<template>
<!--机构树-->
<div>
<el-dialog title="先择组织机构" :append-to-body="true" :visible.sync="dlgShow" :before-close="handleClose" :close-on-click-modal="false" width="500px" custom-class="g-dialog">
<el-dialog title="选择组织机构" :append-to-body="true" :visible.sync="dlgShow" :before-close="handleClose" :close-on-click-modal="false" width="500px" custom-class="g-dialog">
<div>
<!--
<el-input placeholder="" v-model="orgName">