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

This commit is contained in:
dongruihua
2022-11-08 11:24:23 +08:00
20 changed files with 217 additions and 73 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 101 KiB

View File

@@ -1311,6 +1311,15 @@ export default {
if (this.sysTypeList.length > 2) {
this.courseInfo.sysType3 = this.sysTypeList[2]; //三级的id
}
//受众的处理
let crowds=[];
this.courseCrowds.forEach(item=>{
crowds.push({
groupId:item.key,
groupName:item.value
})
});
let saveTeachers = [];
this.teacherValues.forEach(item => {
@@ -1318,7 +1327,8 @@ export default {
});
let postData = {
course: this.courseInfo,
teachers: saveTeachers
teachers: saveTeachers,
crowds:crowds
};
this.btnLoading = true;
let $this = this;

View File

@@ -9,7 +9,7 @@
<div class="newcote-content" v-if="notetab == 1">
<div class="newcote-time" v-if="play_Time != 0">
<img :src="`${webBaseUrl}/images/coteplay.png`" />
{{formatSeconds(play_Time)}}1
{{formatSeconds(play_Time)}}
<img :src="`${webBaseUrl}/images/cotedetel.png`" @click="play_Time = 0" />
</div>
<div class="newcote-text">

View File

@@ -0,0 +1,59 @@
<template>
<div>
<el-dialog width="520px" :close-on-press-escape="false" :close-on-click-modal="false" class="medalbox" :visible.sync="showGonggao" :append-to-body="true" >
<div class="jinian-medal-img" :style="`background: url(${webBaseUrl}/images/gonggao/dlg_bg.png) no-repeat;`">
<div style="text-align: left;padding:180px 70px 100px 60px; width: 500px;">
<div style="color: #333333;font-size: 26px;padding: 30px 0px;text-align: center;font-weight: 700;">最新公告</div>
<div style="color: #333333;font-size: 18px;height: 150px;">
为了保障信息安全为您提供更优质的服务学习平台计划在2022年11月9日0点-11月9日早6点进行服务器升级
在此期间您无法登录学习给您带来不便还请谅解感谢您的理解与支持
</div>
</div>
</div>
</el-dialog>
</div>
</template>
<script>
export default{
data() {
return {
showGonggao:false
};
},
mounted() {
let now=new Date();
let min=new Date(2022,10,9,0,0,0);
let max=new Date(2022,10,9,6,0,0);
//console.log(now,min,max);
//console.log(now.getTime(),min.getTime(),max.getTime());
if(now.getTime()>min.getTime() && now.getTime()<max.getTime()){
//console.log('open')
this.showGonggao=true;
}
}
}
</script>
<style scoped lang="scss">
.jinian-medal-img{
text-align: center;
padding-top: 10px;
}
.medalbox {
background: transparent !important;
::v-deep .el-dialog{
background: transparent !important;
box-shadow:none !important;
.el-dialog__header{
display: none !important;
}
.el-dialog__body{
// width: 320px !important;
// height: 420px !important;
background: transparent !important;
}
}
}
</style>

View File

@@ -15,7 +15,7 @@
<course-image width="254px" height="144px" :course="item.info"></course-image>
</div>
<div class="data-cen pointer" @click="jumpDetail(item)">
<h6 class="course-tit portal-title-tow">{{item.info.courseName || item.contentInfo}}
<h6 class="course-tit portal-title-tow">{{item.info.courseName || item.contentInfo}}
<span class="sysType-name" v-if="item.info.sysType1 !='' && item.info.sysType1 != 0">{{sysTypeName(item.info.sysType1)}}</span>
<span class="sysType-name" v-if="item.info.sysType2 !='' && item.info.sysType2 != 0">{{sysTypeName(item.info.sysType2)}}</span>
<span class="sysType-name" v-if="item.info.sysType3 !='' && item.info.sysType3 != 0">{{sysTypeName(item.info.sysType3)}}</span>
@@ -96,8 +96,9 @@
},
jumpDetail(data) {
if(!data.contentId){
return;
return;
}
this.$router.push({ path: '/course/detail?id=', query: { id: data.contentId } });
}
}

View File

