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

src/components/FinancialModule/DataAnalysis/allEchart.vue

@@ -183,7 +183,8 @@ export default {
     this.getCompanyMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id
     const end = new Date();
     const start = new Date();
-    start.setMonth(start.getMonth() - 6);
+    start.setMonth(start.getMonth() - 7);
+    end.setMonth(end.getMonth() - 1);
     this.dateTime = [this.$commonUtils.getFormatDateM(start),this.$commonUtils.getFormatDateM(end)]
     this.msg.startDate = this.dateTime[0]
     this.msg.endDate = this.dateTime[1]

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

@@ -71,7 +71,7 @@ export default {
           data: x.DetailList.map(y=>{return y.ProfitRate.toFixed(2)})	// 绑定实时数据数组
         }
         datas.push(obj)
-        if(indexs>7){
+        if(indexs>10){
           let name=x.Name;
           Newobj[name]=false;
         }

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

@@ -71,7 +71,7 @@ export default {
           data: x.DetailList.map(y=>{return y.IncomeRate.toFixed(2)})	// 绑定实时数据数组
         }
         datas.push(obj)
-        if(indexs>4){
+        if(indexs>10){
           let name=x.Name;
           Newobj[name]=false;
         }

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

@@ -71,7 +71,7 @@ export default {
           data: x.DetailList.map(y=>{return y.MaoLiRate.toFixed(2)})	// 绑定实时数据数组
         }
         datas.push(obj)
-        if(indexs>4){
+        if(indexs>10){
           let name=x.Name;
           Newobj[name]=false;
         }