|
|
@@ -1084,7 +1084,7 @@ export const chartSetMixin = {
|
|
|
setSeasonChart(newval) {
|
|
|
/* 季节性图的图表配置 */
|
|
|
this.leftIndex = 0;
|
|
|
- this.rightIndex = -1;
|
|
|
+ this.rightIndex = newval[1]?1:-1;
|
|
|
this.rightTwoIndex = -1;
|
|
|
const chartData = newval[0];
|
|
|
// 农历数据需要去除第一项 农历和公历处理逻辑一样
|
|
|
@@ -1106,13 +1106,23 @@ export const chartSetMixin = {
|
|
|
//获取对应轴的上下限
|
|
|
//预测指标-走势图；图表配置-主题设置；不使用自定义上下限，剔除
|
|
|
const useTableLimit = ['/predictEdb','/chartThemeSet','/addpredictEdb','/editpredictEdb','/viewBalanceSheet','/editBalanceSheet'].includes(this.$route.path)
|
|
|
- let minLimit = 0,maxLimit = 0
|
|
|
+ let minLimit = 0,maxLimit = 0,rightMin=0,rightMax=0
|
|
|
if(useTableLimit){
|
|
|
minLimit = chartData.MinData
|
|
|
maxLimit = chartData.MaxData
|
|
|
+ //加上右轴
|
|
|
+ if(this.rightIndex!=-1){
|
|
|
+ rightMin = newval[1].MinData
|
|
|
+ rightMax = newval[1].MaxData
|
|
|
+ }
|
|
|
}else{
|
|
|
minLimit = this.chartLimit.min||0
|
|
|
maxLimit = this.chartLimit.max||0
|
|
|
+ //加上右轴
|
|
|
+ if(this.rightIndex!=-1){
|
|
|
+ rightMin = this.chartLimit.rightMin||0
|
|
|
+ rightMax = this.chartLimit.rightMax||0
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
//数据列-常规左轴
|
|
|
@@ -1185,8 +1195,28 @@ export const chartSetMixin = {
|
|
|
seasonData.push(serieItem)
|
|
|
}
|
|
|
//数据列-右轴
|
|
|
- if(newval[1]){
|
|
|
+ const {SearonRightConfig} = this.chartInfo
|
|
|
+ if(newval[1]&&SearonRightConfig.IsShow){
|
|
|
//右轴的设置
|
|
|
+ let serieItem = {
|
|
|
+ type:'line',
|
|
|
+ data:[],
|
|
|
+ name:SearonRightConfig.Legend||'右轴test',
|
|
|
+ lineWidth:SearonRightConfig.LineWidth,
|
|
|
+ dashStyle:SearonRightConfig.LineStyle,
|
|
|
+ color:SearonRightConfig.LineColor,
|
|
|
+ marker:SearonRightConfig.Style==='mark'?{
|
|
|
+ enabled:true,
|
|
|
+ symbol:SearonRightConfig.Shape,
|
|
|
+ fillColor:SearonRightConfig.ChartColor,
|
|
|
+ radius:SearonRightConfig.Size
|
|
|
+ }:{},
|
|
|
+ yAxis:1,
|
|
|
+ }
|
|
|
+ newval[1].DataList.forEach(item=>{
|
|
|
+ serieItem.data.push([item.DataTimestamp,item.Value])
|
|
|
+ })
|
|
|
+ seasonData.push(serieItem)
|
|
|
}
|
|
|
|
|
|
//y轴
|
|
|
@@ -1225,6 +1255,37 @@ export const chartSetMixin = {
|
|
|
plotBands: this.setAxisPlotAreas(1),
|
|
|
plotLines: this.setAxisPlotLines(1)
|
|
|
}];
|
|
|
+ //如果有右轴,加上右轴
|
|
|
+ if(newval[1]&&SearonRightConfig.IsShow){
|
|
|
+ seasonYdata.push({
|
|
|
+ ...seasonOptions.yAxis,
|
|
|
+ opposite: true,//右轴
|
|
|
+ labels: {
|
|
|
+ formatter: function () {
|
|
|
+ let val = this.value;
|
|
|
+ return val;
|
|
|
+ },
|
|
|
+ align: 'center',
|
|
|
+ style: {
|
|
|
+ ...chartTheme&&chartTheme.yAxisOptions.style
|
|
|
+ }
|
|
|
+ },
|
|
|
+ title: {
|
|
|
+ text: SearonRightConfig.Legend||'右轴',
|
|
|
+ style:{
|
|
|
+ ...chartTheme&&chartTheme.yAxisOptions.style
|
|
|
+ },
|
|
|
+ align: 'high',
|
|
|
+ rotation: 0,
|
|
|
+ y: -12,
|
|
|
+ x: -newval[1].Unit.length*12 ,
|
|
|
+ textAlign: 'right',
|
|
|
+ reserveSpace: false,
|
|
|
+ },
|
|
|
+ max: Number(rightMax),
|
|
|
+ min: Number(rightMin),
|
|
|
+ })
|
|
|
+ }
|
|
|
|
|
|
/* x轴显示月日 */
|
|
|
const xAxis = {
|
cxmo