Merge branch 'master-v32-lushangqing' into 'master'

性能走势图更改lineChart数据没刷新



See merge request !371

@@ -183,7 +183,6 @@ export default {
         }
         }
         //计算需要传参的code值
         //计算需要传参的code值
         const calcCode=(val)=>{
         const calcCode=(val)=>{
-            console.log("&&",val)
             let code='';
             let code='';
             if(val>0 && val<3){
             if(val>0 && val<3){
                 code='time_scope_DAY';
                 code='time_scope_DAY';
@@ -359,10 +358,8 @@ export default {
                 }
                 }
             })
             })
             frequencyData.value = resDataArr;
             frequencyData.value = resDataArr;
-            console.log("999",frequencyData.value.length,props.intervalGroup)
             if(frequencyData.value.length>0){
             if(frequencyData.value.length>0){
                 if(!props.intervalGroup){
                 if(!props.intervalGroup){
-                    console.log("369",frequencyData.value[0].ddicDesc)
                     checkedId.value=frequencyData.value[0].ddicDesc
                     checkedId.value=frequencyData.value[0].ddicDesc
                 }
                 }
             }
             }

@@ -12,7 +12,7 @@ export default {
     setup(props, {attrs, slots, emit}) {
     setup(props, {attrs, slots, emit}) {
         const {proxy} = Vue.getCurrentInstance();
         const {proxy} = Vue.getCurrentInstance();
         let interval=Vue.ref('DAY');
         let interval=Vue.ref('DAY');
-        let optionData=Vue.ref({});
+        let optionData=Vue.ref('');
         let names = Vue.ref(['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00']);
         let names = Vue.ref(['00:00', '01:00', '02:00', '03:00', '04:00', '05:00', '06:00', '07:00', '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00']);
         let series = Vue.ref([]);
         let series = Vue.ref([]);
         let rateData = Vue.ref([]);
         let rateData = Vue.ref([]);
@@ -126,16 +126,12 @@ export default {
                         }],
                         }],
                         kpiUnit: kpiUnit.value
                         kpiUnit: kpiUnit.value
                     }
                     }
-
                 }
                 }
 
 
             }else{
             }else{
                 proxy.$global.showMsg(res.msg,'warning');
                 proxy.$global.showMsg(res.msg,'warning');
             }
             }
-
-
             setSeries();
             setSeries();
-
         }
         }
         const changeInterval=(val)=>{
         const changeInterval=(val)=>{
             interval.value=val;
             interval.value=val;
@@ -211,7 +207,6 @@ export default {
             optionDataInit();
             optionDataInit();
         }
         }
         const optionDataInit=()=>{
         const optionDataInit=()=>{
-
             optionData.value = {
             optionData.value = {
                 tooltip: {
                 tooltip: {
                     trigger: 'axis',
                     trigger: 'axis',
@@ -285,8 +280,8 @@ export default {
                         type: "slider",
                         type: "slider",
                         realtime: true, //拖动滚动条时是否动态的更新图表数据
                         realtime: true, //拖动滚动条时是否动态的更新图表数据
                         height: 25, //滚动条高度
                         height: 25, //滚动条高度
-                        start: 40, //滚动条开始位置（共100等份）
-                        end: 65 //结束位置（共100等份）
+                        start: 0, //滚动条开始位置（共100等份）
+                        end: 100 //结束位置（共100等份）
                     }
                     }
                 ],
                 ],
                 series:series.value
                 series:series.value

@@ -95,7 +95,7 @@ export default {
                  }
                  }
              };*/
              };*/
 
 
-            option && myChart.setOption(option);
+            option && myChart.setOption(option,true);
         }
         }
 
 
 
 
@@ -111,7 +111,7 @@ export default {
                     }
                     }
                 }
                 }
             }
             }
-            proxy.myChart.setOption(adapterOption)
+            proxy.myChart.setOption(adapterOption,true)
             proxy.myChart.resize()
             proxy.myChart.resize()
         }
         }