@@ -262,7 +262,7 @@ import apiUser from "@/api/system/user.js";
})
this.followMe.list = res.result.list;
//console.log(this.mypageList,'this.mypageList');
this.getUserData(res.result.list);
this.getUserData(res.result.list,2);
}else{
console.log('加载关注我数据错误:'+res.message);
}
@@ -280,26 +280,26 @@ import apiUser from "@/api/system/user.js";
item.userFollow.authorInfo = { aid: "",name: "",orgInfo: "",avatar: "",sex: null ,sign:''}
})
this.follow.list = res.result.list;
this.getUserData(res.result.list);
this.getUserData(res.result.list, 1);
}
})
},
getUserData(list) {
// num 判断是哪个接口
getUserData(list,num) {
let ids = [];
if(this.active == 2) {
if(num == 2) {
ids = list.map(item=> item.userFollow.aid);
} else {
ids = list.map(item=> item.userFollow.followId);
}
apiUser.getByIds(ids).then(res => {
if (res.status == 200) {
list.forEach((item, index) => {
res.result.some(author => {
if (this.active == 1 && author.aid == item.userFollow.followId) {
if (num == 1 && author.aid == item.userFollow.followId) {
item.userFollow.authorInfo = author;
return true;
} else if(this.active == 2 && author.aid == item.userFollow.aid){
} else if(num == 2 && author.aid == item.userFollow.aid){
item.userFollow.authorInfo = author;
return true;
} else {

View File

@@ -44,14 +44,14 @@
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="top-nav" :style="{color:textColor}" :class="current == 'follow' ? activeNav : ''">
<router-link to="/follow">我的关注
<div :class="current == 'follow' ? 'nav-bottbor' : ''"></div>
</router-link>
</div>
</div>
</div>
<div class="portal-top-right">
@@ -124,11 +124,13 @@
</div>
</div>
</div>
<gonggao></gonggao>
</div>
</template>
<script>
import { mapGetters, mapActions } from 'vuex';
import apiMessage from '@/api/system/message.js';
import gonggao from '@/components/Gonggao.vue';
import apiBoeCourse from '@/api/boe/course.js';
import {userAvatarText} from "@/utils/tools.js";
export default {
@@ -151,7 +153,7 @@ export default {
}
},
// components:{InterestCollection,GuideBox}, // 注释兴趣爱好弹窗显示
components:{gonggao},
computed: {
...mapGetters(['userInfo', 'userMsg','identity']),
@@ -167,6 +169,7 @@ export default {
},
data() {
return {
showGonggao:true,
fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
findType: '1',
keyword: '',

View File

@@ -93,14 +93,14 @@
<svg-icon icon-class="interlocution"></svg-icon>
<span slot="title">问答管理</span>
</el-menu-item>
<el-menu-item v-show="curIdentity == 3" index="008">
<el-menu-item v-show="curIdentity == 3">
<template slot="title">
<svg-icon icon-class="administrator" style="font-size:17px"></svg-icon>
<span><a href="/resource/index.html" target="_blank" style="color:#303133;">旧版管理员界面</a></span>
</template>
<!-- <i class="el-icon-menu"></i> -->
</el-menu-item>
<el-menu-item v-show="curIdentity == 3" index="009">
<el-menu-item v-show="curIdentity == 3">
<template slot="title">
<svg-icon icon-class="management" style="font-size:16px"></svg-icon>
<span><a href="https://u.boe.com/train/manager/index.html" style="color:#303133;" target="_blank">业务支援读书会管理</a></span>

View File

@@ -118,7 +118,7 @@
</map>
</div>
</el-dialog>
<gonggao></gonggao>
</div>
</template>
@@ -128,8 +128,9 @@ import desk from '@/api/console.js';
import Cookies from 'vue-cookies';
import InterestCollection from '@/components/Portal/interestCollection.vue'
import GuideBox from '@/components/Portal/guideBox.vue'
import gonggao from '@/components/Gonggao.vue';
export default {
components:{InterestCollection,GuideBox},
components:{InterestCollection,GuideBox,gonggao},
data() {
return {
isTiao:false,

View File

@@ -174,7 +174,7 @@
<img :src="getPic(cindex)" alt="">
</span>
<span class="portal-title-desc index-one-line-ellipsis title-line-ellipsis" style="font-size: 14px;color: #04243C;">{{ item.name }}</span>
<div class="list-active">
<div class="list-content">
<div class="list-img">
@@ -440,14 +440,15 @@
<span style="position: absolute; right:60px;top:60px;cursor: pointer;">
<img @click="closeJinian" :src="`${webBaseUrl}/images/close.png`" width="26px" height="26px" alt="">
</span>
<div style="text-align: center;"><img :src="`${webBaseUrl}/images/login_medal.png`" width="206px" height="269px" alt=""></div>
<div style="text-align: center;padding-right: 10px;"><img :src="`${webBaseUrl}/images/login_medal.png`" width="206px" height="269px" alt=""></div>
<div style="text-align: left;padding:20px 60px 100px 60px">
<div class="jntext1">感谢有 一路相伴</div>
<div class="jntext1">感谢有 一路相伴</div>
<div class="jntext2">勋章领取条件:</div>
<div class="jntext3">2022年11月4日-11月19日登录过平台学习的校友</div>
</div>
</div>
</el-dialog>
</div>
</template>
@@ -1148,18 +1149,18 @@
}
.medalbox {
background: transparent !important;
::v-deep .el-dialog{
background: transparent !important;
box-shadow:none !important;
.el-dialog__header{
display: none !important;
}
.el-dialog__body{
// width: 320px !important;
// height: 420px !important;
::v-deep .el-dialog{
background: transparent !important;
}
}
box-shadow:none !important;
.el-dialog__header{
display: none !important;
}
.el-dialog__body{
// width: 320px !important;
// height: 420px !important;
background: transparent !important;
}
}
}

View File

@@ -27,7 +27,7 @@
</div>
</div>
<!-- 回复框 -->
<div class="replys-input" style="padding-left: 60px;margin:10px 0" v-if="item.isReplys">
<div class="replys-input" style="padding-left: 60px;margin:10px 0" v-if="item.isReplys">
<el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="replysContent" maxlength="200" show-word-limit></el-input>
<el-button class="lea-btn" type="primary" @click="addReplys()">回复</el-button>
</div>
@@ -45,7 +45,7 @@
</div>
</div>
</div>
</li>
</ul>
<div style="text-align: center; margin-top:57px;" v-show="count > 0">
@@ -110,6 +110,14 @@
this.$router.go(-1);
},
delReplySon(item,index) { //子级的删除手动删掉,调用保存接口
//修改后,替换为下面的情况
// apiGuestbook.del(item.id).then(res=>{
// if(res.status==200){
// item.replysList.splice(index,1);
// }else{
// this.$message.error('删除失败'+res.message);
// }
// });
item.replysList.splice(index,1);
let replysData = {
id:item.id,
@@ -134,7 +142,7 @@
}
})
}).catch(() => {
this.$message({type: 'info', message: '已取消删除'});
this.$message({type: 'info', message: '已取消删除'});
});
},
isReplys(item,idx) {
@@ -168,12 +176,15 @@
if(res.status == 200) {
this.count = res.result.count;
res.result.list.forEach(item=>{
item.replysList = [];
if(!item.replysList){
item.replysList = [];
}
item.isReplys = false;
item.authorInfo = { aid: "",name: "",orgInfo: "",avatar: "",sex: null,sign:'' }
if(item.replys != '') {
if(item.replys != '' && item.replys.length>10) {
item.replysList = JSON.parse(item.replys);
}
}
//if()
})
this.leavingList = res.result.list;
this.getUserData(res.result.list);
@@ -252,7 +263,7 @@
}
}
</script>
<style lang="scss" scoped>
.backbut{
position: absolute;
@@ -332,4 +343,3 @@
}
}
</style>

View File

@@ -6,7 +6,7 @@
<i style="color: #333333" class="el-icon-search"></i>
</div> -->
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane name="">
<el-tab-pane name="" v-loading="loading">
<span slot="label"><svg-icon icon-class="home-dynamic" style="font-size: 30px;"></svg-icon> <span class="tabs-info">动态</span></span>
<template v-for="item in allPageList">
<course-list v-if="item.contentType == 1" :list="[item]" :isDynamic="true" :personal="personal" @hideIndex="dynamicHide"></course-list>
@@ -17,27 +17,27 @@
<article-list v-if="item.contentType == 2" :list="[item]" :isDynamic="true" :personal="personal" @hideIndex="dynamicHide"></article-list>
</template>
</el-tab-pane>
<el-tab-pane name="1">
<el-tab-pane name="1" v-loading="loading1">
<span slot="label"><svg-icon icon-class="home-course" style="font-size: 30px;"></svg-icon><span class="tabs-info">课程</span></span>
<course-list :list="cousrePageList" :isDynamic="false" :personal="personal" @hideIndex="dynamicHide"></course-list>
</el-tab-pane>
<el-tab-pane name="3">
<el-tab-pane name="3" v-loading="loading3">
<span slot="label"><svg-icon icon-class="home-case" style="font-size: 30px;"></svg-icon><span class="tabs-info">案例</span></span>
<case-list :list="casePageList" :isDynamic="false" :personal="personal" @hideIndex="dynamicHide"></case-list>
</el-tab-pane>
<el-tab-pane name="6">
<el-tab-pane name="6" v-loading="loading6">
<span slot="label"><svg-icon icon-class="home-note" style="font-size: 30px;"></svg-icon><span class="tabs-info">笔记</span></span>
<note-list :list="notePageList" :isDynamic="false" :personal="personal" @hideIndex="dynamicHide"></note-list>
</el-tab-pane>
<el-tab-pane name="4">
<el-tab-pane name="4" v-loading="loading4">
<span slot="label"><svg-icon icon-class="home-qa" style="font-size: 30px;"></svg-icon><span class="tabs-info">提问</span></span>
<put-list :list="qaPageList" :isDynamic="false" :personal="personal" @hideIndex="dynamicHide"></put-list>
</el-tab-pane>
<el-tab-pane name="5">
<el-tab-pane name="5" v-loading="loading5">
<span slot="label"><svg-icon icon-class="home-answer" style="font-size: 30px;"></svg-icon><span class="tabs-info">回答</span></span>
<answer-list :list="answerPageList" :isDynamic="false" :personal="personal" @hideIndex="dynamicHide"></answer-list>
</el-tab-pane>
<el-tab-pane name="2">
<el-tab-pane name="2" v-loading="loading2">
<span slot="label"><svg-icon icon-class="home-article" style="font-size: 30px;"></svg-icon><span class="tabs-info">文章</span></span>
<article-list :list="articlePageList" :isDynamic="false" :personal="personal" @hideIndex="dynamicHide"></article-list>
</el-tab-pane>
@@ -97,6 +97,13 @@
},
data(){
return{
loading:false,
loading1:false,
loading2:false,
loading3:false,
loading4:false,
loading5:false,
loading6:false,
intTabIndex:-1,//初始化显示哪个tab,71我关注的人72关注我的人
page:{
pageIndex:1,
@@ -193,13 +200,37 @@
aid:this.pageId, //指定用户的动态,
hidden:this.pageId == this.userInfo.aid?'':false,//是否隐藏,不指定,查询全部
}
if(this.activeName == '1') {
this.loading1 = true;
} else if(this.activeName == '2') {
this.loading2 = true;
} else if(this.activeName == '3') {
this.loading3 = true;
} else if(this.activeName == '4') {
this.loading4 = true;
} else if(this.activeName == '5') {
this.loading5 = true;
} else if(this.activeName == '6') {
this.loading6 = true;
} else {
this.loading = true;
}
// this.loading = true;
apiStat.userDynamicList(data).then(res=>{
this.loading = false;
this.loading1 = false;
this.loading2 = false;
this.loading3 = false;
this.loading4 = false;
this.loading5 = false;
this.loading6 = false;
if(res.status == 200) {
this.page.count = res.result.count;
let ids = res.result.list.map(item=>item.contentId);
const noReapetIds = [...new Set(ids)];
res.result.list.forEach(item=>{
item.info = {};
item.deleted=false;
item.authorInfo = {
aid: "",
name: "",
@@ -472,6 +503,7 @@
res.result.some(con => {
if (con.courseId == item.contentId) {
item.info = con;
item.deleted=con.deleted;
return true;
} else {
return false;

View File

@@ -17,7 +17,7 @@
</div>
</div>
<div v-if="activeName=='first'" class="medal-index">
<img style="width:143px;height:161px" :src="`${webBaseUrl}/images/login_medal.png`" alt="">
<img style="width:122px;height:161px" :src="`${webBaseUrl}/images/login_medal.png`" alt="">
<p class="index-title">上线纪念</p>
<!-- <p class="index-text">您已超过{{item.exceed}}</p> -->
<el-button class="btn" style="margin-top:48px" type="primary" @click="showLoginMedal = true">查看详情</el-button>
@@ -47,7 +47,7 @@
<el-table :data="rules" style="width: 100%;height:200px;overflow-y: auto;">
<el-table-column prop="name" angin="center" label="勋章" width="80">
<template slot-scope="scope">
<img style="width:40px;height:40px" :src="`${webBaseUrl}/images/medal.png`" alt="" srcset="">
<img style="width:40px;height:40px" :src="baseUrl+medal.medalIcon" alt="" srcset="">
<!-- <medal-img class="table-medal" style="width:46px;height:52px" :item="medal"></medal-img> -->
</template>
</el-table-column>
@@ -68,9 +68,9 @@
<span style="position: absolute; right:60px;top:60px;cursor: pointer;">
<img @click="showLoginMedal = false" :src="`${webBaseUrl}/images/close.png`" width="26px" height="26px" alt="">
</span>
<div style="text-align: center;"><img :src="`${webBaseUrl}/images/login_medal.png`" width="206px" height="269px" alt=""></div>
<div style="text-align: center;padding-right: 10px;"><img :src="`${webBaseUrl}/images/login_medal.png`" width="206px" height="269px" alt=""></div>
<div style="text-align: left;padding:20px 60px 100px 60px">
<div class="jntext1">感谢有 一路相伴</div>
<div class="jntext1">感谢有 一路相伴</div>
<div class="jntext2">勋章领取条件:</div>
<div class="jntext3">2022年11月4日-11月19日登录过平台学习的校友</div>
</div>

View File

@@ -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>

View File

@@ -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>

View File

@@ -13,7 +13,7 @@
</div>
-->
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane name="" label="全部">
<el-tab-pane name="" label="全部" v-loading="loading">
<template v-for="item in allPageList">
<course-list v-if="item.contentType == 1" :list="[item]" :isDynamic="true" :personal="true" :isFollow="true" @hideIndex="dynamicHide"></course-list>
<case-list v-if="item.contentType == 3" :list="[item]" :isDynamic="true" :personal="true" :isFollow="true" @hideIndex="dynamicHide"></case-list>
@@ -22,27 +22,27 @@
<answer-list v-if="item.contentType == 5" :list="[item]" :isDynamic="true" :personal="true" :isFollow="true" @hideIndex="dynamicHide"></answer-list>
<article-list v-if="item.contentType == 2" :list="[item]" :isDynamic="true" :personal="true" :isFollow="true" @hideIndex="dynamicHide"></article-list>
</template>
<div v-if="allPageList.length==0 && loading==1" class="home-no-list">
<div v-if="allPageList.length==0 && !loading" class="home-no-list">
<img class="img" :src="`${webBaseUrl}/images/homeWu/no-course.png`" alt="" srcset="">
<p class="text">暂时没有动态</p>
</div>
</el-tab-pane>
<el-tab-pane name="1" label="课程">
<el-tab-pane name="1" label="课程" v-loading="loading1">
<course-list :list="cousrePageList" :isDynamic="true" :personal="true" :isFollow="true" @hideIndex="dynamicHide"></course-list>
</el-tab-pane>
<el-tab-pane name="6" label="笔记">
<el-tab-pane name="6" label="笔记" v-loading="loading6">
<note-list :list="notePageList" :isDynamic="true" :personal="true" :isFollow="true" @hideIndex="dynamicHide"></note-list>
</el-tab-pane>
<el-tab-pane name="3" label="案例">
<el-tab-pane name="3" label="案例" v-loading="loading3">
<case-list :list="casePageList" :isDynamic="true" :personal="true" :isFollow="true" @hideIndex="dynamicHide"></case-list>
</el-tab-pane>
<el-tab-pane name="2" label="文章">
<el-tab-pane name="2" label="文章" v-loading="loading2">
<article-list :list="articlePageList" :isDynamic="true" :personal="true" :isFollow="true" @hideIndex="dynamicHide"></article-list>
</el-tab-pane>
<el-tab-pane name="4" label="提问">
<el-tab-pane name="4" label="提问" v-loading="loading4">
<put-list :list="qaPageList" :isDynamic="true" :personal="true" :isFollow="true" @hideIndex="dynamicHide"></put-list>
</el-tab-pane>
<el-tab-pane name="5" label="回答">
<el-tab-pane name="5" label="回答" v-loading="loading5">
<answer-list :list="answerPageList" :isDynamic="true" :personal="true" :isFollow="true" @hideIndex="dynamicHide"></answer-list>
</el-tab-pane>
@@ -101,8 +101,15 @@
components:{portalHeader,UcHeader,CaseList,CourseList,NoteList,PutList,AnswerList,ArticleList,FollowList,BookList},
data(){
return{
loading:false,
loading1:false,
loading2:false,
loading3:false,
loading4:false,
loading5:false,
loading6:false,
input:'',
loading:0,//加载中
// loading:0,//加载中
activeName:'first',
page:{
pageIndex:1,
@@ -174,8 +181,29 @@
contentType:this.activeName == 0? '':this.activeName,//内容类型
aids:this.followIds // 数组
}
if(this.activeName == '1') {
this.loading1 = true;
} else if(this.activeName == '2') {
this.loading2 = true;
} else if(this.activeName == '3') {
this.loading3 = true;
} else if(this.activeName == '4') {
this.loading4 = true;
} else if(this.activeName == '5') {
this.loading5 = true;
} else if(this.activeName == '6') {
this.loading6 = true;
} else {
this.loading = true;
}
apiStat.userDynamicfollows(data).then(res=>{
this.loading=1;
this.loading = false;
this.loading1 = false;
this.loading2 = false;
this.loading3 = false;
this.loading4 = false;
this.loading5 = false;
this.loading6 = false;
if(res.status == 200) {
this.page.count = res.result.count;
if(res.result.count==0){

View File

@@ -228,7 +228,6 @@
提问题
</div>
<div class="qa-ranking">
<div class="portal-ranking ranking-bg">
<p class="ranking-title">贡献榜</p>
<ul class="ranking-data">
@@ -248,7 +247,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>

View File

@@ -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>

View File

@@ -68,8 +68,8 @@
</el-dropdown>
</div>
<span @click.stop="jumpRouter(item)">
<el-button style="margin-top:30px" v-if="item.progress==0" type="primary" size="small">开始学习</el-button>
<el-button style="margin-top:30px" v-if="item.progress>0 && item.progress<100" type="primary" size="small">继续学习</el-button>
<!-- <el-button style="margin-top:30px" v-if="item.progress==0" type="primary" size="small">开始学习</el-button> -->
<el-button style="margin-top:30px" v-if="item.progress<100" type="primary" size="small">继续学习</el-button>
<el-button style="margin-top:30px" v-if="item.progress==100" type="primary" size="small">回顾</el-button>
</span>
</div>

View File

@@ -200,13 +200,13 @@ export default {
this.timer = null;
this.$router.go(-1);
}
} else {
this.isShowTip = '当前网络异常,内容已离线保存,请尝试连接网络后重新自动上传!';
}
}).catch(()=>{
this.isShowTip = '当前网络异常,内容已离线保存,请尝试连接网络后重新自动上传!';
setTimeout(()=>{
this.isShowTip = '';
},10000 * 2)
sessionStorage.setItem('isShowTip',this.editdata.content);
}
sessionStorage.setItem('isShowTip',this.editdata.content);
})
}
},