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

Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into stat

Browse Source
This commit is contained in:
daihh
2022-11-22 19:01:47 +08:00
parent 642f1d317f c1789553f2
commit 40865765b7
14 changed files with 72 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/Article/shareItems.vue
View File

@@ -14,7 +14,11 @@
<div class="share-time">{{ item.time }}</div>
</div>
<div class="coures-content">
<span>【文章】</span>{{item.title}}
<div style="width: 100%;">【文章】{{item.title}}</div>
<div style="color: #999999;font-size: 12px;font-weight: normal; cursor: pointer;width: 50px;" v-if="!item.isRead&&type=='myShare'" @click.stop="deleteshares(item)">
<svg-icon icon-class="withdraw" style="margin-right: 5px;font-size: 14px;" ></svg-icon>
撤回
</div>
</div>
</div>
<!-- 旧版 -->
@@ -130,12 +134,15 @@ export default {
width: 100%;
padding: 30px 0;
border-bottom:1px solid #e9e9e9 ;
.coures-content{
margin-top: 20px;
font-size: 16px;
color: #333333;
font-weight: 600;
word-break:break-all;
display: flex;
justify-content: space-between;
span{
font-size: 16px;
margin-left: -9px;
@@ -143,10 +150,12 @@ export default {
}
.coures-head{
display: flex;
.share-name{
font-size: 14px;
color: #666666;
margin-right: 17px;
cursor: pointer;
}
.share-time{
font-size: 14px;

7
src/components/Case/caseItems.vue
View File

@@ -14,7 +14,10 @@
<div class="share-time">{{ item.time }}</div>
</div>
<div class="coures-content">
<span>【案例】</span>{{item.title}}
<div style="width: 100%;">【案例】{{item.title}}</div>
<div v-if="!item.isRead&&type=='myShare'" @click.stop="deleteshares(item)" style="color: #999999;font-size: 12px;font-weight: normal;width: 50px;">
<svg-icon icon-class="withdraw" style="margin-right: 5px;font-size: 14px;" ></svg-icon>
撤回</div>
</div>
</div>
@@ -122,6 +125,8 @@ export default {
color: #333333;
font-weight: 600;
word-break:break-all;
display: flex;
justify-content: space-between;
span{
font-size: 16px;
margin-left: -9px;

6
src/components/Course/myNote.vue
View File

@@ -161,7 +161,6 @@ export default {
//$this.controlHeight=h-
this.listHeight=val-95;
this.inputHeight=(val-220);
this.inputRows=parseInt(this.inputHeight/30);
if(this.inputRows>20){
this.inputRows=20;
@@ -492,6 +491,8 @@ export default {
.newcote-text {
// margin-top: 24px;
word-break: break-all;
word-wrap: break-word;
font-size: 14px;
color: #333333;
height: 100%;
@@ -560,15 +561,12 @@ export default {
.mynote-tab {
width: 180px;
margin-top: 17px;
display: flex;
div {
font-size: 16px;
color: #666666;
flex: 1;
}
.noteactive span {
font-weight: 600;
color: #333333;

7
src/components/Course/shareItem.vue
View File

@@ -14,7 +14,10 @@
<div class="share-time">{{ item.time }}</div>
</div>
<div class="coures-content">
<span>【课程】</span>{{item.title}}
<div style="width: 100%;">【课程】{{item.title}}</div>
<div v-if="!item.isRead&&type=='myShare'" @click.stop="deleteshares(item)" style="color: #999999;font-size: 12px;font-weight: normal;width: 50px;">
<svg-icon icon-class="withdraw" style="margin-right: 5px;font-size: 14px;" ></svg-icon>
撤回</div>
</div>
</div>
@@ -167,6 +170,8 @@ export default {
color: #333333;
font-weight: 600;
word-break:break-all;
display: flex;
justify-content: space-between;
span{
font-size: 16px;
margin-left: -9px;

1
src/components/Follow/button.vue
View File

@@ -143,6 +143,7 @@
<style scoped>
.follow-btn{
cursor: pointer;
/* margin-top: 18px;
height: 40px;
width: 140px; */

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

@@ -100,12 +100,11 @@
if(!data.contentId){
return;
}
console.log(data.info,'data.info')
if(!data.info.enabled || data.info.deleted){
this.$message.warning("此课程已停用或已删除");
return;
}
this.$router.push({ path: '/course/detail?id=', query: { id: data.contentId } });
this.$router.push({ path: '/course/studyindex?id=', query: { id: data.contentId } });
}
}
}

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

@@ -119,6 +119,7 @@
}
},
mounted() {
this.pageId = this.$xpage.getHomeId(this.$route);
this.sex = this.userInfo.sex;
// 判断路由是进入的学员默认页面就重置setCurIdentity
@@ -131,6 +132,7 @@
if(this.pageId !== this.userInfo.aid) {
this.followHas();
}
},
methods:{
cancelFollow() {
@@ -350,6 +352,7 @@
}
}
.content-one-info{
cursor: pointer;
display: inline-block;
line-height: 30px;
width: 80px;

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

@@ -15,7 +15,7 @@
<div class="comment" v-for="(com,comIdx) in list" :key="com.id">
<div class="comment-top">
<div class="comment-author">
<authorInfo :avatar="com.avatar" :name="com.name" :sex="com.sex" :info="com.orgInfo" :sign="com.sign"></authorInfo>
<authorInfo :avatar="com.avatar" :name="com.name" :sex="com.sex" :info="com.orgInfo" :sign="com.sign" :aid="com.sysCreateAid"></authorInfo>
</div>
</div>
<div class="comment-body" >
@@ -47,7 +47,7 @@
<div class="comment" v-for="(reply,replyIdx) in com.replyList" :key="reply.id" v-if="com.showAll || replyIdx<3" :class="replyIdx===com.replyList.length-1 ? 'comment-last' : ''">
<div class="comment-top">
<div class="comment-author">
<authorInfo :avatar="reply.avatar" :name="reply.sysCreateBy" :sex="reply.sex" :info="reply.orgInfo" :sign="reply.sign"></authorInfo>
<authorInfo :avatar="reply.avatar" :aid="reply.sysCreateAid" :name="reply.sysCreateBy" :sex="reply.sex" :info="reply.orgInfo" :sign="reply.sign"></authorInfo>
<span style="margin-left: 10px;color: #8590A6;font-size:14px; ">
<!-- <svg-icon style="font-size: 10px;margin-right: 0;" icon-class="triangle"></svg-icon> -->
<span>回复了</span>

7
src/components/Qa/shareList.vue
View File

@@ -14,7 +14,10 @@
<div class="share-time">{{ item.time }}</div>
</div>
<div class="coures-content">
<span>【问答】</span>{{item.title}}
<div style="width: 100%;">【问答】{{item.title}}</div>
<div v-if="!item.isRead&&type=='myShare'" @click.stop="deleteshares(item)" style="color: #999999;font-size: 12px;font-weight: normal;width: 50px;">
<svg-icon icon-class="withdraw" style="margin-right: 5px;font-size: 14px;" ></svg-icon>
撤回</div>
</div>
</div>
<!-- 旧版 -->
@@ -137,6 +140,8 @@ export default {
color: #333333;
font-weight: 600;
word-break:break-all;
display: flex;
justify-content: space-between;
span{
font-size: 16px;
margin-left: -9px;

3
src/components/UcHeader/Index.vue
View File

@@ -128,6 +128,9 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js";
//this.orgInfo=cutFullName(testName,1);
this.orgInfo=cutFullName(this.userInfo.departFullName,1);
this.loadUserStat();
this.$bus.$on('u-Currency',(num)=>{
this.statData.uvalue = num;
})
},
methods:{