|
@@ -723,7 +723,8 @@ const initBarData = (data: { XEdbIdValue: number[]; YDataList: any; EdbInfoList:
|
|
|
return setBarChart()
|
|
|
}
|
|
|
const setBarChart = () => {
|
|
|
- const {barDateList,barXIdData,chartLimit,barEdbData,chartInfo} = barChartRenderData.value;
|
|
|
+ const {barDateList,barXIdData,barEdbData,chartInfo} = barChartRenderData.value;
|
|
|
+ const { chartLimit } = state;
|
|
|
let seriesData: { data: any; type: string; yAxis: number; name: any; color: any; chartType: string; }[] = [];
|
|
|
const data = _.cloneDeep(barDateList);
|
|
|
|
|
@@ -1720,7 +1721,8 @@ const setAxisPlotLines = (axis: number, axisType: any = null) => {
|
|
|
let markerValue:number;
|
|
|
if (isXDateAxis) {
|
|
|
//季节图x轴额外拼个年份
|
|
|
- let nowYear = new Date().getFullYear();
|
|
|
+ let nowYear = ChartType===2 ? new Date(state.dataList[0].DataList[1].DataList
|
|
|
+ [0].DataTimestamp).getFullYear() : '';
|
|
|
markerValue =
|
|
|
ChartType === 2
|
|
|
? new Date(`${nowYear}-${_.value}`).getTime()
|
|
@@ -1761,7 +1763,8 @@ const setAxisPlotAreas = (axis: number, axisType: any = null) => {
|
|
|
let fromMarkerValue:number, toMarkerValue:number;
|
|
|
if (isXDateAxis) {
|
|
|
//季节图x轴额外拼个年份
|
|
|
- let nowYear = new Date().getFullYear();
|
|
|
+ let nowYear = ChartType===2 ? new Date(state.dataList[0].DataList[1].DataList
|
|
|
+ [0].DataTimestamp).getFullYear() : '';
|
|
|
fromMarkerValue =
|
|
|
ChartType === 2
|
|
|
? new Date(`${nowYear}-${_.fromValue}`).getTime()
|