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

趋势预测图增加刷新数据hackReset，增加oracle图片



See merge request !83

 <template>
 <template>
   <div :style="styleObj">
   <div :style="styleObj">
-    <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,
       options: {
       options: {
         grid: {},
         grid: {},
         /*legend: {
         /*legend: {
@@ -95,7 +96,8 @@ export default {
       handler(val){
       handler(val){
         if(this.optionsSetup.isVuex){
         if(this.optionsSetup.isVuex){
           let optionsData=this.optionsData;
           let optionsData=this.optionsData;
-         /* if(this.optionsData.dataType=="dynamicData"){
+         /*          this.hackReset=false;
+         if(this.optionsData.dataType=="dynamicData"){
             //改变参数值-月季度年，重新加载动态数据--待测
             //改变参数值-月季度年，重新加载动态数据--待测
             this.optionsData.dynamicData.contextData.dataScope=val;
             this.optionsData.dynamicData.contextData.dataScope=val;
             // this.editorOptions();
             // this.editorOptions();
@@ -362,6 +364,7 @@ export default {
     },
     },
     //静态数据
     //静态数据
     staticDataFn(val) {
     staticDataFn(val) {
+      this.hackReset=true;
       this.setSeriesData(val)
       this.setSeriesData(val)
 
 
     },
     },
@@ -492,11 +495,13 @@ export default {
     },
     },
     getEchartData(val, optionsSetup) {
     getEchartData(val, optionsSetup) {
       const data = this.queryEchartsData(val);
       const data = this.queryEchartsData(val);
+      this.hackReset=false;
       data.then(res => {
       data.then(res => {
         this.renderingFn(optionsSetup, res);
         this.renderingFn(optionsSetup, res);
       });
       });
     },
     },
     renderingFn(optionsSetup, val) {
     renderingFn(optionsSetup, val) {
+      this.hackReset=true;
       this.setSeriesData(val.series)
       this.setSeriesData(val.series)
     }
     }
   }
   }