Skip to content

ZhangJianFrontEnd
ZhangJianFrontEnd
Commit 34b6d401 by yuanfeng
Options

Merge branch 'yuanfeng' into '20210819' 

Yuanfeng

See merge request vue-project/liangXing/frontEnd!15
parents 2a4eda66 274e88b9
Showing with 125 additions and 267 deletions
src/components/echarts/BarChart.vue
......@@ -116,7 +116,7 @@ export default {
show: false
},
grid: {
left: -10,
left: 0,
right: 35,
bottom: 0,
top: 0,
......
src/pages/index/Left.vue
......@@ -8,16 +8,16 @@
</div>
<div class="details">
<p class="percent">
<span>{{genderPercent.male}}</span>
<span>{{genderPercent.female}}</span>
<span>{{genderPercent.malePer}}</span>
<span>{{genderPercent.femalePer}}</span>
</p>
<div class="line">
<span class="male" :style={width:genderPercent.male}></span>
<span class="female" :style={width:genderPercent.female}></span>
<span class="male" :style={width:genderPercent.malePer}></span>
<span class="female" :style={width:genderPercent.femalePer}></span>
</div>
<p class="num">
<span>{{gender.male | dealWithNumber}}</span>
<span>{{gender.female | dealWithNumber}}</span>
<span>{{genderPercent.male | dealWithNumber}}</span>
<span>{{genderPercent.female | dealWithNumber}}</span>
</p>
</div>
<div class="female">
......@@ -48,14 +48,14 @@
</div>
<ul>
<li v-for="(item, index) in distribution[distShowKey]" :key="index">
<p>{{item.name}}</p>
<p>{{item.key}}</p>
<count-to :endVal="item.value"/>
</li>
</ul>
</div>
<!-- 行业分布 -->
<div class="industry">
<div class="partTitle margin20-10">年龄结构</div>
<div class="partTitle margin20-10">行业分布</div>
<bar-chart :option="industryConfig.option" :layout="industryConfig.layout" />
</div>
<!-- 参与度|活跃度 -->
......@@ -78,9 +78,9 @@
<div class="studentDemeanor" v-if="greatKey === 0">
<swiper :options="swiperOption">
<swiper-slide v-for="(item, index) in studentDemeanor" :key="index">
<img :src="item.pic" alt="照片" @click="openStudent(index)">
<img :src="item.iconUrl" alt="照片" @click="openStudent(index)">
<p>{{item.name}}</p>
<p>{{item.position}}</p>
<p>{{item.desc}}</p>
</swiper-slide>
</swiper>
</div>
......@@ -93,10 +93,7 @@
>
<ul>
<li v-for="(item, index) in starClass" :key="index">
<span>{{item.name}}</span>
<span>{{item.content1}}</span>
<span>{{item.content2}}</span>
<span>{{item.content3}}</span>
<span v-for="(con, i) in item" :key="i + 'key'">{{con}}</span>
</li>
</ul>
</vue-seamless-scroll>
......@@ -142,233 +139,40 @@ export default {
data () {
return {
// 男女学员数量
gender: {
male: 92768,
female: 41768
// 男女学员比例
genderPercent: {
male: 0,
female: 0,
malePer: '0%',
femalePer: '0%'
},
genderPercent: {},
// 年龄数据
age: [
{
name: '60’s',
value: 32
}, {
name: '70’s',
value: 106
}, {
name: '80’s',
value: 184
}, {
name: '90’s',
value: 131
}
],
// 平均年龄
ageAverage: 45.7,
ageAverage: 0,
// 年龄结构配置
ageConfig: {},
// 学历数据
edu: [
{value: 735, name: '大专'},
{value: 580, name: '本科'},
{value: 484, name: '硕士'},
{value: 300, name: '博士以上'}
],
// 学历情况配置
eduConfig: {},
// 分布
distribution: {
// 党派
party: [
{
name: '民革',
value: 4293
}, {
name: '民盟',
value: 4293
}, {
name: '民健',
value: 4293
}, {
name: '民进',
value: 4293
}, {
name: '无党派',
value: 4293
}
],
party: [],
// 民族
ethnic: [
{
name: '汉族',
value: 3924
}, {
name: '藏族',
value: 3924
}, {
name: '维吾尔族',
value: 3924
}, {
name: '白族',
value: 3924
}, {
name: '苗族',
value: 3924
}
]
ethnic: []
},
// 分布当前展示数据标识
distShowKey: 'party',
// 行业分布
industry: [
{
name: '家电行业',
value: 4172
}, {
name: '电子信息',
value: 892
}, {
name: '机械制造',
value: 8321
}, {
name: '纺织生产',
value: 1892
}, {
name: '生物医药',
value: 1892
}
],
industryConfig: {
layout: {
height: '143px'
}
},
// 参与度活跃度
degree: {
// 参与度
participate: [
{
name: '课程',
value: [
{
name: '0-20%',
value: 100
}, {
name: '21-40%',
value: 180
}, {
name: '41-60%',
value: 310
}, {
name: '61-80%',
value: 380
}, {
name: '81-100%',
value: 489
}
]
}, {
name: '活动',
value: [
{
name: '0-20%',
value: 30
}, {
name: '21-40%',
value: 110
}, {
name: '41-60%',
value: 220
}, {
name: '61-80%',
value: 310
}, {
name: '81-100%',
value: 320
}
]
}
],
// 活跃度
active: [
{
name: '课程',
value: [
{
name: '0-20%',
value: 100
}, {
name: '21-40%',
value: 29
}, {
name: '41-60%',
value: 300
}, {
name: '61-80%',
value: 200
}, {
name: '81-100%',
value: 300
}
]
}, {
name: '活动',
value: [
{
name: '0-20%',
value: 30
}, {
name: '21-40%',
value: 80
}, {
name: '41-60%',
value: 20
}, {
name: '61-80%',
value: 400
}, {
name: '81-100%',
value: 500
}
]
}
]
},
degree: {},
degreeKey: '',
degreeConfig: {},
// 学员风采
studentDemeanor: [
{
pic: require('../../../static/images/index/persion.png'),
name: '白岩松1',
position: '主持人/作家'
}, {
pic: require('../../../static/images/index/persion.png'),
name: '白岩松2',
position: '主持人/作家'
}, {
pic: require('../../../static/images/index/persion.png'),
name: '白岩松3',
position: '主持人/作家'
}, {
pic: require('../../../static/images/index/persion.png'),
name: '白岩松4',
position: '主持人/作家'
}, {
pic: require('../../../static/images/index/persion.png'),
name: '白岩松5',
position: '主持人/作家'
}, {
pic: require('../../../static/images/index/persion.png'),
name: '白岩松6',
position: '主持人/作家'
}, {
pic: require('../../../static/images/index/persion.png'),
name: '白岩松7',
position: '主持人/作家'
}
],
studentDemeanor: [],
swiperOption: {
loop: false,
autoplay: false,
......@@ -376,34 +180,7 @@ export default {
slidesPerView: 4.5
},
// 明星班级
starClass: [
{
name: '2021年秋季班（21人）',
content1: '5人博士后',
content2: '6人博士',
content3: '5人企业家'
}, {
name: '2021年秋季班（22人）',
content1: '5人博士后',
content2: '6人博士',
content3: '5人企业家'
}, {
name: '2021年秋季班（23人）',
content1: '5人博士后',
content2: '6人博士',
content3: '5人企业家'
}, {
name: '2021年秋季班（24人）',
content1: '5人博士后',
content2: '6人博士',
content3: '5人企业家'
}, {
name: '2021年秋季班（25人）',
content1: '5人博士后',
content2: '6人博士',
content3: '5人企业家'
}
],
starClass: [],
classOption: {
step: 0.35,
singleHeight: 50
......@@ -418,56 +195,86 @@ export default {
methods: {
init () {
this.dealGender()
this.getAge()
this.getEdu()
this.getIndustry()
this.changeDegree('participate')
const {
gender,
age,
edu,
party,
ethnic,
industry,
participate,
active,
studentDemeanor,
starClass
} = this.leftData
this.dealGender(gender)
this.getAge(age)
this.getEdu(edu)
this.getDist(party, ethnic)
this.getIndustry(industry)
this.getDegree(participate, active)
this.getStudent(studentDemeanor)
this.getClass(starClass)
},
// 求性别百分比
dealGender () {
const arr = Object.values(this.gender)
const total = arr.reduce((pre, next) => pre + next)
dealGender (data) {
// total为1防止NAN
const total = data.total || 1
const maleItem = data.list && data.list.find(item => item.key === '男')
const male = maleItem.value || 0
const femaleItem = data.list && data.list.find(item => item.key === '女')
const female = femaleItem.value || 0
this.genderPercent = {
male: (this.gender.male * 100 / total).toFixed(1) + '%',
female: (this.gender.female * 100 / total).toFixed(1) + '%'
male,
female,
malePer: (male * 100 / total).toFixed(1) + '%',
femalePer: (female * 100 / total).toFixed(1) + '%'
}
},
// 年龄结构
getAge () {
getAge (data) {
this.ageAverage = data.subTitleValue || 0
const age = data.list || []
this.ageConfig = {
option: {
seriesData: [
{
data: this.age.map(item => item.value).reverse()
data: age.map(item => item.value).reverse()
}
],
base: {
yAxis: [{
data: this.age.map(item => item.name).reverse()
data: age.map(item => item.key).reverse()
}]
}
}
}
},
// 学历情况
getEdu () {
getEdu (data) {
const edu = this.formatArr(data.list || [])
this.eduConfig = {
option: {
seriesData: [
{
data: this.edu
data: edu
}
]
}
}
},
// 党派/民族分布
getDist (data1, data2) {
this.distribution.party = data1.list || []
this.distribution.ethnic = data2.list || []
},
// 切换党派/民族
changeDist (type) {
this.distShowKey = type
},
// 行业分布
getIndustry () {
getIndustry (data) {
const industry = data.list || []
this.industryConfig.option = {
seriesData: [
{
......@@ -477,7 +284,7 @@ export default {
return utils.dealWithNumber(item.value)
}
},
data: this.industry.map(item => item.value).reverse()
data: industry.map(item => item.value).reverse()
}
],
base: {
......@@ -492,11 +299,37 @@ export default {
padding: [0, 10, 0, 0],
fontFamily: 'Microsoft YaHei'
},
data: this.industry.map(item => item.name).reverse()
data: industry.map(item => item.key).reverse()
}]
}
}
},
// 获取参与度与活跃度数据
getDegree (data1, data2) {
// 参与度
const oldParticipate = data1.list || []
const participate = []
oldParticipate.forEach(item => {
participate.push({
name: item.title,
value: this.formatArr(item.list || [])
})
})
// 活跃度
const oldActive = data2.list || []
const active = []
oldActive.forEach(item => {
active.push({
name: item.title,
value: this.formatArr(item.list || [])
})
})
this.degree = {
participate,
active
}
this.changeDegree('participate')
},
// 切换参与度与活跃度
changeDegree (type) {
this.degreeKey = type
......@@ -542,8 +375,29 @@ export default {
}
},
// 学员风采
getStudent (data) {
this.studentDemeanor = data.list || []
},
// 明星班级
getClass (data) {
this.starClass = data.valueList || []
},
// 打开学员风采弹框
openStudent (index) {
console.log(index)
},
// 把数组中的key转成name
formatArr (arr) {
const newArr = []
if (this.utils.isArray(arr) && arr.length) {
arr.forEach(item => {
newArr.push({
name: item.key,
value: item.value
})
})
}
return newArr
}
}
}
......@@ -586,7 +440,7 @@ export default {
span {
width: 0%;
height: 8px;
transition: width linear 300ms;
transition: width linear 1000ms;
&.male {
border-top-left-radius: 4px;
border-bottom-left-radius: 4px;
......@@ -718,6 +572,7 @@ export default {
.img {
width: 88px;
height: 88px;
border-radius: 50%;
}
p {
font-size: 14px;
......@@ -747,7 +602,10 @@ export default {
font-weight: 400;
color: #6DCDFF;
line-height: 34px;
padding: 8px 0px 8px 40px;
font-size: 16px;
padding: 8px 10px 8px 40px;
display: flex;
justify-content: space-between;
}
}
}
......
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