diff --git a/src/components/PointerIcon.jsx b/src/components/PointerIcon.jsx new file mode 100644 index 0000000..1e0a566 --- /dev/null +++ b/src/components/PointerIcon.jsx @@ -0,0 +1,60 @@ +import PropTypes from 'prop-types' + +export const PointerIcon = ({color, size, online, onlineColor}) => ( + + {online && ( // Волны от антенны + + + + + + )} + {/* Арматурная сетка */} + + {/* Шляпы */} + + + + {/* Столб и границы почвы */} + + + + + +) + +PointerIcon.propTypes = { + color: PropTypes.string, + size: PropTypes.oneOfType([ + PropTypes.string, + PropTypes.number, + PropTypes.shape({ + width: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), + height: PropTypes.oneOfType([PropTypes.string, PropTypes.number]) + }) + ]), + online: PropTypes.bool, + onlineColor: PropTypes.string +} + +PointerIcon.defaultProps = { + color: 'currentColor', + size: {width: '48', height: '59'}, + online: false, + onlineColor: 'red' +} + +export default PointerIcon diff --git a/src/images/pointer.svg b/src/images/pointer.svg deleted file mode 100644 index b9d368e..0000000 --- a/src/images/pointer.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/src/pages/Cluster/ClusterWells.jsx b/src/pages/Cluster/ClusterWells.jsx index f2a0020..6cabc16 100644 --- a/src/pages/Cluster/ClusterWells.jsx +++ b/src/pages/Cluster/ClusterWells.jsx @@ -15,6 +15,7 @@ import { Tvd } from '../WellOperations/Tvd' import WellOperationsTable from './WellOperationsTable' import { getOperations } from './functions' import LoaderPortal from '../../components/LoaderPortal' +import PointerIcon from '../../components/PointerIcon' const filtersMinMax = [ { text: 'min', value: 'min' }, @@ -23,6 +24,7 @@ const filtersMinMax = [ const filtersWellsType = [] const DAY_IN_MS = 1000 * 60 * 60 * 24 +const ONLINE_DEADTIME = 600 export default function ClusterWells({statsWells}) { @@ -68,7 +70,8 @@ export default function ClusterWells({statsWells}) { routeSpeedFact: well.total?.fact?.routeSpeed, notProductiveTimePlan: well.total?.plan?.nonProductiveHours, notProductiveTimeFact: well.total?.fact?.nonProductiveHours, - companies: well.companies + companies: well.companies, + lastTelemetryDate: well.lastTelemetryDate } }) @@ -91,8 +94,18 @@ export default function ClusterWells({statsWells}) { const columns = [ makeTextColumn('скв №', 'caption', null, null, - (_, item) => ({item.caption ?? '-'} - )), + (_, item) => ( + + + {item.caption ?? '-'} + + ) + ), makeTextColumn('Тип скв.', 'wellType', filtersWellsType, null, (text) => text ?? '-'), makeGroupColumn('Фактические сроки', [ makeColumn('начало', 'factStart', { sorter: makeDateSorter('factStart'), render: getDate }),