|
@@ -144,7 +144,7 @@ const setDefaultLineOptions = () => {
|
|
);
|
|
);
|
|
|
|
|
|
//y轴
|
|
//y轴
|
|
- let textEn = item.Unit?item.UnitEn:''
|
|
|
|
|
|
+ let textEn = item.ConvertEnUnit||item.UnitEn||item.ConvertUnit||item.Unit
|
|
let yItem = {
|
|
let yItem = {
|
|
...basicYAxis,
|
|
...basicYAxis,
|
|
labels: {
|
|
labels: {
|
|
@@ -159,7 +159,7 @@ const setDefaultLineOptions = () => {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
title: {
|
|
title: {
|
|
- text:language.value=='ch'?sameSideIndex !== index ? '' : `${item.Unit}`:textEn,
|
|
|
|
|
|
+ text:language.value=='ch'?sameSideIndex !== index ? '' : `${item.ConvertUnit||item.Unit}`:textEn,
|
|
style:{
|
|
style:{
|
|
...chartTheme&&chartTheme.yAxisOptions.style
|
|
...chartTheme&&chartTheme.yAxisOptions.style
|
|
},
|
|
},
|
|
@@ -340,7 +340,7 @@ const setSeasonOptions = () => {
|
|
}
|
|
}
|
|
},
|
|
},
|
|
title: {
|
|
title: {
|
|
- text:language.value=='ch'?`${chartData.Unit}`:chartData.UnitEn,
|
|
|
|
|
|
+ text:language.value=='ch'?`${chartData.ConvertUnit||chartData.Unit}`:chartData.ConvertEnUnit||chartData.UnitEn,
|
|
align: 'high',
|
|
align: 'high',
|
|
rotation: 0,
|
|
rotation: 0,
|
|
y: -12,
|
|
y: -12,
|
|
@@ -445,7 +445,7 @@ const setStackOrCombinChart = () => {
|
|
: dataList.findIndex(item => item.IsAxis===2);
|
|
: dataList.findIndex(item => item.IsAxis===2);
|
|
|
|
|
|
//y轴
|
|
//y轴
|
|
- let textEn = item.Unit?item.UnitEn:''
|
|
|
|
|
|
+ let textEn = item.ConvertEnUnit||item.UnitEn||item.ConvertUnit||item.Unit
|
|
let yItem = {
|
|
let yItem = {
|
|
...basicYAxis,
|
|
...basicYAxis,
|
|
labels: {
|
|
labels: {
|
|
@@ -460,7 +460,7 @@ const setStackOrCombinChart = () => {
|
|
},
|
|
},
|
|
},
|
|
},
|
|
title: {
|
|
title: {
|
|
- text:language.value=='ch'?sameSideIndex !== index ? '' : `${item.Unit}`:textEn,
|
|
|
|
|
|
+ text:language.value=='ch'?sameSideIndex !== index ? '' : `${item.ConvertUnit||item.Unit}`:textEn,
|
|
// text: null,
|
|
// text: null,
|
|
align: 'high',
|
|
align: 'high',
|
|
rotation: 0,
|
|
rotation: 0,
|
|
@@ -613,10 +613,12 @@ const setScatterChartOptions = () => {
|
|
}
|
|
}
|
|
|
|
|
|
const { IsOrder,ChartColor } = dataList[0];
|
|
const { IsOrder,ChartColor } = dataList[0];
|
|
|
|
+ const textYEn = dataList[1].ConvertEnUnit||dataList[1].UnitEn||dataList[1].ConvertUnit||dataList[1].Unit
|
|
|
|
+ const textXEn = dataList[0].ConvertEnUnit||dataList[0].UnitEn||dataList[0].ConvertUnit||dataList[0].Unit
|
|
//y轴
|
|
//y轴
|
|
let yAxis = {
|
|
let yAxis = {
|
|
title: {
|
|
title: {
|
|
- text: language.value=='ch'?`${dataList[1].Unit}`:dataList[1].Unit?dataList[1].UnitEn:'',
|
|
|
|
|
|
+ text: language.value=='ch'?`${dataList[1].ConvertUnit||dataList[1].Unit}`:textYEn,
|
|
// text: null,
|
|
// text: null,
|
|
align: 'high',
|
|
align: 'high',
|
|
rotation: 0,
|
|
rotation: 0,
|
|
@@ -639,8 +641,8 @@ const setScatterChartOptions = () => {
|
|
},
|
|
},
|
|
opposite: false,
|
|
opposite: false,
|
|
reversed: IsOrder,
|
|
reversed: IsOrder,
|
|
- min: Number(dataList[0].MinData),
|
|
|
|
- max: Number(dataList[0].MaxData),
|
|
|
|
|
|
+ min: Number(dataList[1].MinData),
|
|
|
|
+ max: Number(dataList[1].MaxData),
|
|
tickWidth: 1,
|
|
tickWidth: 1,
|
|
tickLength: 5,
|
|
tickLength: 5,
|
|
lineWidth: 1,
|
|
lineWidth: 1,
|
|
@@ -682,7 +684,7 @@ const setScatterChartOptions = () => {
|
|
xAxis: {
|
|
xAxis: {
|
|
...scatterXAxis,
|
|
...scatterXAxis,
|
|
title: {
|
|
title: {
|
|
- text: language.value=='ch'?`${dataList[0].Unit}`:dataList[0].Unit?dataList[0].UnitEn:'',
|
|
|
|
|
|
+ text: language.value=='ch'?`${dataList[0].ConvertUnit||dataList[0].Unit}`:textXEn,
|
|
align: 'high',
|
|
align: 'high',
|
|
rotation: 0,
|
|
rotation: 0,
|
|
x: 0,
|
|
x: 0,
|