|
@@ -800,6 +800,7 @@ function setSplineOpt(e){
|
|
|
|
|
|
//季节图
|
|
|
function setSeasonOpt(e){
|
|
|
+ const isETASource = e.ChartInfo.Source===1
|
|
|
axisLimitState.leftIndex=0
|
|
|
axisLimitState.rightIndex=-1
|
|
|
axisLimitState.rightTwoIndex=-1
|
|
@@ -848,7 +849,7 @@ function setSeasonOpt(e){
|
|
|
//获取上下限
|
|
|
let minLimit = 0,maxLimit = 0
|
|
|
//非ETA图库不使用自定义上下限
|
|
|
- if(!useSalfLimit){
|
|
|
+ if(!useSalfLimit&&!isETASource){
|
|
|
minLimit = data.MinData
|
|
|
maxLimit = data.MaxData
|
|
|
}else{
|
|
@@ -977,6 +978,7 @@ function setSeasonOpt(e){
|
|
|
//堆叠图/组合图设置
|
|
|
//本来和曲线图逻辑基本一致兼容下即可 为了以后便于维护和阅读还是拆开写吧
|
|
|
function setStackOrCombinChart(e){
|
|
|
+ const isETASource = e.ChartInfo.Source===1
|
|
|
const data=e.EdbInfoList
|
|
|
//图表类型
|
|
|
const chartTypeMap = {
|
|
@@ -1074,7 +1076,7 @@ function setStackOrCombinChart(e){
|
|
|
//获取上下限
|
|
|
let minLimit = 0,maxLimit = 0
|
|
|
//非ETA图库不使用自定义上下限
|
|
|
- if(!useSalfLimit){
|
|
|
+ if(!useSalfLimit&&!isETASource){
|
|
|
minLimit = chartData[sameSideIndex].MinData
|
|
|
maxLimit = chartData[sameSideIndex].MaxData
|
|
|
}else{
|
|
@@ -1086,8 +1088,6 @@ function setStackOrCombinChart(e){
|
|
|
if(limitMap[item.IsAxis]){
|
|
|
minLimit = axisLimitState[`${limitMap[item.IsAxis][0]}`]||0
|
|
|
maxLimit = axisLimitState[`${limitMap[item.IsAxis][1]}`]||0
|
|
|
- console.log('check,check,check',axisLimitState.leftMin,axisLimitState.leftMax)
|
|
|
- console.log('test堆叠',minLimit,maxLimit)
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -1218,6 +1218,7 @@ function setStackOrCombinChart(e){
|
|
|
|
|
|
/* 散点图 第一个指标值为x轴 第二个指标为y轴*/
|
|
|
function setScatterOptions(data){
|
|
|
+ const isETASource = data.ChartInfo.Source===1
|
|
|
axisLimitState.leftIndex=1
|
|
|
axisLimitState.rightIndex=-1
|
|
|
axisLimitState.rightTwoIndex=-1
|
|
@@ -1292,7 +1293,7 @@ function setScatterOptions(data){
|
|
|
|
|
|
//获取上下限
|
|
|
let minLimit = 0,maxLimit = 0
|
|
|
- if(!useSalfLimit){
|
|
|
+ if(!useSalfLimit&&!isETASource){
|
|
|
minLimit = Math.min(...real_data.map(_ => _.y));
|
|
|
maxLimit = Math.max(...real_data.map(_ => _.y));
|
|
|
}else{
|