From f549219be2a914f1ffde2865ac5c32e2eca8430f Mon Sep 17 00:00:00 2001 From: goodmice Date: Fri, 29 Oct 2021 16:22:56 +0500 Subject: [PATCH 1/2] =?UTF-8?q?=D0=94=D0=BB=D1=8F=20=D1=81=D1=82=D0=BE?= =?UTF-8?q?=D0=BB=D0=B1=D1=86=D0=BE=D0=B2=20=D0=A0=D0=A2=D0=9A=20=D0=B4?= =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B=20=D0=B5=D0=B4?= =?UTF-8?q?=D0=B8=D0=BD=D0=B8=D1=86=D1=8B=20=D0=B8=D0=B7=D0=BC=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/WellOperations/DrillProcessFlow.jsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pages/WellOperations/DrillProcessFlow.jsx b/src/pages/WellOperations/DrillProcessFlow.jsx index c078fe0..cd75ae7 100644 --- a/src/pages/WellOperations/DrillProcessFlow.jsx +++ b/src/pages/WellOperations/DrillProcessFlow.jsx @@ -9,12 +9,12 @@ import { EditableTable } from '../../components/Table' import { DrillFlowChartService } from '../../services/api' const columns = [ - makeNumericStartEnd('Глубина', 'depth'), - makeNumericMinMax('Нагрузка', 'axialLoad'), - makeNumericMinMax('Давление', 'pressure'), - makeNumericMinMax('Момент на ВСП', 'rotorTorque'), - makeNumericMinMax('Обороты на ВСП', 'rotorSpeed'), - makeNumericMinMax('Расход', 'flow') + makeNumericStartEnd('Глубина, м', 'depth'), + makeNumericMinMax('Нагрузка, т', 'axialLoad'), + makeNumericMinMax('Давление, атм', 'pressure'), + makeNumericMinMax('Момент на ВСП, кН·м', 'rotorTorque'), + makeNumericMinMax('Обороты на ВСП, об/мин', 'rotorSpeed'), + makeNumericMinMax('Расход, л/с', 'flow') ] export const DrillProcessFlow = ({idWell}) => { From a6f52e6aabe0a5525ca3accf531c692d0bfb8507 Mon Sep 17 00:00:00 2001 From: goodmice Date: Fri, 29 Oct 2021 17:10:16 +0500 Subject: [PATCH 2/2] =?UTF-8?q?=D0=A8=D0=B8=D1=80=D0=B8=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D0=B5=D0=B9=20=D0=BD=D0=B0=20=D1=81=D1=82?= =?UTF-8?q?=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D0=B5=20=D1=81=D0=BE=D0=BE=D0=B1?= =?UTF-8?q?=D1=89=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/Messages.jsx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pages/Messages.jsx b/src/pages/Messages.jsx index 7910e03..20603c5 100644 --- a/src/pages/Messages.jsx +++ b/src/pages/Messages.jsx @@ -21,16 +21,19 @@ const categoryDictionary = { const columns = [ { + width: '10%', title: 'Дата', key: 'date', dataIndex: 'date', render: item => moment(item).format('DD MMM YYYY, HH:mm:ss'), }, { + width: '10%', title: 'Глубина', key: 'wellDepth', dataIndex: 'wellDepth', render: depth => {depth.toFixed(2)} м., }, { + width: '10%', title: 'Категория', key: 'categoryId', dataIndex: 'categoryId', @@ -42,6 +45,7 @@ const columns = [ key: 'message', dataIndex: 'message', }, { + width: '10%', title: 'Пользователь', key: 'user', dataIndex: 'user',