|
|
|
|
@ -32,19 +32,41 @@
|
|
|
|
|
</ul>
|
|
|
|
|
</div>
|
|
|
|
|
</a-tab-pane>
|
|
|
|
|
<!--<a-tab-pane key="2" tab="志愿组合" force-render>-->
|
|
|
|
|
<!--<div class="titleStyle">年级志愿组合情况对比一览表</div>-->
|
|
|
|
|
<!--<bar-echarts-->
|
|
|
|
|
<!--:xAxisData="volunteerCombination.xAxisData"-->
|
|
|
|
|
<!--:echartStyle="volunteerCombination.style"-->
|
|
|
|
|
<!--:seriesData="volunteerCombination.seriesData"-->
|
|
|
|
|
<!--:xAxisName="volunteerCombination.xAxisName"-->
|
|
|
|
|
<!--:yAxisName="volunteerCombination.yAxisName"-->
|
|
|
|
|
<!--:legendData="volunteerCombination.legendData"-->
|
|
|
|
|
<!--:isType="volunteerCombination.isType"-->
|
|
|
|
|
<!--v-on:volunteerCombination="getStudentApplyCount"-->
|
|
|
|
|
<!--></bar-echarts>-->
|
|
|
|
|
<!--</a-tab-pane>-->
|
|
|
|
|
<a-tab-pane key="2" tab="志愿组合" force-render>
|
|
|
|
|
<div class="leftContents">
|
|
|
|
|
<div class="titleStyle">年级志愿组合情况对比一览表</div>
|
|
|
|
|
<bar-echarts
|
|
|
|
|
:xAxisData="volunteerCombination.xAxisData"
|
|
|
|
|
:echartStyle="volunteerCombination.style"
|
|
|
|
|
:seriesData="volunteerCombination.seriesData"
|
|
|
|
|
:xAxisName="volunteerCombination.xAxisName"
|
|
|
|
|
:yAxisName="volunteerCombination.yAxisName"
|
|
|
|
|
:legendData="volunteerCombination.legendData"
|
|
|
|
|
:isType="volunteerCombination.isType"
|
|
|
|
|
v-on:volunteerCombination="getStudentApplyCount"
|
|
|
|
|
v-if="barFlag"
|
|
|
|
|
></bar-echarts>
|
|
|
|
|
</div>
|
|
|
|
|
<div class="rightContents">
|
|
|
|
|
<div class="widthBox">
|
|
|
|
|
<div style="height:3rem">
|
|
|
|
|
<img :src=this.imgSrc class="img2"/>
|
|
|
|
|
<span style="float: left;margin: 0.8rem 0 1rem 0.5rem">志愿组合</span>
|
|
|
|
|
</div>
|
|
|
|
|
<vue-scroll v-if="subjectArr.length > 0" class="plan-list-div" :ops="listScroll" style="height:20rem">
|
|
|
|
|
<ul class="ulLine">
|
|
|
|
|
<li :key="item.key" v-for="(item,index) in subjectArr">
|
|
|
|
|
<div style="float: left;">{{item.key}}
|
|
|
|
|
<img :src=winnerSrc class="img3" :style="{display:index===0||index===1?'block':'none'}"/>
|
|
|
|
|
</div>
|
|
|
|
|
<div style="float: right;">{{item.value}}人</div>
|
|
|
|
|
</li>
|
|
|
|
|
</ul>
|
|
|
|
|
</vue-scroll>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
</a-tab-pane>
|
|
|
|
|
</a-tabs>
|
|
|
|
|
|
|
|
|
|
</div>
|
|
|
|
|
@ -60,6 +82,8 @@
|
|
|
|
|
import Political from './image/political.png';
|
|
|
|
|
import History from './image/history.png';
|
|
|
|
|
import Geography from './image/geography.png';
|
|
|
|
|
import JianTou from './image/u4603.svg';
|
|
|
|
|
import WinnerSrc from './image/u4579.svg';
|
|
|
|
|
export default {
|
|
|
|
|
name: "chooseStatisticsBig",
|
|
|
|
|
components: {
|
|
|
|
|
@ -70,6 +94,12 @@
|
|
|
|
|
data:function() {
|
|
|
|
|
return {
|
|
|
|
|
lineFlag:false,
|
|
|
|
|
barFlag:false,
|
|
|
|
|
type:1,
|
|
|
|
|
imgSrc:JianTou,
|
|
|
|
|
winnerSrc:WinnerSrc,
|
|
|
|
|
listScroll: this.StaticParams.scrollOption,
|
|
|
|
|
subjectArr:[],
|
|
|
|
|
singleSubject:{
|
|
|
|
|
xAxisData:[],
|
|
|
|
|
list:[],
|
|
|
|
|
@ -84,29 +114,15 @@
|
|
|
|
|
},
|
|
|
|
|
volunteerCombination:{
|
|
|
|
|
xAxisData:[],
|
|
|
|
|
yAxis:[],
|
|
|
|
|
style: {
|
|
|
|
|
height: ''
|
|
|
|
|
},
|
|
|
|
|
isType:"across",
|
|
|
|
|
legendData:['自动接警','人工接警'],
|
|
|
|
|
seriesData:[
|
|
|
|
|
{
|
|
|
|
|
name: '自动接警',
|
|
|
|
|
type: 'bar',
|
|
|
|
|
stack:'111',//堆叠
|
|
|
|
|
barMaxWidth: '20',//柱状图最大宽度
|
|
|
|
|
data: [20, 30, 40]
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
name: '人工接警',
|
|
|
|
|
type: 'bar',
|
|
|
|
|
stack:'111',//堆叠
|
|
|
|
|
barMaxWidth: '20',//柱状图最大宽度
|
|
|
|
|
data: [10, 50, 35]
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
xAxisName:"年级",
|
|
|
|
|
yAxisName:"课程总数"
|
|
|
|
|
legendData:[],
|
|
|
|
|
seriesData:[],
|
|
|
|
|
xAxisName:"志愿组合",
|
|
|
|
|
yAxisName:"人数"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
};
|
|
|
|
|
@ -121,7 +137,14 @@
|
|
|
|
|
},
|
|
|
|
|
methods: {
|
|
|
|
|
callback(key) {
|
|
|
|
|
console.log(key);
|
|
|
|
|
this.type=key;
|
|
|
|
|
if(key==="1"){
|
|
|
|
|
this.lineFlag=false;
|
|
|
|
|
this.getStudentApplyCount();
|
|
|
|
|
}else if(key==="2"){
|
|
|
|
|
this.barFlag=false;
|
|
|
|
|
this.getStudentThreeApplyCount();
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
getStudentApplyCount:function () {
|
|
|
|
|
let params={
|
|
|
|
|
@ -186,6 +209,48 @@
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
getStudentThreeApplyCount:function () {
|
|
|
|
|
let params={
|
|
|
|
|
bureauId:this.BaseConfig.person_info_my.bureau_id,
|
|
|
|
|
};
|
|
|
|
|
this.InterfaceConfig.callInterface([{
|
|
|
|
|
url:InterfaceConfig.getStudentThreeApplyCount.url,
|
|
|
|
|
params:params,
|
|
|
|
|
method:InterfaceConfig.getStudentThreeApplyCount.method,
|
|
|
|
|
isTestLogin:InterfaceConfig.getStudentThreeApplyCount.isTestLogin,
|
|
|
|
|
isOfficeInterface:false
|
|
|
|
|
}],(result)=> {
|
|
|
|
|
if(result[0].data.success){
|
|
|
|
|
this.barFlag=true;
|
|
|
|
|
let data=result[0].data;
|
|
|
|
|
let series=[];
|
|
|
|
|
let legendData=[];
|
|
|
|
|
if(data.list.length!==0){
|
|
|
|
|
data.list.forEach((item)=>{
|
|
|
|
|
legendData.push(item.year);
|
|
|
|
|
let count=[];
|
|
|
|
|
let xName=[];
|
|
|
|
|
item.xaxis.forEach((itemIn)=>{
|
|
|
|
|
xName.push(itemIn.xaxis_name);
|
|
|
|
|
count.push(itemIn.count);
|
|
|
|
|
this.volunteerCombination.xAxisData=xName;
|
|
|
|
|
});
|
|
|
|
|
series.push({name:item.year,type:"bar",data:count,stack:"11"});
|
|
|
|
|
});
|
|
|
|
|
this.volunteerCombination.legendData=legendData;
|
|
|
|
|
this.volunteerCombination.seriesData=series;
|
|
|
|
|
}
|
|
|
|
|
if(data.listSum.length!==0){
|
|
|
|
|
let dom=[];
|
|
|
|
|
data.listSum.forEach((sumItem,sunIndex)=>{
|
|
|
|
|
dom.push({key:sumItem.xaxis_name,value:sumItem.count})
|
|
|
|
|
})
|
|
|
|
|
this.subjectArr=dom;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
@ -202,6 +267,11 @@
|
|
|
|
|
width: 40%;
|
|
|
|
|
float: left;
|
|
|
|
|
}
|
|
|
|
|
.leftContents {
|
|
|
|
|
width: 60%;
|
|
|
|
|
float: left;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
.rightContent {
|
|
|
|
|
width: 60%;
|
|
|
|
|
float: left;
|
|
|
|
|
@ -234,7 +304,49 @@
|
|
|
|
|
line-height: 90px;
|
|
|
|
|
width: 58%;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
.rightContents {
|
|
|
|
|
width: 40%;
|
|
|
|
|
float: left;
|
|
|
|
|
.widthBox{
|
|
|
|
|
width: 13rem;
|
|
|
|
|
height: 18rem;
|
|
|
|
|
margin: 2rem auto;
|
|
|
|
|
background: #FDFDFD;
|
|
|
|
|
box-shadow: 0 0 20px 0 rgba(0, 0, 0, 0.2);
|
|
|
|
|
}
|
|
|
|
|
.img2{
|
|
|
|
|
width: 15px;
|
|
|
|
|
height: 15px;
|
|
|
|
|
float: left;
|
|
|
|
|
margin: 1rem 0 1rem 1rem;
|
|
|
|
|
}
|
|
|
|
|
.img3{
|
|
|
|
|
width: 15px;
|
|
|
|
|
height: 15px;
|
|
|
|
|
float: right;
|
|
|
|
|
}
|
|
|
|
|
.ulLine{
|
|
|
|
|
width: 13rem;
|
|
|
|
|
list-style: none;
|
|
|
|
|
padding: 0;
|
|
|
|
|
height: 14rem;
|
|
|
|
|
/*overflow-y: auto;*/
|
|
|
|
|
}
|
|
|
|
|
.ulLine li{
|
|
|
|
|
float: left;
|
|
|
|
|
height: 2rem;
|
|
|
|
|
width: 98%;
|
|
|
|
|
border-bottom: 1px solid #F2F2F2;
|
|
|
|
|
overflow: hidden;
|
|
|
|
|
text-overflow: ellipsis;
|
|
|
|
|
white-space: nowrap;
|
|
|
|
|
padding: 0 1rem 0 1rem;
|
|
|
|
|
}
|
|
|
|
|
.plan-list-div {
|
|
|
|
|
min-height: 12rem;
|
|
|
|
|
max-height: 14rem;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
CUIYUWEI
4 years ago
