forked from ddrilling/asb_cloud_front
Merge branch 'master' into dev
This commit is contained in:
commit
76c4dff162
@ -181,12 +181,22 @@ export default function TelemetryView({idWell}) {
|
|||||||
|
|
||||||
const handleDataSaub = (data) => {
|
const handleDataSaub = (data) => {
|
||||||
if (data) {
|
if (data) {
|
||||||
|
data.forEach((_, idx) => {
|
||||||
|
if (data[idx].rotorSpeed < 1)
|
||||||
|
data[idx].rotorSpeed = 0;
|
||||||
|
data[idx].blockSpeed = Math.abs(data[idx].blockSpeed)
|
||||||
|
})
|
||||||
setDataSaub(data)
|
setDataSaub(data)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const handleDataSpin = (data) => {
|
const handleDataSpin = (data) => {
|
||||||
if (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)
|
setDataSpin(data)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -230,7 +240,7 @@ export default function TelemetryView({idWell}) {
|
|||||||
</GridItem>
|
</GridItem>
|
||||||
<GridItem col='1' row='2' rowSpan='3' style={{minWidth:'260px', width:'0.142fr'}}>
|
<GridItem col='1' row='2' rowSpan='3' style={{minWidth:'260px', width:'0.142fr'}}>
|
||||||
<CustomColumn data={dataSaub}/>
|
<CustomColumn data={dataSaub}/>
|
||||||
</GridItem>
|
</GridItem>
|
||||||
{paramsGroups.map((group, index) =>
|
{paramsGroups.map((group, index) =>
|
||||||
<GridItem col={2 + index} row='2' className='border_small' key={group.label}>
|
<GridItem col={2 + index} row='2' className='border_small' key={group.label}>
|
||||||
<Column
|
<Column
|
||||||
@ -239,7 +249,8 @@ export default function TelemetryView({idWell}) {
|
|||||||
lineGroup={group}
|
lineGroup={group}
|
||||||
interval={chartInterval}
|
interval={chartInterval}
|
||||||
showBorder={getIndexOfDrillingBy(dataSaub) === index}/>
|
showBorder={getIndexOfDrillingBy(dataSaub) === index}/>
|
||||||
</GridItem>)}
|
</GridItem>
|
||||||
|
)}
|
||||||
|
|
||||||
<GridItem col='2' row='3' colSpan='7'>
|
<GridItem col='2' row='3' colSpan='7'>
|
||||||
<ActiveMessagesOnline idWell={idWell}/>
|
<ActiveMessagesOnline idWell={idWell}/>
|
||||||
|
Loading…
Reference in New Issue
Block a user