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