Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/DataAnalysis/allEchart.vue

@@ -236,10 +236,14 @@
       </template>
 
       <template v-if="activeName=='4'">
-        <!-- <fourIncomeChange :msgData="msg" :StatisticalData="StatisticalData"></fourIncomeChange>
-        <fourIncomeShare></fourIncomeShare>
-        <fourWoolRateChange></fourWoolRateChange>
-        <fourActualRateChange></fourActualRateChange> -->
+        <div class="allEchartRow">
+          <fourIncomeChange :msgData="msg" :StatisticalData="StatisticalData"></fourIncomeChange>
+          <!-- <fourIncomeShare :msgData="msg" :StatisticalData="StatisticalData"></fourIncomeShare> -->
+        </div>
+        <div class="allEchartRow">
+          <!-- <fourWoolRateChange :msgData="msg" :StatisticalData="StatisticalData"></fourWoolRateChange>
+          <fourActualRateChange :msgData="msg" :StatisticalData="StatisticalData"></fourActualRateChange> -->
+        </div>
       </template>
 
     </div>
@@ -463,7 +467,7 @@ export default {
         msg,
         res => {
           if (res.data.resultCode == 1) {
-            console.log(this.StatisticalData,'=---------')
+            console.log(this.StatisticalData,'=---------'  )
             this.StatisticalData = res.data.data
           } else {
             this.Error(res.data.message);

src/components/FinancialModule/DataAnalysis/components/fourEchart/ActualRateChange.vue

@@ -41,12 +41,10 @@ export default {
     StatisticalData:{
       handler(n,o){
         this.MonthList = n.MonthQuarterList//月份列表
-        this.JapanAllData = n.JapanAllData
-        this.JapanXBData = n.JapanXBData
-        this.JapanSPData = n.JapanSPData
-        this.MaoLiAnalysisData = n.MaoLiAnalysisData
-        this.SJLLAnalysisData = n.SJLLAnalysisData
-        this.RoomAnalysisData = n.RoomAnalysisData
+        this.ShopData = n.ShopData
+        this.LeaderRankList = n.LeaderRankList
+        this.GuideRankList = n.GuideRankList
+        this.CommissionRateList = n.CommissionRateList
         this.getEchart()
       },
       deep: true,
@@ -66,7 +64,7 @@ export default {
       let titles = []
       let Stocklegend = {}
       let Newobj = {}
-      this.JapanSPData.forEach((x,indexs)=>{
+      this.CommissionRateList.forEach((x,indexs)=>{
         let Name = `${x.Name}`
         titles.push(Name)
         let obj = {
@@ -80,9 +78,9 @@ export default {
               position: 'top', // 在顶部显示
               formatter: '{c}k' // 格式化金额，{c} 代表数据值
           },
-          data: x.MonthData.map(x=>{ return (x/1000).toFixed(2) })	// 绑定实时数据数组
+          data: [(x.Commission/1000).toFixed(2)]
         }
-        if(x.Name=='人均车资') datas.push(obj)
+        datas.push(obj)
         if(indexs>6){
           let name=x.Name;
           Newobj[name]=false;

src/components/FinancialModule/DataAnalysis/components/fourEchart/IncomeChange.vue

@@ -62,6 +62,7 @@ export default {
       let titles = []
       let Stocklegend = {}
       let Newobj = {}
+      console.log(this.ShopData,'=====')
       this.ShopData.forEach((x,indexs)=>{
         let Name = `${x.Name}`
         titles.push(Name)
@@ -78,7 +79,7 @@ export default {
           },
           data: x.DetailList.map(x=>{ return (x.TotalMoney/10000).toFixed(2) })	// 绑定实时数据数组
         }
-        if(x.Name=='收入') datas.push(obj)
+        datas.push(obj)
         if(indexs>6){
           let name=x.Name;
           Newobj[name]=false;

src/components/FinancialModule/DataAnalysis/components/fourEchart/IncomeShare.vue

@@ -41,12 +41,10 @@ export default {
     StatisticalData:{
       handler(n,o){
         this.MonthList = n.MonthQuarterList//月份列表
-        this.JapanAllData = n.JapanAllData
-        this.JapanXBData = n.JapanXBData
-        this.JapanSPData = n.JapanSPData
-        this.MaoLiAnalysisData = n.MaoLiAnalysisData
-        this.SJLLAnalysisData = n.SJLLAnalysisData
-        this.RoomAnalysisData = n.RoomAnalysisData
+        this.ShopData = n.ShopData
+        this.LeaderRankList = n.LeaderRankList
+        this.GuideRankList = n.GuideRankList
+        this.CommissionRateList = n.CommissionRateList
         this.getEchart()
       },
       deep: true,
@@ -66,7 +64,7 @@ export default {
       let titles = []
       let Stocklegend = {}
       let Newobj = {}
-      this.JapanSPData.forEach((x,indexs)=>{
+      this.LeaderRankList.forEach((x,indexs)=>{
         let Name = `${x.Name}`
         titles.push(Name)
         let obj = {
@@ -80,9 +78,9 @@ export default {
               position: 'top', // 在顶部显示
               formatter: '{c}' // 格式化金额，{c} 代表数据值
           },
-          data: x.MonthData.map(x=>{ return x })	// 绑定实时数据数组
+          data: [x.TotalMoney]
         }
-        if(x.Name=='团数') datas.push(obj)
+        datas.push(obj)
         if(indexs>6){
           let name=x.Name;
           Newobj[name]=false;

src/components/FinancialModule/DataAnalysis/components/fourEchart/WoolRateChange.vue

@@ -41,12 +41,10 @@ export default {
     StatisticalData:{
       handler(n,o){
         this.MonthList = n.MonthQuarterList//月份列表
-        this.JapanAllData = n.JapanAllData
-        this.JapanXBData = n.JapanXBData
-        this.JapanSPData = n.JapanSPData
-        this.MaoLiAnalysisData = n.MaoLiAnalysisData
-        this.SJLLAnalysisData = n.SJLLAnalysisData
-        this.RoomAnalysisData = n.RoomAnalysisData
+        this.ShopData = n.ShopData
+        this.LeaderRankList = n.LeaderRankList
+        this.GuideRankList = n.GuideRankList
+        this.CommissionRateList = n.CommissionRateList
         this.getEchart()
       },
       deep: true,
@@ -66,7 +64,7 @@ export default {
       let titles = []
       let Stocklegend = {}
       let Newobj = {}
-      this.JapanSPData.forEach((x,indexs)=>{
+      this.GuideRankList.forEach((x,indexs)=>{
         let Name = `${x.Name}`
         titles.push(Name)
         let obj = {
@@ -80,9 +78,9 @@ export default {
               position: 'top', // 在顶部显示
               formatter: '{c}k' // 格式化金额，{c} 代表数据值
           },
-          data: x.MonthData.map(x=>{ return (x/1000).toFixed(2) })	// 绑定实时数据数组
+          data: [(x.TotalMoney/1000).toFixed(2)]
         }
-        if(x.Name=='人均机票') datas.push(obj)
+        datas.push(obj)
         if(indexs>6){
           let name=x.Name;
           Newobj[name]=false;