Commit 2c82be36 authored by zhengke's avatar zhengke

1

parent d6284daa
...@@ -122,9 +122,10 @@ ...@@ -122,9 +122,10 @@
.label_Day { .label_Day {
color: rgba(0, 0, 0, .5); color: rgba(0, 0, 0, .5);
font-size: 14px; font-size: 14px;
width: 25px; width: 30px;
display: inline-block; display: inline-block;
text-align: left; text-align: right;
margin-right:5px;
} }
.label_Number { .label_Number {
...@@ -445,7 +446,7 @@ ...@@ -445,7 +446,7 @@
<div class="Data_One"> <div class="Data_One">
<span class="label_Day">昨日</span> <span class="label_Day">昨日</span>
<span class="label_Cule"> <span class="label_Cule">
{{ConsultObj.YestodayRates}} % {{ConsultObj.YestodayRates}}%
</span> </span>
</div> </div>
<div class="Data_One"> <div class="Data_One">
...@@ -620,15 +621,14 @@ ...@@ -620,15 +621,14 @@
<span class="Data_Span">{{ConsultObj.CurMonthOrderGoal}}</span> <span class="Data_Span">{{ConsultObj.CurMonthOrderGoal}}</span>
<span class="Data_Ci"></span> <span class="Data_Ci"></span>
</div> </div>
<div class="Data_Right"> <div class="Data_Right" style="width:101px;">
<div class="Data_One"> <div class="Data_One">
<span class="label_Day">完成进度</span> <span class="label_Day" style="width:56px;">完成进度</span>
<span class="label_Cule" <span class="label_Cule"
:class="{'greenClass':calcPercent(ConsultObj.CurMonthOrderSale,ConsultObj.CurMonthOrderGoal)>0}"> :class="{'greenClass':calcPercent(ConsultObj.CurMonthOrderSale,ConsultObj.CurMonthOrderGoal)>0}">
{{calcPercent(ConsultObj.CurMonthOrderSale,ConsultObj.CurMonthOrderGoal)}}% {{calcPercent(ConsultObj.CurMonthOrderSale,ConsultObj.CurMonthOrderGoal)}}%
</span> </span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
...@@ -867,26 +867,18 @@ ...@@ -867,26 +867,18 @@
this.series[0].data = []; this.series[0].data = [];
this.series[1].data = []; this.series[1].data = [];
this.series[2].data = []; this.series[2].data = [];
let xArray = [];
tempData.forEach(x => { tempData.forEach(x => {
this.series[0].data.push(x.ClueCount); this.series[0].data.push(x.ClueCount);
this.series[1].data.push(x.VisitCount); this.series[1].data.push(x.VisitCount);
this.series[2].data.push(x.TrialLessonCount); this.series[2].data.push(x.TrialLessonCount);
xArray.push(x.DayStr); this.chartOptions.xaxis.categories.push(x.DayStr);
// this.chartOptions.xaxis.categories.push(x.DayStr);
}) })
if (xArray && xArray.length > 0) {
// this.chartOptions = {
// xaxis: {
// categories: this.xArray
// }
// }
this.chartOptions.xaxis.categories = xArray;
}
setTimeout(() => { setTimeout(() => {
this.$refs.apex.updateSeries(this.series) this.$refs.apex.updateOptions(this.chartOptions)
}, 200) this.$refs.apex.resetSeries()
// this.$refs.apex.updateSeries(this.series)
}, 500)
} }
}); });
}, },
......
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