cxmo 8 月之前
父節點
當前提交
66bb8362a9
共有 1 個文件被更改,包括 6 次插入6 次删除
  1. 6 6
      src/hooks/chart/render.js

+ 6 - 6
src/hooks/chart/render.js

@@ -823,7 +823,7 @@ function setSplineOpt(e){
 //季节图
 function setSeasonOpt(e){
     axisLimitState.leftIndex=0
-    const {SeasonRightConfig={}} = e.DataResp||{}
+    const {RightAxis:SeasonRightConfig={}} = e.DataResp||{}
     axisLimitState.rightIndex=SeasonRightConfig.IsShow?1:-1
     axisLimitState.rightTwoIndex=-1
 
@@ -946,7 +946,7 @@ function setSeasonOpt(e){
             data:[],
             yAxis:1,
         }
-        const DataList = (SeasonRightConfig.IndicatorType===1?SeasonRightConfig.EdbInfoList[0].DataList:e.EdbInfoList[1].DataList)||[]
+        const DataList = (SeasonRightConfig.IndicatorType===1?SeasonRightConfig.EdbInfoList[0].DataList:e.EdbInfoList[1]?.DataList)||[]
         DataList.forEach(item=>{
             serieItem.data.push([item.DataTimestamp,item.Value])
         })
@@ -2498,10 +2498,10 @@ function calcYAxislimit(tableData=[],ChartInfo,DataResp={}){
     }
     //季节性图-右轴单独处理
     if(ChartInfo.ChartType===2){
-        if(DataResp.SeasonRightConfig&&DataResp.SeasonRightConfig.IsAdd&&DataResp.SeasonRightConfig.IsShow){
-            if(DataResp.SeasonRightConfig.IndicatorType===1){
-                axisLimitState.rightMin = DataResp.SeasonRightConfig.EdbInfoList[0].MinData||0
-                axisLimitState.rightMax = DataResp.SeasonRightConfig.EdbInfoList[0].MaxData||0
+        if(DataResp.RightAxis&&DataResp.RightAxis.IsAdd&&DataResp.RightAxis.IsShow){
+            if(DataResp.RightAxis.IndicatorType===1){
+                axisLimitState.rightMin = DataResp.RightAxis.EdbInfoList[0].MinData||0
+                axisLimitState.rightMax = DataResp.RightAxis.EdbInfoList[0].MaxData||0
             }else{
                 axisLimitState.rightMin = tableData[1].MinData||0
                 axisLimitState.rightMax = tableData[1].MaxData||0