Исправлено оповещение об ошибке в TelemetryView. Испарвлены стили.

src/components/ChartTimeOnlineFooter.jsx

@@ -32,7 +32,7 @@ export const ChartTimeOnlineFooter = (props) =>{
 
   if(popContent)
     spField = <Popover content={popContent}>
-      <div className="menu_title">
+      <div className="chart-footer">
         <ControlOutlined className='display_label'/>
         {spField}
       </div>

src/components/Well.jsx

@@ -41,7 +41,7 @@ export default function Well() {
       </Menu>
 
       <Layout>
-        <Content className="site-layout-background sheet">
+        <Content className="site-layout-background">
           <Switch>
             <Route path="/well/:id/file">
               <Files/>

src/pages/Main.jsx

@@ -13,7 +13,7 @@ export default function Main() {
     <Content>
       <PageHeader/>
       <Layout>
-        <Content className="site-layout-background sheet well_menu">
+        <Content className="site-layout-background sheet">
           <Switch>
             <Route path="/well/:id/">
               <Well/>

src/pages/TelemetryView.jsx

@@ -39,7 +39,13 @@ const pressureGroup = {
   lineSp: {label: "pressureSp", units: 'атм', xAccessorName: "pressureSp", yAccessorName: "date", color: '#c00'},
   lineIdle: {label: "pressureIdle", units: 'атм', xAccessorName: "pressureIdle", yAccessorName: "date", color: '#c00'},
   linesOther: [
-    { label: "мекс. перепад", units: 'атм', xAccessorName: "pressureDeltaLimitMax", yAccessorName: "date", color: '#c00' },
+    {
+      label: "мекс. перепад",
+      units: 'атм',
+      xAccessorName: "pressureDeltaLimitMax",
+      yAccessorName: "date",
+      color: '#c00'
+    },
   ],
 }
 
@@ -57,10 +63,29 @@ const hookWeightGroup = {
   label: "Ввес на крюке",
   yDisplay: false,
   linePv: {label: "hookWeight", units: 'т', xAccessorName: "hookWeight", yAccessorName: "date", color: '#0aa'},
-  lineIdle: { label: "hookWeightIdle", units: 'т', xAccessorName: "hookWeightIdle", yAccessorName: "date", color: '#0aa', dash },
+  lineIdle: {
+    label: "hookWeightIdle",
+    units: 'т',
+    xAccessorName: "hookWeightIdle",
+    yAccessorName: "date",
+    color: '#0aa',
+    dash
+  },
   linesOther: [
-    { label: "hookWeightLimitMin", units: 'т', xAccessorName: "hookWeightLimitMin", yAccessorName: "date", color: '#0aa' },
+    {
-    { label: "hookWeightLimitMax", units: 'т', xAccessorName: "hookWeightLimitMax", yAccessorName: "date", color: '#0aa' },
+      label: "hookWeightLimitMin",
+      units: 'т',
+      xAccessorName: "hookWeightLimitMin",
+      yAccessorName: "date",
+      color: '#0aa'
+    },
+    {
+      label: "hookWeightLimitMax",
+      units: 'т',
+      xAccessorName: "hookWeightLimitMax",
+      yAccessorName: "date",
+      color: '#0aa'
+    },
   ],
 }
 
@@ -69,9 +94,21 @@ const rotorTorqueGroup = {
   yDisplay: false,
   linePv: {label: "rotorTorque", units: 'кН·м', xAccessorName: "rotorTorque", yAccessorName: "date", color: '#a0a'},
   lineSp: {label: "rotorTorqueSp", units: 'кН·м', xAccessorName: "rotorTorqueSp", yAccessorName: "date", color: '#a0a'},
-  lineIdle: { label: "rotorTorqueIdle", units: 'кН·м', xAccessorName: "rotorTorqueIdle", yAccessorName: "date", color: '#a0a' },
+  lineIdle: {
+    label: "rotorTorqueIdle",
+    units: 'кН·м',
+    xAccessorName: "rotorTorqueIdle",
+    yAccessorName: "date",
+    color: '#a0a'
+  },
   linesOther: [
-    { label: "rotorTorqueLimitMax", units: 'кН·м', xAccessorName: "rotorTorqueLimitMax", yAccessorName: "date", color: '#a0a' },
+    {
+      label: "rotorTorqueLimitMax",
+      units: 'кН·м',
+      xAccessorName: "rotorTorqueLimitMax",
+      yAccessorName: "date",
+      color: '#a0a'
+    },
   ],
 }
 
@@ -164,20 +201,19 @@ export default function TelemetryView(props) {
   }
 
   useEffect(() => {
-    try {
     DataService.getData(id)
       .then(handleReceiveDataSaub)
-    } catch (ex) {
+      .catch((ex) => {
-      Notification(`Не удалось загрузить данные по скважине ${id}`, 'error')
+        Notification(`Не удалось загрузить данные по скважине "${id}"`, 'error')
-    }
+        console.log(ex)
+      })
 
-    try {
     MessageService.getMessage(id)
       .then(handleReceiveMessages)
-    } catch (ex) {
+      .catch((ex) => {
-      Notification(`Не удалось загрузить сообщения по скважине ${id}`, 'error')
+        Notification(`Не удалось загрузить сообщения по скважине "${id}"`, 'error')
         console.log(ex)
-    }
+      })
 
     let unSubscribeDataSaubHub = Subscribe('ReceiveDataSaub', `well_${id}`, handleReceiveDataSaub)
     let unSubscribeMessagesHub = Subscribe('ReceiveMessages', `well_${id}`, handleReceiveMessages)

src/styles/App.less

@@ -61,6 +61,7 @@ html {
 .sheet{
   padding: 5px 24px;
   min-height: 280px;
+  margin: 0 15px;
 }
 
 .site-layout-background {
@@ -117,7 +118,8 @@ html {
   flex: auto;
 }
 
-.menu_title {
+.menu_title,
+.chart-footer {
   display: flex;
 }