Отображаемый интервал графика исправлен

This commit is contained in:
goodmice 2021-10-27 15:59:55 +05:00
parent 3a35574a8b
commit d4a8c7b1f1
2 changed files with 4 additions and 3 deletions

View File

@ -101,14 +101,14 @@ export const Column = ({ lineGroup, data, flowChartData, interval, showBorder, s
})
})
preDataParams.yStart = new Date()
preDataParams.yStart.setSeconds(preDataParams.yStart.getSeconds() - interval)
preDataParams.yStart = new Date(Math.max(new Date(dataLast.date), preDataParams.yStart ?? new Date(0)))
preDataParams.yStart.setSeconds(preDataParams.yStart.getSeconds() - interval * 0.97)
preDataParams.yInterval = interval
preDataParams.displayLabels = yDisplay ?? false
return {...preDataParams}
})
}, [data, lineGroup, interval, yDisplay, flowChartData])
}, [data, lineGroup, interval, yDisplay, flowChartData, dataLast])
return (
<div style={style}>

View File

@ -314,6 +314,7 @@ export default function TelemetryView({ idWell }) {
data[idx].rotorTorque = 0;
data[idx].blockSpeed = Math.abs(data[idx].blockSpeed)
})
data.sort((a, b) => a.date > b.date ? 1 : -1)
setDataSaub(data)
}
}