|
@@ -52,12 +52,15 @@
|
|
|
<!--课堂信息end-->
|
|
|
<div class="school-analyse-top">
|
|
|
<div class="school-analyse-top-left" >
|
|
|
+ <p class="classechart-titles classted">本年课例明细</p>
|
|
|
<Bar :barData="detailsEchart.bar1"></Bar>
|
|
|
</div>
|
|
|
<div class="school-analyse-top-center">
|
|
|
+ <p class="classechart-titles activityed">本年活动明细</p>
|
|
|
<Bar :barData="detailsEchart.bar2"></Bar>
|
|
|
</div>
|
|
|
<div class="school-analyse-top-right">
|
|
|
+ <p class="classechart-titles interacted">本年课堂互动明细</p>
|
|
|
<Bar :barData="detailsEchart.bar3"></Bar>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -177,7 +180,7 @@ export default {
|
|
|
},
|
|
|
grid: {
|
|
|
top: '25%',
|
|
|
- bottom: '1.5%',
|
|
|
+ bottom: '5%',
|
|
|
left: '5%',
|
|
|
right: '5%',
|
|
|
containLabel: true,
|
|
@@ -191,7 +194,7 @@ export default {
|
|
|
rotate: 0,
|
|
|
textStyle: {
|
|
|
color: '#A6D3FD',
|
|
|
- fontSize: 10,
|
|
|
+ fontSize: 9,
|
|
|
},
|
|
|
},
|
|
|
axisPointer: {
|
|
@@ -268,7 +271,7 @@ export default {
|
|
|
},
|
|
|
grid: {
|
|
|
top: '25%',
|
|
|
- bottom: '1.5%',
|
|
|
+ bottom: '5%',
|
|
|
left: '2%',
|
|
|
right: '5%',
|
|
|
containLabel: true,
|
|
@@ -360,7 +363,7 @@ export default {
|
|
|
},
|
|
|
grid: {
|
|
|
top: '25%',
|
|
|
- bottom: '1.5%',
|
|
|
+ bottom: '5%',
|
|
|
left: '5%',
|
|
|
right: '5%',
|
|
|
containLabel: true,
|
|
@@ -710,13 +713,13 @@ export default {
|
|
|
this.detailsEchart.bar3.timeline.data = this.anSchool.times
|
|
|
this.detailsEchart.bar3.xAxis[0].data = this.anSchool.times
|
|
|
this.detailsEchart.bar3.series[0].data = this.anSchool.interacts
|
|
|
-
|
|
|
+ console.log(this.anSchool.classed,'课例')
|
|
|
//center data
|
|
|
//课例
|
|
|
this.detailsbasics[0].num=scStats.lessStats.all
|
|
|
this.detailsbasics[0].todayNum =scStats.lessStats.day
|
|
|
this.detailsbasics[0].subheadingNum =scStats.lessStats.lastDay === 0 && scStats.lessStats.day === 0 ? '0%' : scStats.lessStats.lastDay === 0 ? '100%' : ((scStats.lessStats.day - scStats.lessStats.lastDay) / scStats.lessStats.lastDay).toFixed(2) * 100 + '%'
|
|
|
- this.detailsbasics[0].subheadNum = this.anSchool.classed[this.anSchool.classed.length - 2] === 0 && this.anSchool.classed[this.anSchool.classed.length - 1] === 0 ? '0%' : this.anSchool.classed[this.anSchool.classed.length - 2] === 0 ? '100%' : ((this.anSchool.classed[this.anSchool.classed.length - 1] - this.anSchool.classed[this.anSchool.classed.length - 2]) / this.anSchool.classed[this.anSchool.classed.length - 2] * 100).toFixed(2) + '%'
|
|
|
+ this.detailsbasics[0].subheadNum = this.anSchool.classed[this.anSchool.classed.length - 2] == 0 && this.anSchool.classed[this.anSchool.classed.length - 1] == 0 ? '0%' : this.anSchool.classed[this.anSchool.classed.length - 2] == 0 ? '100%' : ((this.anSchool.classed[this.anSchool.classed.length - 1] - this.anSchool.classed[this.anSchool.classed.length - 2]) / this.anSchool.classed[this.anSchool.classed.length - 2] * 100).toFixed(2) + '%'
|
|
|
//活动
|
|
|
this.detailsbasics[1].num = scStats.actStats.all
|
|
|
this.detailsbasics[1].todayNum = scStats.actStats.dayCnt
|
|
@@ -729,8 +732,11 @@ export default {
|
|
|
this.detailsbasics[2].subheadingNum = scStats.lessStats.lastDayInter === 0 && scStats.lessStats.dayInter === 0 ? '0%' : scStats.lessStats.lastDayInter === 0 ? '100%' : ((scStats.lessStats.dayInter - scStats.lessStats.lastDayInter) / scStats.lessStats.lastDayInter).toFixed(2) * 100 + '%'
|
|
|
this.detailsbasics[2].subheadNum = this.anSchool.interacts[this.anSchool.interacts.length - 2] === 0 && this.anSchool.interacts[this.anSchool.interacts.length - 1] === 0 ? '0%' : this.anSchool.interacts[this.anSchool.interacts.length - 2] === 0 ? '100%' : ((this.anSchool.interacts[this.anSchool.interacts.length - 1] - this.anSchool.interacts[this.anSchool.interacts.length - 2]) / this.anSchool.interacts[this.anSchool.interacts.length - 2] * 100).toFixed(2) + '%'
|
|
|
//总数据
|
|
|
- let nowYear = scStats.lessStats.all + scStats.actStats.all
|
|
|
+ let nowYear = scStats.lessStats.all + scStats.actStats.all +alls
|
|
|
let lastYear = scStats.lessStats.lastYear + scStats.actStats.lastYear
|
|
|
+
|
|
|
+ this.detailsbasics[3].num = nowYear
|
|
|
+ this.detailsbasics[3].todayNum = Number(scStats.lessStats.day) + Number(scStats.actStats.dayCnt) + Number(scStats.lessStats.dayInter)
|
|
|
this.detailsbasics[3].subheadNum = nowYear === 0 && lastYear === 0 ? '0%' : lastYear === 0 ? '100%' : (((nowYear - lastYear) / lastYear) * 100).toFixed(2) + '%'
|
|
|
let classedDatas = this.anSchool.classed; let activitysDatas = this.anSchool.activitys; let interactDatas = this.anSchool.interacts
|
|
|
let tataldata1 = classedDatas.map((index, item) => { return index + activitysDatas[item]; })
|
|
@@ -1027,6 +1033,20 @@ export default {
|
|
|
height:55px;
|
|
|
margin-right:1%;
|
|
|
}
|
|
|
+.classechart-titles{
|
|
|
+ font-size: 16px;
|
|
|
+ font-weight: 700;
|
|
|
+ text-align: center;
|
|
|
+}
|
|
|
+.classted{
|
|
|
+ color: rgba(112,103,245,.6);
|
|
|
+}
|
|
|
+.activityed{
|
|
|
+ color:rgba(255,117,26,.6)
|
|
|
+}
|
|
|
+.interacted{
|
|
|
+ color:rgba(29,227,255,.9)
|
|
|
+}
|
|
|
.purples {
|
|
|
/* background: rgba(112, 103, 245, 0.3); */
|
|
|
background-image: linear-gradient(62deg, #8EC5FC 0%, #E0C3FC 100%);
|