{permissionToApprove && (
mark.idMarkType === 0)} />
+
)}
diff --git a/src/pages/DrillingProgram/MarksCard.jsx b/src/pages/DrillingProgram/MarksCard.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/DrillingProgram/index.jsx b/src/pages/DrillingProgram/index.jsx
old mode 100644
new mode 100755
index 303d240..2b8aa69
--- a/src/pages/DrillingProgram/index.jsx
+++ b/src/pages/DrillingProgram/index.jsx
@@ -10,6 +10,7 @@ import {
} from '@ant-design/icons'
import { memo, useCallback, useEffect, useMemo, useState } from 'react'
+import { useIdWell } from '@asb/context'
import LoaderPortal from '@components/LoaderPortal'
import { downloadFile, formatBytes, invokeWebApiWrapperAsync } from '@components/factory'
import { arrayOrDefault, formatDate } from '@utils'
@@ -22,23 +23,25 @@ import CategoryHistory from './CategoryHistory'
import '@styles/drilling_program.less'
-const idStateNotInitialized = 0
-const idStateApproving = 1
-const idStateCreating = 2
-const idStateReady = 3
-const idStateError = 4
-const idStateUnknown = -1
-
-const stateString = {
- [idStateNotInitialized]: { icon: CloseOutlined, text: 'Не настроена' },
- [idStateApproving]: { icon: AuditOutlined, text: 'Согласовывается' },
- [idStateCreating]: { icon: LoadingOutlined, text: 'Формируется' },
- [idStateReady]: { icon: CheckOutlined, text: 'Сформирована' },
- [idStateError]: { icon: WarningOutlined, text: 'Ошибка формирования' },
- [idStateUnknown]: { icon: WarningOutlined, text: 'Неизвестно' },
+const ID_STATE = {
+ NotInitialized: 0,
+ Approving: 1,
+ Creating: 2,
+ Ready: 3,
+ Error: 4,
+ Unknown: -1,
}
-export const DrillingProgram = memo(({ idWell }) => {
+const STATE_STRING = {
+ [ID_STATE.NotInitialized]: { icon: CloseOutlined, text: 'Не настроена' },
+ [ID_STATE.Approving]: { icon: AuditOutlined, text: 'Согласовывается' },
+ [ID_STATE.Creating]: { icon: LoadingOutlined, text: 'Формируется' },
+ [ID_STATE.Ready]: { icon: CheckOutlined, text: 'Сформирована' },
+ [ID_STATE.Error]: { icon: WarningOutlined, text: 'Ошибка формирования' },
+ [ID_STATE.Unknown]: { icon: WarningOutlined, text: 'Неизвестно' },
+}
+
+export const DrillingProgram = memo(() => {
const [selectedCategory, setSelectedCategory] = useState()
const [historyVisible, setHistoryVisible] = useState(false)
const [editorVisible, setEditorVisible] = useState(false)
@@ -46,6 +49,8 @@ export const DrillingProgram = memo(({ idWell }) => {
const [categories, setCategories] = useState([])
const [data, setData] = useState({})
+ const idWell = useIdWell()
+
const {
idState,
permissionToEdit,
@@ -54,8 +59,8 @@ export const DrillingProgram = memo(({ idWell }) => {
error,
} = useMemo(() => data, [data])
- const stateId = useMemo(() => idState ?? idStateUnknown, [idState])
- const state = useMemo(() => stateString[stateId], [stateId])
+ const stateId = useMemo(() => idState ?? ID_STATE.Unknown, [idState])
+ const state = useMemo(() => STATE_STRING[stateId], [stateId])
const StateIcon = useMemo(() => state.icon, [state?.icon])
const updateData = useCallback(async () => await invokeWebApiWrapperAsync(
@@ -86,9 +91,10 @@ export const DrillingProgram = memo(({ idWell }) => {
setHistoryVisible(!!catId)
}, [])
- const onEditorClosed = useCallback(() => {
+ const onEditorClosed = useCallback((needUpdate) => {
setEditorVisible(false)
- updateData()
+ if (needUpdate)
+ updateData()
}, [updateData])
return (
@@ -99,16 +105,12 @@ export const DrillingProgram = memo(({ idWell }) => {
Программа бурения
{permissionToEdit && (
-
)}
- {stateId === idStateReady ? (
+ {stateId === ID_STATE.Ready ? (
<>
+
+
+
+ {group.widgets?.map((widget) => (
+ setSelectedSettings(null)}
+ settings={selectedSettings}
+ onEdit={onEdit}
+ />
+
+
+
+
+ )
+})
+
+export default OperationsChart
diff --git a/src/pages/Telemetry/Operations/OperationsTable.jsx b/src/pages/Telemetry/Operations/OperationsTable.jsx
new file mode 100644
index 0000000..dfee059
--- /dev/null
+++ b/src/pages/Telemetry/Operations/OperationsTable.jsx
@@ -0,0 +1,30 @@
+import { memo } from 'react'
+
+import { Table, makeTextColumn, makeNumericColumn, makeDateColumn, makeNumericRender } from '@components/Table'
+
+import '@styles/detected_operations.less'
+
+export const columns = [
+ makeTextColumn('Пользователь', 'telemetryUserName', null, null, null, { width: 200 }),
+ makeDateColumn('Дата начала', 'dateStart', null, undefined, { width: 150 }),
+ makeNumericColumn('Продолжительность (мин)', 'durationMinutes', null, null, makeNumericRender(2), 150),
+ makeNumericColumn('Глубина (м)', 'depthStart', null, null, makeNumericRender(1), 100),
+]
+
+export const OperationsTable = memo(({ data, height, ...other }) => (
+
+
+
+))
+
+export default OperationsTable
diff --git a/src/pages/Telemetry/Operations/index.jsx b/src/pages/Telemetry/Operations/index.jsx
new file mode 100644
index 0000000..f6f57fc
--- /dev/null
+++ b/src/pages/Telemetry/Operations/index.jsx
@@ -0,0 +1,91 @@
+import { memo, useCallback, useContext, useEffect, useState } from 'react'
+import { InputNumber } from 'antd'
+import moment from 'moment'
+
+import { IdWellContext } from '@asb/context'
+import LoaderPortal from '@components/LoaderPortal'
+import { DateRangeWrapper } from '@components/Table'
+import { invokeWebApiWrapperAsync } from '@components/factory'
+import { DetectedOperationService, TelemetryDataSaubService } from '@api'
+import { range } from '@utils'
+
+import OperationsChart from './OperationsChart'
+import OperationsTable from './OperationsTable'
+
+import '@styles/detected_operations.less'
+
+export const Operations = memo(() => {
+ const [isLoading, setIsLoading] = useState(false)
+ const [dateRange, setDateRange] = useState([])
+ const [yDomain, setYDomain] = useState(20)
+ const [dates, setDates] = useState()
+ const [data, setData] = useState([])
+
+ const idWell = useContext(IdWellContext)
+
+ const disabledDates = useCallback((current) => current && !moment(current).isBetween(...dateRange, 'day', '[]'), [dateRange])
+
+ const disabledTimes = useCallback((date) => ({
+ disabledHours: () => range(24).filter(h => date && !moment(date).hours(h).isBetween(...dateRange, 'hour', '[]')),
+ disabledMinutes: () => range(60).filter(m => date && !moment(date).minutes(m).isBetween(...dateRange, 'minute', '[]')),
+ disabledSeconds: () => range(60).filter(s => date && !moment(date).seconds(s).isBetween(...dateRange, 'second', '[]'))
+ }), [dateRange])
+
+ useEffect(() => invokeWebApiWrapperAsync(
+ async () => {
+ const dates = await TelemetryDataSaubService.getDataDatesRange(idWell)
+ if (dates) {
+ const dt = [moment(dates.from), moment(dates.to)]
+ setDateRange(dt)
+ setDates(dt)
+ }
+ },
+ setIsLoading,
+ 'Не удалось загрузить диапазон доступных дат',
+ 'Получение дапазона доступних дат',
+ ), [idWell])
+
+ useEffect(() => invokeWebApiWrapperAsync(
+ async () => {
+ if (!dates) return
+ const data = await DetectedOperationService.get(idWell, undefined, dates[0].toISOString(), dates[1].toISOString())
+ setData(data)
+ },
+ setIsLoading,
+ 'Не удалось загрузить список определённых операций',
+ 'Получение списка определённых операций',
+ ), [idWell, dates])
+
+ return (
+
+
+
+
+ )
+})
+
+export default Operations
diff --git a/src/pages/TelemetryView/ActiveMessagesOnline.jsx b/src/pages/Telemetry/TelemetryView/ActiveMessagesOnline.jsx
old mode 100644
new mode 100755
similarity index 77%
rename from src/pages/TelemetryView/ActiveMessagesOnline.jsx
rename to src/pages/Telemetry/TelemetryView/ActiveMessagesOnline.jsx
index ec888ea..3e9ea0b
--- a/src/pages/TelemetryView/ActiveMessagesOnline.jsx
+++ b/src/pages/Telemetry/TelemetryView/ActiveMessagesOnline.jsx
@@ -1,19 +1,22 @@
import { Table } from 'antd'
-import { useState, useEffect, useCallback, memo } from 'react'
+import { useState, useEffect, useCallback, memo, useContext } from 'react'
+import { IdWellContext } from '@asb/context'
import LoaderPortal from '@components/LoaderPortal'
import { invokeWebApiWrapperAsync } from '@components/factory'
import { Subscribe } from '@services/signalr'
import { MessageService } from '@api'
-import { columns } from '@pages/Messages'
+import { columns } from '../Messages'
import '@styles/message.css'
-export const ActiveMessagesOnline = memo(({ idWell }) => {
+export const ActiveMessagesOnline = memo(() => {
const [messages, setMessages] = useState([])
const [loader, setLoader] = useState(false)
+ const idWell = useContext(IdWellContext)
+
const handleReceiveMessages = useCallback((messages) => {
if (messages)
setMessages(messages.items.splice(0, 4))
@@ -29,7 +32,10 @@ export const ActiveMessagesOnline = memo(({ idWell }) => {
`Не удалось загрузить сообщения по скважине "${idWell}"`,
'Получение списка сообщений'
)
- return Subscribe('hubs/telemetry','ReceiveMessages', `well_${idWell}`, handleReceiveMessages)
+ return Subscribe('hubs/telemetry',`well_${idWell}`, {
+ methodName: 'ReceiveMessages',
+ handler: handleReceiveMessages,
+ })
}, [idWell, handleReceiveMessages])
return (
diff --git a/src/pages/TelemetryView/ChartTimeOnlineFooter.jsx b/src/pages/Telemetry/TelemetryView/ChartTimeOnlineFooter.jsx
old mode 100644
new mode 100755
similarity index 100%
rename from src/pages/TelemetryView/ChartTimeOnlineFooter.jsx
rename to src/pages/Telemetry/TelemetryView/ChartTimeOnlineFooter.jsx
diff --git a/src/pages/TelemetryView/CustomColumn.jsx b/src/pages/Telemetry/TelemetryView/CustomColumn.jsx
old mode 100644
new mode 100755
similarity index 90%
rename from src/pages/TelemetryView/CustomColumn.jsx
rename to src/pages/Telemetry/TelemetryView/CustomColumn.jsx
index f3ac368..9da3fea
--- a/src/pages/TelemetryView/CustomColumn.jsx
+++ b/src/pages/Telemetry/TelemetryView/CustomColumn.jsx
@@ -11,6 +11,7 @@ const params = [
{ label: 'Расход, м³/ч', accessorName: 'flow', isArrowVisible: true },
{ label: 'Расход х.х., м³/ч', accessorName: 'flowIdle', isArrowVisible: true },
{ label: 'Время', accessorName: 'date', format: 'HH:mm:ss' },
+ { label: 'MSE, %', accessorName: 'mse', format: 2 },
]
export const CustomColumn = memo(({ data }) => {
@@ -26,8 +27,8 @@ export const CustomColumn = memo(({ data }) => {
label={param.label}
value={param.value}
suffix={param.units}
- format = {param.format}
- isArrowVisible = {param.isArrowVisible}
+ format={param.format}
+ isArrowVisible={param.isArrowVisible}
/>
))}
+
+
+
+ MSE
diff --git a/src/pages/Telemetry/index.jsx b/src/pages/Telemetry/index.jsx new file mode 100755 index 0000000..8207810 --- /dev/null +++ b/src/pages/Telemetry/index.jsx @@ -0,0 +1,51 @@ +import { useParams } from 'react-router-dom' +import { memo, useContext, useMemo } from 'react' +import { Layout } from 'antd' +import { AlertOutlined, FundViewOutlined, DatabaseOutlined } from '@ant-design/icons' + +import { RootPathContext } from '@asb/context' +import { PrivateSwitch, PrivateMenu } from '@components/Private' + +import Archive from './Archive' +import Messages from './Messages' +import DashboardNNB from './DashboardNNB' +import TelemetryView from './TelemetryView' + +import '@styles/index.css' +import Operations from './Operations' + +const { Content } = Layout + +export const Telemetry = memo(() => { + const { tab } = useParams() + const root = useContext(RootPathContext) + const rootPath = useMemo(() => `${root}/telemetry`, [root]) + + return ( +
-
-
-
-
-
-
-
-
diff --git a/src/pages/WellOperations/Tvd/NetGraphExport.jsx b/src/pages/WellOperations/Tvd/NetGraphExport.jsx
old mode 100644
new mode 100755
diff --git a/src/pages/WellOperations/Tvd/NptTable.jsx b/src/pages/WellOperations/Tvd/NptTable.jsx
old mode 100644
new mode 100755
index 12f39bf..3369f3b
--- a/src/pages/WellOperations/Tvd/NptTable.jsx
+++ b/src/pages/WellOperations/Tvd/NptTable.jsx
@@ -53,6 +53,7 @@ export const NptTable = memo(({ operations }) => {
({
borderDash,
})
-export const Tvd = memo(({ idWell, title, ...other }) => {
+export const Tvd = memo(({ idWell: wellId, title, ...other }) => {
const [chart, setChart] = useState()
const [xLabel, setXLabel] = useState('day')
const [operations, setOperations] = useState({})
const [tableVisible, setTableVisible] = useState(false)
const [isLoading, setIsLoading] = useState(false)
+ const idWellContext = useContext(IdWellContext)
+ const idWell = useMemo(() => wellId ?? idWellContext, [wellId, idWellContext])
+
const chartRef = useRef(null)
const history = useHistory()
diff --git a/src/pages/WellOperations/WellDrillParams.jsx b/src/pages/WellOperations/WellDrillParams.jsx
old mode 100644
new mode 100755
index 8db51b6..5a4570b
--- a/src/pages/WellOperations/WellDrillParams.jsx
+++ b/src/pages/WellOperations/WellDrillParams.jsx
@@ -1,10 +1,12 @@
-import { useState, useEffect, useCallback, memo, useMemo } from 'react'
+import { useState, useEffect, useCallback, memo, useMemo, useContext } from 'react'
+import { IdWellContext } from '@asb/context'
import {
EditableTable,
makeSelectColumn,
makeActionHandler,
makeNumericAvgRange,
+ makeNumericSorter,
} from '@components/Table'
import LoaderPortal from '@components/LoaderPortal'
import { invokeWebApiWrapperAsync } from '@components/factory'
@@ -12,17 +14,19 @@ import { DrillParamsService, WellOperationService } from '@api'
import { hasPermission } from '@utils/permissions'
import { arrayOrDefault } from '@utils'
+
export const getColumns = async (idWell) => {
let sectionTypes = await WellOperationService.getSectionTypes(idWell)
- sectionTypes = Object.keys(sectionTypes).map((id) => ({
- label: sectionTypes[id],
- value: id,
+ sectionTypes = Object.entries(sectionTypes).map(([id, value]) => ({
+ label: value,
+ value: parseInt(id),
}))
return [
makeSelectColumn('Конструкция секции','idWellSectionType', sectionTypes, null, {
editable: true,
width: 160,
+ sorter: makeNumericSorter('idWellSectionType'),
}),
makeNumericAvgRange('Нагрузка, т', 'axialLoad', 1),
makeNumericAvgRange('Давление, атм', 'pressure', 1),
@@ -32,11 +36,13 @@ export const getColumns = async (idWell) => {
]
}
-export const WellDrillParams = memo(({ idWell }) => {
+export const WellDrillParams = memo(() => {
const [params, setParams] = useState([])
const [showLoader, setShowLoader] = useState(false)
const [columns, setColumns] = useState([])
+ const idWell = useContext(IdWellContext)
+
const updateParams = useCallback(async () => await invokeWebApiWrapperAsync(
async () => {
const params = arrayOrDefault(await DrillParamsService.getAll(idWell))
diff --git a/src/pages/WellOperations/WellOperationsEditor.jsx b/src/pages/WellOperations/WellOperationsEditor.jsx
old mode 100644
new mode 100755
index 033a6f0..11b0298
--- a/src/pages/WellOperations/WellOperationsEditor.jsx
+++ b/src/pages/WellOperations/WellOperationsEditor.jsx
@@ -1,8 +1,9 @@
import moment from 'moment'
import { Input } from 'antd'
import { useLocation } from 'react-router-dom'
-import { useState, useEffect, memo, useMemo, useCallback } from 'react'
+import { useState, useEffect, memo, useMemo, useCallback, useContext } from 'react'
+import { IdWellContext } from '@asb/context'
import {
EditableTable,
makeColumn,
@@ -21,6 +22,7 @@ import { hasPermission } from '@utils/permissions'
import { arrayOrDefault } from '@utils'
import { WellOperationService } from '@api'
+
const { TextArea } = Input
const basePageSize = 160
@@ -52,12 +54,14 @@ const generateColumns = (showNpt = false, categories = [], sectionTypes = []) =>
makeTextColumn('Комментарий', 'comment', null, null, null, { editable: true, input: }),
].filter(Boolean)
-export const WellOperationsEditor = memo(({ idWell, idType, showNpt, ...other }) => {
+export const WellOperationsEditor = memo(({ idType, showNpt, ...other }) => {
const [pageNumAndPageSize, setPageNumAndPageSize] = useState({ current: 1, pageSize: basePageSize })
const [paginationTotal, setPaginationTotal] = useState(0)
const [operations, setOperations] = useState([])
const [showLoader, setShowLoader] = useState(false)
+ const idWell = useContext(IdWellContext)
+
const [categories, setCategories] = useState([])
const [sectionTypes, setSectionTypes] = useState([])
@@ -128,6 +132,7 @@ export const WellOperationsEditor = memo(({ idWell, idType, showNpt, ...other })
bordered
size={'small'}
columns={columns}
+ sticky={true}
dataSource={operations}
onRowAdd={hasPermission('WellOperation.edit') && makeActionHandler('insertRange', handlerProps, recordParser, 'Добавление операции по скважине')}
onRowEdit={hasPermission('WellOperation.edit') && makeActionHandler('update', handlerProps, recordParser, 'Редактирование операции по скважине')}
diff --git a/src/pages/WellOperations/WellSectionsStat.jsx b/src/pages/WellOperations/WellSectionsStat.jsx
old mode 100644
new mode 100755
index 5355698..089c0c2
--- a/src/pages/WellOperations/WellSectionsStat.jsx
+++ b/src/pages/WellOperations/WellSectionsStat.jsx
@@ -1,10 +1,12 @@
-import { useState, useEffect, memo } from 'react'
+import { useState, useEffect, memo, useContext } from 'react'
+import { IdWellContext } from '@asb/context'
import LoaderPortal from '@components/LoaderPortal'
import { invokeWebApiWrapperAsync } from '@components/factory'
import { Table, makeColumn, makeColumnsPlanFact, makeNumericRender } from '@components/Table'
-import { OperationStatService } from '@api'
import { calcDuration } from '@utils/datetime'
+import { OperationStatService } from '@api'
+
const numericRender = makeNumericRender(2)
@@ -19,10 +21,12 @@ const columns = [
makeColumnsPlanFact('Спуск ОК, м/ч' ,'casingDownSpeed', { render: numericRender }),
]
-export const WellSectionsStat = memo(({ idWell }) => {
+export const WellSectionsStat = memo(() => {
const [sections, setSections] = useState([])
const [showLoader, setShowLoader] = useState(false)
+ const idWell = useContext(IdWellContext)
+
useEffect(() => invokeWebApiWrapperAsync(
async () => {
const sectionsResponse = await OperationStatService.getStatWell(idWell)
diff --git a/src/pages/WellOperations/index.jsx b/src/pages/WellOperations/index.jsx
old mode 100644
new mode 100755
index cedad37..c77a3c6
--- a/src/pages/WellOperations/index.jsx
+++ b/src/pages/WellOperations/index.jsx
@@ -1,6 +1,6 @@
-import { memo, useCallback } from 'react'
-import { Layout, Menu } from 'antd'
-import { Switch, useParams, useHistory, useLocation } from 'react-router-dom'
+import { useParams, useHistory, useLocation } from 'react-router-dom'
+import { memo, useCallback, useContext, useMemo } from 'react'
+import { Layout } from 'antd'
import {
BarChartOutlined,
BuildOutlined,
@@ -9,7 +9,8 @@ import {
TableOutlined,
} from '@ant-design/icons'
-import { PrivateDefaultRoute, PrivateRoute, PrivateMenuItemLink } from '@components/Private'
+import { IdWellContext, RootPathContext } from '@asb/context'
+import { PrivateMenu, PrivateSwitch } from '@components/Private'
import { Tvd } from './Tvd'
import { ImportExportBar } from './ImportExportBar'
@@ -17,68 +18,51 @@ import { WellDrillParams } from './WellDrillParams'
import { DrillProcessFlow } from './DrillProcessFlow'
import { WellSectionsStat } from './WellSectionsStat'
import { WellOperationsEditor } from './WellOperationsEditor'
-import { Flex } from '@asb/components/Grid'
+import { Flex } from '@components/Grid'
+
const { Content } = Layout
-export const WellOperations = memo(({ idWell }) => {
+export const WellOperations = memo(() => {
const { tab } = useParams()
const history = useHistory()
const location = useLocation()
- const rootPath = `/well/${idWell}/operations`
+ const root = useContext(RootPathContext)
+ const idWell = useContext(IdWellContext)
+ const rootPath = useMemo(() => `${root}/operations`, [root])
const onImported = useCallback(() =>
history.push({ pathname: `${rootPath}`, state: { from: location.pathname }})
, [history, location, rootPath])
- const isIEBarDisabled = !['plan', 'fact'].includes(tab)
+ const isIEBarDisabled = useMemo(() => !['plan', 'fact'].includes(tab), [tab])
return(
- <>
+