no message

src/components/FinancialModule/DataAnalysis/components/Echart/ChangeProportion.vue

@@ -77,6 +77,7 @@ export default {
       let datas = []
       let Stocklegend = {}
       let Newobj={};
+      console.log(this.CostAnalysisData,'---------')
         for(let index=0;index<this.incomeTitles.length;index++){
           for(let i=0;i<this.MonthList.length;i++){
             let filter = this.CostAnalysisData.filter(z=>{return z.Month==this.MonthList[i]})
@@ -90,24 +91,24 @@ export default {
                   }else if(indexs==1){
                     x.name = '房费/收入'
                     this.CostAnalysisData.forEach(z=>{
-                      x.data.push(z['RoomFeeRate'])
+                      x.data.push(z['RommFeeRate'])
                     })
-                  }else if(indexs==3){
+                  }else if(indexs==2){
                     x.name = '车费/收入'
                     this.CostAnalysisData.forEach(z=>{
                       x.data.push(z['CarFeeRate'])
                     })
-                  }else if(indexs==4){
+                  }else if(indexs==3){
                     x.name = '餐费/收入'
                     this.CostAnalysisData.forEach(z=>{
                       x.data.push(z['MealFeeRate'])
                     })
-                  }else if(indexs==5){
+                  }else if(indexs==4){
                     x.name = '门票/收入'
                     this.CostAnalysisData.forEach(z=>{
                       x.data.push(z['TicketFeeRate'])
                     })
-                  }else if(indexs==6){
+                  }else if(indexs==5){
                     x.name = '签证/收入'
                     this.CostAnalysisData.forEach(z=>{
                       x.data.push(z['VisaFeeRate'])
@@ -129,15 +130,6 @@ export default {
 
       option = {
           color:that.colorList,
-          tooltip : {
-              trigger: 'axis',
-              axisPointer: {
-                lineStyle: {
-                  type: 'dashed',
-                  color: "#ddd"
-                }
-              }
-          },
           legend: {
             x:'left',
             y:'bottom',
@@ -151,14 +143,27 @@ export default {
           grid: {
             left: 15, // 默认10%，给24就挺合适的。
             top: 30, // 默认60
-            right: 15, // 默认10%
+            right: 45, // 默认10%
             bottom: 70, // 默认60
             containLabel: true
           },
+          tooltip : {
+              trigger: 'axis',
+              axisPointer: {
+                lineStyle: {
+                  type: 'dashed',
+                  color: "#ddd"
+                }
+              }
+          },
           xAxis : [
               {
                 type: 'category',
                 boundaryGap: false,
+                nameTextStyle: {
+                  fontWeight: 600,
+                  fontSize: 18
+                },
                 data:this.MonthList,
                 axisLine: {
                   lineStyle: {
@@ -198,6 +203,11 @@ export default {
                 }
               }
           ],
+          dataZoom: [
+            {
+              type: 'inside'
+            }
+          ],
           series:datas
       };
         myChart.setOption(option,true)

src/components/FinancialModule/DataAnalysis/components/lineEchart.vue

@@ -126,22 +126,22 @@ export default {
                     this.CostAnalysisData.forEach(z=>{
                       x.data.push(z['RoomFee'])
                     })
-                  }else if(indexs==3){
+                  }else if(indexs==2){
                     x.name = '车费'
                     this.CostAnalysisData.forEach(z=>{
                       x.data.push(z['CarFee'])
                     })
-                  }else if(indexs==4){
+                  }else if(indexs==3){
                     x.name = '餐费'
                     this.CostAnalysisData.forEach(z=>{
                       x.data.push(z['MealFee'])
                     })
-                  }else if(indexs==5){
+                  }else if(indexs==4){
                     x.name = '门票'
                     this.CostAnalysisData.forEach(z=>{
                       x.data.push(z['TicketFee'])
                     })
-                  }else if(indexs==6){
+                  }else if(indexs==5){
                     x.name = '签证'
                     this.CostAnalysisData.forEach(z=>{
                       x.data.push(z['VisaFee'])
@@ -156,24 +156,24 @@ export default {
                   }else if(indexs==1){
                     x.name = '房费/收入'
                     this.CostAnalysisData.forEach(z=>{
-                      x.data.push(z['RoomFeeRate'])
+                      x.data.push(z['RommFeeRate'])
                     })
-                  }else if(indexs==3){
+                  }else if(indexs==2){
                     x.name = '车费/收入'
                     this.CostAnalysisData.forEach(z=>{
                       x.data.push(z['CarFeeRate'])
                     })
-                  }else if(indexs==4){
+                  }else if(indexs==3){
                     x.name = '餐费/收入'
                     this.CostAnalysisData.forEach(z=>{
                       x.data.push(z['MealFeeRate'])
                     })
-                  }else if(indexs==5){
+                  }else if(indexs==4){
                     x.name = '门票/收入'
                     this.CostAnalysisData.forEach(z=>{
                       x.data.push(z['TicketFeeRate'])
                     })
-                  }else if(indexs==6){
+                  }else if(indexs==5){
                     x.name = '签证/收入'
                     this.CostAnalysisData.forEach(z=>{
                       x.data.push(z['VisaFeeRate'])