Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

【#823】【虚拟容量视图】年柱子展示错误，当前年无数据，页面展示不对（共性问题）,在v-chart上增加v-if判断，重新获取取数据后改变



See merge request !77

 <template>
 <template>
   <div :style="styleObj" v-if="isDisplay">
   <div :style="styleObj" v-if="isDisplay">
-    <v-chart :options="options" autoresize/>
+    <v-chart v-if="hackReset" :options="options" autoresize/>
   </div>
   </div>
 </template>
 </template>
 
 
@@ -16,6 +16,7 @@ export default {
   },
   },
   data() {
   data() {
     return {
     return {
+      hackReset:true,
       chartData:[],
       chartData:[],
       isDisplay:true,
       isDisplay:true,
       kpiUnit:'',
       kpiUnit:'',
@@ -174,6 +175,7 @@ export default {
         }
         }
         if(this.optionsSetup.isVuex){
         if(this.optionsSetup.isVuex){
           let optionsData=this.optionsData;
           let optionsData=this.optionsData;
+          this.hackReset=false;
           if(this.optionsData.dataType=="dynamicData"){
           if(this.optionsData.dataType=="dynamicData"){
             //改变参数值-月季度年，重新加载动态数据--待测
             //改变参数值-月季度年，重新加载动态数据--待测
             this.optionsData.dynamicData.contextData.time=time;
             this.optionsData.dynamicData.contextData.time=time;
@@ -526,6 +528,7 @@ export default {
         : this.dynamicDataFn(optionsData.dynamicData, optionsData.refreshTime,optionsData.isRefresh);
         : this.dynamicDataFn(optionsData.dynamicData, optionsData.refreshTime,optionsData.isRefresh);
     },
     },
     staticDataFn(val) {
     staticDataFn(val) {
+      this.hackReset=true;
       const series = this.options.series;
       const series = this.options.series;
       let axis = [];
       let axis = [];
       let bar = [];
       let bar = [];
@@ -564,6 +567,7 @@ export default {
       });
       });
     },
     },
     renderingFn(val) {
     renderingFn(val) {
+      this.hackReset=true;
       let xAxis=val.xAxis;
       let xAxis=val.xAxis;
       if(xAxis && xAxis.length>0){
       if(xAxis && xAxis.length>0){
         this.options.xAxis.data =xAxis;
         this.options.xAxis.data =xAxis;