diff --git a/src/pages/TelemetryView/index.jsx b/src/pages/TelemetryView/index.jsx index a8c3211..8f0727f 100644 --- a/src/pages/TelemetryView/index.jsx +++ b/src/pages/TelemetryView/index.jsx @@ -179,14 +179,22 @@ export default function TelemetryView({idWell}) { const options = timePeriodCollection.map((line) => ) - const handleData = (state) => (data) => { - if (data && state) { + const handleDataSaub = (data) => { + if (data) { data.forEach((_, idx) => { if (data[idx].rotorSpeed < 1) data[idx].rotorSpeed = 0; + if (data[idx].rotorTorque < 1) + data[idx].rotorTorque = 0; data[idx].blockSpeed = Math.abs(data[idx].blockSpeed) }) - state(data) + setDataSaub(data) + } + } + + const handleDataSpin = (data) => { + if (data) { + setDataSpin(data) } } @@ -195,14 +203,14 @@ export default function TelemetryView({idWell}) { async () => { const dataSaub = await TelemetryDataSaubService.getData(idWell, null, chartInterval) const dataSpin = await TelemetryDataSpinService.getData(idWell, null, chartInterval) - handleData(setDataSaub)(dataSaub) - handleData(setDataSpin)(dataSpin) + handleDataSaub(dataSaub) + handleDataSpin(dataSpin) }, setShowLoader, `Не удалось получить данные по скважине "${idWell}"`, ) - const unsubscribeSaub = Subscribe('hubs/telemetry', 'ReceiveDataSaub', `well_${idWell}`, handleData(setDataSaub)) - const unsubscribeSpin = Subscribe('hubs/telemetry', 'ReceiveDataSpin', `well_${idWell}`, handleData(setDataSpin)) + const unsubscribeSaub = Subscribe('hubs/telemetry', 'ReceiveDataSaub', `well_${idWell}`, handleDataSaub) + const unsubscribeSpin = Subscribe('hubs/telemetry', 'ReceiveDataSpin', `well_${idWell}`, handleDataSpin) return () => { unsubscribeSaub() unsubscribeSpin()