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

src/components/FinancialModule/DataAnalysis/allEchart.vue

@@ -109,7 +109,8 @@
         </li>
       </ul>
     </div>
-    <div v-loading="loading" style="height: 78%;overflow: auto;display: flex;flex-direction: row;flex-wrap: wrap;">
+    <!-- height: 78%;overflow: auto; -->
+    <div v-loading="loading" style="display: flex;flex-direction: row;flex-wrap: wrap;">
       <IncomeChange :msgData="msg" :StatisticalData="StatisticalData"></IncomeChange>
       <IncomeShare :msgData="msg" :StatisticalData="StatisticalData"></IncomeShare>
       <WoolRateChange :msgData="msg" :StatisticalData="StatisticalData"></WoolRateChange>

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

@@ -27,6 +27,12 @@ export default {
       'rgba(228,57,57,.7)','rgba(247,154,44,.7)','rgba(255,246,11,.7)','rgba(61,217,72,.7)','rgba(57,202,228,.7)','rgba(44,49,241,.7)','rgba(122,57,228,.7)'],
     }
   },
+  created() {
+    window.addEventListener('resize', this.handleResize);
+  },
+  destroyed() {
+    window.removeEventListener('resize', this.handleResize);
+  },
   watch: {
     StatisticalData:{
       handler(n,o){
@@ -44,6 +50,10 @@ export default {
 
   },
   methods: {
+    handleResize() {
+
+      location.reload()
+    },
     getEchart(){
       let datas = []
       let titles = []
@@ -149,7 +159,7 @@ export default {
         series:datas
       }
 
-      myChart.setOption(option,true)	// echarts设置初始化选项
+      myChart.setOption(option,true)
     },
 
   }

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

@@ -49,6 +49,12 @@ export default {
       ],
     }
   },
+  created() {
+    window.addEventListener('resize', this.handleResize);
+  },
+  destroyed() {
+    window.removeEventListener('resize', this.handleResize);
+  },
   watch: {
     StatisticalData:{
       handler(n,o){
@@ -70,6 +76,10 @@ export default {
 
   },
   methods: {
+    handleResize() {
+
+      location.reload()
+    },
     getEchart(){
       this.inCostDatas()
       let that = this

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

@@ -27,6 +27,12 @@ export default {
       'rgba(228,57,57,.7)','rgba(247,154,44,.7)','rgba(255,246,11,.7)','rgba(61,217,72,.7)','rgba(57,202,228,.7)','rgba(44,49,241,.7)','rgba(122,57,228,.7)'],
     }
   },
+  created() {
+    window.addEventListener('resize', this.handleResize);
+  },
+  destroyed() {
+    window.removeEventListener('resize', this.handleResize);
+  },
   watch: {
     StatisticalData:{
       handler(n,o){
@@ -44,6 +50,10 @@ export default {
 
   },
   methods: {
+    handleResize() {
+
+      location.reload()
+    },
     getEchart(){
       let datas = []
       let titles = []
@@ -149,7 +159,7 @@ export default {
         series:datas
       }
 
-      myChart.setOption(option,true)	// echarts设置初始化选项
+      myChart.setOption(option,true)
     },
 
   }

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

@@ -36,6 +36,12 @@ export default {
       CurrentMonth: null
     }
   },
+  created() {
+    window.addEventListener('resize', this.handleResize);
+  },
+  destroyed() {
+    window.removeEventListener('resize', this.handleResize);
+  },
   watch: {
     StatisticalData:{
       handler(n,o){
@@ -53,6 +59,10 @@ export default {
 
   },
   methods: {
+    handleResize() {
+
+      location.reload()
+    },
     getEchart(){
       let datas = [{
         name: this.CurrentMonth,
@@ -120,7 +130,7 @@ export default {
         series: datas
       }
 
-      myChart.setOption(option,true)	// echarts设置初始化选项
+      myChart.setOption(option,true)
     },
 
   }

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

@@ -27,6 +27,12 @@ export default {
       'rgba(228,57,57,.7)','rgba(247,154,44,.7)','rgba(255,246,11,.7)','rgba(61,217,72,.7)','rgba(57,202,228,.7)','rgba(44,49,241,.7)','rgba(122,57,228,.7)'],
     }
   },
+  created() {
+    window.addEventListener('resize', this.handleResize);
+  },
+  destroyed() {
+    window.removeEventListener('resize', this.handleResize);
+  },
   watch: {
     StatisticalData:{
       handler(n,o){
@@ -44,6 +50,10 @@ export default {
 
   },
   methods: {
+    handleResize() {
+
+      location.reload()
+    },
     getEchart(){
       let datas = []
       let titles = []
@@ -149,7 +159,7 @@ export default {
         series:datas
       }
 
-      myChart.setOption(option,true)	// echarts设置初始化选项
+      myChart.setOption(option,true)
     },
 
   }

src/components/FinancialModule/DataAnalysis/components/packetEchart.vue

@@ -241,7 +241,7 @@ export default {
         series:datas
       }
 
-      myChart.setOption(option,true)	// echarts设置初始化选项
+      myChart.setOption(option,true)
     },
     getJapanPacketOutChart(){
       let datas = []
@@ -343,7 +343,7 @@ export default {
         series:datas
       }
 
-      myChart.setOption(option,true)	// echarts设置初始化选项
+      myChart.setOption(option,true)
     },
 
     getJapanRoutineOutChart(){
@@ -446,7 +446,7 @@ export default {
         series:datas
       }
 
-      myChart.setOption(option,true)	// echarts设置初始化选项
+      myChart.setOption(option,true)
     },
     getJapanpRofitOutChart(){
       let that = this