ia.novokshanov/asb_cloud_front
1
0
Fork 0
forked from ddrilling/asb_cloud_front
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hotfix. CF2-75, CF2-76. Дубликация кода обработчиков устранена

Browse Source
This commit is contained in:
goodmice 2021-10-14 12:44:06 +05:00
parent f3c42568dc
commit 4c24bdf226
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/pages/TelemetryView/index.jsx
View File

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