mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git
synced 2025-12-08 10:26:43 +08:00
Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into stat
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
font-weight: 600;
|
||||
color: #333333;
|
||||
line-height: 36px;
|
||||
margin-right: 44px;
|
||||
// margin-right: 44px;
|
||||
}
|
||||
.uc-center-one-title{
|
||||
font-size: 18px;
|
||||
@@ -22,6 +22,10 @@
|
||||
font-size: 14px;
|
||||
color: #666666;
|
||||
}
|
||||
.uc-center-summary{
|
||||
font-size: 14px;
|
||||
color: #333333;
|
||||
}
|
||||
.uc-center-icon{
|
||||
font-size: 12px;
|
||||
color: #999999;
|
||||
@@ -62,3 +66,12 @@
|
||||
.el-message-box__btns button:nth-child(2) {
|
||||
margin-left:20px;
|
||||
}
|
||||
.search-btn{
|
||||
background: #2C68FF;
|
||||
}
|
||||
.uc-input{
|
||||
width: 210px;
|
||||
}
|
||||
.uc-select{
|
||||
width: 125px;
|
||||
}
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<template>
|
||||
<div class="item-author">
|
||||
<div style="width:40px;height:40px;" @click="toHome()">
|
||||
<div :style="`width:${width};height:${height};`" @click="toHome()">
|
||||
<el-avatar shape="circle" :src="userAvatar" v-if="userAvatar"></el-avatar>
|
||||
<div v-else class="uavatar">
|
||||
<div v-if="sex == null" style="border-radius: 50%;width: 40px;height: 40px;"></div>
|
||||
<div v-if="sex == null" style="border-radius: 50%;" :style="`width:${width};height:${height};`"></div>
|
||||
<div v-else>
|
||||
<div v-if="sex === 1 "><img src="../../../public/images/Avatarman.png" alt=""></div>
|
||||
<div v-else><img src="../../../public/images/Avatarwoman.png" alt=""></div>
|
||||
@@ -90,8 +90,8 @@
|
||||
}
|
||||
.uavatar{
|
||||
// border: 1px solid #73adfe;
|
||||
// width: 28px;
|
||||
// height: 28px;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
// background: #d9e9ff;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
@@ -103,8 +103,8 @@
|
||||
}
|
||||
img{
|
||||
border-radius: 50%;
|
||||
width: 28px;
|
||||
height: 28px;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,34 +3,34 @@
|
||||
<div>
|
||||
<div class="float-tools">
|
||||
|
||||
<div class="float-tool-icon" @click="toNeedCourse" v-if="identity>1">
|
||||
<div class="float-tool-icon" style="margin-bottom:2px" @click="toNeedCourse" v-if="identity>1">
|
||||
<!-- <svg-icon class-name="icon" icon-class="lessons"></svg-icon> -->
|
||||
<div class="float-img"><img :src="`${webBaseUrl}/images/explo.png`" alt=""></div>
|
||||
<div class="float-img" title="做课程"><img :src="`${webBaseUrl}/images/explo.png`" alt=""></div>
|
||||
<!-- <span>做课程</span> -->
|
||||
</div>
|
||||
<div class="float-tool-icon" @click="$refs.addQuestion.askQuestionDialog = true">
|
||||
<!-- <svg-icon class-name="icon" icon-class="problem"></svg-icon> -->
|
||||
<div class="float-img"><img :src="`${webBaseUrl}/images/issue.png`" alt=""></div>
|
||||
<div class="float-img" title="提问题"><img :src="`${webBaseUrl}/images/issue.png`" alt=""></div>
|
||||
<!-- <span>提问题</span> -->
|
||||
</div>
|
||||
<div class="float-tool-icon" @click="toAddArticle()">
|
||||
<!-- <svg-icon class-name="icon" icon-class="essay"></svg-icon> -->
|
||||
<div class="float-img"> <img :src="`${webBaseUrl}/images/essay.png`" alt=""></div>
|
||||
<div class="float-img" title="写文章"> <img :src="`${webBaseUrl}/images/essay.png`" alt=""></div>
|
||||
<!-- <span>写文章</span> -->
|
||||
</div>
|
||||
<div class="float-tool-icon" @click="showFeedback()">
|
||||
<!-- <svg-icon class-name="icon" icon-class="agree"></svg-icon> -->
|
||||
<div class="float-img"> <img :src="`${webBaseUrl}/images/opinion.png`" alt=""></div>
|
||||
<div class="float-img" title="提意见"> <img :src="`${webBaseUrl}/images/opinion.png`" alt=""></div>
|
||||
<!-- <span>提意见</span> -->
|
||||
</div>
|
||||
<div class="float-tool-icon" @click="infoShow=true">
|
||||
<!-- <svg-icon class-name="icon" icon-class="server"></svg-icon> -->
|
||||
<div class="float-img"> <img :src="`${webBaseUrl}/images/contact.png`" alt=""></div>
|
||||
<div class="float-img" title="联系我们"> <img :src="`${webBaseUrl}/images/contact.png`" alt=""></div>
|
||||
<!-- <span>联系我们</span> -->
|
||||
</div>
|
||||
<div class="float-tool-icon" @click="backtop">
|
||||
<div class="float-tool-icon" style="margin-top:2px" @click="backtop">
|
||||
<!-- <svg-icon class-name="icon" icon-class="top"></svg-icon> -->
|
||||
<div class="float-img"> <img :src="`${webBaseUrl}/images/back.png`" alt=""></div>
|
||||
<div class="float-img" title="返回顶部"> <img :src="`${webBaseUrl}/images/back.png`" alt=""></div>
|
||||
<!-- <span>返回顶部</span> -->
|
||||
</div>
|
||||
</div>
|
||||
@@ -236,20 +236,22 @@ export default {
|
||||
<style scoped lang="scss">
|
||||
.float-tools{
|
||||
position: fixed;
|
||||
background: white;
|
||||
// background: white;
|
||||
// box-shadow:0px 0px 10px #999;
|
||||
border-radius: 2px;
|
||||
border: 1px solid #f0f0f0;
|
||||
right: 10px;
|
||||
bottom: 40px;
|
||||
padding:0 8px;
|
||||
border-radius: 4px;
|
||||
// border: 1px solid #f0f0f0;
|
||||
right: 24px;
|
||||
bottom: 126px;
|
||||
// padding:0 8px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
z-index: 999;
|
||||
.float-tool-icon{
|
||||
background: white;
|
||||
padding:8px;
|
||||
cursor: pointer;
|
||||
padding: 8px 0;
|
||||
// padding: 8px 0;
|
||||
// border-bottom: 1px solid #999;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
@@ -3,15 +3,18 @@
|
||||
<div class="article-list" v-for="(item, idx) in items" :key="idx" @click="jumpRouter(item)">
|
||||
<div class="article-info">
|
||||
<div class="article-info-title">
|
||||
<span v-if="item.isResolve ==true" class="qa-basic qa-solve">【已解决】</span>
|
||||
<span v-if="item.isResolve == false" class="qa-basic qa-unSolve">【待解决】</span>
|
||||
<span class="title one-line-ellipsis" v-html="$keywordActiveShow(item.title,keyWord)"></span>
|
||||
|
||||
<!-- <span v-if="item.isResolve ==true" class="qa-basic qa-solve">【已解决】</span>
|
||||
<span v-if="item.isResolve == false" class="qa-basic qa-unSolve">【待解决】</span> -->
|
||||
<span class="uc-center-one-title one-line-ellipsis" v-html="$keywordActiveShow(item.title,keyWord)"></span>
|
||||
<div class="button-cla" style="margin-right:70px">
|
||||
<el-button class="edit" @click.stop="editItem(item)" type="text" size="mini"><svg-icon style="margin-right: 6px;font-size: 14px;" icon-class="edit-icon"></svg-icon>编辑</el-button>
|
||||
<el-button class="del" @click.stop="delItem(item)" type="text" size="mini"><svg-icon style="margin-right: 6px;font-size: 14px;" icon-class="del-icon"></svg-icon>删除</el-button>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 提问内容 -->
|
||||
<div class="article-info-summary ">
|
||||
<!-- <div class="summary-content two-line-ellipsis" style="word-wrap: break-word;">{{ item.content }}</div> -->
|
||||
<div class="summary-content two-line-ellipsis " v-html="$keywordActiveShow(item.content,keyWord)"></div>
|
||||
<div class="summary-content two-line-ellipsis " v-html="$keywordActiveShow(item.content,keyWord)"></div>
|
||||
<!-- <div class="article-info-tools"> -->
|
||||
<!-- <div class="article-info-tools-source">来源:{{ item.course }}</div> -->
|
||||
<div class="two-line-ellipsis" style="margin-bottom: 10px;" v-if="item.bestAnswer !== ''">
|
||||
@@ -22,17 +25,15 @@
|
||||
<div style="position: relative; font-size: 15px;display: flex;justify-content: flex-start;align-items: center;">
|
||||
<!-- <div style="font-size:15px;margin:8px 0">提问人:{{ item.sysCreateBy }}</div> -->
|
||||
|
||||
<span style="color: #7b7b7b;margin-right: 8px;">
|
||||
<span style="font-size: 14px;color: #999999;margin-right: 8px;">
|
||||
|
||||
提问时间: {{ item.sysCreateTime }}
|
||||
</span>
|
||||
<span v-if="item.status==0||item.status==2" style="color: red">{{statusText(item.status)}}</span>
|
||||
<!-- <div class="article-info-tools-btns"> -->
|
||||
<!-- <interactBar :data="item" :type="0" class="test" :answers="true" :comments="false" :shares="false" :views="false"></interactBar> -->
|
||||
<div class="button-cla">
|
||||
<el-button class="edit" @click.stop="editItem(item)" type="text" icon="el-icon-edit" size="mini" >编辑</el-button>
|
||||
<el-button class="del" @click.stop="delItem(item)" type="text" icon="el-icon-delete" size="mini" >删除</el-button>
|
||||
</div>
|
||||
|
||||
<div class="button-cla"><interactBar nodeWidth="60px" :readonly="true" :type="4" :data="item" :shares="true" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar></div>
|
||||
</div>
|
||||
<!-- <el-link icon="el-icon-chat-line-round" class="article-info-tools-btn" >回答57</el-link>
|
||||
<el-link icon="el-icon-s-promotion" class="article-info-tools-btn" >分享57</el-link>
|
||||
@@ -79,9 +80,10 @@
|
||||
// import interactBar from '@/components/Portal/interactBar';
|
||||
import imageUpload from '@/components/ImageUpload/index.vue';
|
||||
import apiQa from '@/api/modules/qa.js'
|
||||
import interactBar from '@/components/Portal/interactBar.vue';
|
||||
export default {
|
||||
name: 'articleItems',
|
||||
components: { imageUpload },
|
||||
components: { imageUpload,interactBar },
|
||||
props: {
|
||||
items: {
|
||||
//name,
|
||||
@@ -225,8 +227,9 @@ export default {
|
||||
font-size: 14px;
|
||||
}
|
||||
.artlist{
|
||||
padding-left: 23px;
|
||||
padding-left: 16px;
|
||||
padding-right: 32px;
|
||||
// margin-top: 30px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.one-line-ellipsis{
|
||||
@@ -273,8 +276,8 @@ export default {
|
||||
}
|
||||
.article-list {
|
||||
margin: 5px 0;
|
||||
border-bottom: 1px solid #E8E8E8;
|
||||
padding: 10px 0;
|
||||
border-bottom: 1px solid rgba($color: #999999, $alpha:0.2);
|
||||
padding: 33px 0;
|
||||
}
|
||||
|
||||
.article-info {
|
||||
@@ -285,7 +288,7 @@ export default {
|
||||
display: flex;
|
||||
justify-content: flex-start;
|
||||
align-items: center;
|
||||
margin-left: -14px;
|
||||
// margin-left: -14px;
|
||||
.title{
|
||||
margin-left: 8px;
|
||||
flex-shrink: 10000;
|
||||
@@ -298,8 +301,9 @@ export default {
|
||||
.article-info-summary {
|
||||
margin-left: px;
|
||||
// height:70px;
|
||||
color: #666;
|
||||
color: #333;
|
||||
.summary-content{
|
||||
font-size: 14px;
|
||||
margin:10px 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -268,7 +268,7 @@
|
||||
</el-menu-item>
|
||||
<el-menu-item index="/qa/myreplys">
|
||||
<!-- <i class="el-icon-menu"></i> -->
|
||||
<span slot="title" class="myqa">我回答的</span>
|
||||
<span slot="title" class="textl">我回答的</span>
|
||||
</el-menu-item>
|
||||
</el-submenu>
|
||||
<el-menu-item index="/article/mylist" v-show="curIdentity == 1">
|
||||
|
||||
16
src/icons/svg/del-icon.svg
Normal file
16
src/icons/svg/del-icon.svg
Normal file
@@ -0,0 +1,16 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<title>编组 17备份</title>
|
||||
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="13.我的提问" transform="translate(-1734.000000, -445.000000)">
|
||||
<g id="编组-17备份" transform="translate(1734.000000, 445.000000)">
|
||||
<path d="M6.02941176,0 L7.26470588,0 C8.09313301,-1.52179594e-16 8.76470588,0.671572875 8.76470588,1.5 L8.76470588,2 L8.76470588,2 L4.52941176,2 L4.52941176,1.5 C4.52941176,0.671572875 5.20098464,1.52179594e-16 6.02941176,0 Z" id="矩形" fill="#B3BDC4"></path>
|
||||
<rect id="矩形" fill="#B3BDC4" x="1.70588235" y="3.33333333" width="10.5882353" height="10.6666667" rx="1"></rect>
|
||||
<rect id="矩形" stroke="#B3BDC4" fill="#B3BDC4" x="1.5" y="1.83333333" width="11" height="1" rx="0.5"></rect>
|
||||
<line x1="7" y1="5.45305864" x2="7" y2="11.7528444" id="路径-8" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round"></line>
|
||||
<line x1="4.17647059" y1="6.78639197" x2="4.17647059" y2="10.3333333" id="路径-8备份" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round"></line>
|
||||
<line x1="9.82352941" y1="6.78639197" x2="9.82352941" y2="10.3333333" id="路径-8备份-2" stroke="#FFFFFF" stroke-linecap="round" stroke-linejoin="round"></line>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.5 KiB |
13
src/icons/svg/edit-icon.svg
Normal file
13
src/icons/svg/edit-icon.svg
Normal file
@@ -0,0 +1,13 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg width="15px" height="14px" viewBox="0 0 15 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<title>编组 29</title>
|
||||
<g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
|
||||
<g id="13.我的提问" transform="translate(-1627.000000, -445.000000)">
|
||||
<g id="编组-29" transform="translate(1627.096757, 445.000000)">
|
||||
<polygon id="路径-43" fill="#B3BDC4" points="0 13.7254019 0 10.6458899 7.31104864 3.41424666 10.0545279 5.62816355 3.18899894 13.2703675"></polygon>
|
||||
<polygon id="路径-44" fill="#B3BDC4" points="7.87799024 2.47399486 9.4834953 0.725401855 13 3.41424666 11.0908145 5.10319344"></polygon>
|
||||
<line x1="6.55379409" y1="12.9181356" x2="14" y2="12.9181356" id="路径-45" stroke="#B3BDC4" stroke-width="2"></line>
|
||||
</g>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 960 B |
@@ -32,7 +32,9 @@
|
||||
<p class="ach-title">可能感兴趣</p>
|
||||
<ul>
|
||||
<li class="ava-info" v-for="ava in interestedList" :key="ava.aid">
|
||||
<img :src="baseUrl + ava.avatar" />
|
||||
<!-- <img :src="baseUrl + ava.avatar" /> -->
|
||||
<author-img width="48px" height="48px" :avatar="ava.avatar" :aid="ava.aid" :sex="ava.sex"></author-img>
|
||||
<!-- <medal-img style="width:48px;height:48px" :item="ava"></medal-img> -->
|
||||
<div class="ava-text">
|
||||
<p style="color: #333333;">{{ava.name}}</p>
|
||||
<p style="color: #666666;">{{ava.sign}}</p>
|
||||
@@ -53,10 +55,11 @@
|
||||
import apiUserhobby from '@/api/phase2/userhobby.js';
|
||||
import apiUser from "@/api/system/user.js";
|
||||
import apiFollow from "@/api/phase2/userfollow.js";
|
||||
import authorImg from '@/components/Portal/authorImg.vue';
|
||||
import { mapGetters } from 'vuex';
|
||||
|
||||
export default{
|
||||
components:{top,UcHeader,MedalImg},
|
||||
components:{top,UcHeader,MedalImg,authorImg},
|
||||
data(){
|
||||
return{
|
||||
baseUrl:process.env.VUE_APP_FILE_BASE_URL,
|
||||
@@ -86,13 +89,14 @@
|
||||
})
|
||||
},
|
||||
userhobbyInfo() {
|
||||
apiUserhobby.info(this.pageId).then(res=>{
|
||||
apiUserhobby.list(this.pageId).then(res=>{
|
||||
if(res.status == 200) {
|
||||
let ids = res.result.map(item=>item.aid);
|
||||
const noReapetIds = [...new Set(ids)];
|
||||
apiUser.getByIds(noReapetIds).then(res => {
|
||||
if (res.status == 200) {
|
||||
this.interestedList = res.result;
|
||||
console.log(this.interestedList,'interestedList');
|
||||
} else {
|
||||
this.$message.error(res.message);
|
||||
}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
<template>
|
||||
<div class="home-page-left">
|
||||
<div class="book-input">
|
||||
<!-- <div class="book-input">
|
||||
<span>分享书籍</span>
|
||||
<el-input style="width:130px" v-model="input" placeholder="请输入内容"></el-input>
|
||||
<i style="color: #333333" class="el-icon-search"></i>
|
||||
</div>
|
||||
</div> -->
|
||||
<el-tabs v-model="activeName" @tab-click="handleClick">
|
||||
<el-tab-pane name="">
|
||||
<span slot="label"><svg-icon icon-class="home-dynamic" style="font-size: 30px;"></svg-icon> <span class="tabs-info">动态</span></span>
|
||||
@@ -46,10 +46,10 @@
|
||||
<span slot="label"><svg-icon icon-class="home-follow" style="font-size: 30px;"></svg-icon><span class="tabs-info">关注</span></span>
|
||||
<follow-list ref="followList"></follow-list>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane name="8">
|
||||
<!-- <el-tab-pane name="8">
|
||||
<span slot="label"><svg-icon icon-class="home-book" style="font-size: 30px;"></svg-icon><span class="tabs-info">书籍</span></span>
|
||||
<book-list></book-list>
|
||||
</el-tab-pane>
|
||||
</el-tab-pane> -->
|
||||
</el-tabs>
|
||||
<div style="text-align: center; margin-top:57px;" v-show="page.count > 0">
|
||||
<el-pagination
|
||||
|
||||
@@ -16,16 +16,17 @@
|
||||
<div>
|
||||
<div style="display: flex;justify-content:space-around;padding: 12px 22px 10px 18px;">
|
||||
<!--<div style="padding: 0px 5px;"><el-cascader clearable v-model="params.type" :options="typeList"></el-cascader></div>-->
|
||||
<div class="uc-center-page" style="margin-right:30px">我的提问</div>
|
||||
<div style="padding: 0px 5px;">
|
||||
<el-select v-model="queryObj.isResolve" style="width: 110px;" clearable placeholder="状态">
|
||||
<el-select v-model="queryObj.isResolve" class="uc-select" clearable placeholder="状态">
|
||||
<el-option label="全部" value=""></el-option>
|
||||
<el-option label="待解决" :value="false"></el-option>
|
||||
<el-option label="已解决" :value="true"></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
<div style="padding: 0px 5px;"><el-input clearable placeholder="搜索问题" v-model="queryObj.keyWord"></el-input></div>
|
||||
<div style="padding: 0px 5px;"><el-button icon="el-icon-search" @click="getList" type="primary" >搜索</el-button></div>
|
||||
<div style="padding-left:5px"><el-button type="primary" icon="el-icon-refresh-right" @click="reset">重置</el-button></div>
|
||||
<div style="padding: 0px 6px;"><el-input class="uc-input" clearable placeholder="搜索问题" v-model="queryObj.keyWord"></el-input></div>
|
||||
<div style="padding: 0px 6px;"><el-button icon="el-icon-search" class="search-btn" @click="getList" type="primary" >搜索</el-button></div>
|
||||
<div style="padding-left:5px"><el-button type="primary" class="search-btn" icon="el-icon-refresh-right" @click="reset">重置</el-button></div>
|
||||
</div>
|
||||
</div>
|
||||
<div style="padding: 12px 32px 10px 32px;"><el-button type="primary" style="width: 89px;height: 38px;" icon="el-icon-plus" @click="$refs.addQuestion.askQuestionDialog = true" size="small">提问题</el-button></div>
|
||||
@@ -46,9 +47,10 @@
|
||||
></el-pagination>
|
||||
</div>
|
||||
<div v-else>
|
||||
<div v-if="qaList.length == 0">
|
||||
<div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
|
||||
<div v-else class="zan-wu">暂无数据</div>
|
||||
<div v-if="qaList.length == 0" class="home-no-list">
|
||||
<img class="img" style="width:360px;height:226px" src="/images/homeWu/no-madel.png" alt="" srcset="">
|
||||
<p class="text" v-if="isSearh" style="color: #333333;margin-top:50px;font-size: 14px">没有查询到相关内容</p>
|
||||
<p class="text" v-else style="color: #333333;margin-top:50px;font-size: 14px">你还没有提问问题哦~</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -2,9 +2,10 @@
|
||||
<div>
|
||||
<div style="display: flex;justify-content:space-between; padding: 12px 32px 10px 22px;">
|
||||
<div style="display: flex;justify-content: flex-start;">
|
||||
<div>
|
||||
<el-select v-model="courseType" clearable placeholder="类型">
|
||||
<el-option label="全部" value='1'></el-option>
|
||||
<div class="uc-center-page">我的报名</div>
|
||||
<div style="margin-left:32px">
|
||||
<el-select v-model="courseType" class="uc-select" clearable placeholder="类型">
|
||||
<el-option label="全部类型" value='1'></el-option>
|
||||
<!-- <el-option label="微课" :value="10"></el-option> -->
|
||||
<el-option label="录播课" :value="20"></el-option>
|
||||
<!-- <el-option label="在线课" value="online-course"></el-option> -->
|
||||
@@ -14,41 +15,57 @@
|
||||
<el-option label="学习项目" :value="40"></el-option>
|
||||
</el-select>
|
||||
</div>
|
||||
<el-select style="margin-left:10px" v-model="status" clearable placeholder="学习进度">
|
||||
<el-option label="全部" value='0'></el-option>
|
||||
<el-select style="margin-left:12px" class="uc-select" v-model="status" clearable placeholder="学习进度">
|
||||
<el-option label="所有进度" value='0'></el-option>
|
||||
<el-option label="未开始" :value="1"></el-option>
|
||||
<el-option label="进行中" :value="2"></el-option>
|
||||
<el-option label="已完成" :value="9"></el-option>
|
||||
<!-- <el-option label="已停用" :value="3"></el-option> -->
|
||||
</el-select>
|
||||
<div style="padding-left: 10px;"><el-input v-model="params.courseName" clearable placeholder="搜索名称"></el-input></div>
|
||||
<div style="padding-left: 10px;"><el-button type="primary" icon="el-icon-search" @click="searchData()">搜索</el-button></div>
|
||||
<div style="padding-left: 10px"><el-button type="primary" icon="el-icon-refresh-right" @click="reset()">重置</el-button></div>
|
||||
<div style="padding-left: 12px;"><el-input class="uc-input" v-model="params.courseName" clearable placeholder="搜索名称"></el-input></div>
|
||||
<div style="padding-left: 12px;"><el-button type="primary" class="search-btn" icon="el-icon-search" @click="searchData()">搜索</el-button></div>
|
||||
<div style="padding-left: 12px"><el-button type="primary" class="search-btn" icon="el-icon-refresh-right" @click="reset()">重置</el-button></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uc-list" v-loading="loading">
|
||||
<div class="uc-course" v-for="(item,idx) in pageChange" @click="jumpRouter(item)" :key="idx">
|
||||
<div class="uc-course-img" style="width: 212px;height:119px">
|
||||
<div class="uc-course-img" style="width: 260px;height:144px">
|
||||
<course-image :course="item"></course-image>
|
||||
<div class="uc-type">
|
||||
<span v-if="item.courseType==10">录播</span>
|
||||
<span v-if="item.courseType==20">录播</span>
|
||||
<span v-if="item.courseType==30">线下课</span>
|
||||
<span v-if="item.courseType==40">学习项目</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uc-course-info">
|
||||
<div class="uc-course-name" style="cursor: pointer;">
|
||||
<div>
|
||||
<span v-if="item.courseType==10" class="uc-course-type2">录播</span>
|
||||
<span v-if="item.courseType==20" class="uc-course-type2">录播</span>
|
||||
<span v-if="item.courseType==30" class="uc-course-type3">线下课</span>
|
||||
<span v-if="item.courseType==40" class="uc-course-type4">学习项目</span>
|
||||
</div>
|
||||
|
||||
<div style="flex:1;">
|
||||
<a v-html="$keywordActiveShow(item.courseName,params.courseName)" class="uc-title two-line-ellipsis"></a>
|
||||
</div>
|
||||
</div>
|
||||
<div style="width: 80%;margin-top:38px"><el-progress :percentage="item.progress"></el-progress></div>
|
||||
<div class="uc-course-text">报名时间:{{item.addTime}}</div>
|
||||
<div style="padding-top:6px" class="uc-course-text"><i class="el-icon-time" style="margin-right:4px"></i>报名时间:{{item.addTime}}</div>
|
||||
<div style="width: 80%;margin-top: 20px;display: flex;">
|
||||
<div style="color: #333333;font-size: 14px;">当前进度:</div>
|
||||
<div style="width:170px;padding-top: 5px;">
|
||||
<el-progress :percentage="item.progress" color="#FFA050"></el-progress>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uc-course-btns">
|
||||
<div style="text-align: right;">
|
||||
<el-button class="del" @click.stop="delItem(item,idx)" type="text" icon="el-icon-delete" size="mini" title="删除"></el-button>
|
||||
<!-- <el-button class="del" @click.stop="delItem(item,idx)" type="text" icon="el-icon-delete" size="mini" title="删除"></el-button> -->
|
||||
<el-dropdown>
|
||||
<span class="el-dropdown-link">
|
||||
<svg-icon style="margin-right: 0;font-size:26px;" icon-class="spot"></svg-icon>
|
||||
</span>
|
||||
<el-dropdown-menu slot="dropdown" class="dropdown-box">
|
||||
<el-dropdown-item command="a">
|
||||
<el-button class="del" @click.stop="delItem(item,idx)" type="text" icon="el-icon-delete" size="mini" title="删除"></el-button>
|
||||
</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</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>
|
||||
@@ -73,9 +90,12 @@
|
||||
<span v-if="dataList.length==0">正在加载数据...</span>
|
||||
<span v-else>查询中...</span>
|
||||
</div>
|
||||
<div v-else >
|
||||
<span v-if="dataList.length==0">当前列表无数据</span>
|
||||
<span v-else-if="couresList.length==0" >未找到您要搜索的内容</span>
|
||||
<div v-else class="home-no-list">
|
||||
<!-- <span v-if="dataList.length==0">当前列表无数据</span>
|
||||
<span v-else-if="couresList.length==0" >未找到您要搜索的内容</span> -->
|
||||
<img v-if="dataList.length==0 || couresList.length==0" class="img" style="width:360px;height:226px" src="/images/homeWu/no-madel.png" alt="" srcset="">
|
||||
<p v-if="dataList.length==0" class="text" style="color: #333333;margin-top:50px;font-size: 14px">你还没有报名课程哦~</p>
|
||||
<p v-else-if="couresList.length==0" class="text" style="color: #333333;margin-top:50px;font-size: 14px">未找到您要搜索的内容</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -151,7 +171,7 @@ computed: {
|
||||
if(item.isOld){
|
||||
apiBoeCourse.delLearning(item.kid).then(res=>{
|
||||
if(res.status==200){
|
||||
this.$message({ type: 'success', message: '删除成功!' });
|
||||
this.$message({ type: 'success',center: true, message: '课程删除成功!' });
|
||||
this.couresList.forEach((ic,index)=>{
|
||||
if(item.kid == ic.kid) {
|
||||
this.couresList.splice(index,1);
|
||||
@@ -413,6 +433,7 @@ computed: {
|
||||
}
|
||||
.uc-list{
|
||||
padding-left: 22px;
|
||||
margin-top: 30px;
|
||||
}
|
||||
.uc-course-type1{
|
||||
width: 58px;
|
||||
@@ -467,22 +488,38 @@ computed: {
|
||||
.uc-course {
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
border-bottom: 1px solid #E8E8E8;
|
||||
// border-bottom: 1px solid #E8E8E8;
|
||||
margin-right: 32px;
|
||||
padding: 20px 0px 15px 0px ;
|
||||
padding: 20px 0px 25px 0px ;
|
||||
cursor: pointer;
|
||||
.uc-course-img {
|
||||
width: 200px;
|
||||
img {
|
||||
width: 200px;
|
||||
border: 1px solid #f4f4f5;
|
||||
position: relative;
|
||||
width: 260px;
|
||||
::v-deep img {
|
||||
// width: 200px;
|
||||
// border: 1px solid #f4f4f5;
|
||||
border-radius: 8px;
|
||||
}
|
||||
.uc-type{
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right:0;
|
||||
width: 60px;
|
||||
height: 24px;
|
||||
line-height: 24px;
|
||||
text-align: center;
|
||||
background: #F99000;
|
||||
border-radius: 2px 4px 2px 16px;
|
||||
color: #fff;
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
}
|
||||
}
|
||||
.uc-course-info {
|
||||
flex: 1;
|
||||
margin-top: -3px;
|
||||
line-height: 28px;
|
||||
padding: 0px 10px;
|
||||
padding: 0px 25px;
|
||||
.uc-course-name {
|
||||
display: flex;
|
||||
span{
|
||||
@@ -491,7 +528,7 @@ computed: {
|
||||
margin-right: 8px;
|
||||
}
|
||||
font-size: 18px;
|
||||
font-weight: 700;
|
||||
font-weight: 600;
|
||||
color: #333;
|
||||
}
|
||||
.uc-course-text {
|
||||
|
||||
@@ -339,7 +339,7 @@
|
||||
tarValue = data[i].value;
|
||||
}
|
||||
}
|
||||
let p =Math.round((tarValue/total)*100)+'%';
|
||||
let p =total!= 0?Math.round((tarValue/total)*100)+'%':0 +'%';
|
||||
return ` ${p} ${name}`
|
||||
}
|
||||
},
|
||||
|
||||
@@ -2,12 +2,13 @@
|
||||
<!-- <Remark>
|
||||
1.测评界面实例图<br/>
|
||||
</Remark> -->
|
||||
<div style="padding:10px 0px 12px 2px">
|
||||
<div style="padding:10px 0px 12px 22px">
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-input clearable placeholder="搜索名称" v-model="keyword"></el-input>
|
||||
<el-button type="primary" icon="el-icon-search" @click="getData()">搜索</el-button>
|
||||
<el-button type="primary" icon="el-icon-refresh-right" @click="reset">重置</el-button>
|
||||
<span class="uc-center-page" style="margin-right:90px">我的测评</span>
|
||||
<el-input clearable placeholder="搜索名称" class="uc-input" v-model="keyword"></el-input>
|
||||
<el-button type="primary" icon="el-icon-search" class="search-btn" @click="getData()">搜索</el-button>
|
||||
<el-button type="primary" icon="el-icon-refresh-right" class="search-btn" @click="reset">重置</el-button>
|
||||
</el-col>
|
||||
<el-col :span="8" v-for="(item,index) in testList" :key="index">
|
||||
<!-- @click="textdetail(item)" -->
|
||||
@@ -41,13 +42,12 @@
|
||||
</el-pagination>
|
||||
</div>
|
||||
<div v-else>
|
||||
<div v-if="testList.length == 0">
|
||||
<div v-if="isSearh" class="zan-wu">没有查询到相关内容</div>
|
||||
<div v-else class="zan-wu">暂无数据</div>
|
||||
</div>
|
||||
<div v-if="testList.length == 0" class="home-no-list">
|
||||
<img class="img" style="width:360px;height:226px" src="/images/homeWu/no-madel.png" alt="" srcset="">
|
||||
<p class="text" style="color: #333333;margin-top:50px;font-size: 14px">暂无课程,请优先学习其它课程吧~</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import apiBoeCourse from '@/api/boe/course.js';
|
||||
|
||||
Reference in New Issue
Block a user