diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/chooseStatisticsBig.vue b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/chooseStatisticsBig.vue index 0336fe6..85b58d8 100644 --- a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/chooseStatisticsBig.vue +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/chooseStatisticsBig.vue @@ -32,19 +32,41 @@ - - - - - - - - - - - - - + +
+
年级志愿组合情况对比一览表
+ +
+
+
+
+ + 志愿组合 +
+ +
    +
  • +
    {{item.key}} + +
    +
    {{item.value}}人
    +
    • +
+ +
+ +
+ @@ -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; + } } } diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/chooseStatisticsSmall.vue b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/chooseStatisticsSmall.vue index 2667e0c..7027ff4 100644 --- a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/chooseStatisticsSmall.vue +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/chooseStatisticsSmall.vue @@ -17,19 +17,20 @@ > - - - - - - - - - - - - - + +
年级志愿组合情况对比一览表
+ + @@ -49,6 +50,8 @@ data:function() { return { lineFlag:false, + barFlag:false, + type:1, singleSubject:{ xAxisData:[], style: { @@ -61,29 +64,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:"人数" } }; @@ -98,7 +87,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={ @@ -135,6 +131,42 @@ } + } + }) + }, + 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; + + } + } }) } diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/image/u4579.svg b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/image/u4579.svg new file mode 100644 index 0000000..e59cd62 --- /dev/null +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/image/u4579.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/image/u4603.svg b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/image/u4603.svg new file mode 100644 index 0000000..768d2cd --- /dev/null +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/image/u4603.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/utils/BarEcharts.vue b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/utils/BarEcharts.vue index 88857d9..b99c1d7 100644 --- a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/utils/BarEcharts.vue +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/utils/BarEcharts.vue @@ -120,13 +120,13 @@ yAxis: yAxis, grid: { left: '5%', - right: '6%', + right: '10%', bottom: '20%', containLabel: true }, legend: { x:'center', - y:this.isType==='time'||this.isType==='manyBarFloor'?'top':'bottom', + y:this.isType==='time'||this.isType==='manyBarFloor'||this.isType==='across'?'top':'bottom', data: this.legendData }, dataZoom: this.isType==='time'?[{ @@ -136,7 +136,7 @@ }, { start: 10, end: 30, - }]:this.isType==="manyBarFloor"?[ { + }]:this.isType==="manyBarFloor"||this.isType==="across"?[ { show: true, realtime: true, start: 0, diff --git a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/utils/interfaceConfig.js b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/utils/interfaceConfig.js index 9951ce5..5783a3e 100644 --- a/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/utils/interfaceConfig.js +++ b/src/views/superFusionPlatform/mainPlatform/moduleAndLayout/moduleCom/educationalWisdom/utils/interfaceConfig.js @@ -129,6 +129,11 @@ const InterfaceConfig = { * week 必填 number 机构ID * */ "getTeacherCourseTable":{url:"selectCourse/coresetime/getTeacherCourseTable",method:"get",isTestLogin:false}, + /* + *选排课-选课志愿组合 + * bureau_id 必填 number 机构ID + * */ + "getStudentThreeApplyCount":{url:"selectCourse/statistics/subjectCourse/getStudentThreeApplyCount",method:"get",isTestLogin:false}, }; export default InterfaceConfig