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 13:00:16 +05:00
parent 4c24bdf226
commit f0fde92af0
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,14 +179,22 @@ 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 handleData = (state) => (data) => { const handleDataSaub = (data) => {
if (data && state) { if (data) {
data.forEach((_, idx) => { data.forEach((_, idx) => {
if (data[idx].rotorSpeed < 1) if (data[idx].rotorSpeed < 1)
data[idx].rotorSpeed = 0; data[idx].rotorSpeed = 0;
if (data[idx].rotorTorque < 1)
data[idx].rotorTorque = 0;
data[idx].blockSpeed = Math.abs(data[idx].blockSpeed) 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 () => { 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)
handleData(setDataSaub)(dataSaub) handleDataSaub(dataSaub)
handleData(setDataSpin)(dataSpin) handleDataSpin(dataSpin)
}, },
setShowLoader, setShowLoader,
`Не удалось получить данные по скважине "${idWell}"`, `Не удалось получить данные по скважине "${idWell}"`,
) )
const unsubscribeSaub = Subscribe('hubs/telemetry', 'ReceiveDataSaub', `well_${idWell}`, handleData(setDataSaub)) const unsubscribeSaub = Subscribe('hubs/telemetry', 'ReceiveDataSaub', `well_${idWell}`, handleDataSaub)
const unsubscribeSpin = Subscribe('hubs/telemetry', 'ReceiveDataSpin', `well_${idWell}`, handleData(setDataSpin)) const unsubscribeSpin = Subscribe('hubs/telemetry', 'ReceiveDataSpin', `well_${idWell}`, handleDataSpin)
return () => { return () => {
unsubscribeSaub() unsubscribeSaub()
unsubscribeSpin() unsubscribeSpin()