Skip to content

S
SuperMan
Commit d5a5937f authored by youjie's avatar youjie
Browse files
Options

no message

parent 23c3bec4
Show whitespace changes
Inline Side-by-side
Showing with 34 additions and 24 deletions
src/components/FinancialModule/DataAnalysis/components/Echart/ChangeProportion.vue
View file @ d5a5937f
...@@ -77,6 +77,7 @@ export default { ...@@ -77,6 +77,7 @@ export default {
let datas = [] let datas = []
let Stocklegend = {} let Stocklegend = {}
let Newobj={}; let Newobj={};
console.log(this.CostAnalysisData,'---------')
for(let index=0;index<this.incomeTitles.length;index++){ for(let index=0;index<this.incomeTitles.length;index++){
for(let i=0;i<this.MonthList.length;i++){ for(let i=0;i<this.MonthList.length;i++){
let filter = this.CostAnalysisData.filter(z=>{return z.Month==this.MonthList[i]}) let filter = this.CostAnalysisData.filter(z=>{return z.Month==this.MonthList[i]})
...@@ -90,24 +91,24 @@ export default { ...@@ -90,24 +91,24 @@ export default {
}else if(indexs==1){ }else if(indexs==1){
x.name = '房费/收入' x.name = '房费/收入'
this.CostAnalysisData.forEach(z=>{ this.CostAnalysisData.forEach(z=>{
x.data.push(z['RoomFeeRate']) x.data.push(z['RommFeeRate'])
}) })
}else if(indexs==3){ }else if(indexs==2){
x.name = '车费/收入' x.name = '车费/收入'
this.CostAnalysisData.forEach(z=>{ this.CostAnalysisData.forEach(z=>{
x.data.push(z['CarFeeRate']) x.data.push(z['CarFeeRate'])
}) })
}else if(indexs==4){ }else if(indexs==3){
x.name = '餐费/收入' x.name = '餐费/收入'
this.CostAnalysisData.forEach(z=>{ this.CostAnalysisData.forEach(z=>{
x.data.push(z['MealFeeRate']) x.data.push(z['MealFeeRate'])
}) })
}else if(indexs==5){ }else if(indexs==4){
x.name = '门票/收入' x.name = '门票/收入'
this.CostAnalysisData.forEach(z=>{ this.CostAnalysisData.forEach(z=>{
x.data.push(z['TicketFeeRate']) x.data.push(z['TicketFeeRate'])
}) })
}else if(indexs==6){ }else if(indexs==5){
x.name = '签证/收入' x.name = '签证/收入'
this.CostAnalysisData.forEach(z=>{ this.CostAnalysisData.forEach(z=>{
x.data.push(z['VisaFeeRate']) x.data.push(z['VisaFeeRate'])
...@@ -129,15 +130,6 @@ export default { ...@@ -129,15 +130,6 @@ export default {
option = { option = {
color:that.colorList, color:that.colorList,
tooltip : {
trigger: 'axis',
axisPointer: {
lineStyle: {
type: 'dashed',
color: "#ddd"
}
}
},
legend: { legend: {
x:'left', x:'left',
y:'bottom', y:'bottom',
...@@ -151,14 +143,27 @@ export default { ...@@ -151,14 +143,27 @@ export default {
grid: { grid: {
left: 15, // 默认10%，给24就挺合适的。 left: 15, // 默认10%，给24就挺合适的。
top: 30, // 默认60 top: 30, // 默认60
right: 15, // 默认10% right: 45, // 默认10%
bottom: 70, // 默认60 bottom: 70, // 默认60
containLabel: true containLabel: true
}, },
tooltip : {
trigger: 'axis',
axisPointer: {
lineStyle: {
type: 'dashed',
color: "#ddd"
}
}
},
xAxis : [ xAxis : [
{ {
type: 'category', type: 'category',
boundaryGap: false, boundaryGap: false,
nameTextStyle: {
fontWeight: 600,
fontSize: 18
},
data:this.MonthList, data:this.MonthList,
axisLine: { axisLine: {
lineStyle: { lineStyle: {
...@@ -198,6 +203,11 @@ export default { ...@@ -198,6 +203,11 @@ export default {
} }
} }
], ],
dataZoom: [
{
type: 'inside'
}
],
series:datas series:datas
}; };
myChart.setOption(option,true) myChart.setOption(option,true)
......
src/components/FinancialModule/DataAnalysis/components/lineEchart.vue
View file @ d5a5937f
...@@ -126,22 +126,22 @@ export default { ...@@ -126,22 +126,22 @@ export default {
this.CostAnalysisData.forEach(z=>{ this.CostAnalysisData.forEach(z=>{
x.data.push(z['RoomFee']) x.data.push(z['RoomFee'])
}) })
}else if(indexs==3){ }else if(indexs==2){
x.name = '车费' x.name = '车费'
this.CostAnalysisData.forEach(z=>{ this.CostAnalysisData.forEach(z=>{
x.data.push(z['CarFee']) x.data.push(z['CarFee'])
}) })
}else if(indexs==4){ }else if(indexs==3){
x.name = '餐费' x.name = '餐费'
this.CostAnalysisData.forEach(z=>{ this.CostAnalysisData.forEach(z=>{
x.data.push(z['MealFee']) x.data.push(z['MealFee'])
}) })
}else if(indexs==5){ }else if(indexs==4){
x.name = '门票' x.name = '门票'
this.CostAnalysisData.forEach(z=>{ this.CostAnalysisData.forEach(z=>{
x.data.push(z['TicketFee']) x.data.push(z['TicketFee'])
}) })
}else if(indexs==6){ }else if(indexs==5){
x.name = '签证' x.name = '签证'
this.CostAnalysisData.forEach(z=>{ this.CostAnalysisData.forEach(z=>{
x.data.push(z['VisaFee']) x.data.push(z['VisaFee'])
...@@ -156,24 +156,24 @@ export default { ...@@ -156,24 +156,24 @@ export default {
}else if(indexs==1){ }else if(indexs==1){
x.name = '房费/收入' x.name = '房费/收入'
this.CostAnalysisData.forEach(z=>{ this.CostAnalysisData.forEach(z=>{
x.data.push(z['RoomFeeRate']) x.data.push(z['RommFeeRate'])
}) })
}else if(indexs==3){ }else if(indexs==2){
x.name = '车费/收入' x.name = '车费/收入'
this.CostAnalysisData.forEach(z=>{ this.CostAnalysisData.forEach(z=>{
x.data.push(z['CarFeeRate']) x.data.push(z['CarFeeRate'])
}) })
}else if(indexs==4){ }else if(indexs==3){
x.name = '餐费/收入' x.name = '餐费/收入'
this.CostAnalysisData.forEach(z=>{ this.CostAnalysisData.forEach(z=>{
x.data.push(z['MealFeeRate']) x.data.push(z['MealFeeRate'])
}) })
}else if(indexs==5){ }else if(indexs==4){
x.name = '门票/收入' x.name = '门票/收入'
this.CostAnalysisData.forEach(z=>{ this.CostAnalysisData.forEach(z=>{
x.data.push(z['TicketFeeRate']) x.data.push(z['TicketFeeRate'])
}) })
}else if(indexs==6){ }else if(indexs==5){
x.name = '签证/收入' x.name = '签证/收入'
this.CostAnalysisData.forEach(z=>{ this.CostAnalysisData.forEach(z=>{
x.data.push(z['VisaFeeRate']) x.data.push(z['VisaFeeRate'])
......
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