forked from ddrilling/asb_cloud_front
nit fix warnings and client update
This commit is contained in:
parent
fba38ed023
commit
4638e46a93
@ -57,8 +57,8 @@ export default function RigMnemo({
|
|||||||
blockPositionLocal = blockPositionLocal ? blockPositionLocal : 0
|
blockPositionLocal = blockPositionLocal ? blockPositionLocal : 0
|
||||||
const blockTranslate = `translate(-75, ${-35 + (50 * (30 - blockPositionLocal) / 30)})`
|
const blockTranslate = `translate(-75, ${-35 + (50 * (30 - blockPositionLocal) / 30)})`
|
||||||
|
|
||||||
let bitPositionLocal = +bitPosition
|
//let bitPositionLocal = +bitPosition
|
||||||
bitPositionLocal = bitPositionLocal ? bitPositionLocal : 0
|
//bitPositionLocal = bitPositionLocal ? bitPositionLocal : 0
|
||||||
//const bitTranslate = `translate(0, ${-41 + 41 * (3426 - bitPosition)/(3426 - 3200)})`
|
//const bitTranslate = `translate(0, ${-41 + 41 * (3426 - bitPosition)/(3426 - 3200)})`
|
||||||
const bitTranslate = `translate(0, 0)`
|
const bitTranslate = `translate(0, 0)`
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@ import { TreeSelect } from 'antd'
|
|||||||
import { useHistory } from 'react-router-dom'
|
import { useHistory } from 'react-router-dom'
|
||||||
import notify from './notify'
|
import notify from './notify'
|
||||||
|
|
||||||
export default function WellTreeSelector({}) {
|
export default function WellTreeSelector() {
|
||||||
const [wellsTree, setWellsTree] = useState([])
|
const [wellsTree, setWellsTree] = useState([])
|
||||||
const [showLoader, setShowLoader] = useState(false)
|
const [showLoader, setShowLoader] = useState(false)
|
||||||
const history = useHistory()
|
const history = useHistory()
|
||||||
|
@ -7,7 +7,7 @@ import {ClusterService} from '../services/api'
|
|||||||
import notify from '../components/notify'
|
import notify from '../components/notify'
|
||||||
|
|
||||||
const calcViewParams = (clusters) => {
|
const calcViewParams = (clusters) => {
|
||||||
if (clusters.length === 0)
|
if (clusters && clusters.length === 0)
|
||||||
return {center:[60.81226, 70.0562], zoom: 5}
|
return {center:[60.81226, 70.0562], zoom: 5}
|
||||||
|
|
||||||
const center = clusters.reduce((sum, cluster) => {
|
const center = clusters.reduce((sum, cluster) => {
|
||||||
|
@ -67,7 +67,7 @@ export default function Report(props) {
|
|||||||
title: 'Название отчета',
|
title: 'Название отчета',
|
||||||
dataIndex: 'reportName',
|
dataIndex: 'reportName',
|
||||||
key: 'reportName',
|
key: 'reportName',
|
||||||
render: name => <a href='#' onClick={event => getReportFile(event, name)} download={name}>{name}</a>
|
render: name => <button onClick={event => getReportFile(event, name)} download={name}>{name}</button>
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
@ -80,10 +80,10 @@ export default function Report(props) {
|
|||||||
<br />
|
<br />
|
||||||
<span> { progressData.operation } </span>
|
<span> { progressData.operation } </span>
|
||||||
<br />
|
<br />
|
||||||
<a href='#' onClick={event => {getReportFile(event, progressData.reportName)}}
|
<button onClick={event => {getReportFile(event, progressData.reportName)}}
|
||||||
download={progressData.reportName}>
|
download={progressData.reportName}>
|
||||||
{ progressData.reportName }
|
{ progressData.reportName }
|
||||||
</a>
|
</button>
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
@ -118,7 +118,7 @@ export default function WellAnalysis() {
|
|||||||
setLoader(false)
|
setLoader(false)
|
||||||
}
|
}
|
||||||
GetOperations()
|
GetOperations()
|
||||||
}, [id, categories, range])
|
}, [id, categories, range, page])
|
||||||
|
|
||||||
return(<>
|
return(<>
|
||||||
<div className='filter-group'>
|
<div className='filter-group'>
|
||||||
|
Loading…
Reference in New Issue
Block a user