commit

src/views/hzyb/chart/Detail.vue

@@ -2032,6 +2032,7 @@ const getAxisMaxOrMin=(arr,type)=>{
 */
 const setAxisPlotLines = (axis,axisType) => {
     const { MarkersLines,ChartType } = resData.value.ChartInfo;
+    const { EdbInfoList } = resData.value;
     if(!MarkersLines) return []
 
     let markerLines = JSON.parse(MarkersLines);
@@ -2043,7 +2044,8 @@ const setAxisPlotLines = (axis,axisType) => {
         let markerValue;
         if(isXDateAxis) {
             //季节图x轴额外拼个年份
-            let nowYear = new Date().getFullYear();
+            let nowYear = ChartType===2 ? new Date(EdbInfoList[0].DataList[1].DataList
+                [0].DataTimestamp).getFullYear() : '';
             markerValue = ChartType===2 
                 ? new Date(`${nowYear}-${_.value}`).getTime()
                 : new Date(_.value).getTime()
@@ -2072,6 +2074,7 @@ const setAxisPlotLines = (axis,axisType) => {
 /* 处理标识区拼接 axisType表示x轴类型处理时间轴的值 datetime/null */
 const setAxisPlotAreas = (axis,axisType) => {
     const { MarkersAreas,ChartType } = resData.value.ChartInfo;
+    const { EdbInfoList } = resData.value;
     if(!MarkersAreas) return []
 
     let markerAreas = JSON.parse(MarkersAreas);
@@ -2083,7 +2086,8 @@ const setAxisPlotAreas = (axis,axisType) => {
         let fromMarkerValue,toMarkerValue;
         if(isXDateAxis) {
             //季节图x轴额外拼个年份
-            let nowYear = new Date().getFullYear();
+            let nowYear = ChartType===2 ? new Date(EdbInfoList[0].DataList[1].DataList
+                [0].DataTimestamp).getFullYear() : '';
             fromMarkerValue = ChartType===2 
                 ? new Date(`${nowYear}-${_.fromValue}`).getTime()
                 : new Date(_.fromValue).getTime()