hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-10 03:16:42 +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-10-20 17:50:42 +08:00
parent dc85fe8175 d232f326da
commit ded8fa61a4
8 changed files with 90 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/assets/styles/portal-index.scss
View File

@@ -456,6 +456,15 @@
}
}
.gui-box-left{
width: 160px;
.left-title{
width: 160px;
}
dd{
margin-left: 10px;
}
}
.gui-box-right{//资源引导位宽度
width: 497px;
.swiper-slide{
@@ -729,6 +738,15 @@
}
}
.gui-box-left{
width: 160px;
.left-title{
width: 160px;
}
dd{
margin-left: 10px;
}
}
.gui-box-right{//资源引导位宽度
width: 658px;
.swiper-slide{
@@ -851,7 +869,6 @@
}
}
.boe-qa-index{
height: 276px;
margin-right: 36px;
padding: 30px;
@@ -898,6 +915,29 @@
}
}
}
.article-other-info{
div{
.el-avatar{
width: 32px;
height: 32px;
img{
width: 100% !important;
}
}
}
}
.item-author{
div{
.el-avatar{
width: 32px;
height: 32px;
img{
width: 100% !important;
}
}
}
}
.boe-article-index{
padding: 30px;
margin-right: 20px;
@@ -959,8 +999,8 @@
height: 34px;
}
.el-avatar{
width: 34px;
height: 34px;
width: 32px;
height: 32px;
img{
width: 100% !important;
}
@@ -986,14 +1026,23 @@
}
}
.gui-box-left{
width: 160px;
.left-title{
width: 160px;
}
dd{
margin-left: 10px;
}
}
.gui-box-right{//资源引导位宽度
width: 697px;
width: 742px;
.swiper-slide{
width: 576px;
height: 500px;
width: 500px;
height: 400px;
text-align: center;
.banner-img{
width: 576px;
width: 500px;
height: 100%;
}
}
@@ -1001,7 +1050,7 @@
.gui-box{
.close-right{
right:28px;
top:25px;
top:28px;
}
}
.medal-index{ // 勋章规则控制
@@ -1249,6 +1298,15 @@
}
}
.gui-box-left{
width: 190px;
.left-title{
width: 190px;
}
dd{
margin-left: 20px;
}
}
.gui-box-right{//资源引导位宽度
width: 897px;
.swiper-slide{

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

@@ -369,7 +369,7 @@ export default {
content: "编辑了笔记",//this.mynoteData.content,//事件的内容
objId: res.result.id,//关联的id
objType: "6",//关联的类型
objInfo: this.data.name +''+ this.score,
objInfo: this.data.name +'&'+ this.score,
aid: this.userInfo.aid, //当前登录人的id
aname: this.userInfo.name,//当前人的姓名
status: 1 //状态，直接写1

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

@@ -19,7 +19,7 @@
<h6 class="course-tit portal-title-tow">{{item.info.name || item.contentInfo}} <span class="score-info">{{toScore(item.info.score)}}分</span> </h6>
<p class="title-info">{{item.info.summary}}</p>
<div class="pro-line"> <div>当前进度：</div> <div style="width:200px"><el-progress :percentage="50"></el-progress></div></div>
<p class="portal-time">最新一次学习时间：2022-5-28 22:30:28</p>
<p class="portal-time">最新一次学习时间：{{item.eventTime}}</p>
</div>
<div style="width:150px">
<div class="follow-hide" style="text-align: right;" v-if="!isDynamic && personal && !item.hidden" @click="emitHide(item.id)">

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

@@ -9,7 +9,7 @@
<svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏
</span>
</p>
<h6 class="note-title-info follow-home-title pointer" @click="jumpDetail(item)">{{item.contentInfo}} <span style="color: #333333;font-weight: 400;font-size: 14px;margin-left: 20px;"></span> <span class="score-info" style="margin-left:22px">{{toScore(item.score)}}分</span>
<h6 class="note-title-info follow-home-title pointer" @click="jumpDetail(item)">{{processNoteTitles(item.contentInfo, 1)}} <span style="color: #333333;font-weight: 400;font-size: 14px;margin-left: 20px;"></span> <span class="score-info" style="margin-left:22px">{{processNoteTitles(item.contentInfo, 2)}}分</span>
<span class="follow-hide" style="float:right" v-if="!isDynamic && personal && !item.hidden" @click="emitHide(item.id)">
<svg-icon style="margin-right: 10px;font-size:22px;padding-top: 4px;" icon-class="eyes"></svg-icon>隐藏
</span>
@@ -62,6 +62,14 @@
mounted() {
},
methods:{
processNoteTitles(info,num) {
let data = info.split('&');
if(num ==1) {
return data[0];
} else {
return this.toScore(Number(data[1]));
}
},
jumpDetail(item){
this.$router.push('/course/detail?id='+item.info.courseId)
},

2
src/components/Portal/authorInfo.vue
View File

@@ -1,6 +1,6 @@
<template>
<div class="item-author">
<div style="width:28px;height:28px;" @click="toHome()">
<div @click="toHome()">
<!-- <el-avatar shape="square" size="small" :src="userAvatar" v-if="userAvatar"></el-avatar> -->
<!-- <div v-else class="uavatar"><span class="uavatar-text">{{avatarText}}</span></div> -->
<el-avatar shape="circle" size="small" :src="userAvatar" v-if="userAvatar"></el-avatar>

13
src/components/Portal/guideBox.vue
View File

@@ -74,10 +74,10 @@
created() {
let width = document.body.clientWidth;
console.log(width,'width');
if(width > 1920) {
if(width > 1921) {
this.clientWidth = '1088px';
}
if(width > 1681 && width < 1920) {
if(width > 1681 && width < 1921) {
this.clientWidth = '888px';
}
if(width > 1367 && width < 1680) {
@@ -181,12 +181,13 @@
}
.gui-box-left{
padding-top: 90px;
width: 190px;
// width: 190px;
// background: #387DF7;
background: url('../../../public/images/homeWu/guide-bg.png') no-repeat 101% / 101%;
background: url('../../../public/images/homeWu/guide-bg.png') no-repeat;
background-size: 100% 100%;
border-radius: 10px 0 0 10px;
.left-title{
width: 190px;
// width: 190px;
margin-bottom: 42px;
text-align: center;
color: #FFFFFF;
@@ -198,7 +199,7 @@
font-weight: 400;
color: #FFFFFF;
line-height: 22px;
margin-left: 20px;
// margin-left: 20px;
padding: 0 30px;
margin-bottom: 27px;
cursor: pointer;

13
src/views/Index.vue
View File

@@ -26,7 +26,7 @@
<p class="personal-info">{{cutOrgNamePath(userInfo.departFullName)}}</p>
<a href="uc/study/task">
<div class="personal-box">
<span>代办</span>
<span>待办</span>
<span>{{studyTaskCount? studyTaskCount:0 }} 个待处理 <img :src="`${webBaseUrl}/images/homeWu/Pending.png`" alt=""> </span>
<img class="personal-box-img" :src="`${webBaseUrl}/images/homeWu/agency.png`" alt="" srcset="">
</div>
@@ -194,7 +194,7 @@
<div class="case-inter">
<div class="case-inter-box">
<div class="case-inter-left">
<authorInfo :avatar="ca.authorInfo.avatar" :info="ca.authorInfo.orgInfo" :name="ca.authorInfo.name" :sex="ca.authorInfo.sex" :aid="userInfo.aid"></authorInfo>
<authorInfo :avatar="ca.authorInfo.avatar" :info="ca.authorInfo.orgInfo" :name="ca.authorInfo.name" :sex="ca.authorInfo.sex" :aid="userInfo.aid"></authorInfo>
</div>
<div class="interact-bar-index"
style="font-size: 12px;color: #6E7B84;display: flex;line-height: 30px;">
@@ -246,7 +246,7 @@
<article-image height="100%" width="100%" :article="articleList.first"></article-image>
</div>
<div class="article-info">
<div class="article-info-title " style="margin-top:10px">
<div class="article-info-title " style="margin-top:10px">
<div class="one-line-ellipsis">
<span
style="font-weight: 600;font-size: 16px;word-break:break-all;color: #00253E;">{{ articleList.first.title }}</span>
@@ -267,7 +267,7 @@
</div>
<div class="article-other-info" style="margin-top:17px">
<div>
<author-img :avatar="articleList.first.authorInfo.avatar" :aid="articleList.first.authorInfo.aid"
<author-img height="32px" width="32px" :avatar="articleList.first.authorInfo.avatar" :aid="articleList.first.authorInfo.aid"
:sex="articleList.first.authorInfo.sex"></author-img>
</div>
<div style="margin-top:5px">
@@ -295,7 +295,7 @@
</a>
<div class="article-bottom">
<div style="display:flex">
<author-img :avatar="article.authorInfo.avatar" :aid="article.authorInfo.aid"
<author-img height="32px" width="32px" :avatar="article.authorInfo.avatar" :aid="article.authorInfo.aid"
:sex="article.authorInfo.sex"></author-img>
<span
style="color: #6E7B84;font-size: 14px;margin:6px 13px 0 10px;">{{article.authorInfo.name}}</span>
@@ -1836,10 +1836,7 @@
}
.article-other-info {
// height: 40px;
// margin-top: 10px;
display: flex;
// justify-content: space-between;
}
}

7
src/views/homepage/page.vue
View File

@@ -342,11 +342,6 @@
apiNote.ids(ids).then(res=>{
if(res.status == 200) {
list.forEach((item, index) => {
let score = item.contentInfo.substr(item.contentInfo.length -1,1);
if(Number(score) > 0) {
item.score = score;
}
res.result.some(con => {
if (con.id == item.contentId) {
item.info = con;
@@ -355,8 +350,6 @@
return false;
}
});
item.contentInfo = item.contentInfo.slice(0,item.contentInfo.length -1);
});
}
})