Commit 35c1303d by wangyui2025

Merge branch 'wangrui' into '20210819'

add

See merge request vue-project/liangXing/frontEnd!7
parents 95c0cf89 22bfddf5
......@@ -4,10 +4,10 @@
<div class="faculty">
<div class="teachernum">
<div class="teacherTitle">师资力量</div>
<pie-chart :option="eduConfig.option"/>
<pie-chart :option="eduConfig.option" />
</div>
<div class="staff">
<bar-chart :option="staffConfig.option"/>
<bar-chart :option="staffConfig.option" />
</div>
</div>
<div class="course">
......@@ -21,7 +21,77 @@
<span>出勤率</span>
</p>
<div class="line">
<bar-chart :option="lineConfig.option"/>
<bar-chart :option="lineConfig.option" />
</div>
</div>
<div class="right-bottom">
<title-line :con="'交流会/专题'"></title-line>
<div class="topic">
<div class="left">
<p class="sub-title">****交流会</p>
<div class="swiper-content">
<swiper :options="swiperOption" class="swipers">
<swiper-slide
v-for="(item, index) in topicList"
:key="index"
class="swiper-item"
>
<img :src="item.img" alt="" />
</swiper-slide>
</swiper>
<div class="pagination-items">
<div
class="swiper-pagination change"
slot="pagination"
></div>
</div>
</div>
</div>
<div class="right">
<div class="num">
<span><count-to :endVal="110" /></span>
<span><count-to :endVal="120" /></span>
<span><count-to :endVal="270" /></span>
<span><count-to :endVal="4000" /></span>
</div>
<div class="text">
<span class="item"
>对接交流活动 <count-to :endVal="110" />余场</span
>
<span class="item"
>发布大企业创新需求<count-to
:endVal="120"
/>余个</span
>
<span class="item"
>促成项目合作<count-to :endVal="270" />余个</span
>
<span class="item"
>服务创新创业企业<count-to
:endVal="4000"
/>余家次</span
>
</div>
</div>
</div>
<div class="topic-show">
<p class="sub-title">专题展示</p>
<div class="topic-item">
<div class="item">
<img
src="../../../static/images/index/topic-bg4.png"
alt=""
/>
<p>连续两届成功“创客中国”上海赛区总决赛</p>
</div>
<div class="item">
<img
src="../../../static/images/index/topic-bg4.png"
alt=""
/>
<p>连续两届成功“创客中国”上海赛区总决赛</p>
</div>
</div>
</div>
</div>
</div>
......@@ -29,22 +99,24 @@
<script>
import TitleLine from '@/components/TitleLine'
import { swiper, swiperSlide } from 'vue-awesome-swiper'
import 'swiper/dist/css/swiper.css'
import BarChart from '@/components/echarts/BarChart.vue'
import PieChart from '@/components/echarts/PieChart.vue'
export default {
name: 'Right',
components: {
TitleLine,
BarChart,
PieChart
PieChart,
swiper,
swiperSlide
},
data () {
return {
eduConfig: {},
edu: [
{value: 168, name: '教师数'}
{ value: 168, name: '教师数' }
],
staffConfig: {},
// 师资数据
......@@ -76,16 +148,41 @@ export default {
genderPercent: {
male: '32%',
female: '68%'
},
swiperOption: {
mousewheel: true,
centeredSlides: true,
centeredSlidesBounds: true,
autoplay: {
delay: 3000,
disableOnInteraction: false // 手动切换之后继续自动轮播
},
loop: true,
pagination: {
el: '.swiper-pagination',
clickable: true,
type: 'bullets'
}
}
},
topicList: [
{
img: '../../../static/images/index/topic-bg1.png'
},
{
img: '../../../static/images/index/topic-bg1.png'
},
{
img: '../../../static/images/index/topic-bg1.png'
}
]
}
},
mounted () {
this.getstaff()
this.getEdu()
this.getline()
},
methods: {
getline () {
this.lineConfig = {
......@@ -255,59 +352,60 @@ export default {
}
</script>
<style lang="less" scoped>
.managePlatform-right {
.faculty{
<style lang="less">
.managePlatform-right {
height: 500px;
.faculty {
margin-top: 7px;
height: 156px;
display: flex;
.teachernum{
.teachernum {
width: 134px;
height: 100%;
.teacherTitle{
.teacherTitle {
font-size: 18px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #FFFFFF;
color: #ffffff;
}
}
.staff{
.staff {
margin-top: 47px;
width: 340px;
}
}
.course{
.course {
height: 110px;
.coursetitle{
.coursetitle {
display: flex;
justify-content: space-between;
.left{
.left {
font-size: 18px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #FFFFFF;
color: #ffffff;
}
.seemore{
.seemore {
width: 94px;
cursor: pointer;
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #18D1C6;
background: url('./../../../static/images/index/查看更多.png') no-repeat right;
color: #18d1c6;
background: url('./../../../static/images/index/查看更多.png')
no-repeat right;
}
}
.percent{
.percent {
margin-top: 10px;
display: flex;
justify-content: space-between;
span{
span {
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #6DCDFF;
color: #6dcdff;
}
}
.line {
......@@ -322,17 +420,176 @@ export default {
&.male {
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
background-color: #00BEFF;
background-color: #00beff;
opacity: 0.5;
}
&.female {
border-top-right-radius: 4px;
border-bottom-right-radius: 4px;
background-color: #00DE7D;
background-color: #00de7d;
opacity: 0.5;
}
}
}
}
.right-bottom {
.topic {
margin-top: 19px;
width: 482px;
height: 158px;
display: flex;
background: url('../../../static/images/index/comm-bg.png')
no-repeat center;
.left {
margin-left: 11px;
margin-right: 21px;
.sub-title {
font-size: 18px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #ffffff;
line-height: 28px;
}
.swiper-content {
width: 190px;
height: 107px;
.swipers {
width: 100%;
height: 100%;
.swiper-item {
width: 100%;
height: 100%;
img {
width: 190px;
height: 107px;
}
}
}
.pagination-items {
width: 60px;
margin: 0 auto;
.change.swiper-pagination.swiper-pagination-clickable {
width: 60px;
height: 6px;
border-radius: 50%;
margin-top: 5px;
display: flex;
justify-content: space-between;
// .swiper-pagination-bullet {
// width: 6px;
// height: 6px;
// background: rgba(62, 157, 247, 0.4);
// }
// .swiper-pagination-bullet-active {
// background: #3e9df7;
// }
}
.swiper-pagination-bullet {
background: rgba(62, 157, 247, 0.4);
}
.swiper-pagination-bullet-active {
background: #3e9df7;
}
}
}
}
.right {
display: flex;
.num {
position: relative;
margin-top: 14px;
width: 54px;
height: 138px;
background: url('../../../static/images/index/topic-bg2.png')
no-repeat center 0;
span {
position: absolute;
font-size: 16px;
font-family: Century Gothic;
font-weight: 400;
color: #ffffff;
left: 3px;
top: 5px;
}
span:nth-child(2) {
left: 20px;
top: 40px;
}
span:nth-child(3) {
left: 3px;
top: 70px;
}
span:nth-child(4) {
left: 16px;
top: 108px;
}
}
.text {
position: relative;
margin-top: 14px;
width: 197px;
display: flex;
align-items: center;
height: 138px;
.item {
position: absolute;
height: auto;
font-size: 14px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #ffffff;
left: 0;
top: 7px;
}
.item:nth-child(2) {
left: 10px;
top: 45px;
}
.item:nth-child(3) {
left: 0;
top: 80px;
}
.item:nth-child(4) {
left: 10px;
top: 108px;
}
}
}
}
.topic-show {
.sub-title {
font-size: 18px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #ffffff;
line-height: 28px;
margin: 15px 0;
}
.topic-item {
display: flex;
justify-content: space-between;
.item {
width: 230px;
height: 105px;
background: url('../../../static/images/index/topic-bg3.png')
no-repeat;
img {
display: block;
width: 153px;
height: 56px;
margin: 0 auto;
margin-top: 17px;
margin-bottom: 8px;
}
p {
font-size: 12px;
font-family: Microsoft YaHei;
font-weight: 400;
color: #6dcdff;
}
}
}
}
}
}
</style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment