|
@@ -15,10 +15,10 @@
|
|
|
<!-- 筛选 -->
|
|
<!-- 筛选 -->
|
|
|
<div class="filter-row">
|
|
<div class="filter-row">
|
|
|
<el-select v-model="queryParams.personType" placeholder="用户类型" style="width:220px">
|
|
<el-select v-model="queryParams.personType" placeholder="用户类型" style="width:220px">
|
|
|
- <el-option label="研究生" value="2" />
|
|
|
|
|
- <el-option label="本科生" value="3" />
|
|
|
|
|
|
|
+ <el-option label="硕士研究生" value="2" />
|
|
|
|
|
+ <el-option label="本科" value="3" />
|
|
|
|
|
+ <el-option label="博士研究生" value="4" />
|
|
|
<el-option label="教职工" value="1" />
|
|
<el-option label="教职工" value="1" />
|
|
|
- <el-option label="博士" value="4" />
|
|
|
|
|
</el-select>
|
|
</el-select>
|
|
|
<!--<el-cascader-->
|
|
<!--<el-cascader-->
|
|
|
<!--v-if="adminType == 1"-->
|
|
<!--v-if="adminType == 1"-->
|
|
@@ -187,7 +187,7 @@ export default {
|
|
|
|
|
|
|
|
chart.setOption({
|
|
chart.setOption({
|
|
|
legend: {
|
|
legend: {
|
|
|
- data: ['研究生', '本科生', '教职工', '博士'],
|
|
|
|
|
|
|
+ data: ['本科', '硕士研究生', '博士研究生', '教职工'],
|
|
|
top: 10,
|
|
top: 10,
|
|
|
right: 'center',
|
|
right: 'center',
|
|
|
itemWidth: 14,
|
|
itemWidth: 14,
|
|
@@ -239,12 +239,10 @@ export default {
|
|
|
],
|
|
],
|
|
|
series: [
|
|
series: [
|
|
|
{
|
|
{
|
|
|
- name: '研究生',
|
|
|
|
|
|
|
+ name: '本科',
|
|
|
type: 'bar',
|
|
type: 'bar',
|
|
|
- barGap: '10%',
|
|
|
|
|
- barCategoryGap: '40%',
|
|
|
|
|
- data: data.map(d => d.graduateCreditHours),
|
|
|
|
|
- itemStyle: { color: '#5b9cf6' },
|
|
|
|
|
|
|
+ data: data.map(d => d.undergraduateCreditHours),
|
|
|
|
|
+ itemStyle: { color: '#4fbe7e' },
|
|
|
label: {
|
|
label: {
|
|
|
show: true,
|
|
show: true,
|
|
|
position: 'top',
|
|
position: 'top',
|
|
@@ -254,10 +252,12 @@ export default {
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- name: '本科生',
|
|
|
|
|
|
|
+ name: '硕士研究生',
|
|
|
type: 'bar',
|
|
type: 'bar',
|
|
|
- data: data.map(d => d.undergraduateCreditHours),
|
|
|
|
|
- itemStyle: { color: '#4fbe7e' },
|
|
|
|
|
|
|
+ barGap: '10%',
|
|
|
|
|
+ barCategoryGap: '40%',
|
|
|
|
|
+ data: data.map(d => d.graduateCreditHours),
|
|
|
|
|
+ itemStyle: { color: '#5b9cf6' },
|
|
|
label: {
|
|
label: {
|
|
|
show: true,
|
|
show: true,
|
|
|
position: 'top',
|
|
position: 'top',
|
|
@@ -267,10 +267,10 @@ export default {
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- name: '教职工',
|
|
|
|
|
|
|
+ name: '博士研究生',
|
|
|
type: 'bar',
|
|
type: 'bar',
|
|
|
- data: data.map(d => d.staffCreditHours),
|
|
|
|
|
- itemStyle: { color: '#f59e42' },
|
|
|
|
|
|
|
+ data: data.map(d => d.doctoralCreditsHours),
|
|
|
|
|
+ itemStyle: { color: '#00CED1' },
|
|
|
label: {
|
|
label: {
|
|
|
show: true,
|
|
show: true,
|
|
|
position: 'top',
|
|
position: 'top',
|
|
@@ -280,10 +280,10 @@ export default {
|
|
|
},
|
|
},
|
|
|
},
|
|
},
|
|
|
{
|
|
{
|
|
|
- name: '博士',
|
|
|
|
|
|
|
+ name: '教职工',
|
|
|
type: 'bar',
|
|
type: 'bar',
|
|
|
- data: data.map(d => d.doctoralCreditsHours),
|
|
|
|
|
- itemStyle: { color: '#00CED1' },
|
|
|
|
|
|
|
+ data: data.map(d => d.staffCreditHours),
|
|
|
|
|
+ itemStyle: { color: '#f59e42' },
|
|
|
label: {
|
|
label: {
|
|
|
show: true,
|
|
show: true,
|
|
|
position: 'top',
|
|
position: 'top',
|