mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git
synced 2025-12-14 05:16:43 +08:00
Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into stat
This commit is contained in:
@@ -15,6 +15,14 @@
|
||||
</dl>
|
||||
</div>
|
||||
<div class="gui-box-right">
|
||||
<div id="container" style="z-index:99;" >
|
||||
<!-- 当轮播图等于一张时 -->
|
||||
<swiper :options="swiperOptiontwo" v-if="resonimgTow.length">
|
||||
<swiper-slide style="margin: 0 auto;" v-for="(item , idx ) in resonimgTow" :key="'a'+idx" class="swiper-slide games">
|
||||
<img class="banner-img" style=" margin: 0 auto;" :src=" fileBaseUrl + item.img" alt="">
|
||||
</swiper-slide>
|
||||
</swiper>
|
||||
</div>
|
||||
<div id="guideBox" style="z-index:99;">
|
||||
<swiper :options="swiperOption" ref="mySwiper" v-if="resonimg.length">
|
||||
<swiper-slide style="margin: 0 auto;" v-for="(item, idx ) in resonimg" :key="item.id" class="swiper-slide games">
|
||||
@@ -52,9 +60,14 @@
|
||||
guideCollection:false,// 兴趣采集
|
||||
guideList:[],
|
||||
resonimg:[],
|
||||
resonimgTow:[],
|
||||
swiperOptiontwo: {
|
||||
autoplay: false,
|
||||
// noSwiping: true,
|
||||
},
|
||||
swiperOption: {
|
||||
autoplay: {
|
||||
disableOnInteraction: false ,
|
||||
disableOnInteraction: false,
|
||||
delay: 2000,
|
||||
},
|
||||
speed: 2000, //切换速度,即slider自动滑动开始到结束的时间(单位ms)
|
||||
@@ -131,9 +144,15 @@
|
||||
|
||||
showImg(item) {
|
||||
this.resonimg = [];
|
||||
this.resonimgTow = [];
|
||||
if(item){
|
||||
this.description = item.description;
|
||||
this.resonimg = item.images;
|
||||
if(item.images.length > 1) {
|
||||
this.resonimg = item.images;
|
||||
} else {
|
||||
this.resonimgTow = item.images;
|
||||
}
|
||||
|
||||
}
|
||||
},
|
||||
notYet() {
|
||||
|
||||
@@ -270,12 +270,15 @@ export default {
|
||||
if(this.type==30){
|
||||
content='案例评论'
|
||||
}
|
||||
if(this.type==60 || this.type==10 || this.type==20 || this.type==30) {
|
||||
content=sendName+typeText+content
|
||||
// 评论点赞通知没有关联id,评论通知暂时关闭
|
||||
if(this.type==60 || this.type==10 || this.type==20 || this.type==30 || this.type == 6) {
|
||||
return;
|
||||
// content=sendName+typeText+content
|
||||
} else {
|
||||
content=sendName+typeText+content+'-'+title
|
||||
}
|
||||
|
||||
|
||||
let message={
|
||||
content,
|
||||
refId,
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
</div>
|
||||
</a>
|
||||
<div class="last-study-info">
|
||||
<div class="one-line-ellipsis" style="color: #333;font-size: 16px;">
|
||||
<div class="one-line-ellipsis" style="color: #333;font-size: 16px;" v-if="overlayShow">
|
||||
<router-link :to="'/course/studyindex?id='+lastStudy.courseId" >
|
||||
<img class="Recent" :src="`${webBaseUrl}/images/Recent.png`" alt="">
|
||||
最近学习: {{lastStudy.courseName}}
|
||||
|
||||
@@ -118,7 +118,6 @@
|
||||
return item.medalId == 3;
|
||||
})
|
||||
}
|
||||
console.log(data,'data');
|
||||
return data;
|
||||
}
|
||||
},
|
||||
|
||||
@@ -75,7 +75,7 @@
|
||||
<span class="portal-right-text" v-if="index==4" style="margin-right:20px">
|
||||
<img :src="`${webBaseUrl}/images/list05.png`" alt="">
|
||||
</span>
|
||||
<span class="portal-title-desc">{{ item.sysCreateUname }} <span class="orinfo-text">({{ item.orinfo }})</span> </span>
|
||||
<span class="portal-title-desc">{{ item.sysCreateUname }} <span class="orinfo-text">{{ item.orinfo }}</span> </span>
|
||||
</router-link>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
<span class="portal-right-text" v-if="index==4" style="margin-right:20px">
|
||||
<img :src="`${webBaseUrl}/images/list05.png`" alt="">
|
||||
</span>
|
||||
<span class="portal-title-desc ">{{ item.sysCreateUname }}<span class="orinfo-text">({{ item.orinfo }})</span> </span>
|
||||
<span class="portal-title-desc ">{{ item.sysCreateUname }}<span class="orinfo-text">{{ item.orinfo }}</span> </span>
|
||||
<!-- {{ item.sysCreateAid }} -->
|
||||
<!-- </router-link> -->
|
||||
</li>
|
||||
|
||||
@@ -248,7 +248,7 @@
|
||||
<span class="portal-right-text" v-if="index==4" style="margin-right:20px">
|
||||
<img :src="`${webBaseUrl}/images/list05.png`" alt="">
|
||||
</span>
|
||||
<span class="portal-title-desc">{{ item.sysCreateUname }} <span class="orinfo-text">({{ item.orinfo }})</span> </span>
|
||||
<span class="portal-title-desc">{{ item.sysCreateUname }} <span class="orinfo-text">{{ item.orinfo }}</span> </span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@@ -102,7 +102,7 @@
|
||||
<span class="portal-right-text" v-if="index==4" style="margin-right:20px">
|
||||
<img :src="`${webBaseUrl}/images/list05.png`" alt="">
|
||||
</span>
|
||||
<span class="portal-title-desc">{{ item.sysCreateUname }}<span class="orinfo-text">({{ item.orinfo }})</span> </span>
|
||||
<span class="portal-title-desc">{{ item.sysCreateUname }}<span class="orinfo-text">{{ item.orinfo }}</span> </span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
<div class="edit-footer">
|
||||
<el-radio-group v-if="editdata.openType == 9" v-model="editdata.openType"><el-radio :label="9">公开</el-radio><el-radio :label="1">私密</el-radio></el-radio-group>
|
||||
<el-radio-group v-if="editdata.openType == 1" v-model="editdata.openType"><el-radio :label="1">私密</el-radio></el-radio-group>
|
||||
<el-button style="margin-right:40%;box-shadow: 1px 8px 15px 1px rgba(56,125,247,0.18);" type="primary" @click="savedata">保存</el-button>
|
||||
<el-button style="margin-right:34%;box-shadow: 1px 8px 15px 1px rgba(56,125,247,0.18);" type="primary" @click="savedata">保存</el-button>
|
||||
<el-button @click="comeback">取消</el-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -146,7 +146,7 @@
|
||||
<div class="table-hear">
|
||||
<div style="margin-left:5px">排名</div>
|
||||
<div style="margin-left:5px">姓名</div>
|
||||
<div style="margin-left:34%;">学习时长:小时</div>
|
||||
<div style="margin-left:32%;">学习时长:小时</div>
|
||||
</div>
|
||||
<div>
|
||||
<div class="table-hear" style="margin-top:40px;border-bottom: 1px solid #ddd;padding-bottom:20px" v-for="(lan,idx) in learningDuration.list" :key="lan.id">
|
||||
|
||||
Reference in New Issue
Block a user