diff --git a/live_monitor_vue/Makefile b/live_monitor_vue/Makefile
index 6950952..073fcf1 100644
--- a/live_monitor_vue/Makefile
+++ b/live_monitor_vue/Makefile
@@ -1,9 +1,14 @@
 HOOK_NAME=pre-push
 HOOK_PATH=../.git/hooks/$(HOOK_NAME)
 
-prehook:
-	@echo "Setting up pre-push hook..."
+clearhook:
+	@echo "clear hooks"
 	@rm -f $(HOOK_PATH)
+	@echo "hooks cleared"
+
+
+prehook:
+	make clearhook
 	@echo '#!/bin/sh'									>> $(HOOK_PATH)
 	@echo 'echo "Running lint for live_monitor_vue"'	>> $(HOOK_PATH)
 	@echo 'cd ./live_monitor_vue'						>> $(HOOK_PATH)
diff --git a/live_monitor_vue/src/components/1_atoms/DoubleSwitch.vue b/live_monitor_vue/src/components/1_atoms/DoubleSwitch.vue
index 3514666..d4f4e9c 100644
--- a/live_monitor_vue/src/components/1_atoms/DoubleSwitch.vue
+++ b/live_monitor_vue/src/components/1_atoms/DoubleSwitch.vue
@@ -1,9 +1,8 @@
-
-
 <script>
 
 export default {
   name: 'DoubleSwitch',
+  inject: ['isChecked'],
   props: {
     machine: {
       type: Object,
@@ -26,13 +25,12 @@ export default {
       default: ''
     },
   },
+  emits: ['switched'],
   computed: {
   },
   mounted () {
     
   },
-  inject: ['isChecked'],
-  emits: ['switched'],
   methods: {
     buttonClass: function(value) {
       return `border border-slate-400 flex items-center justify-center cursor-pointer rounded transition-all text-xs text-center py-[5px] px-2 ${value}`
@@ -46,7 +44,6 @@ export default {
 </script>
 
 
-
 <template>
   <label class="relative inline-flex items-center cursor-pointer">
     <input
@@ -55,11 +52,12 @@ export default {
       type="checkbox"
       :checked="isChecked"
       @change="setChecked"
-    />
+    >
 
     <div
       :class="`w-11 h-6 rounded-full peer peer-focus:ring-4 peer-focus:ring-${secondColor}-300 dark:peer-focus:ring-${secondColor}-800 dark:bg-${firstColor}-700 peer-checked/checkbox:after:translate-x-full peer-checked/checkbox:after:border-white after:content-[''] after:absolute after:top-0.5 after:left-[2px] after:bg-white after:border-${firstColor}-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-${firstColor}-600`"
-      :style="{background: !isChecked ? firstColor : secondColor}"></div>
+      :style="{background: !isChecked ? firstColor : secondColor}"
+    />
     <span class="block peer-checked/checkbox:hidden ml-2 text-sm font-medium text-gray-900 dark:text-gray-300"> {{ firstTitle }}</span>
     <span class="hidden peer-checked/checkbox:block ml-2 text-sm font-medium text-gray-900 dark:text-gray-300"> {{ secondTitle }} </span>
   </label>
diff --git a/live_monitor_vue/src/components/2_molecules/MachinesModal/MachinesModal.vue b/live_monitor_vue/src/components/2_molecules/MachinesModal/MachinesModal.vue
index 2ce78fc..c705286 100644
--- a/live_monitor_vue/src/components/2_molecules/MachinesModal/MachinesModal.vue
+++ b/live_monitor_vue/src/components/2_molecules/MachinesModal/MachinesModal.vue
@@ -1,13 +1,3 @@
-<template>
-  <ButtonModal
-    text="Выбрать машину"
-    btnClass="col-span-4"
-    containerClass="pt-10 px-4 min-w-[80vw]"
-  >
-    <Tabulator v-bind="tabulatorOptions" />
-  </ButtonModal>
-</template>
-
 <script>
 import ButtonModal from '@molecules/ButtonModal/ButtonModal.vue'
 import Tabulator from "@molecules/VTabulator/VTabulator.vue"
@@ -49,3 +39,13 @@ export default {
 }
 
 </script>
+
+<template>
+  <ButtonModal
+    text="Выбрать машину"
+    btnClass="col-span-4"
+    containerClass="pt-10 px-4 min-w-[80vw]"
+  >
+    <Tabulator v-bind="tabulatorOptions" />
+  </ButtonModal>
+</template>
diff --git a/live_monitor_vue/src/components/2_molecules/MapModal/MapModal.vue b/live_monitor_vue/src/components/2_molecules/MapModal/MapModal.vue
index ecb13cb..4b94d60 100644
--- a/live_monitor_vue/src/components/2_molecules/MapModal/MapModal.vue
+++ b/live_monitor_vue/src/components/2_molecules/MapModal/MapModal.vue
@@ -37,6 +37,8 @@ export default {
       default: ""
     }
   },
+  computed: {
+  },
   updated () {
     this.$nextTick(function () {
       if (this.data && this.id && this.open) {
@@ -45,8 +47,6 @@ export default {
       }
     })
   },
-  computed: {
-  },
   methods: {
   }
 }
diff --git a/live_monitor_vue/src/components/2_molecules/MapModal/helpers.js b/live_monitor_vue/src/components/2_molecules/MapModal/helpers.js
index 68e5188..1d739ad 100644
--- a/live_monitor_vue/src/components/2_molecules/MapModal/helpers.js
+++ b/live_monitor_vue/src/components/2_molecules/MapModal/helpers.js
@@ -196,11 +196,11 @@ const setTooltip = (map, coordinates, machine, tooltip_id, content_id, closer_id
     tooltipText.classList.add(content_id)
 
     if (feature) {
-      const container = tooltip.getElement();
-      const props = feature.getProperties()
+      const container = tooltip.getElement()
+      // const props = feature.getProperties()
 
-      const coordsFormated = feature.getGeometry()
-      const coordsFormat = feature.getGeometry().getFlatCoordinates()
+      // const coordsFormated = feature.getGeometry()
+      // const coordsFormat = feature.getGeometry().getFlatCoordinates()
 
       // const hdms = toLonLat(coordinates)
   
@@ -228,12 +228,9 @@ const setTooltip = (map, coordinates, machine, tooltip_id, content_id, closer_id
   });
   
   map.on('pointermove', function (e) {
-    const pixel = map.getEventPixel(e.originalEvent);
-    const hit = map.hasFeatureAtPixel(pixel);
-    // console.log('hit', hit)
-    // console.log('pixel', pixel)
-    // console.log('map', map)
-    // map.getTarget().style.cursor = hit ? 'pointer' : '';
+    const pixel = map.getEventPixel(e.originalEvent)
+    const hit = map.hasFeatureAtPixel(pixel)
+    map.getTarget().style.cursor = hit ? 'pointer' : ''
   })
 
   onClose.addEventListener('click', onClosed)
diff --git a/live_monitor_vue/src/components/2_molecules/VDatepicker/VDatepicker.vue b/live_monitor_vue/src/components/2_molecules/VDatepicker/VDatepicker.vue
index ce29802..57268e2 100644
--- a/live_monitor_vue/src/components/2_molecules/VDatepicker/VDatepicker.vue
+++ b/live_monitor_vue/src/components/2_molecules/VDatepicker/VDatepicker.vue
@@ -39,7 +39,7 @@ export default {
       enableTime: this.enableTime,
       dateFormat: this._dateFormat,
       locale: Russian,
-      onChange: (a,_b,_c) => {
+      onChange: (a) => {
         this.onchange(a[0])
       }
     });
diff --git a/live_monitor_vue/src/components/2_molecules/VSpinner/VSpinner.vue b/live_monitor_vue/src/components/2_molecules/VSpinner/VSpinner.vue
index 5b30a08..620bfa1 100644
--- a/live_monitor_vue/src/components/2_molecules/VSpinner/VSpinner.vue
+++ b/live_monitor_vue/src/components/2_molecules/VSpinner/VSpinner.vue
@@ -1,15 +1,3 @@
-<template>
-  <div class="w-fit flex items-center">
-    <RawSpinner
-      class="mr-2"
-    />
-    <span
-      v-if="!disableText"
-      class="text-lg text-slate-700"
-    >{{ text }}</span>
-  </div>
-</template>
-
 <script>
 import RawSpinner from './VSpinnerSvg.vue'
 
@@ -36,3 +24,15 @@ export default {
 }
 
 </script>
+
+<template>
+  <div class="w-fit flex items-center">
+    <RawSpinner
+      class="mr-2"
+    />
+    <span
+      v-if="!disableText"
+      class="text-lg text-slate-700"
+    >{{ text }}</span>
+  </div>
+</template>
diff --git a/live_monitor_vue/src/components/2_molecules/VSpinner/VSpinnerSvg.vue b/live_monitor_vue/src/components/2_molecules/VSpinner/VSpinnerSvg.vue
index 628bb91..0c03113 100644
--- a/live_monitor_vue/src/components/2_molecules/VSpinner/VSpinnerSvg.vue
+++ b/live_monitor_vue/src/components/2_molecules/VSpinner/VSpinnerSvg.vue
@@ -1,24 +1,3 @@
-<template>
-  <svg
-    aria-hidden="true"
-    :width="size"
-    :height="size"
-    class="text-gray-200 animate-spin dark:text-gray-600 fill-blue-600"
-    viewBox="0 0 100 101"
-    fill="none"
-    xmlns="http://www.w3.org/2000/svg"
-  >
-    <path
-      d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
-      fill="currentColor"
-    />
-    <path
-      d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
-      fill="currentFill"
-    />
-  </svg>
-</template>
-
 <script>
 
 export default {
@@ -40,3 +19,24 @@ export default {
 }
 
 </script>
+
+<template>
+  <svg
+    aria-hidden="true"
+    :width="size"
+    :height="size"
+    class="text-gray-200 animate-spin dark:text-gray-600 fill-blue-600"
+    viewBox="0 0 100 101"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+      fill="currentColor"
+    />
+    <path
+      d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+      fill="currentFill"
+    />
+  </svg>
+</template>
diff --git a/live_monitor_vue/src/components/2_molecules/VTabulator/VTabulator.vue b/live_monitor_vue/src/components/2_molecules/VTabulator/VTabulator.vue
index c20a0ad..7ea651b 100644
--- a/live_monitor_vue/src/components/2_molecules/VTabulator/VTabulator.vue
+++ b/live_monitor_vue/src/components/2_molecules/VTabulator/VTabulator.vue
@@ -5,11 +5,10 @@ import {
   sorter,
   renderGroupHeader,
   groupByFunction,
-  makedFiltering,
   tablefy
 } from "./helper";
 import localization from "./localization";
-import { cond, equals, is, mergeAll, sort, T, mergeDeepRight } from "ramda";
+import { is, sort, mergeDeepRight } from "ramda";
 import { pipe } from "@helpers/functions";
 import Pagination from "./VTabulatorPagination.vue";
 
@@ -116,7 +115,7 @@ export default {
         data: this.data,
         groupStartOpen: false,
 
-        groupHeader: function (value, count, data, group) {
+        groupHeader: function (value, count) {
           return value + "<span>(" + count + " записей)</span>";
         },
       };
@@ -155,23 +154,23 @@ export default {
     },
     __getGroupCfg() {
       if (this.groupByTemplate)
-      return { groupBy: groupByFunction(this.groupByTemplate) };
+        return { groupBy: groupByFunction(this.groupByTemplate) };
       if (this.groupBy) return { groupBy: this.groupBy };
       return {};
     },
     __getGroupHeaderCfg() {
       if (this.groupHeader)
-      return {
-        groupHeader: (value, count, data, group) =>
-          renderGroupHeader({
-            extra: this.groupExtraValues,
-            groupHeader: this.groupHeader,
-            value,
-            count,
-            data,
-            group,
-          }),
-      };
+        return {
+          groupHeader: (value, count, data, group) =>
+            renderGroupHeader({
+              extra: this.groupExtraValues,
+              groupHeader: this.groupHeader,
+              value,
+              count,
+              data,
+              group,
+            }),
+        };
       return {};
     },
   }
@@ -189,6 +188,6 @@ export default {
     </div>
   </div>
   <div v-if="pagination">
-    <Pagination :params="pagination"/>
+    <Pagination :params="pagination" />
   </div>
 </template>
diff --git a/live_monitor_vue/src/components/2_molecules/VTabulator/VTabulatorPagination.vue b/live_monitor_vue/src/components/2_molecules/VTabulator/VTabulatorPagination.vue
index bd9d780..9c2b245 100644
--- a/live_monitor_vue/src/components/2_molecules/VTabulator/VTabulatorPagination.vue
+++ b/live_monitor_vue/src/components/2_molecules/VTabulator/VTabulatorPagination.vue
@@ -1,12 +1,9 @@
-
-
 <script>
-import {mapGetters, mapMutations, mapActions, useStore} from "vuex"
 import { validation } from './helper'
 import { Alert } from "@store/hooks/Alert"
 
 export default {
-  name: 'Pagination',
+  name: 'TabulatorPagination',
   components: {
   },
   props: {
@@ -26,8 +23,8 @@ export default {
   },
   watch: {
     params: {
-      handler(value, oldValue) {
-        if(value) {
+      handler(newValue) {
+        if(newValue) {
           const loader = document.querySelector(`#table_loder_${this.params.id}`)
           loader.style.display = 'none'
         }
@@ -39,10 +36,10 @@ export default {
   },
   methods: {
     selectOptions: (selectOption, paginationOptions) => {
-      const options = selectOption ? selectOption : optionsDefault
+      const options = selectOption ? selectOption : []
       const currentOptions = options.filter((el) => {
         if(el <= Math.ceil(paginationOptions.total / 10) * 10) {
-        return el
+          return el
         }
       })
       if(paginationOptions.show_all) {
@@ -93,13 +90,13 @@ export default {
           return false
         }
         if(!error) {
-            e.target.removeAttribute('disabled')
-            e.target.classList.remove('opacity-50')
-            const loader = document.querySelector(`#table_loder_${this.params.id}`)
-            loader.style.display = 'block'
-            e.target.focus()
-            const params = {pageNumber: this.inputValue, pageSize: this.params.paginationOptions.page_size}
-            return this.params.updatePagination(params)
+          e.target.removeAttribute('disabled')
+          e.target.classList.remove('opacity-50')
+          const loader = document.querySelector(`#table_loder_${this.params.id}`)
+          loader.style.display = 'block'
+          e.target.focus()
+          const params = {pageNumber: this.inputValue, pageSize: this.params.paginationOptions.page_size}
+          return this.params.updatePagination(params)
         } else {
           e.target.setAttribute('disabled', 'disabled')
           e.target.classList.add('opacity-50')
@@ -120,61 +117,145 @@ export default {
 </script>
 
 
-
 <template>
   <div class="pagination w-full flex flex-row items-center justify-between gap-3 mt-2 mb-8 xl:mb-0 pb-8 xl:p-2.5 bg-slate-100 border-2 border-solid border-slate-300 rounded-lg flex-col 2xl:flex-row">
     <div class="pagination-left flex flex-row gap-1">
-      <div class="current-entries flex text-sm font-bold">Показаны {{currentEntries(params?.paginationOptions)}}</div>
-      <div class="count-entries flex text-sm font-bold">(Всего записей - {{params?.paginationOptions?.total}})</div>
+      <div class="current-entries flex text-sm font-bold">
+        Показаны {{ currentEntries(params?.paginationOptions) }}
+      </div>
+      <div class="count-entries flex text-sm font-bold">
+        (Всего записей - {{ params?.paginationOptions?.total }})
+      </div>
     </div>
     <div class="pagination-right flex flex-col xl:flex-row items-center gap-3">
-      <div :id="`table_loder_${params.id}`" class="hidden w-full h-auto bg-light flex items-center justify-center px-2"><div type-node="loader" class="flex my_margin-3 items-center justify-center">
-        <div role="status">
-          <svg aria-hidden="true" class="mr-2 w-6 h-6 text-gray-400 animate-spin dark:text-gray-400 fill-white" viewBox="0 0 100 101" fill="none" >
-            <path d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z" fill="currentColor"/>
-            <path d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z" fill="currentFill"/>
-          </svg>
+      <div
+        :id="`table_loder_${params.id}`"
+        class="hidden w-full h-auto bg-light flex items-center justify-center px-2"
+      >
+        <div
+          type-node="loader"
+          class="flex my_margin-3 items-center justify-center"
+        >
+          <div role="status">
+            <svg
+              aria-hidden="true"
+              class="mr-2 w-6 h-6 text-gray-400 animate-spin dark:text-gray-400 fill-white"
+              viewBox="0 0 100 101"
+              fill="none"
+            >
+              <path
+                d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+                fill="currentColor"
+              />
+              <path
+                d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+                fill="currentFill"
+              />
+            </svg>
+          </div>
         </div>
-      </div></div>
+      </div>
       <div class="buttons flex h-fit gap-1 sm:gap-3 text-sm">
-        <div class="flex gap-1 sm:gap-3" v-if="params.paginationOptions.page_number > 1">
+        <div
+          v-if="params.paginationOptions.page_number > 1"
+          class="flex gap-1 sm:gap-3"
+        >
           <div v-if="params.paginationOptions.page_number - 1 !== 1">
-            <button :table_btn="`${params.id}`" class="previous flex items-center text-white font-bold bg-slate-600 hover:bg-slate-700 py-1 px-3 gap-2 rounded" @click="setPagination({pageNumber: 1, pageSize: params.paginationOptions.page_size})">
+            <button
+              :table_btn="`${params.id}`"
+              class="previous flex items-center text-white font-bold bg-slate-600 hover:bg-slate-700 py-1 px-3 gap-2 rounded"
+              @click="setPagination({pageNumber: 1, pageSize: params.paginationOptions.page_size})"
+            >
               <span>1</span>
             </button>
           </div>
-          <button :table_btn="`${params.id}`" class="previous flex items-center text-white font-bold bg-slate-600 hover:bg-slate-700 py-1 px-3 gap-2 rounded" @click="setPagination({pageNumber: params.paginationOptions.page_number - 1, pageSize: params.paginationOptions.page_size})">
-            <span class="hidden sm:flex">Назад</span><i class="ri-arrow-left-line sm:hidden"></i>
+          <button
+            :table_btn="`${params.id}`"
+            class="previous flex items-center text-white font-bold bg-slate-600 hover:bg-slate-700 py-1 px-3 gap-2 rounded"
+            @click="setPagination({pageNumber: params.paginationOptions.page_number - 1, pageSize: params.paginationOptions.page_size})"
+          >
+            <span class="hidden sm:flex">Назад</span><i class="ri-arrow-left-line sm:hidden" />
           </button>
-          <button :table_btn="`${params.id}`" class="previous flex items-center text-white font-bold bg-slate-600 hover:bg-slate-700 py-1 px-3 gap-2 rounded" @click="setPagination({pageNumber: params.paginationOptions.page_number - 1, pageSize: params.paginationOptions.page_size})">
-            <span>{{params.paginationOptions.page_number - 1}}</span>
+          <button
+            :table_btn="`${params.id}`"
+            class="previous flex items-center text-white font-bold bg-slate-600 hover:bg-slate-700 py-1 px-3 gap-2 rounded"
+            @click="setPagination({pageNumber: params.paginationOptions.page_number - 1, pageSize: params.paginationOptions.page_size})"
+          >
+            <span>{{ params.paginationOptions.page_number - 1 }}</span>
           </button>
         </div>
-        <button :table_btn="`${params.id}`" class="active flex items-center text-blue-700 font-bold bg-white py-1 px-3 gap-2 rounded cursor-default">
-          <span>{{params.paginationOptions.page_number}}</span>
+        <button
+          :table_btn="`${params.id}`"
+          class="active flex items-center text-blue-700 font-bold bg-white py-1 px-3 gap-2 rounded cursor-default"
+        >
+          <span>{{ params.paginationOptions.page_number }}</span>
         </button>
-        <div class="flex gap-1 sm:gap-3" v-if="params.paginationOptions.page_number < params.paginationOptions.total_pages">
-          <button :table_btn="`${params.id}`" class="next flex items-center text-white font-bold bg-slate-600 hover:bg-slate-700 py-1 px-3 gap-2 rounded" @click="setPagination({pageNumber: params.paginationOptions.page_number + 1, pageSize: params.paginationOptions.page_size})">
-            <span>{{params.paginationOptions.page_number + 1}}</span>
+        <div
+          v-if="params.paginationOptions.page_number < params.paginationOptions.total_pages"
+          class="flex gap-1 sm:gap-3"
+        >
+          <button
+            :table_btn="`${params.id}`"
+            class="next flex items-center text-white font-bold bg-slate-600 hover:bg-slate-700 py-1 px-3 gap-2 rounded"
+            @click="setPagination({pageNumber: params.paginationOptions.page_number + 1, pageSize: params.paginationOptions.page_size})"
+          >
+            <span>{{ params.paginationOptions.page_number + 1 }}</span>
           </button>
-          <button :table_btn="`${params.id}`" class="next flex items-center text-white font-bold bg-slate-600 hover:bg-slate-700 py-1 px-3 gap-2 rounded" @click="setPagination({pageNumber: params.paginationOptions.page_number + 1, pageSize: params.paginationOptions.page_size})">
-            <span class="hidden sm:flex">Вперёд</span><i class="ri-arrow-right-line sm:hidden"></i>
+          <button
+            :table_btn="`${params.id}`"
+            class="next flex items-center text-white font-bold bg-slate-600 hover:bg-slate-700 py-1 px-3 gap-2 rounded"
+            @click="setPagination({pageNumber: params.paginationOptions.page_number + 1, pageSize: params.paginationOptions.page_size})"
+          >
+            <span class="hidden sm:flex">Вперёд</span><i class="ri-arrow-right-line sm:hidden" />
           </button>
           <div v-if="params.paginationOptions.page_number + 1 !== params.paginationOptions.total_pages">
-            <button :table_btn="`${params.id}`" class="next flex items-center text-white font-bold bg-slate-600 hover:bg-slate-700 py-1 px-3 gap-2 rounded" @click="setPagination({pageNumber: params.paginationOptions.total_pages, pageSize: params.paginationOptions.page_size})">
-              <span>{{params.paginationOptions.total_pages}}</span>
+            <button
+              :table_btn="`${params.id}`"
+              class="next flex items-center text-white font-bold bg-slate-600 hover:bg-slate-700 py-1 px-3 gap-2 rounded"
+              @click="setPagination({pageNumber: params.paginationOptions.total_pages, pageSize: params.paginationOptions.page_size})"
+            >
+              <span>{{ params.paginationOptions.total_pages }}</span>
             </button>
           </div>
         </div>
       </div>
-      <div class="flex flex-row items-center justify-center gap-2"><input v-on:input="updateInputValue" :class="`page-input-${params.id}`" class="flex max-w-[80px] items-center text-slate-700 text-sm font-bold focus-visible:outline-blue-300 bg-white py-1 px-2 gap-2 rounded" value="" placeholder="Страница"/><button @click="setPaginationButton" disabled :class="`page-button-${params.id}`" class="opacity-50 flex items-center text-white font-bold bg-slate-600 hover:bg-slate-700 py-1 px-1 rounded">Перейти</button></div>
-      <div id="select-on-page" class="select-on-page flex items-center justify-center gap-3 p-1 text-sm text-slate-700 font-bold">
+      <div class="flex flex-row items-center justify-center gap-2">
+        <input
+          :class="`page-input-${params.id}`"
+          class="flex max-w-[80px] items-center text-slate-700 text-sm font-bold focus-visible:outline-blue-300 bg-white py-1 px-2 gap-2 rounded"
+          value=""
+          placeholder="Страница"
+          @input="updateInputValue"
+        ><button
+          disabled
+          :class="`page-button-${params.id}`"
+          class="opacity-50 flex items-center text-white font-bold bg-slate-600 hover:bg-slate-700 py-1 px-1 rounded"
+          @click="setPaginationButton"
+        >
+          Перейти
+        </button>
+      </div>
+      <div
+        id="select-on-page"
+        class="select-on-page flex items-center justify-center gap-3 p-1 text-sm text-slate-700 font-bold"
+      >
         Показать
-          <select name="on_page" v-bind:value="params.paginationOptions.page_size" v-on:change="updateSelectedValue" :table_option="`${params.id}`" class="flex text-gray-700 pl-3 pr-9 py-0.5 rounded cursor-pointer border-none" style="--tw-ring-color:focus: none" >
-            <option :key={idx} v-for="(el, idx) in selectOptions(params.selectOption, params.paginationOptions)" :value="`${el === 'Все' ? params.paginationOptions.total : el}`">
-              {{ el }}
-            </option>`
-          </select>
+        <select
+          name="on_page"
+          :value="params.paginationOptions.page_size"
+          :table_option="`${params.id}`"
+          class="flex text-gray-700 pl-3 pr-9 py-0.5 rounded cursor-pointer border-none"
+          style="--tw-ring-color:focus: none"
+          @change="updateSelectedValue"
+        >
+          <option
+            v-for="(el, idx) in selectOptions(params.selectOption, params.paginationOptions)"
+            :key="{idx}"
+            :value="`${el === 'Все' ? params.paginationOptions.total : el}`"
+          >
+            {{ el }}
+          </option>`
+        </select>
       </div>
     </div>
   </div>
diff --git a/live_monitor_vue/src/components/2_molecules/VTabulator/helper.js b/live_monitor_vue/src/components/2_molecules/VTabulator/helper.js
index 013bbff..bf08cad 100644
--- a/live_monitor_vue/src/components/2_molecules/VTabulator/helper.js
+++ b/live_monitor_vue/src/components/2_molecules/VTabulator/helper.js
@@ -1,4 +1,4 @@
-import { always, cond, equals, is, T,  mergeLeft } from "ramda";
+import { always, cond, equals, is, T, pipe, mergeLeft } from "ramda";
 import Handlebars from "handlebars/dist/cjs/handlebars";
 import moment from "moment";
 import presetConfig from './presetConfig'
@@ -20,23 +20,23 @@ const tablefy = (list = []) => {
   return list.map((el) => mergeLeft(el, defaultData(el?.title || "")))
 }
 
-const math = (value, operator, operand, options) => {
+const math = (value, operator, operand) => {
   var left = parseFloat(value);
   var right = parseFloat(operand);
 
   switch(operator) {
-    case "+":
-      return left + right;
-    case "-":
-      return left - right;
-    case "*":
-      return left * right;
-    case "/":
-      return left / right;
-    case "%":
-      return left % right;
-    default:
-      return "";
+  case "+":
+    return left + right;
+  case "-":
+    return left - right;
+  case "*":
+    return left * right;
+  case "/":
+    return left / right;
+  case "%":
+    return left % right;
+  default:
+    return "";
   }
 }
 
@@ -138,7 +138,8 @@ const link = (col) => ({
   [
     "from_list",
     (list, param_string) => {
-
+      const [key, value] = param_string.split(",")
+      return list.find(el => el[key] === value)
     }
   ],
   [
@@ -204,7 +205,7 @@ const render = (col) => ({
       if(col.onCell && !record.status) {
         console.log('onCell', col.onCell)
         cell.getElement().style.backgroundColor = parseFunc(col.onCell)(record)?.style?.backgroundColor
-       }
+      }
       if (`${col.render}`.includes("{{") && `${col.render}`.includes("}}")) {
         let record = cell.getRow().getData();
         cell.getElement().innerHTML = Handlebars.compile(col.render)(
@@ -278,21 +279,21 @@ const makedFiltering = (id, filterParams, selectedFilter, clearFilters) => {
   const table = document.querySelector(`#${id}`)
   const isFiltering = document.querySelector(`${id}-filters`)
 
-    if(id && filterParams) {
-      filterParams.unshift([])
-      const filtersContainer = document.createElement('div')
-      filtersContainer.setAttribute("id", `${id}-filters`)
-      filtersContainer.classList.add("col-span-12")
-      filtersContainer.innerHTML = `
+  if(id && filterParams) {
+    filterParams.unshift([])
+    const filtersContainer = document.createElement('div')
+    filtersContainer.setAttribute("id", `${id}-filters`)
+    filtersContainer.classList.add("col-span-12")
+    filtersContainer.innerHTML = `
       <div id="${id}-filtersContainer" class="filters flex flex-row items-center justify-start gap-3 mb-0 pt-2.5 bg-slate-100 rounded-t-md flex-row 2xl:flex-row">
         <div id="${id}-selectFilters" class="flex items-center justify-start gap-3 p-1 ml-2 text-base text-slate-700 font-bold">
           Фильтр по статусу
           <select name="selectFilter" id="${id}-selectFilter" class="flex text-gray-700 pl-3 pr-9 py-0.5 rounded cursor-pointer border-none" style="--tw-ring-color:focus: none" >
           ${filterParams.map((el) => {
-            return (`<option value='${el}'>
+    return (`<option value='${el}'>
                       ${el}
                     </option>`)
-          })}
+  })}
           </select>
         </div>
         <button id="${id}-filtersClear"class="w-fit h-fit flex items-center text-white text-sm font-bold bg-slate-600 hover:bg-slate-700 py-1 px-3 gap-1 rounded">Очистить фильтр</button>
@@ -334,9 +335,9 @@ const makedFiltering = (id, filterParams, selectedFilter, clearFilters) => {
 
 const validation = (value, pagination) => {
   const pipe = (...fns) => (...x) => fns.reduce((error, validator) => error || validator(...x), undefined)
-  const required = value => {
-    return value ? undefined : "*"
-  }
+  // const required = value => {
+  //   return value ? undefined : "*"
+  // }
   const minPage = length => value => {
     value = value.replace(/\s+/g, '')
     return value >= length ? undefined : `Номер страницы должен быть больше или равен ${length}`
diff --git a/live_monitor_vue/src/components/2_molecules/VTabulator/localization.js b/live_monitor_vue/src/components/2_molecules/VTabulator/localization.js
index 6b0116c..6d2b2b5 100644
--- a/live_monitor_vue/src/components/2_molecules/VTabulator/localization.js
+++ b/live_monitor_vue/src/components/2_molecules/VTabulator/localization.js
@@ -6,22 +6,22 @@ const localization = () => ({
     },
     "pagination":{
       "page_size":"Размер таблицы", //label for the page size select element
-        "page_title":"Показать страницу",//tooltip text for the numeric page button, appears in front of the page number (eg. "Show Page" will result in a tool tip of "Show Page 1" on the page 1 button)
-        "first":"К первой", //text for the first page button
-        "first_title":"Показать страницу", //tooltip text for the first page button
-        "last":"К последней",
-        "last_title":"Последняя страница",
-        "prev":"<<",
-        "prev_title":"<<",
-        "next":">>",
-        "next_title":">>",
-        "all":"Все",
-        "counter":{
-            "showing": "Показать",
-            "of": "из",
-            "rows": "строки",
-            "pages": "страницы",
-        }
+      "page_title":"Показать страницу",//tooltip text for the numeric page button, appears in front of the page number (eg. "Show Page" will result in a tool tip of "Show Page 1" on the page 1 button)
+      "first":"К первой", //text for the first page button
+      "first_title":"Показать страницу", //tooltip text for the first page button
+      "last":"К последней",
+      "last_title":"Последняя страница",
+      "prev":"<<",
+      "prev_title":"<<",
+      "next":">>",
+      "next_title":">>",
+      "all":"Все",
+      "counter":{
+        "showing": "Показать",
+        "of": "из",
+        "rows": "строки",
+        "pages": "страницы",
+      }
     },
   },
 });
diff --git a/live_monitor_vue/src/components/2_molecules/VTabulator/presetConfig.js b/live_monitor_vue/src/components/2_molecules/VTabulator/presetConfig.js
index 5b29478..39392fe 100644
--- a/live_monitor_vue/src/components/2_molecules/VTabulator/presetConfig.js
+++ b/live_monitor_vue/src/components/2_molecules/VTabulator/presetConfig.js
@@ -1,52 +1,5 @@
 import { cond, T } from "ramda";
 
-const text = `
-0	Конфигурация не установлена (по умолчанию)
-1	Стандартная конфигурация МРТ (МПТ/АВФ)
-2	Стандартная конфигурация ЖДСМ
-3	Стандартная конфигурация УК/ВПО
-4	ЩОМ/РМ (Акселерометр)
-5	СМ (Сибирский ПГУПС)
-6	СМ (зарезервировано)
-7	Эмуляция платы БКП
-8	Конфигурация Блок-М
-40	Эмуляторы
-41	Эмуляторы (CAN1 + CAN2 (Блок-М) + ModBus
-50	Стандартная конфигурация ModBus Master (опрос внешних устройств)
-51	Стандартная конфигурация ModBus Master (опрос плат АС КРСПС)
-52	Конфигурация трекера (электрички и т.п.)
-53	Конфигурация трекер + счетчик импульсов + акселерометр
-54	РадарП
-55	СДРГО
-100	ПМА-1М РПМ
-101	ЩОМ-1400 РПМ
-102	АМ-140 СКРТ РПМ
-103	АС-01 РПМ
-104	ТЭС ПСС-1К РПМ
-105	ПСС-2П РПМ
-200	РПБ-01 ВНИКТИ
-201	МПК Спецлоко
-202	УК 25/25 ВНИКТИ
-203	СЗ-800 ВНИКТИ
-300	ЩОМ-1200С ТЖДМ
-301	ЩОМ-2000 ТЖДМc
-302	ССГС-1 ТЖДМ
-303	ВПО-С ТЖДМ
-304	МПВ ТЖДМ
-305	УПК ТЖДМ
-306	ПРЛ-М ТЖДМ
-307	РУ-700 ТЖДМ
-308	МПВ Секция 2 ТЖДМ
-1911	Конфигурация для отладки
-4096	Настраиваемая конфигурация
-`
-
-//TODO SERGEY
-const parse = () => {
-  text
-  return {}
-}
-
 const get_f1_preset = (el) => {
   const r = {
     0: "Конфигурация не установлена (по умолчанию)",
diff --git a/live_monitor_vue/src/components/2_molecules/VTabulator/stringFunction.js b/live_monitor_vue/src/components/2_molecules/VTabulator/stringFunction.js
index b9ada66..daec88b 100644
--- a/live_monitor_vue/src/components/2_molecules/VTabulator/stringFunction.js
+++ b/live_monitor_vue/src/components/2_molecules/VTabulator/stringFunction.js
@@ -8,10 +8,8 @@ import {
   propEq,
   findIndex,
   update,
-  is,
   cond,
   T,
-  isNil
 } from "ramda";
 
 let getPackSettings = (userId, page, packStructId, func) => {
@@ -30,7 +28,7 @@ let getPackSettings = (userId, page, packStructId, func) => {
   }
 };
 
-const prepDiscretes = (from, to, arr) =>
+const prepDiscretes = (from, to) =>
   range(from, to + 1).map((el) => ({
     title: el,
     dataIndex: `disc${el}`,
@@ -79,17 +77,14 @@ const withCustomSettings = (_columns, requestSettings) => {
   let columns = _columns
 
   if (requestSettings?.colors?.isOn) {
-  }
-
-  if (requestSettings?.colors?.isOn) {
-    let colors = requestSettings.colors.list.filter((el) => el.isOn);
-    colors = groupBy((c) => c.param)(colors);
-    coloredParams = Object.keys(colors);
+    let colors = requestSettings.colors.list.filter((el) => el.isOn)
+    colors = groupBy((c) => c.param)(colors)
+    const coloredParams = Object.keys(colors)
     columns = columns.map((el) => {
       if (coloredParams.includes(el.dataIndex)) {
         return {
           ...el,
-          onCell: (data, index) => {
+          onCell: (data) => {
             let colrSettings = colors[el.dataIndex];
             let value = data[el.dataIndex];
             let color = find(({ from, untill }) =>
@@ -147,23 +142,22 @@ const withCustomSettings = (_columns, requestSettings) => {
     }
   }
 
-  return columns;
+  return columns
 };
 
-const fetch_sorter_field = (sorter, req_params) => {
-  const date_param = req_params?.settings?.date_param
-  return cond([
-    [() => sorter?.field, () => sorter.field],
-    [is(Array), field_from_arr(sorter, date_param)],
-    [isNil, () => date_param],
-  ])(sorter)
-}
-
-const field_from_arr = (sorter, date_param) => () => {
-  const field = sorter.find((el) => `${el?.field}`.includes("dt"))?.field
-  return field || date_param
-}
+// const fetch_sorter_field = (sorter, req_params) => {
+//   const date_param = req_params?.settings?.date_param
+//   return cond([
+//     [() => sorter?.field, () => sorter.field],
+//     [is(Array), field_from_arr(sorter, date_param)],
+//     [isNil, () => date_param],
+//   ])(sorter)
+// }
 
+// const field_from_arr = (sorter, date_param) => () => {
+//   const field = sorter.find((el) => `${el?.field}`.includes("dt"))?.field
+//   return field || date_param
+// }
 
 const get_f1_preset = (el) => {
   const r = {
@@ -401,6 +395,6 @@ let parseFunc2 = (string) => {
 const parseFunc3 = (string) => {
   const f = new Function(`return (${string})`)
   return f()
-  }
+}
 
 export {parseFunc, parseFunc2, parseFunc3}
diff --git a/live_monitor_vue/src/components/2_molecules/VTabulator/time_funcs.js b/live_monitor_vue/src/components/2_molecules/VTabulator/time_funcs.js
index bd16987..17098b2 100644
--- a/live_monitor_vue/src/components/2_molecules/VTabulator/time_funcs.js
+++ b/live_monitor_vue/src/components/2_molecules/VTabulator/time_funcs.js
@@ -21,7 +21,7 @@ const monthNames = [
 ];
 
 export const reformateDateString = (date, format = "full") =>
-  !!date ? reformate(date, format) : null;
+  date ? reformate(date, format) : null;
 
 const reformate = (date, format) =>
   cond([
@@ -116,42 +116,42 @@ export const parseSepareteDate = (
     if (dateBits[key] < 10) dateBits[key] = `0${dateBits[key]}`;
   });
   switch (mode) {
-    case "DateDMY":
-      return dateBits.day + symbol + dateBits.month + symbol + dateBits.year;
-    case "DateDM":
-      return dateBits.day + symbol + dateBits.month;
-    case "DateYMD":
-      return dateBits.year + symbol + dateBits.month + symbol + dateBits.day;
-    case "DateDMYHM":
-      return `${
-        dateBits.day + symbol + dateBits.month + symbol + dateBits.year
-      } ${dateBits.hours}:${dateBits.minutes}`;
-    case "DateDMYHMS":
-      return `${
-        dateBits.day + symbol + dateBits.month + symbol + dateBits.year
-      } ${dateBits.hours}:${dateBits.minutes}:${dateBits.seconds}`;
-    case "DateYMDHM":
-      return `${
-        dateBits.year + symbol + dateBits.month + symbol + dateBits.day
-      } ${dateBits.hours}:${dateBits.minutes}`;
-    case "DateYMDHMS":
-      return `${
-        dateBits.year + symbol + dateBits.month + symbol + dateBits.day
-      } ${dateBits.hours}:${dateBits.minutes}:${dateBits.seconds}`;
-    case "DateHM":
-      return `${dateBits.hours}:${dateBits.minutes}`;
-    case "DateHMDM":
-      return `${dateBits.hours}:${dateBits.minutes} ${dateBits.day}${symbol}${dateBits.month}`;
-    case "DateDataBase":
-      return `${
-        dateBits.year + symbol + dateBits.month + symbol + dateBits.day
-      }T${dateBits.hours}:${dateBits.minutes}:${dateBits.seconds}`;
-    case "DateDataBaseSpace":
-      return `${
-        dateBits.year + symbol + dateBits.month + symbol + dateBits.day
-      } ${dateBits.hours}:${dateBits.minutes}:${dateBits.seconds}`;
-    default:
-      return dateBits.day + symbol + dateBits.month + symbol + dateBits.year;
+  case "DateDMY":
+    return dateBits.day + symbol + dateBits.month + symbol + dateBits.year;
+  case "DateDM":
+    return dateBits.day + symbol + dateBits.month;
+  case "DateYMD":
+    return dateBits.year + symbol + dateBits.month + symbol + dateBits.day;
+  case "DateDMYHM":
+    return `${
+      dateBits.day + symbol + dateBits.month + symbol + dateBits.year
+    } ${dateBits.hours}:${dateBits.minutes}`;
+  case "DateDMYHMS":
+    return `${
+      dateBits.day + symbol + dateBits.month + symbol + dateBits.year
+    } ${dateBits.hours}:${dateBits.minutes}:${dateBits.seconds}`;
+  case "DateYMDHM":
+    return `${
+      dateBits.year + symbol + dateBits.month + symbol + dateBits.day
+    } ${dateBits.hours}:${dateBits.minutes}`;
+  case "DateYMDHMS":
+    return `${
+      dateBits.year + symbol + dateBits.month + symbol + dateBits.day
+    } ${dateBits.hours}:${dateBits.minutes}:${dateBits.seconds}`;
+  case "DateHM":
+    return `${dateBits.hours}:${dateBits.minutes}`;
+  case "DateHMDM":
+    return `${dateBits.hours}:${dateBits.minutes} ${dateBits.day}${symbol}${dateBits.month}`;
+  case "DateDataBase":
+    return `${
+      dateBits.year + symbol + dateBits.month + symbol + dateBits.day
+    }T${dateBits.hours}:${dateBits.minutes}:${dateBits.seconds}`;
+  case "DateDataBaseSpace":
+    return `${
+      dateBits.year + symbol + dateBits.month + symbol + dateBits.day
+    } ${dateBits.hours}:${dateBits.minutes}:${dateBits.seconds}`;
+  default:
+    return dateBits.day + symbol + dateBits.month + symbol + dateBits.year;
   }
 };
 
diff --git a/live_monitor_vue/src/components/3_organisms/PackColumns.js b/live_monitor_vue/src/components/3_organisms/PackColumns.js
index 47c5154..303221d 100644
--- a/live_monitor_vue/src/components/3_organisms/PackColumns.js
+++ b/live_monitor_vue/src/components/3_organisms/PackColumns.js
@@ -1,15 +1,14 @@
-import { parse } from "handlebars/dist/cjs/handlebars/compiler/base";
 import { cond, T, isEmpty } from "ramda";
 
 const setPackColumns = (name) => {
   switch(name) {
-    case 'КолонкиПакетов': 
-      return [
-        {
-          title: "Пакет на проде",
-          field: "switch ",
-          width: 150,
-          render: `
+  case 'КолонкиПакетов': 
+    return [
+      {
+        title: "Пакет на проде",
+        field: "switch ",
+        width: 150,
+        render: `
           <form x-data='{ isProd: {{ isProd }} }' phx-change='update_pack_struct_online:{{ id }}'>
             <div class='flex justify-center'>
               <div class='form-check form-switch'>
@@ -20,17 +19,17 @@ const setPackColumns = (name) => {
             </div>
           </form>
           `
-        },
-        {
-          title: "Название",
-          field: "name",
-          width: 180
-        },
-        {
-          title: "Действия",
-          field: "actions",
-          width: 100,
-          render: `
+      },
+      {
+        title: "Название",
+        field: "name",
+        width: 180
+      },
+      {
+        title: "Действия",
+        field: "actions",
+        width: 100,
+        render: `
           <div class='flex gap-2 py-1'>
             <button style='width: 25px; height: 25px;' class='italic border border-solid transition-all duration-300 rounded-full cursor-pointer hover:text-gray-500 linear-loader card-btn-action pt-[2px] text-primary' phx-click='select_struct:{{ id }}' >
               <i class='ri-eye-fill'></i>
@@ -50,105 +49,105 @@ const setPackColumns = (name) => {
                 </button>
           </div>
           `
-        }
-      ]
-    case 'Сырые': 
-      return [
-        {
-          title: "Время пакета",
-          field: "pack_dt",
-          width: 180
-        },
-        {
-          title: "Архивная дата",
-          field: "arhiv_date",
-          width: 90
-        },
-        {
-          title: "Номер пакета",
-          field: "pack_number",
-          width: 70
-        },
-        {
-          title: "Длинна пакета",
-          field: "pack_len",
-          width: 70
-        },
-        {
-          title: "Репл",
-          field: "id_repl",
-          width: 70
-        },
-        {
-          title: "IMEI",
-          field: "imei",
-          width: 120
-        },
-        {
-          title: "ДАННЫЕ",
-          field: "data",
-          width: 600
-        },
-        {
-          title: "Дата начала передачи",
-          field: "connect_dt",
-          width: 180
-        },
-        {
-          title: "Дата завершения передачи",
-          field: "disconnect_dt",
-          width: 180
-        }
-      ]
-    case 'Нераспознанные':
-      return [
-        {
-          title: "Время пакета",
-          field: "pack_dt",
-          width: 180
-        },
-        {
-          title: "Архивная дата",
-          field: "arhiv_date",
-          width: 90
-        },
-        {
-          title: "Номер пакета",
-          field: "pack_number",
-          width: 70
-        },
-        {
-          title: "Длинна пакета",
-          field: "pack_len",
-          width: 70
-        },
-        {
-          title: "Репл",
-          field: "id_repl",
-          width: 70
-        },
-        {
-          title: "IMEI",
-          field: "imei",
-          width: 120
-        },
-        {
-          title: "ДАННЫЕ",
-          field: "data",
-          width: 600
-        },
-        {
-          title: "Дата начала передачи",
-          field: "connect_dt",
-          width: 180
-        },
-        {
-          title: "Дата завершения передачи",
-          field: "disconnect_dt",
-          width: 180
-        }
-      ]
-    default: return []
+      }
+    ]
+  case 'Сырые': 
+    return [
+      {
+        title: "Время пакета",
+        field: "pack_dt",
+        width: 180
+      },
+      {
+        title: "Архивная дата",
+        field: "arhiv_date",
+        width: 90
+      },
+      {
+        title: "Номер пакета",
+        field: "pack_number",
+        width: 70
+      },
+      {
+        title: "Длинна пакета",
+        field: "pack_len",
+        width: 70
+      },
+      {
+        title: "Репл",
+        field: "id_repl",
+        width: 70
+      },
+      {
+        title: "IMEI",
+        field: "imei",
+        width: 120
+      },
+      {
+        title: "ДАННЫЕ",
+        field: "data",
+        width: 600
+      },
+      {
+        title: "Дата начала передачи",
+        field: "connect_dt",
+        width: 180
+      },
+      {
+        title: "Дата завершения передачи",
+        field: "disconnect_dt",
+        width: 180
+      }
+    ]
+  case 'Нераспознанные':
+    return [
+      {
+        title: "Время пакета",
+        field: "pack_dt",
+        width: 180
+      },
+      {
+        title: "Архивная дата",
+        field: "arhiv_date",
+        width: 90
+      },
+      {
+        title: "Номер пакета",
+        field: "pack_number",
+        width: 70
+      },
+      {
+        title: "Длинна пакета",
+        field: "pack_len",
+        width: 70
+      },
+      {
+        title: "Репл",
+        field: "id_repl",
+        width: 70
+      },
+      {
+        title: "IMEI",
+        field: "imei",
+        width: 120
+      },
+      {
+        title: "ДАННЫЕ",
+        field: "data",
+        width: 600
+      },
+      {
+        title: "Дата начала передачи",
+        field: "connect_dt",
+        width: 180
+      },
+      {
+        title: "Дата завершения передачи",
+        field: "disconnect_dt",
+        width: 180
+      }
+    ]
+  default: return []
   }
 }
 
@@ -156,18 +155,19 @@ const prepareSetPackColumns = (name, data) => {
   console.log('prepareSetPackColumns data', data);
   console.log('prepareSetPackColumns name', name);
   switch(name) {
-    case 'askr_logs': 
-      if (data.length > 0) {
-        return data[0].map((el) => ({title: Object.keys(el)[0], field: Object.keys(el)[0], width: 150}))
-      }
-      if (data.length === 0) {
-        return []
-      }
-    case 'raw':
-      return setPackColumns('Сырые')
-    case 'unrecognized':
-      return setPackColumns('Нераспознанные')
-    default: return []
+  case 'askr_logs': 
+    if (data.length > 0) {
+      return data[0].map((el) => ({title: Object.keys(el)[0], field: Object.keys(el)[0], width: 150}))
+    }
+    if (data.length === 0) {
+      return []
+    }
+    break  
+  case 'raw':
+    return setPackColumns('Сырые')
+  case 'unrecognized':
+    return setPackColumns('Нераспознанные')
+  default: return []
   }
 }
 
@@ -206,12 +206,12 @@ const parseCols = (packStructure, report) => {
 const fetchColumn = (packStructure, report, id = null) => {
   console.log('packStructure', packStructure)
   console.log('id', id)
-    const getCurrentPackColls = (packStructure, id) => {
-      const currentPackStructure = packStructure.find((el) => el.id === id)
-      console.log('currentPackStructure', currentPackStructure)
-      const currColumns = currentPackStructure.columns ? currentPackStructure.columns : []
-      return parseCols(currColumns, null)
-    }
+  const getCurrentPackColls = (packStructure, id) => {
+    const currentPackStructure = packStructure.find((el) => el.id === id)
+    console.log('currentPackStructure', currentPackStructure)
+    const currColumns = currentPackStructure.columns ? currentPackStructure.columns : []
+    return parseCols(currColumns, null)
+  }
   return cond([
     [(packStructure) => !packStructure === true,  () => parseCols(null, report)],
     [(packStructure) => (packStructure?.length >= 1) && (id && typeof id === 'number'),  () => getCurrentPackColls(packStructure, id)],
diff --git a/live_monitor_vue/src/components/3_organisms/PackView/Button.vue b/live_monitor_vue/src/components/3_organisms/PackView/Button.vue
index c93d4d5..fa6c109 100644
--- a/live_monitor_vue/src/components/3_organisms/PackView/Button.vue
+++ b/live_monitor_vue/src/components/3_organisms/PackView/Button.vue
@@ -1,7 +1,5 @@
-
-
 <script>
-import {mapGetters, mapMutations, mapActions, useStore} from "vuex"
+import {mapGetters, mapActions} from "vuex"
 
 export default {
   name: 'PackViewButton',
@@ -30,7 +28,7 @@ export default {
     },
     idx: {
       type: Number,
-      default: ""
+      default: 0
     }
   },
   computed: {
@@ -44,14 +42,30 @@ export default {
 </script>
 
 
-
 <template>
   {{ console.log('selectedPackMode', selectedPackMode)
-   }}
-  <button @click="updateModePack(mode)" v-bind:key="idx" type="button" class="w-full">
-    <input name="switchTableMode" type="radio" :id="name" :value="name" :checked="active" class="hidden peer" required="">
-    <label :for="name" :class="labelClass" class="transition-all w-full border-slate-600 w-full block cursor-pointer py-1 text-ssm sm:text-sm hover:bg-slate-700 hover:text-white text-slate-600 border-slate-600
-    peer-checked:bg-slate-600 peer-checked:text-white">
+  }}
+  <button
+    :key="idx"
+    type="button"
+    class="w-full"
+    @click="updateModePack(mode)"
+  >
+    <input
+      :id="name"
+      name="switchTableMode"
+      type="radio"
+      :value="name"
+      :checked="active"
+      class="hidden peer"
+      required=""
+    >
+    <label
+      :for="name"
+      :class="labelClass"
+      class="transition-all w-full border-slate-600 w-full block cursor-pointer py-1 text-ssm sm:text-sm hover:bg-slate-700 hover:text-white text-slate-600 border-slate-600
+    peer-checked:bg-slate-600 peer-checked:text-white"
+    >
       {{ inner }}
     </label>
   </button>
diff --git a/live_monitor_vue/src/components/3_organisms/PackView/index.vue b/live_monitor_vue/src/components/3_organisms/PackView/index.vue
index e26564f..7f11501 100644
--- a/live_monitor_vue/src/components/3_organisms/PackView/index.vue
+++ b/live_monitor_vue/src/components/3_organisms/PackView/index.vue
@@ -1,7 +1,5 @@
-
-
 <script>
-import {mapGetters, mapMutations, mapActions, useStore} from "vuex"
+import {mapGetters, mapActions} from "vuex"
 import PackViewButton from './Button.vue'
 import Spinner from "@molecules/VSpinner/VSpinner.vue"
 import Tabulator from "@molecules/VTabulator/VTabulator.vue"
@@ -24,11 +22,6 @@ export default {
       default: ""
     },
   },
-  data () {
-    return {
-      hasData: false
-    }
-  },
   setup (props, {slots}) {
     const hasDescription = slots.description != undefined
     const hasError = slots.error != undefined
@@ -38,12 +31,10 @@ export default {
       hasError
     }
   },
-  updated () {
-    this.$nextTick(function () {
-      if (!isEmpty(this.packData)) {
-        this.hasData = true
-      }
-    })
+  data () {
+    return {
+      hasData: false
+    }
   },
   computed: {
     ...mapGetters('machines', ['packData', 'selectPackStructs', 'selectedPackStruct']),
@@ -54,6 +45,13 @@ export default {
         {mode: 'unrecognized', isActive: false, name: 'switch_unrecognized', inner: 'нераспознанные', labelClass: 'rounded-r-lg border'},
       ])
   },
+  updated () {
+    this.$nextTick(function () {
+      if (!isEmpty(this.packData)) {
+        this.hasData = true
+      }
+    })
+  },
   methods: {
     ...mapActions('machines', ['updateSelectStruct']),
     updateSelectedValue: function (e) {
@@ -66,26 +64,43 @@ export default {
 </script>
 
 
-
 <template>
   <div class="w-full relative">
     {{
-     console.log('packData', packData)
-     }}
-    <div v-if="!hasData" class="w-full h-[50px] rounded-xl bg-slate-200 hidden" :id="`${id}_loader`">
-      <Spinner/>
+      console.log('packData', packData)
+    }}
+    <div
+      v-if="!hasData"
+      :id="`${id}_loader`"
+      class="w-full h-[50px] rounded-xl bg-slate-200 hidden"
+    >
+      <Spinner />
     </div>
-    <div v-if="hasData" :id="id" class="w-full rounded-md bg-light border-rounded p-4">
+    <div
+      v-if="hasData"
+      :id="id"
+      class="w-full rounded-md bg-light border-rounded p-4"
+    >
       <div class="grid grid-cols-12 mb-6">
         <div class="flex flex-col gap-1 col-span-12 sm:col-span-4 md:col-span-5 lg:col-span-5 2xl:col-span-7 sm:mb-0">
-          <h2 :id="`${id}_pack_name`" class=" text-lg">Пакет: <span v-if="selectPackStructs" >{{selectPackStructs[0]?.packNumber}}</span></h2>
-          <div v-if="hasDescription" class="text-xs text-slate-500">
-           <slot name="description" /> 
+          <h2
+            :id="`${id}_pack_name`"
+            class=" text-lg"
+          >
+            Пакет: <span v-if="selectPackStructs">{{ selectPackStructs[0]?.packNumber }}</span>
+          </h2>
+          <div
+            v-if="hasDescription"
+            class="text-xs text-slate-500"
+          >
+            <slot name="description" /> 
           </div>
         </div>
         <!-- <form phx-change="c_packs_mode:on_click" :id="`${id}_table_active`" class="col-span-12 sm:col-span-8 md:col-span-7 lg:col-span-7 2xl:col-span-5 flex justify-center hidden"> -->
         <div class="col-span-12 sm:col-span-8 md:col-span-7 lg:col-span-7 2xl:col-span-5 flex justify-center">
-          <PackViewButton v-for="(button, idx) in buttonsData" 
+          <PackViewButton
+            v-for="(button, idx) in buttonsData"
+            :key="idx" 
             :idx="idx" 
             :mode="button.mode"
             :name="button.name" 
@@ -96,24 +111,53 @@ export default {
         </div>
         <!-- </form> -->
       </div>
-      <div class="relative" :id="id">
-        <div id="selectStructContainer" class="flex gap-2 items-center mb-2">
+      <div
+        :id="id"
+        class="relative"
+      >
+        <div
+          id="selectStructContainer"
+          class="flex gap-2 items-center mb-2"
+        >
           <span>Выберите структуру:</span>
-          <select v-if="selectPackStructs" id="selectStruct" name="struct" v-bind:value="selectedPackStruct.id" v-on:change="updateSelectedValue" class=" w-fit bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block py-1 pl-2 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" style="--tw-ring-color:focus: none" >
-            <option :key={idx} v-for="(el, idx) in selectPackStructs" :value="el.id">
+          <select
+            v-if="selectPackStructs"
+            id="selectStruct"
+            name="struct"
+            :value="selectedPackStruct.id"
+            class=" w-fit bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block py-1 pl-2 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
+            style="--tw-ring-color:focus: none"
+            @change="updateSelectedValue"
+          >
+            <option
+              v-for="(el, idx) in selectPackStructs"
+              :key="{idx}"
+              :value="el.id"
+            >
               {{ el.name }}
             </option>
           </select>
         </div>
-        <div :id="`${id}_report`" class="tab-pane active bg-light relative shadow  text-center min-h-[300px] relative rounded-md w-full relative">
+        <div
+          :id="`${id}_report`"
+          class="tab-pane active bg-light relative shadow  text-center min-h-[300px] relative rounded-md w-full relative"
+        >
           <Tabulator v-bind="packData" />
-          <div v-if="isLoader" class="w-full h-[50px] rounded-xl bg-slate-200 hidden" :id="`${id}_loader`">
-            <Spinner/>
+          <div
+            v-if="isLoader"
+            :id="`${id}_loader`"
+            class="w-full h-[50px] rounded-xl bg-slate-200 hidden"
+          >
+            <Spinner />
           </div>
         </div>
       </div>
     </div>
-    <div v-if="hasError" :id="`${id}_error`" class="w-full rounded-md bg-light border-rounded p-4 flex flex-col gap-5 items-center justify-center hidden">
+    <div
+      v-if="hasError"
+      :id="`${id}_error`"
+      class="w-full rounded-md bg-light border-rounded p-4 flex flex-col gap-5 items-center justify-center hidden"
+    >
       <slot name="error" /> 
     </div>
   </div>
diff --git a/live_monitor_vue/src/components/4_frames/AppContainer/AppContainerRightPanel.vue b/live_monitor_vue/src/components/4_frames/AppContainer/AppContainerRightPanel.vue
index b885d00..1ecbad5 100644
--- a/live_monitor_vue/src/components/4_frames/AppContainer/AppContainerRightPanel.vue
+++ b/live_monitor_vue/src/components/4_frames/AppContainer/AppContainerRightPanel.vue
@@ -1,5 +1,4 @@
 <script>
-import {mapGetters} from 'vuex'
 import { createIcons, icons } from "lucide";
 
 export default {
diff --git a/live_monitor_vue/src/components/5_pages/404/Car.vue b/live_monitor_vue/src/components/5_pages/404/Car.vue
index 370e3f0..a87d86a 100644
--- a/live_monitor_vue/src/components/5_pages/404/Car.vue
+++ b/live_monitor_vue/src/components/5_pages/404/Car.vue
@@ -1,3 +1,18 @@
+<script>
+
+export default {
+  name: 'App',
+  components: {},
+  data() {
+  },
+  computed: {
+  },
+  methods: {
+  }
+}
+
+</script>
+
 <template>
   <svg
     width="1008"
@@ -965,18 +980,3 @@
     </defs>
   </svg>
 </template>
-
-<script>
-
-export default {
-  name: 'App',
-  components: {},
-  data() {
-  },
-  computed: {
-  },
-  methods: {
-  }
-}
-
-</script>
diff --git a/live_monitor_vue/src/components/5_pages/404/index.vue b/live_monitor_vue/src/components/5_pages/404/index.vue
index 80f51c7..d0acb28 100644
--- a/live_monitor_vue/src/components/5_pages/404/index.vue
+++ b/live_monitor_vue/src/components/5_pages/404/index.vue
@@ -1,3 +1,18 @@
+<script>
+
+export default {
+  name: 'App',
+  components: {},
+  data() {
+  },
+  computed: {
+  },
+  methods: {
+  }
+}
+
+</script>
+
 <template>
   <div class="hidden 2xl:flex w-full h-[100vh] overflow-hidden bg-white">
     <div class="h-full overflow-hidden flex flex-col justify-between translate-y-1">
@@ -32,21 +47,6 @@
   </div>
 </template>
 
-<script>
-
-export default {
-  name: 'App',
-  components: {},
-  data() {
-  },
-  computed: {
-  },
-  methods: {
-  }
-}
-
-</script>
-
 
 <style scoped>
 
diff --git a/live_monitor_vue/src/components/5_pages/Auth/index.vue b/live_monitor_vue/src/components/5_pages/Auth/index.vue
index e2e0e84..f3de0f0 100644
--- a/live_monitor_vue/src/components/5_pages/Auth/index.vue
+++ b/live_monitor_vue/src/components/5_pages/Auth/index.vue
@@ -2,7 +2,7 @@
 import Login from './Login.vue'
 
 export default {
-  name: 'Auth',
+  name: 'AuthPage',
   components: {
     Login
   },
diff --git a/live_monitor_vue/src/components/5_pages/Communication/index.vue b/live_monitor_vue/src/components/5_pages/Communication/index.vue
index bf737b4..ad85167 100644
--- a/live_monitor_vue/src/components/5_pages/Communication/index.vue
+++ b/live_monitor_vue/src/components/5_pages/Communication/index.vue
@@ -1,9 +1,3 @@
-<template>
-  <div>
-    123
-  </div>
-</template>
-
 <script>
 
 export default {
@@ -18,3 +12,9 @@ export default {
 }
 
 </script>
+
+<template>
+  <div>
+    123
+  </div>
+</template>
diff --git a/live_monitor_vue/src/components/5_pages/Cron/Task.vue b/live_monitor_vue/src/components/5_pages/Cron/Task.vue
index 0119533..6fb14c0 100644
--- a/live_monitor_vue/src/components/5_pages/Cron/Task.vue
+++ b/live_monitor_vue/src/components/5_pages/Cron/Task.vue
@@ -1,3 +1,29 @@
+<script>
+import TaskModal from './TaskModal.vue'
+import TaskHistory from './TaskHistory.vue'
+
+export default {
+  name: 'TaskComponent',
+  components: {
+    TaskModal,
+    TaskHistory
+  },
+  props: {
+    index: {
+      default: 0,
+      type: Number
+    }
+  },
+  data() {
+  },
+  computed: {
+  },
+  methods: {
+  }
+}
+
+</script>
+
 <template>
   <div class="flex justify-between w-full border border-slate-300 p-1 flex-col md:flex-row hover:bg-slate-300 hover:border-slate-600 transition-all">
     <div class="flex gap-1 items-center">
@@ -67,30 +93,3 @@
     </div>
   </div>
 </template>
-
-<script>
-import TaskModal from './TaskModal.vue'
-import TaskHistory from './TaskHistory.vue'
-import ButtonModal from '@molecules/ButtonModal/ButtonModal.vue'
-
-export default {
-name: 'Task',
-components: {
-  TaskModal,
-  TaskHistory
-},
-props: {
-  index: {
-    default: 0,
-    type: Number
-  }
-},
-data() {
-},
-computed: {
-},
-methods: {
-}
-}
-
-</script>
diff --git a/live_monitor_vue/src/components/5_pages/Cron/TaskHistory.vue b/live_monitor_vue/src/components/5_pages/Cron/TaskHistory.vue
index c40e530..77ae9bb 100644
--- a/live_monitor_vue/src/components/5_pages/Cron/TaskHistory.vue
+++ b/live_monitor_vue/src/components/5_pages/Cron/TaskHistory.vue
@@ -1,3 +1,35 @@
+<script>
+import ButtonModal from '@molecules/ButtonModal/ButtonModal.vue'
+
+export default {
+  name: 'TaskHistory',
+  components: {
+    ButtonModal,
+  },
+  props: {
+    taskId: {
+      default: "",
+      type: String
+    }
+  },
+  data() {
+    return {
+      task: "",
+      task_description: "",
+      task_name: ""
+    }
+  },
+  computed: {
+  },
+  methods: {
+    onToggle: ({isOpen}) => {
+      console.log(isOpen)
+    }
+  }
+}
+
+</script>
+
 <template>
   <ButtonModal
     forcedBtnClass="  "
@@ -12,36 +44,3 @@
     1234
   </ButtonModal>
 </template>
-
-<script>
-import ButtonModal from '@molecules/ButtonModal/ButtonModal.vue'
-import {data} from './historyData'
-
-export default {
-name: 'TaskHistory',
-components: {
-  ButtonModal,
-},
-props: {
-  taskId: {
-    default: "",
-    type: String
-  }
-},
-data() {
-  return {
-    task: "",
-    task_description: "",
-    task_name: ""
-  }
-},
-computed: {
-},
-methods: {
-  onToggle: ({isOpen}) => {
-    console.log(isOpen)
-  }
-}
-}
-
-</script>
diff --git a/live_monitor_vue/src/components/5_pages/Cron/TaskModal.vue b/live_monitor_vue/src/components/5_pages/Cron/TaskModal.vue
index 1d41a3c..8a02f2d 100644
--- a/live_monitor_vue/src/components/5_pages/Cron/TaskModal.vue
+++ b/live_monitor_vue/src/components/5_pages/Cron/TaskModal.vue
@@ -1,3 +1,39 @@
+<script>
+import ButtonModal from '@molecules/ButtonModal/ButtonModal.vue'
+import Datepicker from "@molecules/VDatepicker/VDatepicker.vue"
+import { FwbTextarea } from 'flowbite-vue'
+
+export default {
+  name: 'TaskModal',
+  components: {
+    Datepicker,
+    ButtonModal,
+    FwbTextarea
+  },
+  props: {
+    taskId: {
+      default: "",
+      type: String
+    }
+  },
+  data() {
+    return {
+      task: "",
+      task_description: "",
+      task_name: ""
+    }
+  },
+  computed: {
+  },
+  methods: {
+    onToggle: ({isOpen}) => {
+      console.log(isOpen)
+    }
+  }
+}
+
+</script>
+
 <template>
   <ButtonModal
     forcedBtnClass="  "
@@ -218,39 +254,3 @@
     </form>
   </ButtonModal>
 </template>
-
-<script>
-import ButtonModal from '@molecules/ButtonModal/ButtonModal.vue'
-import Datepicker from "@molecules/VDatepicker/VDatepicker.vue"
-import { FwbTextarea } from 'flowbite-vue'
-
-export default {
-name: 'TaskModal',
-components: {
-  Datepicker,
-  ButtonModal,
-  FwbTextarea
-},
-props: {
-  taskId: {
-    default: "",
-    type: String
-  }
-},
-data() {
-  return {
-    task: "",
-    task_description: "",
-    task_name: ""
-  }
-},
-computed: {
-},
-methods: {
-  onToggle: ({isOpen}) => {
-    console.log(isOpen)
-  }
-}
-}
-
-</script>
diff --git a/live_monitor_vue/src/components/5_pages/Cron/historyData.js b/live_monitor_vue/src/components/5_pages/Cron/historyData.js
index cb13ef1..fccf786 100644
--- a/live_monitor_vue/src/components/5_pages/Cron/historyData.js
+++ b/live_monitor_vue/src/components/5_pages/Cron/historyData.js
@@ -1,2146 +1,2146 @@
 const data = {
   columns: [
     {
-        "download": false,
-        "field": "id",
-        "headerFilter": "input",
-        "headerFilterPlaceholder": "ID",
-        "minWidth": 80,
-        "print": false,
-        "responsive": 0,
-        "sorter": "number",
-        "title": "ID",
-        "vertAlign": "middle"
+      "download": false,
+      "field": "id",
+      "headerFilter": "input",
+      "headerFilterPlaceholder": "ID",
+      "minWidth": 80,
+      "print": false,
+      "responsive": 0,
+      "sorter": "number",
+      "title": "ID",
+      "vertAlign": "middle"
     },
     {
-        "download": false,
-        "field": "status",
-        "headerFilter": "input",
-        "headerFilterPlaceholder": "Статус",
-        "minWidth": 80,
-        "print": false,
-        "render": "\n          {{#if (eq status \"ok\")}}\n            <i class=\"ri-checkbox-circle-line text-green-700\"></i>\n          {{else}}\n            <i class=\"ri-close-circle-line text-red-700\"></i>\n          {{/if}}\n        ",
-        "responsive": 0,
-        "sorter": "string",
-        "title": "Статус",
-        "vertAlign": "middle"
+      "download": false,
+      "field": "status",
+      "headerFilter": "input",
+      "headerFilterPlaceholder": "Статус",
+      "minWidth": 80,
+      "print": false,
+      "render": "\n          {{#if (eq status \"ok\")}}\n            <i class=\"ri-checkbox-circle-line text-green-700\"></i>\n          {{else}}\n            <i class=\"ri-close-circle-line text-red-700\"></i>\n          {{/if}}\n        ",
+      "responsive": 0,
+      "sorter": "string",
+      "title": "Статус",
+      "vertAlign": "middle"
     },
     {
-        "download": false,
-        "field": "insertedAt",
-        "headerFilter": "input",
-        "headerFilterPlaceholder": "Дата создания",
-        "minWidth": 80,
-        "print": false,
-        "render": " {{ dt_format ( dt_shift insertedAt 3 \"hours\"  ) }} ",
-        "responsive": 0,
-        "sorter": "string",
-        "title": "Дата создания",
-        "vertAlign": "middle"
+      "download": false,
+      "field": "insertedAt",
+      "headerFilter": "input",
+      "headerFilterPlaceholder": "Дата создания",
+      "minWidth": 80,
+      "print": false,
+      "render": " {{ dt_format ( dt_shift insertedAt 3 \"hours\"  ) }} ",
+      "responsive": 0,
+      "sorter": "string",
+      "title": "Дата создания",
+      "vertAlign": "middle"
     },
     {
-        "download": false,
-        "field": "from_now",
-        "headerFilter": "input",
-        "headerFilterPlaceholder": "Выполнено X времени назад",
-        "minWidth": 80,
-        "print": false,
-        "render": " {{ from_now ( dt_shift insertedAt 3 \"hours\"  ) }} ",
-        "responsive": 0,
-        "sorter": "string",
-        "title": "Выполнено X времени назад",
-        "vertAlign": "middle"
+      "download": false,
+      "field": "from_now",
+      "headerFilter": "input",
+      "headerFilterPlaceholder": "Выполнено X времени назад",
+      "minWidth": 80,
+      "print": false,
+      "render": " {{ from_now ( dt_shift insertedAt 3 \"hours\"  ) }} ",
+      "responsive": 0,
+      "sorter": "string",
+      "title": "Выполнено X времени назад",
+      "vertAlign": "middle"
     },
     {
-        "download": false,
-        "field": "executionTime",
-        "headerFilter": "input",
-        "headerFilterPlaceholder": "Время выполнения",
-        "minWidth": 80,
-        "print": false,
-        "render": " {{ time_from_sec executionTime }} ",
-        "responsive": 0,
-        "sorter": "string",
-        "title": "Время выполнения",
-        "vertAlign": "middle"
+      "download": false,
+      "field": "executionTime",
+      "headerFilter": "input",
+      "headerFilterPlaceholder": "Время выполнения",
+      "minWidth": 80,
+      "print": false,
+      "render": " {{ time_from_sec executionTime }} ",
+      "responsive": 0,
+      "sorter": "string",
+      "title": "Время выполнения",
+      "vertAlign": "middle"
     },
     {
-        "download": false,
-        "field": "result",
-        "headerFilter": "input",
-        "headerFilterPlaceholder": "Результат",
-        "minWidth": 80,
-        "print": false,
-        "render": " <input class=\"w-full\" value=\"{{ result }}\" /> ",
-        "responsive": 0,
-        "sorter": "string",
-        "title": "Результат",
-        "vertAlign": "middle"
+      "download": false,
+      "field": "result",
+      "headerFilter": "input",
+      "headerFilterPlaceholder": "Результат",
+      "minWidth": 80,
+      "print": false,
+      "render": " <input class=\"w-full\" value=\"{{ result }}\" /> ",
+      "responsive": 0,
+      "sorter": "string",
+      "title": "Результат",
+      "vertAlign": "middle"
     }
   ],
   initialSort: {},
   height: "600px",
   data: [
     {
-        "executionTime": 0,
-        "id": 565453,
-        "insertedAt": "2023-10-18T13:25:03",
-        "periodTaskId": 59,
-        "result": "{\"started\":\"true\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-18T13:25:03"
-    },
-    {
-        "executionTime": 12830.732104,
-        "id": 565454,
-        "insertedAt": "2023-10-18T13:25:16",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-18T13:25:16"
-    },
-    {
-        "executionTime": 25506.658174,
-        "id": 565523,
-        "insertedAt": "2023-10-18T14:25:42",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-18T14:25:42"
-    },
-    {
-        "executionTime": 12638.976351,
-        "id": 565592,
-        "insertedAt": "2023-10-18T15:25:54",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-18T15:25:54"
-    },
-    {
-        "executionTime": 5450.995343,
-        "id": 565660,
-        "insertedAt": "2023-10-18T16:26:00",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-18T16:26:00"
-    },
-    {
-        "executionTime": 4498.97287,
-        "id": 565726,
-        "insertedAt": "2023-10-18T17:26:04",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-18T17:26:04"
-    },
-    {
-        "executionTime": 9490.473885,
-        "id": 565794,
-        "insertedAt": "2023-10-18T18:26:14",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-18T18:26:14"
-    },
-    {
-        "executionTime": 3777.207784,
-        "id": 565862,
-        "insertedAt": "2023-10-18T19:26:17",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-18T19:26:17"
-    },
-    {
-        "executionTime": 10360.10679,
-        "id": 565928,
-        "insertedAt": "2023-10-18T20:26:28",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-18T20:26:28"
-    },
-    {
-        "executionTime": 10904.072981,
-        "id": 565994,
-        "insertedAt": "2023-10-18T21:26:39",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-18T21:26:39"
-    },
-    {
-        "executionTime": 8854.622403,
-        "id": 566059,
-        "insertedAt": "2023-10-18T22:26:48",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-18T22:26:48"
-    },
-    {
-        "executionTime": 22137.177519,
-        "id": 566126,
-        "insertedAt": "2023-10-18T23:27:10",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-18T23:27:10"
-    },
-    {
-        "executionTime": 23796.095803,
-        "id": 566193,
-        "insertedAt": "2023-10-19T00:27:34",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-19T00:27:34"
-    },
-    {
-        "executionTime": 5347.562875,
-        "id": 566261,
-        "insertedAt": "2023-10-19T01:27:39",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-19T01:27:39"
-    },
-    {
-        "executionTime": 7084.301646,
-        "id": 566328,
-        "insertedAt": "2023-10-19T02:27:46",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-19T02:27:46"
-    },
-    {
-        "executionTime": 12227.822644,
-        "id": 566396,
-        "insertedAt": "2023-10-19T03:27:58",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-19T03:27:58"
-    },
-    {
-        "executionTime": 15664.352595,
-        "id": 566464,
-        "insertedAt": "2023-10-19T04:28:14",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-19T04:28:14"
-    },
-    {
-        "executionTime": 8316.466938,
-        "id": 566532,
-        "insertedAt": "2023-10-19T05:28:22",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-19T05:28:22"
-    },
-    {
-        "executionTime": 11386.891617,
-        "id": 566599,
-        "insertedAt": "2023-10-19T06:28:34",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-19T06:28:34"
-    },
-    {
-        "executionTime": 8653.684831,
-        "id": 566666,
-        "insertedAt": "2023-10-19T07:28:42",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-19T07:28:42"
-    },
-    {
-        "executionTime": 9391.686816,
-        "id": 566732,
-        "insertedAt": "2023-10-19T08:28:52",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-19T08:28:52"
-    },
-    {
-        "executionTime": 22501.649602,
-        "id": 566799,
-        "insertedAt": "2023-10-19T09:29:14",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-19T09:29:14"
-    },
-    {
-        "executionTime": 10885.245415,
-        "id": 566867,
-        "insertedAt": "2023-10-19T10:29:25",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-19T10:29:25"
-    },
-    {
-        "executionTime": 9258.535819,
-        "id": 566934,
-        "insertedAt": "2023-10-19T11:29:34",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-19T11:29:34"
-    },
-    {
-        "executionTime": 8133.948237,
-        "id": 567001,
-        "insertedAt": "2023-10-19T12:29:43",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-19T12:29:43"
-    },
-    {
-        "executionTime": 6390.36249,
-        "id": 567068,
-        "insertedAt": "2023-10-19T13:29:49",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-19T13:29:49"
-    },
-    {
-        "executionTime": 7477.104871,
-        "id": 567137,
-        "insertedAt": "2023-10-19T14:29:56",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-19T14:29:56"
-    },
-    {
-        "executionTime": 10038.312753,
-        "id": 567205,
-        "insertedAt": "2023-10-19T15:30:06",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-19T15:30:06"
-    },
-    {
-        "executionTime": 9420.225642,
-        "id": 567272,
-        "insertedAt": "2023-10-19T16:30:16",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-19T16:30:16"
-    },
-    {
-        "executionTime": 7346.672479,
-        "id": 567340,
-        "insertedAt": "2023-10-19T17:30:23",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-19T17:30:23"
-    },
-    {
-        "executionTime": 6576.494211,
-        "id": 567407,
-        "insertedAt": "2023-10-19T18:30:30",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-19T18:30:30"
-    },
-    {
-        "executionTime": 8940.800004,
-        "id": 567474,
-        "insertedAt": "2023-10-19T19:30:39",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-19T19:30:39"
-    },
-    {
-        "executionTime": 16072.824718,
-        "id": 567540,
-        "insertedAt": "2023-10-19T20:30:55",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-19T20:30:55"
-    },
-    {
-        "executionTime": 20382.916564,
-        "id": 567607,
-        "insertedAt": "2023-10-19T21:31:15",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-19T21:31:15"
-    },
-    {
-        "executionTime": 19532.305813,
-        "id": 567671,
-        "insertedAt": "2023-10-19T22:31:35",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-19T22:31:35"
-    },
-    {
-        "executionTime": 19107.544175,
-        "id": 567738,
-        "insertedAt": "2023-10-19T23:31:54",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-19T23:31:54"
-    },
-    {
-        "executionTime": 23040.839649,
-        "id": 567806,
-        "insertedAt": "2023-10-20T00:32:17",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-20T00:32:17"
-    },
-    {
-        "executionTime": 21107.16595,
-        "id": 567873,
-        "insertedAt": "2023-10-20T01:32:38",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-20T01:32:38"
-    },
-    {
-        "executionTime": 93369.774113,
-        "id": 567943,
-        "insertedAt": "2023-10-20T02:34:11",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-20T02:34:11"
-    },
-    {
-        "executionTime": 14633.250643,
-        "id": 568010,
-        "insertedAt": "2023-10-20T03:34:26",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-20T03:34:26"
-    },
-    {
-        "executionTime": 13639.341422,
-        "id": 568078,
-        "insertedAt": "2023-10-20T04:34:40",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-20T04:34:40"
-    },
-    {
-        "executionTime": 18258.706865,
-        "id": 568146,
-        "insertedAt": "2023-10-20T05:34:58",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-20T05:34:58"
-    },
-    {
-        "executionTime": 28120.82204,
-        "id": 568213,
-        "insertedAt": "2023-10-20T06:35:26",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-20T06:35:26"
-    },
-    {
-        "executionTime": 19145.029084,
-        "id": 568280,
-        "insertedAt": "2023-10-20T07:35:45",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-20T07:35:45"
-    },
-    {
-        "executionTime": 11311.334032,
-        "id": 568348,
-        "insertedAt": "2023-10-20T08:35:57",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-20T08:35:57"
-    },
-    {
-        "executionTime": 16597.839119,
-        "id": 568415,
-        "insertedAt": "2023-10-20T09:36:13",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-20T09:36:13"
-    },
-    {
-        "executionTime": 12118.510335,
-        "id": 568483,
-        "insertedAt": "2023-10-20T10:36:25",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-20T10:36:25"
-    },
-    {
-        "executionTime": 13712.516946,
-        "id": 568551,
-        "insertedAt": "2023-10-20T11:36:39",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-20T11:36:39"
-    },
-    {
-        "executionTime": 10850.637941,
-        "id": 568618,
-        "insertedAt": "2023-10-20T12:36:50",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-20T12:36:50"
-    },
-    {
-        "executionTime": 13838.414455,
-        "id": 568685,
-        "insertedAt": "2023-10-20T13:37:04",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-20T13:37:04"
-    },
-    {
-        "executionTime": 20671.84048,
-        "id": 568754,
-        "insertedAt": "2023-10-20T14:37:25",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-20T14:37:25"
-    },
-    {
-        "executionTime": 6578.811228,
-        "id": 568822,
-        "insertedAt": "2023-10-20T15:37:31",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-20T15:37:31"
-    },
-    {
-        "executionTime": 9966.687064,
-        "id": 568889,
-        "insertedAt": "2023-10-20T16:37:41",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-20T16:37:41"
-    },
-    {
-        "executionTime": 9748.776076,
-        "id": 568957,
-        "insertedAt": "2023-10-20T17:37:51",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-20T17:37:51"
-    },
-    {
-        "executionTime": 14125.883917,
-        "id": 569024,
-        "insertedAt": "2023-10-20T18:38:05",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-20T18:38:05"
-    },
-    {
-        "executionTime": 13083.516895,
-        "id": 569091,
-        "insertedAt": "2023-10-20T19:38:18",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-20T19:38:18"
-    },
-    {
-        "executionTime": 8202.300136,
-        "id": 569157,
-        "insertedAt": "2023-10-20T20:38:26",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-20T20:38:26"
-    },
-    {
-        "executionTime": 22449.223386,
-        "id": 569224,
-        "insertedAt": "2023-10-20T21:38:49",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-20T21:38:49"
-    },
-    {
-        "executionTime": 9441.313234,
-        "id": 569288,
-        "insertedAt": "2023-10-20T22:38:58",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-20T22:38:58"
-    },
-    {
-        "executionTime": 13947.953856,
-        "id": 569355,
-        "insertedAt": "2023-10-20T23:39:12",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-20T23:39:12"
-    },
-    {
-        "executionTime": 7427.373488,
-        "id": 569423,
-        "insertedAt": "2023-10-21T00:39:20",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-21T00:39:20"
-    },
-    {
-        "executionTime": 18873.430029,
-        "id": 569490,
-        "insertedAt": "2023-10-21T01:39:39",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-21T01:39:39"
-    },
-    {
-        "executionTime": 8703.515895,
-        "id": 569558,
-        "insertedAt": "2023-10-21T02:39:47",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-21T02:39:47"
-    },
-    {
-        "executionTime": 19149.708344,
-        "id": 569626,
-        "insertedAt": "2023-10-21T03:40:06",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-21T03:40:06"
-    },
-    {
-        "executionTime": 6561.565621,
-        "id": 569692,
-        "insertedAt": "2023-10-21T04:40:13",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-21T04:40:13"
-    },
-    {
-        "executionTime": 14805.120659,
-        "id": 569760,
-        "insertedAt": "2023-10-21T05:40:28",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-21T05:40:28"
-    },
-    {
-        "executionTime": 13154.512687,
-        "id": 569828,
-        "insertedAt": "2023-10-21T06:40:41",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-21T06:40:41"
-    },
-    {
-        "executionTime": 12049.492643,
-        "id": 569895,
-        "insertedAt": "2023-10-21T07:40:53",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-21T07:40:53"
-    },
-    {
-        "executionTime": 28678.246497,
-        "id": 569963,
-        "insertedAt": "2023-10-21T08:41:22",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-21T08:41:22"
-    },
-    {
-        "executionTime": 12806.755473,
-        "id": 570030,
-        "insertedAt": "2023-10-21T09:41:35",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-21T09:41:35"
-    },
-    {
-        "executionTime": 12112.2066,
-        "id": 570098,
-        "insertedAt": "2023-10-21T10:41:47",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-21T10:41:47"
-    },
-    {
-        "executionTime": 18896.700608,
-        "id": 570165,
-        "insertedAt": "2023-10-21T11:42:06",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-21T11:42:06"
-    },
-    {
-        "executionTime": 10626.103438,
-        "id": 570233,
-        "insertedAt": "2023-10-21T12:42:16",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-21T12:42:16"
-    },
-    {
-        "executionTime": 17312.599398,
-        "id": 570300,
-        "insertedAt": "2023-10-21T13:42:34",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-21T13:42:34"
-    },
-    {
-        "executionTime": 6518.565339,
-        "id": 570368,
-        "insertedAt": "2023-10-21T14:42:40",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-21T14:42:40"
-    },
-    {
-        "executionTime": 10094.334083,
-        "id": 570436,
-        "insertedAt": "2023-10-21T15:42:50",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-21T15:42:50"
-    },
-    {
-        "executionTime": 10672.328049,
-        "id": 570503,
-        "insertedAt": "2023-10-21T16:43:01",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-21T16:43:01"
-    },
-    {
-        "executionTime": 12041.763037,
-        "id": 570571,
-        "insertedAt": "2023-10-21T17:43:13",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-21T17:43:13"
-    },
-    {
-        "executionTime": 11876.56709,
-        "id": 570639,
-        "insertedAt": "2023-10-21T18:43:25",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-21T18:43:25"
-    },
-    {
-        "executionTime": 7201.877892,
-        "id": 570706,
-        "insertedAt": "2023-10-21T19:43:32",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-21T19:43:32"
-    },
-    {
-        "executionTime": 16874.004167,
-        "id": 570771,
-        "insertedAt": "2023-10-21T20:43:49",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-21T20:43:49"
-    },
-    {
-        "executionTime": 9935.479061,
-        "id": 570836,
-        "insertedAt": "2023-10-21T21:43:59",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-21T21:43:59"
-    },
-    {
-        "executionTime": 9689.546956,
-        "id": 570904,
-        "insertedAt": "2023-10-21T22:44:09",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-21T22:44:09"
-    },
-    {
-        "executionTime": 9762.459615,
-        "id": 570969,
-        "insertedAt": "2023-10-21T23:44:18",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-21T23:44:18"
-    },
-    {
-        "executionTime": 8405.282881,
-        "id": 571035,
-        "insertedAt": "2023-10-22T00:44:27",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-22T00:44:27"
-    },
-    {
-        "executionTime": 14364.198572,
-        "id": 571103,
-        "insertedAt": "2023-10-22T01:44:41",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-22T01:44:41"
-    },
-    {
-        "executionTime": 8024.676241,
-        "id": 571171,
-        "insertedAt": "2023-10-22T02:44:49",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-22T02:44:49"
-    },
-    {
-        "executionTime": 5278.004221,
-        "id": 571239,
-        "insertedAt": "2023-10-22T03:44:54",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-22T03:44:54"
-    },
-    {
-        "executionTime": 11275.317315,
-        "id": 571305,
-        "insertedAt": "2023-10-22T04:45:06",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-22T04:45:06"
-    },
-    {
-        "executionTime": 8400.580549,
-        "id": 571373,
-        "insertedAt": "2023-10-22T05:45:14",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-22T05:45:14"
-    },
-    {
-        "executionTime": 7250.017597,
-        "id": 571440,
-        "insertedAt": "2023-10-22T06:45:21",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-22T06:45:21"
-    },
-    {
-        "executionTime": 8478.795528,
-        "id": 571508,
-        "insertedAt": "2023-10-22T07:45:30",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-22T07:45:30"
-    },
-    {
-        "executionTime": 17860.496364,
-        "id": 571576,
-        "insertedAt": "2023-10-22T08:45:48",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-22T08:45:48"
-    },
-    {
-        "executionTime": 17850.995427,
-        "id": 571644,
-        "insertedAt": "2023-10-22T09:46:06",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-22T09:46:06"
-    },
-    {
-        "executionTime": 16847.764486,
-        "id": 571712,
-        "insertedAt": "2023-10-22T10:46:23",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-22T10:46:23"
-    },
-    {
-        "executionTime": 22675.100884,
-        "id": 571780,
-        "insertedAt": "2023-10-22T11:46:45",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-22T11:46:45"
-    },
-    {
-        "executionTime": 24274.494325,
-        "id": 571847,
-        "insertedAt": "2023-10-22T12:47:10",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-22T12:47:10"
-    },
-    {
-        "executionTime": 57056.385325,
-        "id": 571915,
-        "insertedAt": "2023-10-22T13:48:07",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-22T13:48:07"
-    },
-    {
-        "executionTime": 29834.174693,
-        "id": 571985,
-        "insertedAt": "2023-10-22T14:48:36",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-22T14:48:36"
-    },
-    {
-        "executionTime": 18064.115125,
-        "id": 572051,
-        "insertedAt": "2023-10-22T15:48:55",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-22T15:48:55"
-    },
-    {
-        "executionTime": 17235.804196,
-        "id": 572118,
-        "insertedAt": "2023-10-22T16:49:12",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-22T16:49:12"
-    },
-    {
-        "executionTime": 24043.626783,
-        "id": 572186,
-        "insertedAt": "2023-10-22T17:49:36",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-22T17:49:36"
-    },
-    {
-        "executionTime": 45410.015509,
-        "id": 572254,
-        "insertedAt": "2023-10-22T18:50:21",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-22T18:50:21"
-    },
-    {
-        "executionTime": 41536.839892,
-        "id": 572322,
-        "insertedAt": "2023-10-22T19:51:03",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-22T19:51:03"
-    },
-    {
-        "executionTime": 36076.127793,
-        "id": 572388,
-        "insertedAt": "2023-10-22T20:51:39",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-22T20:51:39"
-    },
-    {
-        "executionTime": 20826.715815,
-        "id": 572454,
-        "insertedAt": "2023-10-22T21:52:00",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-22T21:52:00"
-    },
-    {
-        "executionTime": 17251.123948,
-        "id": 572521,
-        "insertedAt": "2023-10-22T22:52:17",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-22T22:52:17"
-    },
-    {
-        "executionTime": 19620.653646,
-        "id": 572585,
-        "insertedAt": "2023-10-22T23:52:37",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-22T23:52:37"
-    },
-    {
-        "executionTime": 22169.646658,
-        "id": 572654,
-        "insertedAt": "2023-10-23T00:52:59",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-23T00:52:59"
-    },
-    {
-        "executionTime": 16766.979611,
-        "id": 572722,
-        "insertedAt": "2023-10-23T01:53:16",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-23T01:53:16"
-    },
-    {
-        "executionTime": 28533.760379,
-        "id": 572790,
-        "insertedAt": "2023-10-23T02:53:44",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-23T02:53:44"
-    },
-    {
-        "executionTime": 7039.501403,
-        "id": 572858,
-        "insertedAt": "2023-10-23T03:53:51",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-23T03:53:51"
-    },
-    {
-        "executionTime": 15383.807504,
-        "id": 572926,
-        "insertedAt": "2023-10-23T04:54:06",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-23T04:54:06"
-    },
-    {
-        "executionTime": 20728.129146,
-        "id": 572994,
-        "insertedAt": "2023-10-23T05:54:27",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-23T05:54:27"
-    },
-    {
-        "executionTime": 20400.658759,
-        "id": 573062,
-        "insertedAt": "2023-10-23T06:54:48",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-23T06:54:48"
-    },
-    {
-        "executionTime": 26587.83587,
-        "id": 573130,
-        "insertedAt": "2023-10-23T07:55:14",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-23T07:55:14"
-    },
-    {
-        "executionTime": 27201.75375,
-        "id": 573197,
-        "insertedAt": "2023-10-23T08:55:41",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-23T08:55:41"
-    },
-    {
-        "executionTime": 18283.301548,
-        "id": 573263,
-        "insertedAt": "2023-10-23T09:56:00",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-23T09:56:00"
-    },
-    {
-        "executionTime": 21826.943032,
-        "id": 573331,
-        "insertedAt": "2023-10-23T10:56:22",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-23T10:56:22"
-    },
-    {
-        "executionTime": 19191.541687,
-        "id": 573399,
-        "insertedAt": "2023-10-23T11:56:41",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-23T11:56:41"
-    },
-    {
-        "executionTime": 10096.851551,
-        "id": 573466,
-        "insertedAt": "2023-10-23T12:56:51",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-23T12:56:51"
-    },
-    {
-        "executionTime": 13146.595699,
-        "id": 573535,
-        "insertedAt": "2023-10-23T13:57:04",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-23T13:57:04"
-    },
-    {
-        "executionTime": 7387.308849,
-        "id": 573604,
-        "insertedAt": "2023-10-23T14:57:11",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-23T14:57:11"
-    },
-    {
-        "executionTime": 6882.649267,
-        "id": 573672,
-        "insertedAt": "2023-10-23T15:57:18",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-23T15:57:18"
-    },
-    {
-        "executionTime": 20741.254908,
-        "id": 573738,
-        "insertedAt": "2023-10-23T16:57:39",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-23T16:57:39"
-    },
-    {
-        "executionTime": 14819.786967,
-        "id": 573806,
-        "insertedAt": "2023-10-23T17:57:54",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-23T17:57:54"
-    },
-    {
-        "executionTime": 6012.501554,
-        "id": 573874,
-        "insertedAt": "2023-10-23T18:58:00",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-23T18:58:00"
-    },
-    {
-        "executionTime": 7288.949266,
-        "id": 573941,
-        "insertedAt": "2023-10-23T19:58:07",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-23T19:58:07"
-    },
-    {
-        "executionTime": 10039.087204,
-        "id": 574005,
-        "insertedAt": "2023-10-23T20:58:17",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-23T20:58:17"
-    },
-    {
-        "executionTime": 18735.452283,
-        "id": 574072,
-        "insertedAt": "2023-10-23T21:58:36",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-23T21:58:36"
-    },
-    {
-        "executionTime": 11642.914346,
-        "id": 574137,
-        "insertedAt": "2023-10-23T22:58:48",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-23T22:58:48"
-    },
-    {
-        "executionTime": 21661.318476,
-        "id": 574204,
-        "insertedAt": "2023-10-23T23:59:09",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-23T23:59:09"
-    },
-    {
-        "executionTime": 6275.455767,
-        "id": 574271,
-        "insertedAt": "2023-10-24T00:59:16",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-24T00:59:16"
-    },
-    {
-        "executionTime": 13574.85228,
-        "id": 574340,
-        "insertedAt": "2023-10-24T01:59:29",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-24T01:59:29"
-    },
-    {
-        "executionTime": 13921.98355,
-        "id": 574407,
-        "insertedAt": "2023-10-24T02:59:43",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-24T02:59:43"
-    },
-    {
-        "executionTime": 8728.364933,
-        "id": 574475,
-        "insertedAt": "2023-10-24T03:59:52",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-24T03:59:52"
-    },
-    {
-        "executionTime": 8222.973997,
-        "id": 574544,
-        "insertedAt": "2023-10-24T05:00:00",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-24T05:00:00"
-    },
-    {
-        "executionTime": 11405.025213,
-        "id": 574612,
-        "insertedAt": "2023-10-24T06:00:12",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-24T06:00:12"
-    },
-    {
-        "executionTime": 6332.608149,
-        "id": 574679,
-        "insertedAt": "2023-10-24T07:00:18",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-24T07:00:18"
-    },
-    {
-        "executionTime": 9698.369318,
-        "id": 574747,
-        "insertedAt": "2023-10-24T08:00:28",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-24T08:00:28"
-    },
-    {
-        "executionTime": 13418.162113,
-        "id": 574814,
-        "insertedAt": "2023-10-24T09:00:41",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-24T09:00:41"
-    },
-    {
-        "executionTime": 27395.999374,
-        "id": 574880,
-        "insertedAt": "2023-10-24T10:01:08",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-24T10:01:08"
-    },
-    {
-        "executionTime": 19306.760685,
-        "id": 574947,
-        "insertedAt": "2023-10-24T11:01:28",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-24T11:01:28"
-    },
-    {
-        "executionTime": 26209.771113,
-        "id": 575016,
-        "insertedAt": "2023-10-24T12:01:54",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-24T12:01:54"
-    },
-    {
-        "executionTime": 13455.070945,
-        "id": 575083,
-        "insertedAt": "2023-10-24T13:02:07",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-24T13:02:07"
-    },
-    {
-        "executionTime": 17960.671354,
-        "id": 575149,
-        "insertedAt": "2023-10-24T14:02:25",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-24T14:02:25"
-    },
-    {
-        "executionTime": 21750.247305,
-        "id": 575217,
-        "insertedAt": "2023-10-24T15:02:47",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-24T15:02:47"
-    },
-    {
-        "executionTime": 40227.423309,
-        "id": 575285,
-        "insertedAt": "2023-10-24T16:03:27",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-24T16:03:27"
-    },
-    {
-        "executionTime": 31770.816425,
-        "id": 575353,
-        "insertedAt": "2023-10-24T17:03:59",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-24T17:03:59"
-    },
-    {
-        "executionTime": 19246.059556,
-        "id": 575419,
-        "insertedAt": "2023-10-24T18:04:18",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-24T18:04:18"
-    },
-    {
-        "executionTime": 29754.513292,
-        "id": 575487,
-        "insertedAt": "2023-10-24T19:04:48",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-24T19:04:48"
-    },
-    {
-        "executionTime": 36019.741095,
-        "id": 575555,
-        "insertedAt": "2023-10-24T20:05:24",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-24T20:05:24"
-    },
-    {
-        "executionTime": 22913.071005,
-        "id": 575620,
-        "insertedAt": "2023-10-24T21:05:47",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-24T21:05:47"
-    },
-    {
-        "executionTime": 27934.54485,
-        "id": 575687,
-        "insertedAt": "2023-10-24T22:06:15",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-24T22:06:15"
-    },
-    {
-        "executionTime": 32861.597163,
-        "id": 575753,
-        "insertedAt": "2023-10-24T23:06:48",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-24T23:06:48"
-    },
-    {
-        "executionTime": 16235.099873,
-        "id": 575818,
-        "insertedAt": "2023-10-25T00:07:04",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-25T00:07:04"
-    },
-    {
-        "executionTime": 14362.177984,
-        "id": 575885,
-        "insertedAt": "2023-10-25T01:07:18",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-25T01:07:18"
-    },
-    {
-        "executionTime": 23565.905357,
-        "id": 575952,
-        "insertedAt": "2023-10-25T02:07:42",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-25T02:07:42"
-    },
-    {
-        "executionTime": 28002.564675,
-        "id": 576021,
-        "insertedAt": "2023-10-25T03:08:10",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-25T03:08:10"
-    },
-    {
-        "executionTime": 18890.225215,
-        "id": 576089,
-        "insertedAt": "2023-10-25T04:08:29",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-25T04:08:29"
-    },
-    {
-        "executionTime": 27984.396003,
-        "id": 576156,
-        "insertedAt": "2023-10-25T05:08:57",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-25T05:08:57"
-    },
-    {
-        "executionTime": 27113.467092,
-        "id": 576223,
-        "insertedAt": "2023-10-25T06:09:24",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-25T06:09:24"
-    },
-    {
-        "executionTime": 21065.936348,
-        "id": 576291,
-        "insertedAt": "2023-10-25T07:09:45",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-25T07:09:45"
-    },
-    {
-        "executionTime": 23280.725155,
-        "id": 576358,
-        "insertedAt": "2023-10-25T08:10:08",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-25T08:10:08"
-    },
-    {
-        "executionTime": 12448.142332,
-        "id": 576426,
-        "insertedAt": "2023-10-25T09:10:21",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-25T09:10:21"
-    },
-    {
-        "executionTime": 10578.340706,
-        "id": 576493,
-        "insertedAt": "2023-10-25T10:10:31",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-25T10:10:31"
-    },
-    {
-        "executionTime": 65150.023463,
-        "id": 576561,
-        "insertedAt": "2023-10-25T11:11:37",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-25T11:11:37"
-    },
-    {
-        "executionTime": 16062.956382,
-        "id": 576627,
-        "insertedAt": "2023-10-25T12:11:53",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-25T12:11:53"
-    },
-    {
-        "executionTime": 12054.297644,
-        "id": 576695,
-        "insertedAt": "2023-10-25T13:12:05",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-25T13:12:05"
-    },
-    {
-        "executionTime": 13558.529867,
-        "id": 576763,
-        "insertedAt": "2023-10-25T14:12:18",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-25T14:12:18"
-    },
-    {
-        "executionTime": 10419.25344,
-        "id": 576831,
-        "insertedAt": "2023-10-25T15:12:29",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-25T15:12:29"
-    },
-    {
-        "executionTime": 9835.146307,
-        "id": 576900,
-        "insertedAt": "2023-10-25T16:12:39",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-25T16:12:39"
-    },
-    {
-        "executionTime": 9438.069156,
-        "id": 576967,
-        "insertedAt": "2023-10-25T17:12:48",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-25T17:12:48"
-    },
-    {
-        "executionTime": 4407.767618,
-        "id": 577034,
-        "insertedAt": "2023-10-25T18:12:53",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-25T18:12:53"
-    },
-    {
-        "executionTime": 8411.103945,
-        "id": 577101,
-        "insertedAt": "2023-10-25T19:13:01",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-25T19:13:01"
-    },
-    {
-        "executionTime": 17225.743877,
-        "id": 577168,
-        "insertedAt": "2023-10-25T20:13:18",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-25T20:13:18"
-    },
-    {
-        "executionTime": 42193.306564,
-        "id": 577233,
-        "insertedAt": "2023-10-25T21:14:00",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-25T21:14:00"
-    },
-    {
-        "executionTime": 6816.801347,
-        "id": 577300,
-        "insertedAt": "2023-10-25T22:14:07",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-25T22:14:07"
-    },
-    {
-        "executionTime": 15366.79233,
-        "id": 577365,
-        "insertedAt": "2023-10-25T23:14:23",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-25T23:14:23"
-    },
-    {
-        "executionTime": 15553.291367,
-        "id": 577430,
-        "insertedAt": "2023-10-26T00:14:38",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-26T00:14:38"
-    },
-    {
-        "executionTime": 11846.103536,
-        "id": 577499,
-        "insertedAt": "2023-10-26T01:14:50",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-26T01:14:50"
-    },
-    {
-        "executionTime": 12945.090869,
-        "id": 577565,
-        "insertedAt": "2023-10-26T02:15:03",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-26T02:15:03"
-    },
-    {
-        "executionTime": 14400.088356,
-        "id": 577633,
-        "insertedAt": "2023-10-26T03:15:17",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-26T03:15:17"
-    },
-    {
-        "executionTime": 9699.564666,
-        "id": 577701,
-        "insertedAt": "2023-10-26T04:15:27",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-26T04:15:27"
-    },
-    {
-        "executionTime": 17427.027944,
-        "id": 577767,
-        "insertedAt": "2023-10-26T05:15:45",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-26T05:15:45"
-    },
-    {
-        "executionTime": 17424.828963,
-        "id": 577835,
-        "insertedAt": "2023-10-26T06:16:02",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-26T06:16:02"
-    },
-    {
-        "executionTime": 22556.142112,
-        "id": 577903,
-        "insertedAt": "2023-10-26T07:16:25",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-26T07:16:25"
-    },
-    {
-        "executionTime": 45638.860077,
-        "id": 577970,
-        "insertedAt": "2023-10-26T08:17:10",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-26T08:17:10"
-    },
-    {
-        "executionTime": 15124.424206,
-        "id": 578037,
-        "insertedAt": "2023-10-26T09:17:25",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-26T09:17:25"
-    },
-    {
-        "executionTime": 58538.647941,
-        "id": 578105,
-        "insertedAt": "2023-10-26T10:18:24",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-26T10:18:24"
-    },
-    {
-        "executionTime": 19944.939161,
-        "id": 578172,
-        "insertedAt": "2023-10-26T11:18:44",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-26T11:18:44"
-    },
-    {
-        "executionTime": 12476.122454,
-        "id": 578239,
-        "insertedAt": "2023-10-26T12:18:56",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-26T12:18:56"
-    },
-    {
-        "executionTime": 26138.974284,
-        "id": 578308,
-        "insertedAt": "2023-10-26T13:19:23",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-26T13:19:23"
-    },
-    {
-        "executionTime": 29993.451738,
-        "id": 578375,
-        "insertedAt": "2023-10-26T14:19:53",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-26T14:19:53"
-    },
-    {
-        "executionTime": 49235.860508,
-        "id": 578444,
-        "insertedAt": "2023-10-26T15:20:42",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-26T15:20:42"
-    },
-    {
-        "executionTime": 45608.745895,
-        "id": 578512,
-        "insertedAt": "2023-10-26T16:21:27",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-26T16:21:27"
-    },
-    {
-        "executionTime": 18540.43865,
-        "id": 578580,
-        "insertedAt": "2023-10-26T17:21:46",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-26T17:21:46"
-    },
-    {
-        "executionTime": 17382.203487,
-        "id": 578648,
-        "insertedAt": "2023-10-26T18:22:03",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-26T18:22:03"
-    },
-    {
-        "executionTime": 16472.550856,
-        "id": 578714,
-        "insertedAt": "2023-10-26T19:22:20",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-26T19:22:20"
-    },
-    {
-        "executionTime": 23356.364242,
-        "id": 578781,
-        "insertedAt": "2023-10-26T20:22:43",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-26T20:22:43"
-    },
-    {
-        "executionTime": 16729.867704,
-        "id": 578847,
-        "insertedAt": "2023-10-26T21:23:00",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-26T21:23:00"
-    },
-    {
-        "executionTime": 23021.381943,
-        "id": 578912,
-        "insertedAt": "2023-10-26T22:23:23",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-26T22:23:23"
-    },
-    {
-        "executionTime": 27154.920474,
-        "id": 578978,
-        "insertedAt": "2023-10-26T23:23:50",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-26T23:23:50"
-    },
-    {
-        "executionTime": 12601.407182,
-        "id": 579045,
-        "insertedAt": "2023-10-27T00:24:03",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-27T00:24:03"
-    },
-    {
-        "executionTime": 9934.220108,
-        "id": 579111,
-        "insertedAt": "2023-10-27T01:24:13",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-27T01:24:13"
-    },
-    {
-        "executionTime": 9350.671174,
-        "id": 579178,
-        "insertedAt": "2023-10-27T02:24:22",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-27T02:24:22"
-    },
-    {
-        "executionTime": 12407.653564,
-        "id": 579245,
-        "insertedAt": "2023-10-27T03:24:34",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-27T03:24:34"
-    },
-    {
-        "executionTime": 10748.877452,
-        "id": 579312,
-        "insertedAt": "2023-10-27T04:24:45",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-27T04:24:45"
-    },
-    {
-        "executionTime": 13877.901156,
-        "id": 579380,
-        "insertedAt": "2023-10-27T05:24:59",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-27T05:24:59"
-    },
-    {
-        "executionTime": 12846.287031,
-        "id": 579446,
-        "insertedAt": "2023-10-27T06:25:12",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-27T06:25:12"
-    },
-    {
-        "executionTime": 26297.270771,
-        "id": 579514,
-        "insertedAt": "2023-10-27T07:25:38",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-27T07:25:38"
-    },
-    {
-        "executionTime": 17023.909561,
-        "id": 579583,
-        "insertedAt": "2023-10-27T08:25:55",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-27T08:25:55"
-    },
-    {
-        "executionTime": 26804.993914,
-        "id": 579651,
-        "insertedAt": "2023-10-27T09:26:22",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-27T09:26:22"
-    },
-    {
-        "executionTime": 15919.082573,
-        "id": 579718,
-        "insertedAt": "2023-10-27T10:26:38",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-27T10:26:38"
-    },
-    {
-        "executionTime": 21425.455031,
-        "id": 579785,
-        "insertedAt": "2023-10-27T11:26:59",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-27T11:26:59"
-    },
-    {
-        "executionTime": 15144.287468,
-        "id": 579853,
-        "insertedAt": "2023-10-27T12:27:15",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-27T12:27:15"
-    },
-    {
-        "executionTime": 8510.973576,
-        "id": 579919,
-        "insertedAt": "2023-10-27T13:27:23",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-27T13:27:23"
-    },
-    {
-        "executionTime": 18844.519076,
-        "id": 579986,
-        "insertedAt": "2023-10-27T14:27:42",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-27T14:27:42"
-    },
-    {
-        "executionTime": 10460.3759,
-        "id": 580054,
-        "insertedAt": "2023-10-27T15:27:52",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-27T15:27:52"
-    },
-    {
-        "executionTime": 12704.470563,
-        "id": 580123,
-        "insertedAt": "2023-10-27T16:28:05",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-27T16:28:05"
-    },
-    {
-        "executionTime": 14815.57055,
-        "id": 580190,
-        "insertedAt": "2023-10-27T17:28:20",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-27T17:28:20"
-    },
-    {
-        "executionTime": 6908.03389,
-        "id": 580257,
-        "insertedAt": "2023-10-27T18:28:27",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-27T18:28:27"
-    },
-    {
-        "executionTime": 12737.29301,
-        "id": 580324,
-        "insertedAt": "2023-10-27T19:28:40",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-27T19:28:40"
-    },
-    {
-        "executionTime": 26899.241593,
-        "id": 580389,
-        "insertedAt": "2023-10-27T20:29:06",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-27T20:29:06"
-    },
-    {
-        "executionTime": 8521.709216,
-        "id": 580455,
-        "insertedAt": "2023-10-27T21:29:15",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-27T21:29:15"
-    },
-    {
-        "executionTime": 8963.83118,
-        "id": 580520,
-        "insertedAt": "2023-10-27T22:29:24",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-27T22:29:24"
-    },
-    {
-        "executionTime": 29690.504809,
-        "id": 580587,
-        "insertedAt": "2023-10-27T23:29:54",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-27T23:29:54"
-    },
-    {
-        "executionTime": 16023.067089,
-        "id": 580652,
-        "insertedAt": "2023-10-28T00:30:10",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-28T00:30:10"
-    },
-    {
-        "executionTime": 11594.330303,
-        "id": 580720,
-        "insertedAt": "2023-10-28T01:30:21",
-        "periodTaskId": 59,
-        "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
-        "status": "ok",
-        "updatedAt": "2023-10-28T01:30:21"
+      "executionTime": 0,
+      "id": 565453,
+      "insertedAt": "2023-10-18T13:25:03",
+      "periodTaskId": 59,
+      "result": "{\"started\":\"true\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-18T13:25:03"
+    },
+    {
+      "executionTime": 12830.732104,
+      "id": 565454,
+      "insertedAt": "2023-10-18T13:25:16",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-18T13:25:16"
+    },
+    {
+      "executionTime": 25506.658174,
+      "id": 565523,
+      "insertedAt": "2023-10-18T14:25:42",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-18T14:25:42"
+    },
+    {
+      "executionTime": 12638.976351,
+      "id": 565592,
+      "insertedAt": "2023-10-18T15:25:54",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-18T15:25:54"
+    },
+    {
+      "executionTime": 5450.995343,
+      "id": 565660,
+      "insertedAt": "2023-10-18T16:26:00",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-18T16:26:00"
+    },
+    {
+      "executionTime": 4498.97287,
+      "id": 565726,
+      "insertedAt": "2023-10-18T17:26:04",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-18T17:26:04"
+    },
+    {
+      "executionTime": 9490.473885,
+      "id": 565794,
+      "insertedAt": "2023-10-18T18:26:14",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-18T18:26:14"
+    },
+    {
+      "executionTime": 3777.207784,
+      "id": 565862,
+      "insertedAt": "2023-10-18T19:26:17",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-18T19:26:17"
+    },
+    {
+      "executionTime": 10360.10679,
+      "id": 565928,
+      "insertedAt": "2023-10-18T20:26:28",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-18T20:26:28"
+    },
+    {
+      "executionTime": 10904.072981,
+      "id": 565994,
+      "insertedAt": "2023-10-18T21:26:39",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-18T21:26:39"
+    },
+    {
+      "executionTime": 8854.622403,
+      "id": 566059,
+      "insertedAt": "2023-10-18T22:26:48",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-18T22:26:48"
+    },
+    {
+      "executionTime": 22137.177519,
+      "id": 566126,
+      "insertedAt": "2023-10-18T23:27:10",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-18T23:27:10"
+    },
+    {
+      "executionTime": 23796.095803,
+      "id": 566193,
+      "insertedAt": "2023-10-19T00:27:34",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-19T00:27:34"
+    },
+    {
+      "executionTime": 5347.562875,
+      "id": 566261,
+      "insertedAt": "2023-10-19T01:27:39",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-19T01:27:39"
+    },
+    {
+      "executionTime": 7084.301646,
+      "id": 566328,
+      "insertedAt": "2023-10-19T02:27:46",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-19T02:27:46"
+    },
+    {
+      "executionTime": 12227.822644,
+      "id": 566396,
+      "insertedAt": "2023-10-19T03:27:58",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-19T03:27:58"
+    },
+    {
+      "executionTime": 15664.352595,
+      "id": 566464,
+      "insertedAt": "2023-10-19T04:28:14",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-19T04:28:14"
+    },
+    {
+      "executionTime": 8316.466938,
+      "id": 566532,
+      "insertedAt": "2023-10-19T05:28:22",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-19T05:28:22"
+    },
+    {
+      "executionTime": 11386.891617,
+      "id": 566599,
+      "insertedAt": "2023-10-19T06:28:34",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-19T06:28:34"
+    },
+    {
+      "executionTime": 8653.684831,
+      "id": 566666,
+      "insertedAt": "2023-10-19T07:28:42",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-19T07:28:42"
+    },
+    {
+      "executionTime": 9391.686816,
+      "id": 566732,
+      "insertedAt": "2023-10-19T08:28:52",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-19T08:28:52"
+    },
+    {
+      "executionTime": 22501.649602,
+      "id": 566799,
+      "insertedAt": "2023-10-19T09:29:14",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-19T09:29:14"
+    },
+    {
+      "executionTime": 10885.245415,
+      "id": 566867,
+      "insertedAt": "2023-10-19T10:29:25",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-19T10:29:25"
+    },
+    {
+      "executionTime": 9258.535819,
+      "id": 566934,
+      "insertedAt": "2023-10-19T11:29:34",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-19T11:29:34"
+    },
+    {
+      "executionTime": 8133.948237,
+      "id": 567001,
+      "insertedAt": "2023-10-19T12:29:43",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-19T12:29:43"
+    },
+    {
+      "executionTime": 6390.36249,
+      "id": 567068,
+      "insertedAt": "2023-10-19T13:29:49",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-19T13:29:49"
+    },
+    {
+      "executionTime": 7477.104871,
+      "id": 567137,
+      "insertedAt": "2023-10-19T14:29:56",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-19T14:29:56"
+    },
+    {
+      "executionTime": 10038.312753,
+      "id": 567205,
+      "insertedAt": "2023-10-19T15:30:06",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-19T15:30:06"
+    },
+    {
+      "executionTime": 9420.225642,
+      "id": 567272,
+      "insertedAt": "2023-10-19T16:30:16",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-19T16:30:16"
+    },
+    {
+      "executionTime": 7346.672479,
+      "id": 567340,
+      "insertedAt": "2023-10-19T17:30:23",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-19T17:30:23"
+    },
+    {
+      "executionTime": 6576.494211,
+      "id": 567407,
+      "insertedAt": "2023-10-19T18:30:30",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-19T18:30:30"
+    },
+    {
+      "executionTime": 8940.800004,
+      "id": 567474,
+      "insertedAt": "2023-10-19T19:30:39",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-19T19:30:39"
+    },
+    {
+      "executionTime": 16072.824718,
+      "id": 567540,
+      "insertedAt": "2023-10-19T20:30:55",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-19T20:30:55"
+    },
+    {
+      "executionTime": 20382.916564,
+      "id": 567607,
+      "insertedAt": "2023-10-19T21:31:15",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-19T21:31:15"
+    },
+    {
+      "executionTime": 19532.305813,
+      "id": 567671,
+      "insertedAt": "2023-10-19T22:31:35",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-19T22:31:35"
+    },
+    {
+      "executionTime": 19107.544175,
+      "id": 567738,
+      "insertedAt": "2023-10-19T23:31:54",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-19T23:31:54"
+    },
+    {
+      "executionTime": 23040.839649,
+      "id": 567806,
+      "insertedAt": "2023-10-20T00:32:17",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-20T00:32:17"
+    },
+    {
+      "executionTime": 21107.16595,
+      "id": 567873,
+      "insertedAt": "2023-10-20T01:32:38",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-20T01:32:38"
+    },
+    {
+      "executionTime": 93369.774113,
+      "id": 567943,
+      "insertedAt": "2023-10-20T02:34:11",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-20T02:34:11"
+    },
+    {
+      "executionTime": 14633.250643,
+      "id": 568010,
+      "insertedAt": "2023-10-20T03:34:26",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-20T03:34:26"
+    },
+    {
+      "executionTime": 13639.341422,
+      "id": 568078,
+      "insertedAt": "2023-10-20T04:34:40",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-20T04:34:40"
+    },
+    {
+      "executionTime": 18258.706865,
+      "id": 568146,
+      "insertedAt": "2023-10-20T05:34:58",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-20T05:34:58"
+    },
+    {
+      "executionTime": 28120.82204,
+      "id": 568213,
+      "insertedAt": "2023-10-20T06:35:26",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-20T06:35:26"
+    },
+    {
+      "executionTime": 19145.029084,
+      "id": 568280,
+      "insertedAt": "2023-10-20T07:35:45",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-20T07:35:45"
+    },
+    {
+      "executionTime": 11311.334032,
+      "id": 568348,
+      "insertedAt": "2023-10-20T08:35:57",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-20T08:35:57"
+    },
+    {
+      "executionTime": 16597.839119,
+      "id": 568415,
+      "insertedAt": "2023-10-20T09:36:13",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-20T09:36:13"
+    },
+    {
+      "executionTime": 12118.510335,
+      "id": 568483,
+      "insertedAt": "2023-10-20T10:36:25",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-20T10:36:25"
+    },
+    {
+      "executionTime": 13712.516946,
+      "id": 568551,
+      "insertedAt": "2023-10-20T11:36:39",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-20T11:36:39"
+    },
+    {
+      "executionTime": 10850.637941,
+      "id": 568618,
+      "insertedAt": "2023-10-20T12:36:50",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-20T12:36:50"
+    },
+    {
+      "executionTime": 13838.414455,
+      "id": 568685,
+      "insertedAt": "2023-10-20T13:37:04",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-20T13:37:04"
+    },
+    {
+      "executionTime": 20671.84048,
+      "id": 568754,
+      "insertedAt": "2023-10-20T14:37:25",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-20T14:37:25"
+    },
+    {
+      "executionTime": 6578.811228,
+      "id": 568822,
+      "insertedAt": "2023-10-20T15:37:31",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-20T15:37:31"
+    },
+    {
+      "executionTime": 9966.687064,
+      "id": 568889,
+      "insertedAt": "2023-10-20T16:37:41",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-20T16:37:41"
+    },
+    {
+      "executionTime": 9748.776076,
+      "id": 568957,
+      "insertedAt": "2023-10-20T17:37:51",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-20T17:37:51"
+    },
+    {
+      "executionTime": 14125.883917,
+      "id": 569024,
+      "insertedAt": "2023-10-20T18:38:05",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-20T18:38:05"
+    },
+    {
+      "executionTime": 13083.516895,
+      "id": 569091,
+      "insertedAt": "2023-10-20T19:38:18",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-20T19:38:18"
+    },
+    {
+      "executionTime": 8202.300136,
+      "id": 569157,
+      "insertedAt": "2023-10-20T20:38:26",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-20T20:38:26"
+    },
+    {
+      "executionTime": 22449.223386,
+      "id": 569224,
+      "insertedAt": "2023-10-20T21:38:49",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-20T21:38:49"
+    },
+    {
+      "executionTime": 9441.313234,
+      "id": 569288,
+      "insertedAt": "2023-10-20T22:38:58",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-20T22:38:58"
+    },
+    {
+      "executionTime": 13947.953856,
+      "id": 569355,
+      "insertedAt": "2023-10-20T23:39:12",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-20T23:39:12"
+    },
+    {
+      "executionTime": 7427.373488,
+      "id": 569423,
+      "insertedAt": "2023-10-21T00:39:20",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-21T00:39:20"
+    },
+    {
+      "executionTime": 18873.430029,
+      "id": 569490,
+      "insertedAt": "2023-10-21T01:39:39",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-21T01:39:39"
+    },
+    {
+      "executionTime": 8703.515895,
+      "id": 569558,
+      "insertedAt": "2023-10-21T02:39:47",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-21T02:39:47"
+    },
+    {
+      "executionTime": 19149.708344,
+      "id": 569626,
+      "insertedAt": "2023-10-21T03:40:06",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-21T03:40:06"
+    },
+    {
+      "executionTime": 6561.565621,
+      "id": 569692,
+      "insertedAt": "2023-10-21T04:40:13",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-21T04:40:13"
+    },
+    {
+      "executionTime": 14805.120659,
+      "id": 569760,
+      "insertedAt": "2023-10-21T05:40:28",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-21T05:40:28"
+    },
+    {
+      "executionTime": 13154.512687,
+      "id": 569828,
+      "insertedAt": "2023-10-21T06:40:41",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-21T06:40:41"
+    },
+    {
+      "executionTime": 12049.492643,
+      "id": 569895,
+      "insertedAt": "2023-10-21T07:40:53",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-21T07:40:53"
+    },
+    {
+      "executionTime": 28678.246497,
+      "id": 569963,
+      "insertedAt": "2023-10-21T08:41:22",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-21T08:41:22"
+    },
+    {
+      "executionTime": 12806.755473,
+      "id": 570030,
+      "insertedAt": "2023-10-21T09:41:35",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-21T09:41:35"
+    },
+    {
+      "executionTime": 12112.2066,
+      "id": 570098,
+      "insertedAt": "2023-10-21T10:41:47",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-21T10:41:47"
+    },
+    {
+      "executionTime": 18896.700608,
+      "id": 570165,
+      "insertedAt": "2023-10-21T11:42:06",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-21T11:42:06"
+    },
+    {
+      "executionTime": 10626.103438,
+      "id": 570233,
+      "insertedAt": "2023-10-21T12:42:16",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-21T12:42:16"
+    },
+    {
+      "executionTime": 17312.599398,
+      "id": 570300,
+      "insertedAt": "2023-10-21T13:42:34",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-21T13:42:34"
+    },
+    {
+      "executionTime": 6518.565339,
+      "id": 570368,
+      "insertedAt": "2023-10-21T14:42:40",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-21T14:42:40"
+    },
+    {
+      "executionTime": 10094.334083,
+      "id": 570436,
+      "insertedAt": "2023-10-21T15:42:50",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-21T15:42:50"
+    },
+    {
+      "executionTime": 10672.328049,
+      "id": 570503,
+      "insertedAt": "2023-10-21T16:43:01",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-21T16:43:01"
+    },
+    {
+      "executionTime": 12041.763037,
+      "id": 570571,
+      "insertedAt": "2023-10-21T17:43:13",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-21T17:43:13"
+    },
+    {
+      "executionTime": 11876.56709,
+      "id": 570639,
+      "insertedAt": "2023-10-21T18:43:25",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-21T18:43:25"
+    },
+    {
+      "executionTime": 7201.877892,
+      "id": 570706,
+      "insertedAt": "2023-10-21T19:43:32",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-21T19:43:32"
+    },
+    {
+      "executionTime": 16874.004167,
+      "id": 570771,
+      "insertedAt": "2023-10-21T20:43:49",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-21T20:43:49"
+    },
+    {
+      "executionTime": 9935.479061,
+      "id": 570836,
+      "insertedAt": "2023-10-21T21:43:59",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-21T21:43:59"
+    },
+    {
+      "executionTime": 9689.546956,
+      "id": 570904,
+      "insertedAt": "2023-10-21T22:44:09",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-21T22:44:09"
+    },
+    {
+      "executionTime": 9762.459615,
+      "id": 570969,
+      "insertedAt": "2023-10-21T23:44:18",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-21T23:44:18"
+    },
+    {
+      "executionTime": 8405.282881,
+      "id": 571035,
+      "insertedAt": "2023-10-22T00:44:27",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-22T00:44:27"
+    },
+    {
+      "executionTime": 14364.198572,
+      "id": 571103,
+      "insertedAt": "2023-10-22T01:44:41",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-22T01:44:41"
+    },
+    {
+      "executionTime": 8024.676241,
+      "id": 571171,
+      "insertedAt": "2023-10-22T02:44:49",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-22T02:44:49"
+    },
+    {
+      "executionTime": 5278.004221,
+      "id": 571239,
+      "insertedAt": "2023-10-22T03:44:54",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-22T03:44:54"
+    },
+    {
+      "executionTime": 11275.317315,
+      "id": 571305,
+      "insertedAt": "2023-10-22T04:45:06",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-22T04:45:06"
+    },
+    {
+      "executionTime": 8400.580549,
+      "id": 571373,
+      "insertedAt": "2023-10-22T05:45:14",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-22T05:45:14"
+    },
+    {
+      "executionTime": 7250.017597,
+      "id": 571440,
+      "insertedAt": "2023-10-22T06:45:21",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-22T06:45:21"
+    },
+    {
+      "executionTime": 8478.795528,
+      "id": 571508,
+      "insertedAt": "2023-10-22T07:45:30",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-22T07:45:30"
+    },
+    {
+      "executionTime": 17860.496364,
+      "id": 571576,
+      "insertedAt": "2023-10-22T08:45:48",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-22T08:45:48"
+    },
+    {
+      "executionTime": 17850.995427,
+      "id": 571644,
+      "insertedAt": "2023-10-22T09:46:06",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-22T09:46:06"
+    },
+    {
+      "executionTime": 16847.764486,
+      "id": 571712,
+      "insertedAt": "2023-10-22T10:46:23",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-22T10:46:23"
+    },
+    {
+      "executionTime": 22675.100884,
+      "id": 571780,
+      "insertedAt": "2023-10-22T11:46:45",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-22T11:46:45"
+    },
+    {
+      "executionTime": 24274.494325,
+      "id": 571847,
+      "insertedAt": "2023-10-22T12:47:10",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-22T12:47:10"
+    },
+    {
+      "executionTime": 57056.385325,
+      "id": 571915,
+      "insertedAt": "2023-10-22T13:48:07",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-22T13:48:07"
+    },
+    {
+      "executionTime": 29834.174693,
+      "id": 571985,
+      "insertedAt": "2023-10-22T14:48:36",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-22T14:48:36"
+    },
+    {
+      "executionTime": 18064.115125,
+      "id": 572051,
+      "insertedAt": "2023-10-22T15:48:55",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-22T15:48:55"
+    },
+    {
+      "executionTime": 17235.804196,
+      "id": 572118,
+      "insertedAt": "2023-10-22T16:49:12",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-22T16:49:12"
+    },
+    {
+      "executionTime": 24043.626783,
+      "id": 572186,
+      "insertedAt": "2023-10-22T17:49:36",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-22T17:49:36"
+    },
+    {
+      "executionTime": 45410.015509,
+      "id": 572254,
+      "insertedAt": "2023-10-22T18:50:21",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-22T18:50:21"
+    },
+    {
+      "executionTime": 41536.839892,
+      "id": 572322,
+      "insertedAt": "2023-10-22T19:51:03",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-22T19:51:03"
+    },
+    {
+      "executionTime": 36076.127793,
+      "id": 572388,
+      "insertedAt": "2023-10-22T20:51:39",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-22T20:51:39"
+    },
+    {
+      "executionTime": 20826.715815,
+      "id": 572454,
+      "insertedAt": "2023-10-22T21:52:00",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-22T21:52:00"
+    },
+    {
+      "executionTime": 17251.123948,
+      "id": 572521,
+      "insertedAt": "2023-10-22T22:52:17",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-22T22:52:17"
+    },
+    {
+      "executionTime": 19620.653646,
+      "id": 572585,
+      "insertedAt": "2023-10-22T23:52:37",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-22T23:52:37"
+    },
+    {
+      "executionTime": 22169.646658,
+      "id": 572654,
+      "insertedAt": "2023-10-23T00:52:59",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-23T00:52:59"
+    },
+    {
+      "executionTime": 16766.979611,
+      "id": 572722,
+      "insertedAt": "2023-10-23T01:53:16",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-23T01:53:16"
+    },
+    {
+      "executionTime": 28533.760379,
+      "id": 572790,
+      "insertedAt": "2023-10-23T02:53:44",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-23T02:53:44"
+    },
+    {
+      "executionTime": 7039.501403,
+      "id": 572858,
+      "insertedAt": "2023-10-23T03:53:51",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-23T03:53:51"
+    },
+    {
+      "executionTime": 15383.807504,
+      "id": 572926,
+      "insertedAt": "2023-10-23T04:54:06",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-23T04:54:06"
+    },
+    {
+      "executionTime": 20728.129146,
+      "id": 572994,
+      "insertedAt": "2023-10-23T05:54:27",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-23T05:54:27"
+    },
+    {
+      "executionTime": 20400.658759,
+      "id": 573062,
+      "insertedAt": "2023-10-23T06:54:48",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-23T06:54:48"
+    },
+    {
+      "executionTime": 26587.83587,
+      "id": 573130,
+      "insertedAt": "2023-10-23T07:55:14",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-23T07:55:14"
+    },
+    {
+      "executionTime": 27201.75375,
+      "id": 573197,
+      "insertedAt": "2023-10-23T08:55:41",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-23T08:55:41"
+    },
+    {
+      "executionTime": 18283.301548,
+      "id": 573263,
+      "insertedAt": "2023-10-23T09:56:00",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-23T09:56:00"
+    },
+    {
+      "executionTime": 21826.943032,
+      "id": 573331,
+      "insertedAt": "2023-10-23T10:56:22",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-23T10:56:22"
+    },
+    {
+      "executionTime": 19191.541687,
+      "id": 573399,
+      "insertedAt": "2023-10-23T11:56:41",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-23T11:56:41"
+    },
+    {
+      "executionTime": 10096.851551,
+      "id": 573466,
+      "insertedAt": "2023-10-23T12:56:51",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-23T12:56:51"
+    },
+    {
+      "executionTime": 13146.595699,
+      "id": 573535,
+      "insertedAt": "2023-10-23T13:57:04",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-23T13:57:04"
+    },
+    {
+      "executionTime": 7387.308849,
+      "id": 573604,
+      "insertedAt": "2023-10-23T14:57:11",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-23T14:57:11"
+    },
+    {
+      "executionTime": 6882.649267,
+      "id": 573672,
+      "insertedAt": "2023-10-23T15:57:18",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-23T15:57:18"
+    },
+    {
+      "executionTime": 20741.254908,
+      "id": 573738,
+      "insertedAt": "2023-10-23T16:57:39",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-23T16:57:39"
+    },
+    {
+      "executionTime": 14819.786967,
+      "id": 573806,
+      "insertedAt": "2023-10-23T17:57:54",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-23T17:57:54"
+    },
+    {
+      "executionTime": 6012.501554,
+      "id": 573874,
+      "insertedAt": "2023-10-23T18:58:00",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-23T18:58:00"
+    },
+    {
+      "executionTime": 7288.949266,
+      "id": 573941,
+      "insertedAt": "2023-10-23T19:58:07",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-23T19:58:07"
+    },
+    {
+      "executionTime": 10039.087204,
+      "id": 574005,
+      "insertedAt": "2023-10-23T20:58:17",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-23T20:58:17"
+    },
+    {
+      "executionTime": 18735.452283,
+      "id": 574072,
+      "insertedAt": "2023-10-23T21:58:36",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-23T21:58:36"
+    },
+    {
+      "executionTime": 11642.914346,
+      "id": 574137,
+      "insertedAt": "2023-10-23T22:58:48",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-23T22:58:48"
+    },
+    {
+      "executionTime": 21661.318476,
+      "id": 574204,
+      "insertedAt": "2023-10-23T23:59:09",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-23T23:59:09"
+    },
+    {
+      "executionTime": 6275.455767,
+      "id": 574271,
+      "insertedAt": "2023-10-24T00:59:16",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-24T00:59:16"
+    },
+    {
+      "executionTime": 13574.85228,
+      "id": 574340,
+      "insertedAt": "2023-10-24T01:59:29",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-24T01:59:29"
+    },
+    {
+      "executionTime": 13921.98355,
+      "id": 574407,
+      "insertedAt": "2023-10-24T02:59:43",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-24T02:59:43"
+    },
+    {
+      "executionTime": 8728.364933,
+      "id": 574475,
+      "insertedAt": "2023-10-24T03:59:52",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-24T03:59:52"
+    },
+    {
+      "executionTime": 8222.973997,
+      "id": 574544,
+      "insertedAt": "2023-10-24T05:00:00",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-24T05:00:00"
+    },
+    {
+      "executionTime": 11405.025213,
+      "id": 574612,
+      "insertedAt": "2023-10-24T06:00:12",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-24T06:00:12"
+    },
+    {
+      "executionTime": 6332.608149,
+      "id": 574679,
+      "insertedAt": "2023-10-24T07:00:18",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-24T07:00:18"
+    },
+    {
+      "executionTime": 9698.369318,
+      "id": 574747,
+      "insertedAt": "2023-10-24T08:00:28",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-24T08:00:28"
+    },
+    {
+      "executionTime": 13418.162113,
+      "id": 574814,
+      "insertedAt": "2023-10-24T09:00:41",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-24T09:00:41"
+    },
+    {
+      "executionTime": 27395.999374,
+      "id": 574880,
+      "insertedAt": "2023-10-24T10:01:08",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-24T10:01:08"
+    },
+    {
+      "executionTime": 19306.760685,
+      "id": 574947,
+      "insertedAt": "2023-10-24T11:01:28",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-24T11:01:28"
+    },
+    {
+      "executionTime": 26209.771113,
+      "id": 575016,
+      "insertedAt": "2023-10-24T12:01:54",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-24T12:01:54"
+    },
+    {
+      "executionTime": 13455.070945,
+      "id": 575083,
+      "insertedAt": "2023-10-24T13:02:07",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-24T13:02:07"
+    },
+    {
+      "executionTime": 17960.671354,
+      "id": 575149,
+      "insertedAt": "2023-10-24T14:02:25",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-24T14:02:25"
+    },
+    {
+      "executionTime": 21750.247305,
+      "id": 575217,
+      "insertedAt": "2023-10-24T15:02:47",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-24T15:02:47"
+    },
+    {
+      "executionTime": 40227.423309,
+      "id": 575285,
+      "insertedAt": "2023-10-24T16:03:27",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-24T16:03:27"
+    },
+    {
+      "executionTime": 31770.816425,
+      "id": 575353,
+      "insertedAt": "2023-10-24T17:03:59",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-24T17:03:59"
+    },
+    {
+      "executionTime": 19246.059556,
+      "id": 575419,
+      "insertedAt": "2023-10-24T18:04:18",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-24T18:04:18"
+    },
+    {
+      "executionTime": 29754.513292,
+      "id": 575487,
+      "insertedAt": "2023-10-24T19:04:48",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-24T19:04:48"
+    },
+    {
+      "executionTime": 36019.741095,
+      "id": 575555,
+      "insertedAt": "2023-10-24T20:05:24",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-24T20:05:24"
+    },
+    {
+      "executionTime": 22913.071005,
+      "id": 575620,
+      "insertedAt": "2023-10-24T21:05:47",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-24T21:05:47"
+    },
+    {
+      "executionTime": 27934.54485,
+      "id": 575687,
+      "insertedAt": "2023-10-24T22:06:15",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-24T22:06:15"
+    },
+    {
+      "executionTime": 32861.597163,
+      "id": 575753,
+      "insertedAt": "2023-10-24T23:06:48",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-24T23:06:48"
+    },
+    {
+      "executionTime": 16235.099873,
+      "id": 575818,
+      "insertedAt": "2023-10-25T00:07:04",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-25T00:07:04"
+    },
+    {
+      "executionTime": 14362.177984,
+      "id": 575885,
+      "insertedAt": "2023-10-25T01:07:18",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-25T01:07:18"
+    },
+    {
+      "executionTime": 23565.905357,
+      "id": 575952,
+      "insertedAt": "2023-10-25T02:07:42",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-25T02:07:42"
+    },
+    {
+      "executionTime": 28002.564675,
+      "id": 576021,
+      "insertedAt": "2023-10-25T03:08:10",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-25T03:08:10"
+    },
+    {
+      "executionTime": 18890.225215,
+      "id": 576089,
+      "insertedAt": "2023-10-25T04:08:29",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-25T04:08:29"
+    },
+    {
+      "executionTime": 27984.396003,
+      "id": 576156,
+      "insertedAt": "2023-10-25T05:08:57",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-25T05:08:57"
+    },
+    {
+      "executionTime": 27113.467092,
+      "id": 576223,
+      "insertedAt": "2023-10-25T06:09:24",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-25T06:09:24"
+    },
+    {
+      "executionTime": 21065.936348,
+      "id": 576291,
+      "insertedAt": "2023-10-25T07:09:45",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-25T07:09:45"
+    },
+    {
+      "executionTime": 23280.725155,
+      "id": 576358,
+      "insertedAt": "2023-10-25T08:10:08",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-25T08:10:08"
+    },
+    {
+      "executionTime": 12448.142332,
+      "id": 576426,
+      "insertedAt": "2023-10-25T09:10:21",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-25T09:10:21"
+    },
+    {
+      "executionTime": 10578.340706,
+      "id": 576493,
+      "insertedAt": "2023-10-25T10:10:31",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-25T10:10:31"
+    },
+    {
+      "executionTime": 65150.023463,
+      "id": 576561,
+      "insertedAt": "2023-10-25T11:11:37",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-25T11:11:37"
+    },
+    {
+      "executionTime": 16062.956382,
+      "id": 576627,
+      "insertedAt": "2023-10-25T12:11:53",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-25T12:11:53"
+    },
+    {
+      "executionTime": 12054.297644,
+      "id": 576695,
+      "insertedAt": "2023-10-25T13:12:05",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-25T13:12:05"
+    },
+    {
+      "executionTime": 13558.529867,
+      "id": 576763,
+      "insertedAt": "2023-10-25T14:12:18",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-25T14:12:18"
+    },
+    {
+      "executionTime": 10419.25344,
+      "id": 576831,
+      "insertedAt": "2023-10-25T15:12:29",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-25T15:12:29"
+    },
+    {
+      "executionTime": 9835.146307,
+      "id": 576900,
+      "insertedAt": "2023-10-25T16:12:39",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-25T16:12:39"
+    },
+    {
+      "executionTime": 9438.069156,
+      "id": 576967,
+      "insertedAt": "2023-10-25T17:12:48",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-25T17:12:48"
+    },
+    {
+      "executionTime": 4407.767618,
+      "id": 577034,
+      "insertedAt": "2023-10-25T18:12:53",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-25T18:12:53"
+    },
+    {
+      "executionTime": 8411.103945,
+      "id": 577101,
+      "insertedAt": "2023-10-25T19:13:01",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-25T19:13:01"
+    },
+    {
+      "executionTime": 17225.743877,
+      "id": 577168,
+      "insertedAt": "2023-10-25T20:13:18",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-25T20:13:18"
+    },
+    {
+      "executionTime": 42193.306564,
+      "id": 577233,
+      "insertedAt": "2023-10-25T21:14:00",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-25T21:14:00"
+    },
+    {
+      "executionTime": 6816.801347,
+      "id": 577300,
+      "insertedAt": "2023-10-25T22:14:07",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-25T22:14:07"
+    },
+    {
+      "executionTime": 15366.79233,
+      "id": 577365,
+      "insertedAt": "2023-10-25T23:14:23",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-25T23:14:23"
+    },
+    {
+      "executionTime": 15553.291367,
+      "id": 577430,
+      "insertedAt": "2023-10-26T00:14:38",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-26T00:14:38"
+    },
+    {
+      "executionTime": 11846.103536,
+      "id": 577499,
+      "insertedAt": "2023-10-26T01:14:50",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-26T01:14:50"
+    },
+    {
+      "executionTime": 12945.090869,
+      "id": 577565,
+      "insertedAt": "2023-10-26T02:15:03",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-26T02:15:03"
+    },
+    {
+      "executionTime": 14400.088356,
+      "id": 577633,
+      "insertedAt": "2023-10-26T03:15:17",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-26T03:15:17"
+    },
+    {
+      "executionTime": 9699.564666,
+      "id": 577701,
+      "insertedAt": "2023-10-26T04:15:27",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-26T04:15:27"
+    },
+    {
+      "executionTime": 17427.027944,
+      "id": 577767,
+      "insertedAt": "2023-10-26T05:15:45",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-26T05:15:45"
+    },
+    {
+      "executionTime": 17424.828963,
+      "id": 577835,
+      "insertedAt": "2023-10-26T06:16:02",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-26T06:16:02"
+    },
+    {
+      "executionTime": 22556.142112,
+      "id": 577903,
+      "insertedAt": "2023-10-26T07:16:25",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-26T07:16:25"
+    },
+    {
+      "executionTime": 45638.860077,
+      "id": 577970,
+      "insertedAt": "2023-10-26T08:17:10",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-26T08:17:10"
+    },
+    {
+      "executionTime": 15124.424206,
+      "id": 578037,
+      "insertedAt": "2023-10-26T09:17:25",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-26T09:17:25"
+    },
+    {
+      "executionTime": 58538.647941,
+      "id": 578105,
+      "insertedAt": "2023-10-26T10:18:24",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-26T10:18:24"
+    },
+    {
+      "executionTime": 19944.939161,
+      "id": 578172,
+      "insertedAt": "2023-10-26T11:18:44",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-26T11:18:44"
+    },
+    {
+      "executionTime": 12476.122454,
+      "id": 578239,
+      "insertedAt": "2023-10-26T12:18:56",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-26T12:18:56"
+    },
+    {
+      "executionTime": 26138.974284,
+      "id": 578308,
+      "insertedAt": "2023-10-26T13:19:23",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-26T13:19:23"
+    },
+    {
+      "executionTime": 29993.451738,
+      "id": 578375,
+      "insertedAt": "2023-10-26T14:19:53",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-26T14:19:53"
+    },
+    {
+      "executionTime": 49235.860508,
+      "id": 578444,
+      "insertedAt": "2023-10-26T15:20:42",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-26T15:20:42"
+    },
+    {
+      "executionTime": 45608.745895,
+      "id": 578512,
+      "insertedAt": "2023-10-26T16:21:27",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-26T16:21:27"
+    },
+    {
+      "executionTime": 18540.43865,
+      "id": 578580,
+      "insertedAt": "2023-10-26T17:21:46",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-26T17:21:46"
+    },
+    {
+      "executionTime": 17382.203487,
+      "id": 578648,
+      "insertedAt": "2023-10-26T18:22:03",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-26T18:22:03"
+    },
+    {
+      "executionTime": 16472.550856,
+      "id": 578714,
+      "insertedAt": "2023-10-26T19:22:20",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-26T19:22:20"
+    },
+    {
+      "executionTime": 23356.364242,
+      "id": 578781,
+      "insertedAt": "2023-10-26T20:22:43",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-26T20:22:43"
+    },
+    {
+      "executionTime": 16729.867704,
+      "id": 578847,
+      "insertedAt": "2023-10-26T21:23:00",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-26T21:23:00"
+    },
+    {
+      "executionTime": 23021.381943,
+      "id": 578912,
+      "insertedAt": "2023-10-26T22:23:23",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-26T22:23:23"
+    },
+    {
+      "executionTime": 27154.920474,
+      "id": 578978,
+      "insertedAt": "2023-10-26T23:23:50",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-26T23:23:50"
+    },
+    {
+      "executionTime": 12601.407182,
+      "id": 579045,
+      "insertedAt": "2023-10-27T00:24:03",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-27T00:24:03"
+    },
+    {
+      "executionTime": 9934.220108,
+      "id": 579111,
+      "insertedAt": "2023-10-27T01:24:13",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-27T01:24:13"
+    },
+    {
+      "executionTime": 9350.671174,
+      "id": 579178,
+      "insertedAt": "2023-10-27T02:24:22",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-27T02:24:22"
+    },
+    {
+      "executionTime": 12407.653564,
+      "id": 579245,
+      "insertedAt": "2023-10-27T03:24:34",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-27T03:24:34"
+    },
+    {
+      "executionTime": 10748.877452,
+      "id": 579312,
+      "insertedAt": "2023-10-27T04:24:45",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-27T04:24:45"
+    },
+    {
+      "executionTime": 13877.901156,
+      "id": 579380,
+      "insertedAt": "2023-10-27T05:24:59",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-27T05:24:59"
+    },
+    {
+      "executionTime": 12846.287031,
+      "id": 579446,
+      "insertedAt": "2023-10-27T06:25:12",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-27T06:25:12"
+    },
+    {
+      "executionTime": 26297.270771,
+      "id": 579514,
+      "insertedAt": "2023-10-27T07:25:38",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-27T07:25:38"
+    },
+    {
+      "executionTime": 17023.909561,
+      "id": 579583,
+      "insertedAt": "2023-10-27T08:25:55",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-27T08:25:55"
+    },
+    {
+      "executionTime": 26804.993914,
+      "id": 579651,
+      "insertedAt": "2023-10-27T09:26:22",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-27T09:26:22"
+    },
+    {
+      "executionTime": 15919.082573,
+      "id": 579718,
+      "insertedAt": "2023-10-27T10:26:38",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-27T10:26:38"
+    },
+    {
+      "executionTime": 21425.455031,
+      "id": 579785,
+      "insertedAt": "2023-10-27T11:26:59",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-27T11:26:59"
+    },
+    {
+      "executionTime": 15144.287468,
+      "id": 579853,
+      "insertedAt": "2023-10-27T12:27:15",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-27T12:27:15"
+    },
+    {
+      "executionTime": 8510.973576,
+      "id": 579919,
+      "insertedAt": "2023-10-27T13:27:23",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-27T13:27:23"
+    },
+    {
+      "executionTime": 18844.519076,
+      "id": 579986,
+      "insertedAt": "2023-10-27T14:27:42",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-27T14:27:42"
+    },
+    {
+      "executionTime": 10460.3759,
+      "id": 580054,
+      "insertedAt": "2023-10-27T15:27:52",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-27T15:27:52"
+    },
+    {
+      "executionTime": 12704.470563,
+      "id": 580123,
+      "insertedAt": "2023-10-27T16:28:05",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-27T16:28:05"
+    },
+    {
+      "executionTime": 14815.57055,
+      "id": 580190,
+      "insertedAt": "2023-10-27T17:28:20",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-27T17:28:20"
+    },
+    {
+      "executionTime": 6908.03389,
+      "id": 580257,
+      "insertedAt": "2023-10-27T18:28:27",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-27T18:28:27"
+    },
+    {
+      "executionTime": 12737.29301,
+      "id": 580324,
+      "insertedAt": "2023-10-27T19:28:40",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-27T19:28:40"
+    },
+    {
+      "executionTime": 26899.241593,
+      "id": 580389,
+      "insertedAt": "2023-10-27T20:29:06",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-27T20:29:06"
+    },
+    {
+      "executionTime": 8521.709216,
+      "id": 580455,
+      "insertedAt": "2023-10-27T21:29:15",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-27T21:29:15"
+    },
+    {
+      "executionTime": 8963.83118,
+      "id": 580520,
+      "insertedAt": "2023-10-27T22:29:24",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-27T22:29:24"
+    },
+    {
+      "executionTime": 29690.504809,
+      "id": 580587,
+      "insertedAt": "2023-10-27T23:29:54",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-27T23:29:54"
+    },
+    {
+      "executionTime": 16023.067089,
+      "id": 580652,
+      "insertedAt": "2023-10-28T00:30:10",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-28T00:30:10"
+    },
+    {
+      "executionTime": 11594.330303,
+      "id": 580720,
+      "insertedAt": "2023-10-28T01:30:21",
+      "periodTaskId": 59,
+      "result": "{\"done\":\"%{speed_limit: [%{result: 0}], status: :ok}\"}",
+      "status": "ok",
+      "updatedAt": "2023-10-28T01:30:21"
     }
   ]
 }
diff --git a/live_monitor_vue/src/components/5_pages/Cron/index.vue b/live_monitor_vue/src/components/5_pages/Cron/index.vue
index f1c5c50..0cd743a 100644
--- a/live_monitor_vue/src/components/5_pages/Cron/index.vue
+++ b/live_monitor_vue/src/components/5_pages/Cron/index.vue
@@ -1,3 +1,26 @@
+<script>
+import Task from './Task.vue'
+import TaskModal from './TaskModal.vue'
+
+export default {
+  name: 'CronPage',
+  components: {
+    Task,
+    TaskModal,
+  },
+  data() {
+  },
+  computed: {
+    tasks () {
+      return [1,2,3,4]
+    }
+  },
+  methods: {
+  }
+}
+
+</script>
+
 <template>
   <div class="flex flex-col gap-3 bg-light h-full w-full col-span-12 rounded-xl p-2">
     <TaskModal taskId="new">
@@ -135,27 +158,3 @@
     </div>
   </div>
 </template>
-
-<script>
-import { defineAsyncComponent } from 'vue'
-import Task from './Task.vue'
-import TaskModal from './TaskModal.vue'
-
-export default {
-  name: 'Cron',
-  components: {
-    Task,
-    TaskModal,
-  },
-  data() {
-  },
-  computed: {
-    tasks () {
-      return [1,2,3,4]
-    }
-  },
-  methods: {
-  }
-}
-
-</script>
diff --git a/live_monitor_vue/src/components/5_pages/Devices/index.vue b/live_monitor_vue/src/components/5_pages/Devices/index.vue
index bf737b4..ad85167 100644
--- a/live_monitor_vue/src/components/5_pages/Devices/index.vue
+++ b/live_monitor_vue/src/components/5_pages/Devices/index.vue
@@ -1,9 +1,3 @@
-<template>
-  <div>
-    123
-  </div>
-</template>
-
 <script>
 
 export default {
@@ -18,3 +12,9 @@ export default {
 }
 
 </script>
+
+<template>
+  <div>
+    123
+  </div>
+</template>
diff --git a/live_monitor_vue/src/components/5_pages/FileLogs/index.vue b/live_monitor_vue/src/components/5_pages/FileLogs/index.vue
index bf737b4..ad85167 100644
--- a/live_monitor_vue/src/components/5_pages/FileLogs/index.vue
+++ b/live_monitor_vue/src/components/5_pages/FileLogs/index.vue
@@ -1,9 +1,3 @@
-<template>
-  <div>
-    123
-  </div>
-</template>
-
 <script>
 
 export default {
@@ -18,3 +12,9 @@ export default {
 }
 
 </script>
+
+<template>
+  <div>
+    123
+  </div>
+</template>
diff --git a/live_monitor_vue/src/components/5_pages/FileViewer/index.vue b/live_monitor_vue/src/components/5_pages/FileViewer/index.vue
index bf737b4..ad85167 100644
--- a/live_monitor_vue/src/components/5_pages/FileViewer/index.vue
+++ b/live_monitor_vue/src/components/5_pages/FileViewer/index.vue
@@ -1,9 +1,3 @@
-<template>
-  <div>
-    123
-  </div>
-</template>
-
 <script>
 
 export default {
@@ -18,3 +12,9 @@ export default {
 }
 
 </script>
+
+<template>
+  <div>
+    123
+  </div>
+</template>
diff --git a/live_monitor_vue/src/components/5_pages/FilesLogs/index.vue b/live_monitor_vue/src/components/5_pages/FilesLogs/index.vue
index bf737b4..ad85167 100644
--- a/live_monitor_vue/src/components/5_pages/FilesLogs/index.vue
+++ b/live_monitor_vue/src/components/5_pages/FilesLogs/index.vue
@@ -1,9 +1,3 @@
-<template>
-  <div>
-    123
-  </div>
-</template>
-
 <script>
 
 export default {
@@ -18,3 +12,9 @@ export default {
 }
 
 </script>
+
+<template>
+  <div>
+    123
+  </div>
+</template>
diff --git a/live_monitor_vue/src/components/5_pages/FreePacks/index.vue b/live_monitor_vue/src/components/5_pages/FreePacks/index.vue
index bf737b4..ad85167 100644
--- a/live_monitor_vue/src/components/5_pages/FreePacks/index.vue
+++ b/live_monitor_vue/src/components/5_pages/FreePacks/index.vue
@@ -1,9 +1,3 @@
-<template>
-  <div>
-    123
-  </div>
-</template>
-
 <script>
 
 export default {
@@ -18,3 +12,9 @@ export default {
 }
 
 </script>
+
+<template>
+  <div>
+    123
+  </div>
+</template>
diff --git a/live_monitor_vue/src/components/5_pages/Fuel/index.vue b/live_monitor_vue/src/components/5_pages/Fuel/index.vue
index bf737b4..ad85167 100644
--- a/live_monitor_vue/src/components/5_pages/Fuel/index.vue
+++ b/live_monitor_vue/src/components/5_pages/Fuel/index.vue
@@ -1,9 +1,3 @@
-<template>
-  <div>
-    123
-  </div>
-</template>
-
 <script>
 
 export default {
@@ -18,3 +12,9 @@ export default {
 }
 
 </script>
+
+<template>
+  <div>
+    123
+  </div>
+</template>
diff --git a/live_monitor_vue/src/components/5_pages/ICCID/index.vue b/live_monitor_vue/src/components/5_pages/ICCID/index.vue
index bf737b4..ad85167 100644
--- a/live_monitor_vue/src/components/5_pages/ICCID/index.vue
+++ b/live_monitor_vue/src/components/5_pages/ICCID/index.vue
@@ -1,9 +1,3 @@
-<template>
-  <div>
-    123
-  </div>
-</template>
-
 <script>
 
 export default {
@@ -18,3 +12,9 @@ export default {
 }
 
 </script>
+
+<template>
+  <div>
+    123
+  </div>
+</template>
diff --git a/live_monitor_vue/src/components/5_pages/LastPacksNum/index.vue b/live_monitor_vue/src/components/5_pages/LastPacksNum/index.vue
index 3c6df95..455da07 100644
--- a/live_monitor_vue/src/components/5_pages/LastPacksNum/index.vue
+++ b/live_monitor_vue/src/components/5_pages/LastPacksNum/index.vue
@@ -1,81 +1,3 @@
-<template>
-  <div class="grid grid-cols-12 gap-6 col-span-12 h-full">
-    <form
-      class="rounded-md bg-light px-4 pt-4 pb-6 gap-2 shadow lg:col-span-4 xl:col-span-3 2xl:col-span-2 col-span-12"
-      autocomplete="off"
-    >
-      <h1 class="font-medium leading-tight text-xl mb-4 text-slate-600">
-        Последние пакеты
-      </h1>
-      <div class="grid gap-3 mb-3 ">
-        <div class="relative ">
-          <label
-            for="imei"
-            class="block mb-2 text-sm font-medium text-gray-900 dark:text-gray-300 text-left "
-          >
-            Номер пакета
-          </label>
-          <input
-            id="selected_imei"
-            required=""
-            class="bg-gray-50 border border-gray-300  text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full py-1 pl-2 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500 "
-            placeholder="Номер пакета"
-            name="imei"
-            type="text"
-            autocomplete="off"
-            :value="imei"
-            @input="(e) => setImei(e.target.value)"
-          >
-        </div>
-      </div>
-      <div class="grid gap-3 grid-cols-4">
-        <button
-          type="button"
-          class="col-span-4 lg:col-span-4 cursor-pointer text-white bg-primary hover:brightness-90 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-ssm w-full sm:w-auto px-5 py-1 text-center  dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800 transition_up"
-          @click="uploadData"
-        >
-          Выгрузить
-        </button>
-        <ButtonModal btnClass="cursor-pointer col-span-4 bg-transparent hover:bg-primary text-primary font-semibold hover:text-white py-1 text-ssm px-4 border border-primary hover:border-transparent rounded-lg text-center transition_up">
-          <template #button>
-            <div id="question">
-              <i class="ri-question-mark" />
-            </div>
-          </template>
-          <div class="overflow-auto min-w-[70vw] h-[70vh] pt-10 px-4">
-            <div style="display: flex; flex-direction: column; gap: 1rem;">
-              <span style="font-size: 1.1em; font-weight: bold;">Страница предназначена для получения сведений о последних полученных пакетах, в результате выдающая список машин, которые имели данный пакет за 3х месячный период (иначе запрос становится слишком долгим)<br></span><span style="border-left: 5px solid rgba(0, 0, 0, 0.45); padding: 10px 5px;"><span style="font-weight: bold;">Работа со страницей</span><br><span>Поля выбора находятся на странице. Чтобы загразить данные необходимо -<ol style="font-size: 0.9em; margin-bottom: 0px;"><li>1. ввести номер пакета</li><li>2. нажать на кнопку 'загрузить' и дождаться загрузки</li></ol></span></span>
-            </div>
-          </div>
-        </ButtonModal>
-      </div>
-    </form>
-    <div class="lg:col-span-8 xl:col-span-9 2xl:col-span-10 col-span-12 bg-light shadow">
-      <div
-        v-if="pageState == 'await'"
-        id="report_packs"
-        class="tab-pane active relative text-center min-h-[300px] relative rounded-md "
-      >
-        <span> Выберите машину и нажмите выгрузить</span>
-      </div>
-      <div
-        v-if="pageState == 'loading'"
-        id="report_packs"
-        class="tab-pane active relative text-center min-h-[300px] relative rounded-md  w-full h-full flex items-center justify-center"
-      >
-        <Spinner />
-      </div>
-      <div
-        v-if="pageState == 'isLoaded'"
-        id="report_packs"
-        class="tab-pane active relative text-center min-h-[300px] relative rounded-md "
-      >
-        <Tabulator v-bind="tabulatorOtps" />
-      </div>
-    </div>
-  </div>
-</template>
-
 <script>
 import ButtonModal from '@molecules/ButtonModal/ButtonModal.vue'
 import {mapGetters, mapMutations, mapActions} from 'vuex'
@@ -168,3 +90,81 @@ export default {
   }
 }
 </script>
+
+<template>
+  <div class="grid grid-cols-12 gap-6 col-span-12 h-full">
+    <form
+      class="rounded-md bg-light px-4 pt-4 pb-6 gap-2 shadow lg:col-span-4 xl:col-span-3 2xl:col-span-2 col-span-12"
+      autocomplete="off"
+    >
+      <h1 class="font-medium leading-tight text-xl mb-4 text-slate-600">
+        Последние пакеты
+      </h1>
+      <div class="grid gap-3 mb-3 ">
+        <div class="relative ">
+          <label
+            for="imei"
+            class="block mb-2 text-sm font-medium text-gray-900 dark:text-gray-300 text-left "
+          >
+            Номер пакета
+          </label>
+          <input
+            id="selected_imei"
+            required=""
+            class="bg-gray-50 border border-gray-300  text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full py-1 pl-2 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500 "
+            placeholder="Номер пакета"
+            name="imei"
+            type="text"
+            autocomplete="off"
+            :value="imei"
+            @input="(e) => setImei(e.target.value)"
+          >
+        </div>
+      </div>
+      <div class="grid gap-3 grid-cols-4">
+        <button
+          type="button"
+          class="col-span-4 lg:col-span-4 cursor-pointer text-white bg-primary hover:brightness-90 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-ssm w-full sm:w-auto px-5 py-1 text-center  dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800 transition_up"
+          @click="uploadData"
+        >
+          Выгрузить
+        </button>
+        <ButtonModal btnClass="cursor-pointer col-span-4 bg-transparent hover:bg-primary text-primary font-semibold hover:text-white py-1 text-ssm px-4 border border-primary hover:border-transparent rounded-lg text-center transition_up">
+          <template #button>
+            <div id="question">
+              <i class="ri-question-mark" />
+            </div>
+          </template>
+          <div class="overflow-auto min-w-[70vw] h-[70vh] pt-10 px-4">
+            <div style="display: flex; flex-direction: column; gap: 1rem;">
+              <span style="font-size: 1.1em; font-weight: bold;">Страница предназначена для получения сведений о последних полученных пакетах, в результате выдающая список машин, которые имели данный пакет за 3х месячный период (иначе запрос становится слишком долгим)<br></span><span style="border-left: 5px solid rgba(0, 0, 0, 0.45); padding: 10px 5px;"><span style="font-weight: bold;">Работа со страницей</span><br><span>Поля выбора находятся на странице. Чтобы загразить данные необходимо -<ol style="font-size: 0.9em; margin-bottom: 0px;"><li>1. ввести номер пакета</li><li>2. нажать на кнопку 'загрузить' и дождаться загрузки</li></ol></span></span>
+            </div>
+          </div>
+        </ButtonModal>
+      </div>
+    </form>
+    <div class="lg:col-span-8 xl:col-span-9 2xl:col-span-10 col-span-12 bg-light shadow">
+      <div
+        v-if="pageState == 'await'"
+        id="report_packs"
+        class="tab-pane active relative text-center min-h-[300px] relative rounded-md "
+      >
+        <span> Выберите машину и нажмите выгрузить</span>
+      </div>
+      <div
+        v-if="pageState == 'loading'"
+        id="report_packs"
+        class="tab-pane active relative text-center min-h-[300px] relative rounded-md  w-full h-full flex items-center justify-center"
+      >
+        <Spinner />
+      </div>
+      <div
+        v-if="pageState == 'isLoaded'"
+        id="report_packs"
+        class="tab-pane active relative text-center min-h-[300px] relative rounded-md "
+      >
+        <Tabulator v-bind="tabulatorOtps" />
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/live_monitor_vue/src/components/5_pages/Main/AddUsers/AddUsers.vue b/live_monitor_vue/src/components/5_pages/Main/AddUsers/AddUsers.vue
index 28caa70..8a2ec92 100644
--- a/live_monitor_vue/src/components/5_pages/Main/AddUsers/AddUsers.vue
+++ b/live_monitor_vue/src/components/5_pages/Main/AddUsers/AddUsers.vue
@@ -1,5 +1,5 @@
 <script>
-import {mapGetters, mapActions, mapMutations, useStore} from "vuex"
+import {mapGetters, useStore} from "vuex"
 import Button from "@atoms/VButton.vue"
 import Tabulator from "@molecules/VTabulator/VTabulator.vue"
 
@@ -32,17 +32,22 @@ export default {
 </script>
 
 
-
 <template>
   {{ console.log('adminData', adminData)
-   }}
+  }}
   <div class="rounded w-full pt-4 pb-1 bg-light cursor-pointer transition-all">
     <div class="mx-2 mb-3">
       <a :href="`/html/admin/manage/new?prev_page=/\?page_display_mode=users`">
-        <Button title="Создать" classBtn="cursor-pointer text-white bg-primary hover:brightness-90 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-ssm w-full px-5 py-1 text-center transition-all " />
+        <Button
+          title="Создать"
+          classBtn="cursor-pointer text-white bg-primary hover:brightness-90 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-ssm w-full px-5 py-1 text-center transition-all "
+        />
       </a>
     </div>
-    <div id="admin_list" class="tab-pane m-4 active bg-light relative col-span-12 text-center min-h-[300px] rounded-md tabulator">
+    <div
+      id="admin_list"
+      class="tab-pane m-4 active bg-light relative col-span-12 text-center min-h-[300px] rounded-md tabulator"
+    >
       <Tabulator v-bind="adminData" />
     </div>
   </div>
diff --git a/live_monitor_vue/src/components/5_pages/Main/FinderPacks/FinderPacks.vue b/live_monitor_vue/src/components/5_pages/Main/FinderPacks/FinderPacks.vue
index 0444f94..ba3e1d8 100644
--- a/live_monitor_vue/src/components/5_pages/Main/FinderPacks/FinderPacks.vue
+++ b/live_monitor_vue/src/components/5_pages/Main/FinderPacks/FinderPacks.vue
@@ -1,5 +1,5 @@
 <script>
-import {mapGetters, mapMutations, mapActions, useStore} from "vuex"
+import {mapGetters, mapActions, useStore} from "vuex"
 import Spinner from "@molecules/VSpinner/VSpinner.vue"
 import {PushAfterTimeout} from '@store/hooks/PushAfterTimeout'
 import Accordion from '@atoms/VAccordion.vue'
@@ -42,54 +42,106 @@ export default {
 </script>
 
 
-
 <template>
   <div class="rounded w-full transition-all min-h-[500px] relative">
-    <div v-if="!packsGroups" id="dataLoader" class="h-full absolute inset-0 flex flex-row items-center grow transition items-center justify-center bg-light appear_from_opacity-3 z-30 rounded p-2">
-      <Spinner style="padding: 0"/>
+    <div
+      v-if="!packsGroups"
+      id="dataLoader"
+      class="h-full absolute inset-0 flex flex-row items-center grow transition items-center justify-center bg-light appear_from_opacity-3 z-30 rounded p-2"
+    >
+      <Spinner style="padding: 0" />
     </div>
-    <div v-if="packsGroups" phx-change="update_pack_filter" class="p-5 flex flex-col gap-4 bg-light relative items-center">
-      <div id="searchInput" class="w-full flex flex-col gap-2" >
-        <div class="font-bold">Поиск (название и номер): </div>
-        <input v-bind:value="searchValue" v-on:change="updateSearchValue" :status="status" class="pl-2 py-1 rounded-r-md w-full max-h-[29px] text-sm border-none focus-visible:outline-blue-300" placeholder="Название и номер через пробел"/>
+    <div
+      v-if="packsGroups"
+      phx-change="update_pack_filter"
+      class="p-5 flex flex-col gap-4 bg-light relative items-center"
+    >
+      <div
+        id="searchInput"
+        class="w-full flex flex-col gap-2"
+      >
+        <div class="font-bold">
+          Поиск (название и номер):
+        </div>
+        <input
+          :value="searchValue"
+          :status="status"
+          class="pl-2 py-1 rounded-r-md w-full max-h-[29px] text-sm border-none focus-visible:outline-blue-300"
+          placeholder="Название и номер через пробел"
+          @change="updateSearchValue"
+        >
       </div>
-      <div class="border-2 rounded-lg w-full bottom-0"></div>
+      <div class="border-2 rounded-lg w-full bottom-0" />
     </div>
-    <div v-if="packsGroups?.length === 0" id="no_data" class="w-full min-h-[80vh] bg-light dark:bg-slate-900 dark:text-slate-300 relative">
-      <div class="flex items-center justify-center text-lg font-bold pt-5">Пакеты не найдены</div>
+    <div
+      v-if="packsGroups?.length === 0"
+      id="no_data"
+      class="w-full min-h-[80vh] bg-light dark:bg-slate-900 dark:text-slate-300 relative"
+    >
+      <div class="flex items-center justify-center text-lg font-bold pt-5">
+        Пакеты не найдены
+      </div>
     </div>
     <div class="bg-light">
-      <div v-if="packsGroups?.length > 0" class="grid grid-cols-12 gap-3 p-4">
-        <div :key="idx" v-for="(group, idx) in packsGroups" class="col-span-12 sm:col-span-6 lg:col-span-4">
-          <Accordion :isOpen="isOpen" :id="`pack_group_${group.pack_group_id}`">
+      <div
+        v-if="packsGroups?.length > 0"
+        class="grid grid-cols-12 gap-3 p-4"
+      >
+        <div
+          v-for="(group, idx) in packsGroups"
+          :key="idx"
+          class="col-span-12 sm:col-span-6 lg:col-span-4"
+        >
+          <Accordion
+            :id="`pack_group_${group.pack_group_id}`"
+            :isOpen="isOpen"
+          >
             <template #header>
-              <div v-if="group.order_index" id="packsInfoTitle" class="font-bold text-sm">
+              <div
+                v-if="group.order_index"
+                id="packsInfoTitle"
+                class="font-bold text-sm"
+              >
                 <span class="text-slate-500 font-bold">
                   {{ group.order_index }}. 
                 </span>
                 <span class="font-bold">
                   {{ group.title }}
-                </span></div>
+                </span>
+              </div>
             </template>
             <template #body>
               <div class="flex flex-col gap-2">
-                <table >
+                <table>
                   <thead>
                     <tr>
-                      <th class="items-center justify-center pb-2">Название</th>
+                      <th class="items-center justify-center pb-2">
+                        Название
+                      </th>
                     </tr>
                   </thead>
                   <tbody>
-                    <tr v-for="struct in group.pack_structs" >
+                    <tr
+                      v-for="(struct, index) in group.pack_structs" 
+                      :key="index"
+                    >
                       <td class="items-center justify-center py-2">
                         <div class="flex gap-2 w-full">
                           <div class="w-full text-left decoration-dashed cursor-pointer hover:text-slate-800 transition-all">
                             {{ struct.name }}
                           </div>
-                          <a class="bg-slate-500 hover:bg-slate-700 text-white text-xs font-bold py-1 px-3 rounded transition-all h-fit" target="_blank" :href="`/html/packs/${group.link}?pack=${struct.name}`">
+                          <a
+                            class="bg-slate-500 hover:bg-slate-700 text-white text-xs font-bold py-1 px-3 rounded transition-all h-fit"
+                            target="_blank"
+                            :href="`/html/packs/${group.link}?pack=${struct.name}`"
+                          >
                             таблица
                           </a>
-                          <a class="bg-slate-500 hover:bg-slate-700 text-white text-xs font-bold py-1 px-3 rounded transition-all h-fit" target="_blank" :href="`/admin_panel/packs/${group.pack_group_id}/${struct.id}`">карточка</a>
+                          <a
+                            class="bg-slate-500 hover:bg-slate-700 text-white text-xs font-bold py-1 px-3 rounded transition-all h-fit"
+                            target="_blank"
+                            :href="`/admin_panel/packs/${group.pack_group_id}/${struct.id}`"
+                          >карточка</a>
                         </div>
                       </td>
                     </tr>
diff --git a/live_monitor_vue/src/components/5_pages/Main/Machines/Charts.vue b/live_monitor_vue/src/components/5_pages/Main/Machines/Charts.vue
index 4971a33..5f90716 100644
--- a/live_monitor_vue/src/components/5_pages/Main/Machines/Charts.vue
+++ b/live_monitor_vue/src/components/5_pages/Main/Machines/Charts.vue
@@ -1,21 +1,22 @@
-
-
 <script>
-import {ref, toRaw, computed} from 'vue'
-import {mapGetters, mapMutations, mapActions, useStore} from "vuex";
-import {useRoute, useRouter} from 'vue-router'
-import Button from "@atoms/VButton.vue";
+import {computed} from 'vue'
+import {mapGetters, mapMutations, mapActions} from "vuex";
+import {useRoute} from 'vue-router'
 import DoubleSwitch from "@/components/1_atoms/DoubleSwitch.vue";
 import Chart from "@molecules/VChart/VChart.vue";
 import ECharts from '@store/hooks/Echarts';
 
 export default {
-  name: 'Charts',
+  name: 'ChartsComponent',
   components: {
-    Button,
     Chart,
     DoubleSwitch
   },
+  provide() {
+    return {
+      isChecked: computed(() => this.isChartTypes),
+    }
+  },
   setup() {
     const route = useRoute()
     const path = computed(() => route.path)
@@ -31,15 +32,12 @@ export default {
       isChartTypes: this.isChartTypesUrl,
     }
   },
-  provide() {
-    return {
-      isChecked: computed(() => this.isChartTypes),
-    }
+  computed: {
+    ...mapGetters('layoutMachines', ['selectedSelects', 'selectsData', 'toggleFilter', 'chartsData', 'activeChartData', 'prevGroupByData', 'activeMenuChartData', 'openMenuChart', 'legendFiltersParams']),
   },
   watch: {
     activeChartData: {
-      handler(newValue, oldValue)  {
-        console.log('newValue - activeChartData', newValue)
+      handler(newValue)  {
         if (newValue.id && newValue.type && newValue.data) {
           const chart = new ECharts(newValue.id)
           const isSelectedLegend = this.legendFiltersParams.length > 0 && this.legendFiltersParams[0].id === newValue.id
@@ -51,8 +49,7 @@ export default {
       // deep: true
     },
     activeMenuChartData: {
-      handler(newValue, oldValue)  {
-        // console.log('newValue - activeMenuChartData', newValue)
+      handler(newValue)  {
         if (newValue.groupByInfo && newValue.groupByInfo.chartId) {
           const chart = new ECharts(newValue.groupByInfo.chartId)
           chart.setMenuChart(newValue)
@@ -63,9 +60,6 @@ export default {
       },
     },
   },
-  computed: {
-    ...mapGetters('layoutMachines', ['selectedSelects', 'selectsData', 'toggleFilter', 'chartsData', 'activeChartData', 'prevGroupByData', 'activeMenuChartData', 'openMenuChart', 'legendFiltersParams']),
-  },
   mounted () {
     
   },
@@ -90,13 +84,13 @@ export default {
     },
     setTypeFunc: function(type, chart, data) {
       switch(type) {
-        case 'pie': return chart.makePieCharts({...data, type: type})
-        case 'mount': return chart.makeBarMountCharts({...data, type: type, height: this.height})
-        case 'mainMl': return chart.makeBarCharts({...data, type: type})
-        case 'default': return chart.makeBarTypesCharts({...data, type: type})
-        case 'types': return chart.makeBarTypesCharts({...data, type: type})
-        case 'without_first_layout': return chart.makeBarTypesCharts({...data, type: type})
-        case 'ml': return chart.makeBarTypesCharts({...data, type: type})
+      case 'pie': return chart.makePieCharts({...data, type: type})
+      case 'mount': return chart.makeBarMountCharts({...data, type: type, height: this.height})
+      case 'mainMl': return chart.makeBarCharts({...data, type: type})
+      case 'default': return chart.makeBarTypesCharts({...data, type: type})
+      case 'types': return chart.makeBarTypesCharts({...data, type: type})
+      case 'without_first_layout': return chart.makeBarTypesCharts({...data, type: type})
+      case 'ml': return chart.makeBarTypesCharts({...data, type: type})
       }
     }
   }
@@ -105,25 +99,59 @@ export default {
 </script>
 
 
-
 <template>
   <div class="px-2 sm:px-5 pt-1 bg-light">
-      <div class="relative">
-        <div class="doubleSwitch flex justify-end mt-3 mb-2">
-          <DoubleSwitch name="chartsView" @switched="onToggleCharts" firstColor="#8b5cf6" secondColor="#2563eb" firstTitle="Общий вид" secondTitle="По типам" />
+    <div class="relative">
+      <div class="doubleSwitch flex justify-end mt-3 mb-2">
+        <DoubleSwitch
+          name="chartsView"
+          firstColor="#8b5cf6"
+          secondColor="#2563eb"
+          firstTitle="Общий вид"
+          secondTitle="По типам"
+          @switched="onToggleCharts"
+        />
+      </div>
+      <div
+        v-if="!isChartTypes"
+        id="main"
+        class="relative flex flex-wrap justify-center w-full h-full mb-3"
+      >
+        <div 
+          v-for="(chart, idx) in chartsData.main"
+          :key="idx"
+        >
+          <Chart
+            :id="chart.id"
+            :idx="idx"
+            :type="chart.type"
+            :height="chart.height"
+            :maxHeight="chart.maxHeight"
+            :data="chart.data"
+          />
         </div>
-        <div v-if="!isChartTypes" id="main" class="relative flex flex-wrap justify-center w-full h-full mb-3" >
-          <div v-for="(chart, idx) in chartsData.main">
-            <Chart :idx="idx" :id="chart.id" :type="chart.type" :height="chart.height" :maxHeight="chart.maxHeight" :data="chart.data"/>
-          </div>
-        </div>
-        <div v-if="isChartTypes" id="types" class="relative flex flex-wrap justify-center w-full h-full mb-3" >
-          <div v-for="(chart, idx) in chartsData.types">
-            <Chart :idx="idx" :id="chart.id" :type="chart.type" :height="chart.height" :maxHeight="chart.maxHeight" :data="chart.data"/>
-          </div>
+      </div>
+      <div
+        v-if="isChartTypes"
+        id="types"
+        class="relative flex flex-wrap justify-center w-full h-full mb-3"
+      >
+        <div 
+          v-for="(chart, idx) in chartsData.types"
+          :key="idx"
+        >
+          <Chart
+            :id="chart.id"
+            :idx="idx"
+            :type="chart.type"
+            :height="chart.height"
+            :maxHeight="chart.maxHeight"
+            :data="chart.data"
+          />
         </div>
       </div>
     </div>
+  </div>
 </template>
 
 <style src="vue-multiselect/dist/vue-multiselect.css"></style>
\ No newline at end of file
diff --git a/live_monitor_vue/src/components/5_pages/Main/Machines/DataModal/DataModal.vue b/live_monitor_vue/src/components/5_pages/Main/Machines/DataModal/DataModal.vue
index 44141c2..25df307 100644
--- a/live_monitor_vue/src/components/5_pages/Main/Machines/DataModal/DataModal.vue
+++ b/live_monitor_vue/src/components/5_pages/Main/Machines/DataModal/DataModal.vue
@@ -1,7 +1,5 @@
-
-
 <script>
-import {mapGetters, mapMutations, mapActions, useStore} from "vuex"
+import {mapGetters, mapActions} from "vuex"
 import Modal from '@molecules/VModal/VModal.vue'
 import Accordion from '@atoms/VAccordion.vue'
 import PackView from '@organisms/PackView/index.vue'
@@ -48,6 +46,9 @@ export default {
       machineOverInfo: null
     }
   },
+  computed: {
+    ...mapGetters('machines', ['machineInfo', 'reportPacks']),
+  },
   updated () {
     this.$nextTick(function () {
       if (this.data && this.id && this.open) {
@@ -59,9 +60,6 @@ export default {
       }
     })
   },
-  computed: {
-    ...mapGetters('machines', ['machineInfo', 'reportPacks']),
-  },
   methods: {
     ...mapActions('machines', ['loadPack']),
   }
@@ -70,7 +68,6 @@ export default {
 </script>
 
 
-
 <template>
   <Modal
     v-if="open"
@@ -81,38 +78,87 @@ export default {
       Последние данные
     </div>
     {{ console.log('reportPacks', reportPacks)
-     }}
-    <div :id="id" class="w-[95vw] h-[85vh] m-auto p-5">
-      <div v-if="!machineInfo" id="dataLoader" class=" h-full flex justify-center items-center">
-        <Spinner style="padding: 0"/>
+    }}
+    <div
+      :id="id"
+      class="w-[95vw] h-[85vh] m-auto p-5"
+    >
+      <div
+        v-if="!machineInfo"
+        id="dataLoader"
+        class=" h-full flex justify-center items-center"
+      >
+        <Spinner style="padding: 0" />
       </div>
-      <div v-if="machineInfo" class="w-full flex flex-col gap-5">
+      <div
+        v-if="machineInfo"
+        class="w-full flex flex-col gap-5"
+      >
         <div class="w-full">
           <Accordion id="machineInfo">
             <template #header>
-              <div v-if="machineInfo?.machine_name" id="machineInfoTitle" class="font-bold text-xl">{{ machineInfo.machine_name }}</div>
+              <div
+                v-if="machineInfo?.machine_name"
+                id="machineInfoTitle"
+                class="font-bold text-xl"
+              >
+                {{ machineInfo.machine_name }}
+              </div>
             </template>
             <template #body>
-              <div v-if="machineInfo.machine_info?.length > 0" id="machineInfoBody" class="flex w-full justify-start 2xl:justify-between gap-3 flex-wrap">
+              <div
+                v-if="machineInfo.machine_info?.length > 0"
+                id="machineInfoBody"
+                class="flex w-full justify-start 2xl:justify-between gap-3 flex-wrap"
+              >
                 <div class="flex p-4">
                   <div class="flex mr-8 flex-col bg-slate-200 p-3 rounded">
-                    <h2 clas="font-bold flex items-center"><i class="ri-flashlight-line mr-1" /> Основная информация</h2>
+                    <h2 clas="font-bold flex items-center">
+                      <i class="ri-flashlight-line mr-1" /> Основная информация
+                    </h2>
                     <div class="mt-2 p-2 rounded-md flex flex-col bg-slate-300">
-                      <div v-if="machineMainInfo?.length > 0" class="flex flex-col gap-2">
-                        <div :key="idx" v-for="(info, idx) in machineMainInfo" class="flex items-center items-center bg-slate-200 px-3 py-2 rounded-md">
-                          <div class="text-slate-700 font-bold mr-2">{{ info.title }}</div>
-                          <div class="text-slate-500">{{ info.val }}</div>
+                      <div
+                        v-if="machineMainInfo?.length > 0"
+                        class="flex flex-col gap-2"
+                      >
+                        <div
+                          v-for="(info, idx) in machineMainInfo"
+                          :key="idx"
+                          class="flex items-center items-center bg-slate-200 px-3 py-2 rounded-md"
+                        >
+                          <div class="text-slate-700 font-bold mr-2">
+                            {{ info.title }}
+                          </div>
+                          <div class="text-slate-500">
+                            {{ info.val }}
+                          </div>
                         </div>
                       </div>
                     </div>
                   </div>
-                  <div style="min-width: 300px;" class="flex flex-col bg-slate-200 p-3 rounded">
-                    <h2 clas="font-bold flex items-center"><i class="ri-git-pull-request-line mr-1"></i> Дополнительно</h2>
+                  <div
+                    style="min-width: 300px;"
+                    class="flex flex-col bg-slate-200 p-3 rounded"
+                  >
+                    <h2 clas="font-bold flex items-center">
+                      <i class="ri-git-pull-request-line mr-1" /> Дополнительно
+                    </h2>
                     <div class="mt-2 p-2 rounded-md flex flex-col bg-slate-300">
-                      <div v-if="machineOverInfo?.length > 0" class="flex flex-col gap-2">
-                        <div :key="idx" v-for="(info, idx) in machineOverInfo" class="flex items-center items-center bg-slate-200 px-3 py-2 rounded-md">
-                          <div class="text-slate-700 font-bold mr-2">{{ info.title }}</div>
-                          <div class="text-slate-500">{{ info.val }}</div>
+                      <div
+                        v-if="machineOverInfo?.length > 0"
+                        class="flex flex-col gap-2"
+                      >
+                        <div
+                          v-for="(info, idx) in machineOverInfo"
+                          :key="idx"
+                          class="flex items-center items-center bg-slate-200 px-3 py-2 rounded-md"
+                        >
+                          <div class="text-slate-700 font-bold mr-2">
+                            {{ info.title }}
+                          </div>
+                          <div class="text-slate-500">
+                            {{ info.val }}
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -122,38 +168,62 @@ export default {
             </template>
           </Accordion>
         </div>
-        <Accordion :isOpen="true" id="machine_packs">
+        <Accordion
+          id="machine_packs"
+          :isOpen="true"
+        >
           <template #header>
-            <div class="font-bold text-xl">Пакеты</div>
+            <div class="font-bold text-xl">
+              Пакеты
+            </div>
           </template>
           <template #body>
             <div class="flex flex-col gap-4">
               <div id="packReportButtons">
                 <div class="flex flex-col gap-5">
                   <div class="grid grid-cols-12 gap-3">
-                    <div v-if="reportPacks.length === 0" class="flex items-center justify-center text-slate-700 text-2xl font-bold col-span-12">
+                    <div
+                      v-if="reportPacks.length === 0"
+                      class="flex items-center justify-center text-slate-700 text-2xl font-bold col-span-12"
+                    >
                       <h2>Нет данных по машине</h2>
                     </div>
-                    <div :key="idx" v-if="reportPacks.length > 0" v-for="(pack, idx) in reportPacks" class="col-span-6 sm:col-span-4 lg:col-span-3 xl:col-span-2 flex items-start flex gap-1 justify-center rounded-md bg-slate-300">
-                      <div class="flex-col flex-grow flex py-1">
-                        <div class="flex text-slate-700 font-medium px-3 text-slate-700">
-                          <div class="mr-1">Номер</div>
-                          <div>{{ pack.pack_number }}</div>
+                    <div v-if="reportPacks.length > 0">
+                      <div
+                        v-for="(pack, idx) in reportPacks"
+                        :key="idx"
+                        class="col-span-6 sm:col-span-4 lg:col-span-3 xl:col-span-2 flex items-start flex gap-1 justify-center rounded-md bg-slate-300"
+                      >
+                        <div class="flex-col flex-grow flex py-1">
+                          <div class="flex text-slate-700 font-medium px-3 text-slate-700">
+                            <div class="mr-1">
+                              Номер
+                            </div>
+                            <div>{{ pack.pack_number }}</div>
+                          </div>
+                          <div class="text-slate-600 flex px-3 text-slate-600">
+                            <div class="mr-1">
+                              Количество
+                            </div>
+                            <div>{{ pack.count }}</div>
+                          </div>
                         </div>
-                        <div class="text-slate-600 flex px-3 text-slate-600">
-                          <div class="mr-1">Количество</div>
-                          <div>{{ pack.count }}</div>
+                        <div
+                          class="h-full flex items-center justify-center text-white rounded-md px-3 text-center cursor-pointer transitiona-all bg-slate-400 hover:bg-slate-600"
+                          @click="loadPack(pack.pack_number)"
+                        >
+                          <i class="ri-eye-line" />
                         </div>
                       </div>
-                      <div @click="loadPack(pack.pack_number)" class="h-full flex items-center justify-center text-white rounded-md px-3 text-center cursor-pointer transitiona-all bg-slate-400 hover:bg-slate-600">
-                        <i class="ri-eye-line"></i>
-                      </div>
                     </div>
                   </div>
                 </div>
               </div>
-              <div class="w-full h-[1px] bg-slate-300"></div>
-              <PackView :isLoader="false" id="machineReport">
+              <div class="w-full h-[1px] bg-slate-300" />
+              <PackView
+                id="machineReport"
+                :isLoader="false"
+              >
                 <template #description>
                   <span class="text-slate-400 text-sm">последние 30</span>
                 </template>
diff --git a/live_monitor_vue/src/components/5_pages/Main/Machines/DataModal/helpers.js b/live_monitor_vue/src/components/5_pages/Main/Machines/DataModal/helpers.js
index 802fde1..5a6b67d 100644
--- a/live_monitor_vue/src/components/5_pages/Main/Machines/DataModal/helpers.js
+++ b/live_monitor_vue/src/components/5_pages/Main/Machines/DataModal/helpers.js
@@ -1,7 +1,7 @@
 const getMachineInfo = (info, isMain) => {
   const mainInfo = ["Текущая симкарта", "Последняя коммуникация", "Предприятие приписки", "Текущее устройство"]
   if (isMain) {
-    return info.reduce((acc, el, idx) => {
+    return info.reduce((acc, el) => {
       if (mainInfo.includes(Object.keys(el)[0])) {
         const item = {title: Object.keys(el)[0], val: Object.values(el)[0]}
         acc.push(item)
@@ -12,7 +12,7 @@ const getMachineInfo = (info, isMain) => {
     }, [])
   }
   if (!isMain) {
-    return info.reduce((acc, el, idx) => {
+    return info.reduce((acc, el) => {
       if (!mainInfo.includes(Object.keys(el)[0])) {
         const item = {title: Object.keys(el)[0], val: Object.values(el)[0]}
         acc.push(item)
diff --git a/live_monitor_vue/src/components/5_pages/Main/Machines/Filters.vue b/live_monitor_vue/src/components/5_pages/Main/Machines/Filters.vue
index 0220131..9f908e8 100644
--- a/live_monitor_vue/src/components/5_pages/Main/Machines/Filters.vue
+++ b/live_monitor_vue/src/components/5_pages/Main/Machines/Filters.vue
@@ -1,15 +1,10 @@
-
-
 <script>
-import {ref, toRaw, computed} from 'vue'
-import {mapGetters, mapMutations, mapActions, useStore} from "vuex";
-import Button from "@atoms/VButton.vue";
+import {mapGetters, mapMutations, mapActions} from "vuex"
 import VueMultiselect from 'vue-multiselect'
 
 export default {
-  name: 'Filters',
+  name: 'FiltersComponent',
   components: {
-    Button,
     VueMultiselect
   },
   setup() {
@@ -22,14 +17,14 @@ export default {
     }
   },
   computed: {
-    ...mapGetters('machines', ['selectedSelects', 'selectsData', 'toggleFilter', 'selectedData']),
+    ...mapGetters('layoutMachines', ['selectedSelects', 'selectsData', 'toggleFilter', 'selectedData']),
   },
   mounted () {
     
   },
   methods: {
-    ...mapMutations('machines', ['setSelectedSelect', 'setToggleFilter']),
-    ...mapActions('machines', ['updateSelects']),
+    ...mapMutations('layoutMachines', ['setSelectedSelect', 'setToggleFilter']),
+    ...mapActions('layoutMachines', ['updateSelects']),
     updateSelectedSelects: function(value) {
       if (value.length > 0) {
         this.updateSelects({key: 'set', value: value})
@@ -44,25 +39,38 @@ export default {
 </script>
 
 
-
 <template>
-  <div id="ignore:2Qxwqz" class="pb-1">
+  <div
+    id="ignore:2Qxwqz"
+    class="pb-1"
+  >
     {{ console.log('selectedData' ,selectedData)
-     }}
-    <div v-if="toggleFilter" wrapper_class="grid grid-cols-12 gap-2" selects_class="col-span-12 sm:col-span-6 lg:col-span-3" class="grid grid-cols-12 gap-2 mb-3 border-t border-slate-300 pt-3"  fields={@filters_fields} id="SelectFilters" phx-hook="SelectFilters">
-      <div v-for="selectData in selectsData" class="col-span-12 sm:col-span-6 lg:col-span-3">
+    }}
+    <div
+      v-if="toggleFilter"
+      id="SelectFilters"
+      wrapper_class="grid grid-cols-12 gap-2"
+      selects_class="col-span-12 sm:col-span-6 lg:col-span-3"
+      class="grid grid-cols-12 gap-2 mb-3 border-t border-slate-300 pt-3"
+      fields="{@filters_fields}"
+      phx-hook="SelectFilters"
+    >
+      <div
+        v-for="(selectData, idx) in selectsData"
+        :key="idx"
+        class="col-span-12 sm:col-span-6 lg:col-span-3"
+      >
         <VueMultiselect
-          :multiple="true"
           v-model="selectedSelects[selectData.key]"
+          :multiple="true"
           label="name"
           track-by="name"
           :options="selectData.data"
           :placeholder="selectData.title"
+          :showLabels="false"
           @update:model-value="updateSelectedSelects"
           @remove="removedOption"
-          :showLabels="false"
-          >
-        </VueMultiselect>
+        />
       </div>
     </div>
   </div>
diff --git a/live_monitor_vue/src/components/5_pages/Main/Machines/HistoryViews.vue b/live_monitor_vue/src/components/5_pages/Main/Machines/HistoryViews.vue
index 4733c7b..739cf79 100644
--- a/live_monitor_vue/src/components/5_pages/Main/Machines/HistoryViews.vue
+++ b/live_monitor_vue/src/components/5_pages/Main/Machines/HistoryViews.vue
@@ -13,10 +13,10 @@ export default {
     // const updatedData = historyData.filter((el, idx, arr) => arr.findIndex((item) => item.machine_id === el.machine_id) === idx).slice(0, 50) // uniq values
     const updatedData = isHistoryData ? historyData.slice(0, 50) : []
     const store = useStore()
-    store.commit('machines/setHistoryData', updatedData)
+    store.commit('layoutMachines/setHistoryData', updatedData)
   },
   computed: {
-    ...mapGetters('machines', ['historyData']),
+    ...mapGetters('layoutMachines', ['historyData']),
     tabulatorOtps() {
       return {
         dataSource: this.historyData,
@@ -51,7 +51,7 @@ export default {
     }
   },
   methods: {
-    ...mapMutations('machines', ['setHistoryData']),
+    ...mapMutations('layoutMachines', ['setHistoryData']),
   }
 }
 
diff --git a/live_monitor_vue/src/components/5_pages/Main/Machines/Machine.vue b/live_monitor_vue/src/components/5_pages/Main/Machines/Machine.vue
index ea93d37..e1a73f3 100644
--- a/live_monitor_vue/src/components/5_pages/Main/Machines/Machine.vue
+++ b/live_monitor_vue/src/components/5_pages/Main/Machines/Machine.vue
@@ -1,15 +1,11 @@
-
-
 <script>
-import {mapGetters, mapMutations, mapActions, useStore} from "vuex"
-import Button from "@atoms/VButton.vue"
+import {mapGetters, mapMutations, mapActions} from "vuex"
 import { EventStore } from "@store/hooks/EventStore"
 import moment from 'moment'
 
 export default {
-  name: 'Machine',
+  name: 'MachineComponent',
   components: {
-    Button,
   },
   props: {
     machine: {
@@ -33,18 +29,18 @@ export default {
     }
   },
   computed: {
-    ...mapGetters('machines', ['machinesData', 'historyData', 'historyMachines']),
+    ...mapGetters('layoutMachines', ['machinesData', 'historyData', 'historyMachines']),
   },
   mounted () {
     
   },
   methods: {
-    ...mapMutations('machines', ['setInitHistory', 'setHistoryData', 'setHistoryMachines']),
-    ...mapActions('machines', ['openMapModal', 'openDataModal']),
+    ...mapMutations('layoutMachines', ['setInitHistory', 'setHistoryData', 'setHistoryMachines']),
+    ...mapActions('layoutMachines', ['openMapModal', 'openDataModal']),
     buttonClass: function(value) {
       return `border border-slate-400 flex items-center justify-center cursor-pointer rounded transition-all text-xs text-center py-[5px] px-2 ${value}`
     },
-    cardFunc: function(value) {
+    cardFunc: function() {
       this.initLocalStorage = new EventStore()
       if (this.machine.machine_id) {
         const valueStorage = {machine_id: this.machine.machine_id, machine_type: this.machine.machine_type, link: `/html/askr_devices/analyze_device/${this.machine.device_number}`, created_at: moment().format('HH:mm:ss DD-MM-YY')}
@@ -77,41 +73,94 @@ export default {
 </script>
 
 
-
 <template>
-  <div id="card" class="pt-3 border w-[23%] min-w-[310px] border-slate-300 rounded transition-all bg-slate-300}">
+  <div
+    id="card"
+    class="pt-3 border w-[23%] min-w-[310px] border-slate-300 rounded transition-all bg-slate-300}"
+  >
     <div class="h-full flex flex-col gap-5 relative text-left  justify-between">
-      <div class="flex flex-col items-end absolute text-white top-[-0.75rem] right-0 h-full min-w-[173px] p-2" style="backdrop-filter: blur(10px);">
-        <div class="mb-2 text-right drop-shadow" search-mode="machine_id">ID: {{ machine?.machine_id }}</div>
-        <div class="flex flex-row">
-          <span>{{ machine.railway_name }}</span><i class="ri-route-line ml-2"  title="Дорога:"/>
+      <div
+        class="flex flex-col items-end absolute text-white top-[-0.75rem] right-0 h-full min-w-[173px] p-2"
+        style="backdrop-filter: blur(10px);"
+      >
+        <div
+          class="mb-2 text-right drop-shadow"
+          search-mode="machine_id"
+        >
+          ID: {{ machine?.machine_id }}
         </div>
         <div class="flex flex-row">
-          <span>{{ machine.org_name }}</span><i class="ri-building-2-line ml-2" title="Компания:"/>
+          <span>{{ machine.railway_name }}</span><i
+            class="ri-route-line ml-2"
+            title="Дорога:"
+          />
         </div>
         <div class="flex flex-row">
-          <span>{{ machine.nomer_zn8 }}</span><i class="ri-number-8 ml-2"       title="8зн номер:"/>
+          <span>{{ machine.org_name }}</span><i
+            class="ri-building-2-line ml-2"
+            title="Компания:"
+          />
         </div>
-        <div class="flex flex-row" search-mode="device_number">
-          <span>{{ machine.device_number }}</span><i class="ri-rss-line ml-2"   title="Устройство:"/>
+        <div class="flex flex-row">
+          <span>{{ machine.nomer_zn8 }}</span><i
+            class="ri-number-8 ml-2"
+            title="8зн номер:"
+          />
+        </div>
+        <div
+          class="flex flex-row"
+          search-mode="device_number"
+        >
+          <span>{{ machine.device_number }}</span><i
+            class="ri-rss-line ml-2"
+            title="Устройство:"
+          />
         </div>
       </div>
       <div class="flex flex-col w-full mt-4 mb-2 pl-4 mt-1 z-[1]">
-        <div class="text-slate-800 font-bold m-0" search-mode="machine_type">{{ machine.machine_type }}</div>
-        <div :machine_id="machine.machine_id" history_click="/html/askr_devices/analyze_comm/#{@machine?.imei}" class="text-slate-500 text-xs underline-offset-4" search-mode="imei">{{ machine.imei }}</div>
+        <div
+          class="text-slate-800 font-bold m-0"
+          search-mode="machine_type"
+        >
+          {{ machine.machine_type }}
+        </div>
+        <div
+          :machine_id="machine.machine_id"
+          history_click="/html/askr_devices/analyze_comm/#{@machine?.imei}"
+          class="text-slate-500 text-xs underline-offset-4"
+          search-mode="imei"
+        >
+          {{ machine.imei }}
+        </div>
       </div>
       <div class="flex lg:flex-row flex-col gap-1 my-2 px-2 z-[1]">
         <div class="flex">
-          <a :href="`/html/askr_devices/analyze_device/${machine.device_number}`" id="to_card_machine" no-init="false" @click="cardFunc(machine)" target="_blank" :class="buttonClass('bg-primary text-white')">Карточка</a>
+          <a
+            id="to_card_machine"
+            :href="`/html/askr_devices/analyze_device/${machine.device_number}`"
+            no-init="false"
+            target="_blank"
+            :class="buttonClass('bg-primary text-white')"
+            @click="cardFunc(machine)"
+          >Карточка</a>
         </div>
         <div class="flex gap-1">
-          <div @click="mapFunc(machine)"  :class="buttonClass('bg-white/25 hover:bg-slate-400 hover:text-white')"><i class="ri-map-pin-line"/></div>
-          <div @click="dataFunc(machine)" :class="buttonClass('bg-white/25 hover:bg-slate-400 hover:text-white')">30</div>
+          <div
+            :class="buttonClass('bg-white/25 hover:bg-slate-400 hover:text-white')"
+            @click="mapFunc(machine)"
+          >
+            <i class="ri-map-pin-line" />
+          </div>
+          <div
+            :class="buttonClass('bg-white/25 hover:bg-slate-400 hover:text-white')"
+            @click="dataFunc(machine)"
+          >
+            30
+          </div>
         </div>
       </div>
     </div>
   </div>
-
 </template>
 
 <style scoped>
diff --git a/live_monitor_vue/src/components/5_pages/Main/Machines/Machines.vue b/live_monitor_vue/src/components/5_pages/Main/Machines/Machines.vue
index 41570eb..5e47bf3 100644
--- a/live_monitor_vue/src/components/5_pages/Main/Machines/Machines.vue
+++ b/live_monitor_vue/src/components/5_pages/Main/Machines/Machines.vue
@@ -1,9 +1,7 @@
-
-
 <script>
 import {computed} from 'vue'
 import {mapGetters, mapMutations, mapActions, useStore} from "vuex"
-import {useRoute, useRouter} from 'vue-router'
+import {useRoute} from 'vue-router'
 import Button from "@atoms/VButton.vue"
 import VueMultiselect from 'vue-multiselect'
 import Filters from "./Filters.vue"
@@ -18,7 +16,7 @@ import {PushAfterTimeout} from '@store/hooks/PushAfterTimeout'
 import {EventStore} from '@store/hooks/EventStore'
 
 export default {
-  name: 'Machines',
+  name: 'MachinesComponent',
   components: {
     Button,
     Filters,
@@ -37,12 +35,6 @@ export default {
       default: 'static',
     },
   },
-  data () {
-    return {
-      openMap: false,
-      openData: false,
-    }
-  },
   setup () {
     const initLocalStorage = new EventStore()
     const store = useStore()
@@ -60,10 +52,24 @@ export default {
     store.commit('layoutMachines/setHistoryData', updatedData)
     store.dispatch('layoutMachines/uploadData', externalParams)
   },
+  data () {
+    return {
+      openMap: false,
+      openData: false,
+    }
+  },
   computed: {
     ...mapGetters('layoutMachines', ['searchModes', 'searchValue', 'selectedSearchMode', 'leftTopButtons', 'rightTopButtons', 'selectedMode', 'toggleFilter', 'activeFilterBtn', 'mapData', 'machinesData']),
     ...mapGetters('layout', ['isOpenMenu']),
   },
+  watch: {
+    isSuccessSearch: {
+      handler(newValue, oldValue)  {
+        console.log('isSuccessSearch', newValue, oldValue)
+      },
+      deep: true
+    },
+  },
   mounted () {
 
   },
@@ -83,14 +89,6 @@ export default {
     const store = useStore();
     store.dispatch('layoutMachines/resetStore')
   },
-  watch: {
-    isSuccessSearch: {
-      handler(newValue, oldValue)  {
-        console.log('isSuccessSearch', newValue, oldValue)
-      },
-      deep: true
-    },
-  },
   methods: {
     ...mapMutations('layoutMachines', ['setSearchMode', 'setSelectedMode', 'setToggleFilter', 'setActiveFilterBtn']),
     ...mapActions('layoutMachines', ['updateSearch', 'clearFilters']),
@@ -141,13 +139,15 @@ export default {
 </script>
 
 
-
 <template>
   <div class="px-2 sm:px-5 pt-1 bg-light">
     <div class="relative">
       <div class="grid grid-cols-12 gap-4 md:gap-3 lg:gap-4 pb-3">
         <div class="flex items-center col-span-12 sm:col-span-8 lg:col-span-5 xl:col-span-4 2xl:col-span-3">
-          <div id="search" class="relative w-full max-w-[150px] h-[31px] pl-1 py-1 bg-white border border-primary rounded-l-md z-30">
+          <div
+            id="search"
+            class="relative w-full max-w-[150px] h-[31px] pl-1 py-1 bg-white border border-primary rounded-l-md z-30"
+          >
             <VueMultiselect
               v-model="selectedSearchMode"
               label="name"
@@ -156,50 +156,126 @@ export default {
               placeholder=""
               :showLabels="false"
               @update:model-value="updateSearchMode"
-              >
-            </VueMultiselect>
+            />
           </div>
-          <div id="searchInput" class="relative w-full border-r border-t border-b border-primary rounded-r-md">
-            <input v-bind:value="searchValue" v-on:change="updateSearchValue" :status="status" class="pl-1 py-1 rounded-r-md w-full max-h-[29px] border-none focus-visible:outline-blue-300"/>
+          <div
+            id="searchInput"
+            class="relative w-full border-r border-t border-b border-primary rounded-r-md"
+          >
+            <input
+              :value="searchValue"
+              :status="status"
+              class="pl-1 py-1 rounded-r-md w-full max-h-[29px] border-none focus-visible:outline-blue-300"
+              @change="updateSearchValue"
+            >
           </div>
         </div>
         <!-- {{ console.log('machinesData', machinesData) }} -->
-        <ul id="machinesMode" class="flex col-span-6 sm:col-span-4 md:col-span-4 lg:col-span-3 xl:col-span-2 justify-center">
-          <li v-bind:key="idx" v-for="(mode, idx) in leftTopButtons">
-            <Button :onClick="updateMode" :selected="mode.key" :classIcon="mode.class" :classBtn="[mode.key === 'cards' ? 'rounded-r-none' : 'rounded-l-none', selectedMode === mode.key ? 'text-white bg-primary focus:ring-4 focus:outline-none focus:ring-blue-300' : 'bg-transparent', 'w-full min-w-[88px] h-[30px] border border-primary rounded-md']" />
+        <ul
+          id="machinesMode"
+          class="flex col-span-6 sm:col-span-4 md:col-span-4 lg:col-span-3 xl:col-span-2 justify-center"
+        >
+          <li
+            v-for="(mode, idx) in leftTopButtons"
+            :key="idx"
+          >
+            <Button
+              :onClick="updateMode"
+              :selected="mode.key"
+              :classIcon="mode.class"
+              :classBtn="[mode.key === 'cards' ? 'rounded-r-none' : 'rounded-l-none', selectedMode === mode.key ? 'text-white bg-primary focus:ring-4 focus:outline-none focus:ring-blue-300' : 'bg-transparent', 'w-full min-w-[88px] h-[30px] border border-primary rounded-md']"
+            />
           </li>
         </ul>
-        <div id="historyMode" class="flex col-span-6 sm:col-span-4 md:col-span-4 lg:col-span-3 xl:col-span-2 justify-center">
-          <Button :onClick="updateMode" selected="history" title="Просмотры" :classBtn="[selectedMode === 'history' ? 'focus:ring-4 focus:outline-none focus:ring-blue-300' : '', 'w-full min-w-[88px] h-[30px] bg-primary text-white border border-primary rounded-md']" />
+        <div
+          id="historyMode"
+          class="flex col-span-6 sm:col-span-4 md:col-span-4 lg:col-span-3 xl:col-span-2 justify-center"
+        >
+          <Button
+            :onClick="updateMode"
+            selected="history"
+            title="Просмотры"
+            :classBtn="[selectedMode === 'history' ? 'focus:ring-4 focus:outline-none focus:ring-blue-300' : '', 'w-full min-w-[88px] h-[30px] bg-primary text-white border border-primary rounded-md']"
+          />
         </div>
-        <div id="chartsMode" class="flex col-span-6 sm:col-span-4 md:col-span-4 lg:col-span-3 xl:col-span-2 justify-center">
-          <Button :onClick="updateMode" selected="charts" classIcon="ri-pie-chart-2-line" :classBtn="[selectedMode === 'charts' ? 'focus:ring-4 focus:outline-none focus:ring-blue-300' : '', 'w-full min-w-[88px] h-[30px] bg-primary text-white border border-primary rounded-md']" />
+        <div
+          id="chartsMode"
+          class="flex col-span-6 sm:col-span-4 md:col-span-4 lg:col-span-3 xl:col-span-2 justify-center"
+        >
+          <Button
+            :onClick="updateMode"
+            selected="charts"
+            classIcon="ri-pie-chart-2-line"
+            :classBtn="[selectedMode === 'charts' ? 'focus:ring-4 focus:outline-none focus:ring-blue-300' : '', 'w-full min-w-[88px] h-[30px] bg-primary text-white border border-primary rounded-md']"
+          />
         </div>
-        <ul id="filtersButtons" class="flex col-span-6 sm:col-span-4 md:col-span-4 lg:col-span-3 xl:col-span-2 justify-center">
-          <li v-bind:key="idx" v-for="(mode, idx) in rightTopButtons">
-            <Button :onClick="setFilteredAction" :selected="mode.key" :title="mode.name" :classIcon="mode.iconClass" :classBtn="[activeFilterBtn === mode.key ? 'focus:ring-4 focus:outline-none focus:ring-blue-300' : '', mode.key === 'filter' ? 'rounded-r-none' : 'rounded-l-none', mode.classBtn, 'w-full min-w-[88px] h-[30px] border border-primary rounded-md']" />
+        <ul
+          id="filtersButtons"
+          class="flex col-span-6 sm:col-span-4 md:col-span-4 lg:col-span-3 xl:col-span-2 justify-center"
+        >
+          <li
+            v-for="(mode, idx) in rightTopButtons"
+            :key="idx"
+          >
+            <Button
+              :onClick="setFilteredAction"
+              :selected="mode.key"
+              :title="mode.name"
+              :classIcon="mode.iconClass"
+              :classBtn="[activeFilterBtn === mode.key ? 'focus:ring-4 focus:outline-none focus:ring-blue-300' : '', mode.key === 'filter' ? 'rounded-r-none' : 'rounded-l-none', mode.classBtn, 'w-full min-w-[88px] h-[30px] border border-primary rounded-md']"
+            />
           </li>
         </ul>
       </div>
-      <div id="filters" v-if="toggleFilter">
+      <div
+        v-if="toggleFilter"
+        id="filters"
+      >
         <Filters />
       </div>
-      <div class="border-2 rounded-lg w-full bottom-0"></div>
-      <div id="listMachines" v-if="selectedMode === 'cards'" class="w-full min-h-[80vh] p-4 bg-light dark:bg-slate-900 dark:text-slate-300 relative">
-        <ul v-if="selectedMode === 'cards'" class="flex flex-wrap gap-4 w-full justify-center align-center">
+      <div class="border-2 rounded-lg w-full bottom-0" />
+      <div
+        v-if="selectedMode === 'cards'"
+        id="listMachines"
+        class="w-full min-h-[80vh] p-4 bg-light dark:bg-slate-900 dark:text-slate-300 relative"
+      >
+        <ul
+          v-if="selectedMode === 'cards'"
+          class="flex flex-wrap gap-4 w-full justify-center align-center"
+        >
           <!-- <li v-for="machine in machinesData" class="w-full sm:w-1/2 md:w-1/2 lg:w-1/2 xl:w-1/2 p-2 border-2 border-primary rounded-md"> -->
-          <li v-for="machine in machinesData" class="">
-            <Machine :machine="machine" :openMap="toggleMap" :openData="toggleData" />
+          <li
+            v-for="(machine, idx) in machinesData"
+            :key="idx"
+            class=""
+          >
+            <Machine
+              :machine="machine"
+              :openMap="toggleMap"
+              :openData="toggleData"
+            />
           </li>
         </ul>
       </div>
-      <div id="tableMachines" v-if="selectedMode === 'table'" class="tab-pane bg-light relative py-4 text-center min-h-[300px] relative rounded-md w-full">
+      <div
+        v-if="selectedMode === 'table'"
+        id="tableMachines"
+        class="tab-pane bg-light relative py-4 text-center min-h-[300px] relative rounded-md w-full"
+      >
         <Table />
       </div>
-      <div id="historyViews" v-if="selectedMode === 'history'" class="tab-pane bg-light relative shadow  text-center min-h-[300px] relative w-full p-4">
+      <div
+        v-if="selectedMode === 'history'"
+        id="historyViews"
+        class="tab-pane bg-light relative shadow  text-center min-h-[300px] relative w-full p-4"
+      >
         <HistoryViews />
       </div>
-      <div id="charts" v-if="selectedMode === 'charts'" class="w-full min-h-[80vh] pb-5 bg-light dark:bg-slate-900 dark:text-slate-300 relative">
+      <div
+        v-if="selectedMode === 'charts'"
+        id="charts"
+        class="w-full min-h-[80vh] pb-5 bg-light dark:bg-slate-900 dark:text-slate-300 relative"
+      >
         <!-- <.loader :if={@display_config.is_loading_charts} /> -->
         <div>
           <Charts />
@@ -210,10 +286,10 @@ export default {
         <div class="flex items-center justify-center text-lg font-bold pt-5">Нет данных</div>
       </div> -->
       <MapModal
+        id="mapModal"
         :open="openMap"
         :close="closeMap"
         :data="mapData"
-        id="mapModal"
         headerClass="border-b p-4 font-bold"
       >
         <template #header>
@@ -221,18 +297,38 @@ export default {
             Карта
           </div>
         </template>
-        <div v-if="!mapData" id="map_loader" class="flex justify-center" style="width: 95vw; height: 82vh;">
+        <div
+          v-if="!mapData"
+          id="map_loader"
+          class="flex justify-center"
+          style="width: 95vw; height: 82vh;"
+        >
           <Spinner />
         </div>
-        <div v-if="mapData" id="mapModal" style="width: 95vw; height: 82vh;"></div>
-        <div id="popup" class="ol-popup hidden transition-all">
-          <a href="#" id="popup-closer" class="ol-popup-closer hover:no-underline top-2 right-2 ">
-            <i class="ri-close-fill"></i>
+        <div
+          v-if="mapData"
+          id="mapModal"
+          style="width: 95vw; height: 82vh;"
+        />
+        <div
+          id="popup"
+          class="ol-popup hidden transition-all"
+        >
+          <a
+            id="popup-closer"
+            href="#"
+            class="ol-popup-closer hover:no-underline top-2 right-2 "
+          >
+            <i class="ri-close-fill" />
           </a>
-          <div id="popup-content"></div>
+          <div id="popup-content" />
         </div>
       </MapModal>
-      <DataModal id="dataModal" :open="openData" :close="closeData" />
+      <DataModal
+        id="dataModal"
+        :open="openData"
+        :close="closeData"
+      />
     </div>
   </div>
 </template>
diff --git a/live_monitor_vue/src/components/5_pages/Main/Machines/Table.vue b/live_monitor_vue/src/components/5_pages/Main/Machines/Table.vue
index bc2eaaa..daa708c 100644
--- a/live_monitor_vue/src/components/5_pages/Main/Machines/Table.vue
+++ b/live_monitor_vue/src/components/5_pages/Main/Machines/Table.vue
@@ -1,10 +1,9 @@
 <script>
-import {mapGetters, mapActions, mapMutations, useStore} from "vuex"
+import {mapGetters, mapActions, mapMutations} from "vuex"
 import Tabulator from "@molecules/VTabulator/VTabulator.vue"
-import { EventStore } from "@store/hooks/EventStore"
 
 export default {
-  name: 'Table',
+  name: 'TableComponent',
   components: {Tabulator},
   data () {
     
@@ -12,7 +11,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters('machines', ['tableData', 'pagination']),
+    ...mapGetters('layoutMachines', ['tableData', 'pagination']),
     tabulatorOtps() {
       return {
         dataSource: this.tableData,
@@ -82,8 +81,8 @@ export default {
     }
   },
   methods: {
-    ...mapMutations('machines', ['setHistoryData']),
-    ...mapActions('machines', ['updatePagination']),
+    ...mapMutations('layoutMachines', ['setHistoryData']),
+    ...mapActions('layoutMachines', ['updatePagination']),
   }
 }
 
diff --git a/live_monitor_vue/src/components/5_pages/Main/index.vue b/live_monitor_vue/src/components/5_pages/Main/index.vue
index 9d90764..8739aa7 100644
--- a/live_monitor_vue/src/components/5_pages/Main/index.vue
+++ b/live_monitor_vue/src/components/5_pages/Main/index.vue
@@ -1,20 +1,12 @@
-
-
 <script>
 import {computed} from 'vue'
 import {mapGetters, mapMutations, mapActions, useStore} from "vuex";
 import {useRoute} from 'vue-router'
-import Machines from "./Machines/Machines.vue";
-import FinderPacks from "./FinderPacks/FinderPacks.vue";
-import AddUsers from "./AddUsers/AddUsers.vue";
 import Button from "@atoms/VButton.vue";
 
 export default {
-  name: 'Main',
+  name: 'MainPage',
   components: {
-    Machines,
-    FinderPacks,
-    AddUsers,
     Button
   },
   setup() {
@@ -66,17 +58,27 @@ export default {
 </script>
 
 
-
 <template>
   <div class="col-span-12">
     <div class="p-2 sm:px-5 pt-1 bg-light rounded-t-xl">
       <div class="relative">
         <div class="flex gap-3 sm:gap-7 w-full lg:w-[50%]">
-          <router-link :to="{name: page.link}" @click="setPage(page)" v-for="(page, idx) in pages" class="flex w-full">
-            <Button v-bind:key="idx" type="button" :title="page.name" :classBtn="[selectedPage.key !== page.key ? 'border-transparent': 'border-slate-500', 'flex border-b-4']" />
+          <router-link
+            v-for="(page, idx) in pages"
+            :key="idx"
+            :to="{name: page.link}"
+            class="flex w-full"
+            @click="setPage(page)"
+          >
+            <Button
+              :key="idx"
+              type="button"
+              :title="page.name"
+              :classBtn="[selectedPage.key !== page.key ? 'border-transparent': 'border-slate-500', 'flex border-b-4']"
+            />
           </router-link>
-          </div>
-        <div class="border-2 rounded-lg w-full bottom-0 absolute"/>
+        </div>
+        <div class="border-2 rounded-lg w-full bottom-0 absolute" />
       </div>
     </div>
     <router-view />
diff --git a/live_monitor_vue/src/components/5_pages/News/index.vue b/live_monitor_vue/src/components/5_pages/News/index.vue
index bf737b4..ad85167 100644
--- a/live_monitor_vue/src/components/5_pages/News/index.vue
+++ b/live_monitor_vue/src/components/5_pages/News/index.vue
@@ -1,9 +1,3 @@
-<template>
-  <div>
-    123
-  </div>
-</template>
-
 <script>
 
 export default {
@@ -18,3 +12,9 @@ export default {
 }
 
 </script>
+
+<template>
+  <div>
+    123
+  </div>
+</template>
diff --git a/live_monitor_vue/src/components/5_pages/Packs/Chart/Chart.vue b/live_monitor_vue/src/components/5_pages/Packs/Chart/Chart.vue
index a1a16f6..0ff781f 100644
--- a/live_monitor_vue/src/components/5_pages/Packs/Chart/Chart.vue
+++ b/live_monitor_vue/src/components/5_pages/Packs/Chart/Chart.vue
@@ -1,5 +1,3 @@
-
-
 <script>
 import Chart from "@molecules/VChart/VChart.vue";
 import moment from 'moment'
@@ -45,9 +43,9 @@ export default {
       })
       console.log('yAxisAata', yAxisAata)
       const xAxisData = params.dataSource.map((el) => {
-            const dt = moment(el.pack_dt).format('DD.MM.YYYY HH:mm')
-            return dt
-          })
+        const dt = moment(el.pack_dt).format('DD.MM.YYYY HH:mm')
+        return dt
+      })
       return {charts: yAxisAata, names: {yAxis: ' ', xAxis: 'Дата и время'}, xAxisData, title: 'График'}
     },
   }
@@ -56,10 +54,21 @@ export default {
 </script>
 
 
-
 <template>
   {{ console.log('currentSizes.heigth', maxHeight) }}
-  <div v-if="displayView === 'chart'" id="packChartWrapper" class="relative flex flex-wrap justify-center w-full h-full mb-3" >
-      <Chart id="packChart" type="packLines" height="800" :data="chartData(curerentTableData)" :sizes="currentSizes" :maxWidth="`${maxWidth}px`" :maxHeight="`${maxHeight}px`" />
+  <div
+    v-if="displayView === 'chart'"
+    id="packChartWrapper"
+    class="relative flex flex-wrap justify-center w-full h-full mb-3"
+  >
+    <Chart
+      id="packChart"
+      type="packLines"
+      height="800"
+      :data="chartData(curerentTableData)"
+      :sizes="currentSizes"
+      :maxWidth="`${maxWidth}px`"
+      :maxHeight="`${maxHeight}px`"
+    />
   </div>
 </template>
diff --git a/live_monitor_vue/src/components/5_pages/Packs/index.vue b/live_monitor_vue/src/components/5_pages/Packs/index.vue
index eb6af84..0bf12d9 100644
--- a/live_monitor_vue/src/components/5_pages/Packs/index.vue
+++ b/live_monitor_vue/src/components/5_pages/Packs/index.vue
@@ -1,7 +1,7 @@
 <script>
-import {ref, toRaw, computed} from 'vue'
+import {computed} from 'vue'
 import {mapGetters, mapMutations, mapActions, useStore} from "vuex";
-import {useRoute, useRouter} from 'vue-router'
+import {useRoute} from 'vue-router'
 import Datepicker from "@molecules/VDatepicker/VDatepicker.vue"
 import Spinner from "@molecules/VSpinner/VSpinner.vue"
 import Tabulator from "@molecules/VTabulator/VTabulator.vue"
@@ -10,7 +10,7 @@ import VueMultiselect from 'vue-multiselect'
 import moment from 'moment'
 
 export default {
-  name: 'Packs',
+  name: 'PacksPage',
   components: {
     Datepicker,
     VueMultiselect,
@@ -64,28 +64,28 @@ export default {
       console.log('value', value)
       console.log('key', key)
       switch (key) {
-        case 'date':
-          this.updatePackSettings({dates: {...this.packsSettings.dates, selectedDate: value}})
-          break
-        case 'imei':
-          this.updatePackSettings({imei: value})
-          break
-        case 'selectedPack':
-          this.updatePackSettings({selectedPack: value})
-          break
+      case 'date':
+        this.updatePackSettings({dates: {...this.packsSettings.dates, selectedDate: value}})
+        break
+      case 'imei':
+        this.updatePackSettings({imei: value})
+        break
+      case 'selectedPack':
+        this.updatePackSettings({selectedPack: value})
+        break
       }
     },
     setDate: function(value) {
       console.log('value', value)
-          this.updatePackSettings({dates: {...this.packsSettings.dates, selectedDate: value}})
+      this.updatePackSettings({dates: {...this.packsSettings.dates, selectedDate: value}})
     },
     setImei: function(e) {
       console.log('value', e.target.value)
-          this.updatePackSettings({imei: e.target.value})
+      this.updatePackSettings({imei: e.target.value})
     },
     setPack: function(value) {
       console.log('value', value)
-          this.updatePackSettings({selectedPack: value})
+      this.updatePackSettings({selectedPack: value})
     },
     fetchPack: function(params) {
       console.log('params', params)
@@ -125,55 +125,70 @@ export default {
 </script>
 
 
-
 <template>
   <div class="grid grid-cols-12 gap-6 col-span-12 h-full">
     {{ 
-    // console.log('tableData', tableData)
-    console.log('packsSettings', packsSettings)
-     }}
+      // console.log('tableData', tableData)
+      console.log('packsSettings', packsSettings)
+    }}
     <div class="rounded-md bg-light px-4 pt-4 pb-6 gap-2 shadow lg:col-span-4 xl:col-span-3 2xl:col-span-2 col-span-12">
       <h1 class="font-medium leading-tight text-xl mb-4 text-slate-600">
         Первый пакет
       </h1>
       <div class="grid gap-3 mb-3 ">
         <div class="grid grid-cols-1">
-          <label for="date" class="block mb-2 text-sm font-medium text-gray-900 dark:text-gray-300">
+          <label
+            for="date"
+            class="block mb-2 text-sm font-medium text-gray-900 dark:text-gray-300"
+          >
             Дата
           </label>
-          <Datepicker id="date" :onchange="setDate" />
+          <Datepicker
+            id="date"
+            :onchange="setDate"
+          />
         </div>
         <div phx-feedback-for="imei">
-          <label for="selectedImei" class="block text-sm leading-6 text-zinc-800 dark:text-white">
+          <label
+            for="selectedImei"
+            class="block text-sm leading-6 text-zinc-800 dark:text-white"
+          >
             imei
           </label>
           <input
             id="selectedImei"
             type="text"
             name="imei"
-            v-bind:value="packsSettings.imei"
-            v-on:change="setImei"
+            :value="packsSettings.imei"
             class="block w-full rounded-lg border-zinc-300 py-[1px] px-[11px] text-zinc-900 focus:outline-none focus:ring-4 text-sm sm:leading-6 phx-no-feedback:border-zinc-300 phx-no-feedback:focus:border-zinc-400 phx-no-feedback:focus:ring-zinc-800/5 border-zinc-300 focus:border-zinc-400 focus:ring-zinc-800/5 "
             placeholder="imei"
             required=""
+            @change="setImei"
           >
         </div>
         <div>
-          <label for="selectedPack" class="block mb-2 text-sm font-medium text-gray-900 dark:text-gray-400"
+          <label
+            for="selectedPack"
+            class="block mb-2 text-sm font-medium text-gray-900 dark:text-gray-400"
           >Выбрать пакет</label>
-          <div id="selected_settings_name_wrapper" class="w-full">
-          <div id="packsOptions" class="col-span-12 sm:col-span-6 lg:col-span-3 rounded-lg">
-            <VueMultiselect
-              name="selectedPack"
-              v-model="packsSettings.selectedPack"
-              label="name"
-              track-by="name"
-              :options="packsSettings.selectedPackGroup"
-              :placeholder="packsSettings.selectedPack?.name"
-              @update:model-value="setPack"
-              :showLabels="false"
-              >
-            </VueMultiselect>
+          <div
+            id="selected_settings_name_wrapper"
+            class="w-full"
+          >
+            <div
+              id="packsOptions"
+              class="col-span-12 sm:col-span-6 lg:col-span-3 rounded-lg"
+            >
+              <VueMultiselect
+                v-model="packsSettings.selectedPack"
+                name="selectedPack"
+                label="name"
+                track-by="name"
+                :options="packsSettings.selectedPackGroup"
+                :placeholder="packsSettings.selectedPack?.name"
+                :showLabels="false"
+                @update:model-value="setPack"
+              />
             </div>
           </div>
         </div>
@@ -181,9 +196,9 @@ export default {
       <div class="grid gap-3 grid-cols-4">
         <input
           type="submit"
-          @click="fetchPack(packsSettings)"
           class="col-span-4 lg:col-span-4 cursor-pointer text-white bg-primary hover:brightness-90 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-ssm w-full sm:w-auto px-5 py-1 text-center  dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800 transition_up"
           value="Выгрузить"
+          @click="fetchPack(packsSettings)"
         >
         <div
           phx-click="load_pack_settings"
@@ -206,15 +221,22 @@ export default {
         </div>
       </div>
     </div>
-    <div id="packageDisplay" class="relative lg:col-span-8 xl:col-span-9 2xl:col-span-10 col-span-12 bg-light shadow">
-      <div v-if="!isLoading && curerentTableData.dataSource" id="tableButtons" class="w-full">
+    <div
+      id="packageDisplay"
+      class="relative lg:col-span-8 xl:col-span-9 2xl:col-span-10 col-span-12 bg-light shadow"
+    >
+      <div
+        v-if="!isLoading && curerentTableData.dataSource"
+        id="tableButtons"
+        class="w-full"
+      >
         <div class="w-full flex justify-end">
           <div class="flex gap-3 pt-4 pb-2 pr-4">
             <div class="">
               <button
                 type="button"
-                @click="setOpenColumnSelect"
                 class="flex items-center transition-all justify-center py-2 px-3 bg-light text-sm font-medium text-slate-700 focus:outline-none rounded-lg border border-dashed border-slate-400 hover:text-blue-800 hover:border-blue-900 hover:shadow focus:z-10 focus:ring-4 focus:ring-gray-200 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
+                @click="setOpenColumnSelect"
               >
                 <i class="ri-settings-3-line" />
               </button>
@@ -225,9 +247,9 @@ export default {
             >
               <button
                 type="button"
-                @click="toggleDisplayView"
                 class="flex items-center transition-all justify-center py-2 px-3 bg-light text-sm font-medium text-slate-700 focus:outline-none rounded-lg border border-dashed border-slate-400 hover:text-blue-800 hover:border-blue-900 hover:shadow focus:z-10 focus:ring-4 focus:ring-gray-200 dark:focus:ring-gray-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
                 phx-click="[[&quot;toggle&quot;,{&quot;display&quot;:null,&quot;ins&quot;:[[],[],[]],&quot;outs&quot;:[[],[],[]],&quot;time&quot;:200,&quot;to&quot;:&quot;#graphic_btn_inactive&quot;}],[&quot;toggle&quot;,{&quot;display&quot;:null,&quot;ins&quot;:[[],[],[]],&quot;outs&quot;:[[],[],[]],&quot;time&quot;:200,&quot;to&quot;:&quot;#graphic_btn_active&quot;}],[&quot;toggle&quot;,{&quot;display&quot;:null,&quot;ins&quot;:[[],[],[]],&quot;outs&quot;:[[],[],[]],&quot;time&quot;:200,&quot;to&quot;:&quot;#pack_table_warapper&quot;}],[&quot;toggle&quot;,{&quot;display&quot;:null,&quot;ins&quot;:[[],[],[]],&quot;outs&quot;:[[],[],[]],&quot;time&quot;:200,&quot;to&quot;:&quot;#pack_graphic_wrapper&quot;}],[&quot;push&quot;,{&quot;event&quot;:&quot;toggle_display_data&quot;}]]"
+                @click="toggleDisplayView"
               >
                 <i class="ri-bar-chart-grouped-line" />
               </button>
@@ -277,33 +299,55 @@ export default {
           </div>
         </div>
       </div>
-      <div v-if="columnSelector" id="colums_select_wrapper" class="w-full">
+      <div
+        v-if="columnSelector"
+        id="colums_select_wrapper"
+        class="w-full"
+      >
         <VueMultiselect
-          name="selectedPack"
           v-model="selectedColumnsSelect"
+          name="selectedPack"
           label="name"
           track-by="name"
           :options="columnsSelect"
           :placeholder="null"
-          @select="addedOption"
-          @remove="removedOption"
           :showLabels="false"
           :multiple="true"
           :group-select="true"
-          >
-        </VueMultiselect>
+          @select="addedOption"
+          @remove="removedOption"
+        />
       </div>
-      <div v-if="displayView === 'table'" id="packTableWarapper">
+      <div
+        v-if="displayView === 'table'"
+        id="packTableWarapper"
+      >
         {{ console.log('getters.isLoading', isLoading) }}
-        <div id="reportPacks" class="tab-pane active text-center min-h-[300px] rounded-md ">
-          <Tabulator v-if="!isLoading && curerentTableData.dataSource" v-bind="curerentTableData" />
-          <span v-if="!isLoading && !curerentTableData.dataSource" class="absolute flex w-full justify-center items-center mt-2"> Выберите пакет и нажмите выгрузить</span>
-          <div v-if="isLoading && !curerentTableData.dataSource" class="absolute flex w-full h-full justify-center items-center bg-slate-50" id="packLoader">
+        <div
+          id="reportPacks"
+          class="tab-pane active text-center min-h-[300px] rounded-md "
+        >
+          <Tabulator
+            v-if="!isLoading && curerentTableData.dataSource"
+            v-bind="curerentTableData"
+          />
+          <span
+            v-if="!isLoading && !curerentTableData.dataSource"
+            class="absolute flex w-full justify-center items-center mt-2"
+          > Выберите пакет и нажмите выгрузить</span>
+          <div
+            v-if="isLoading && !curerentTableData.dataSource"
+            id="packLoader"
+            class="absolute flex w-full h-full justify-center items-center bg-slate-50"
+          >
             <Spinner />
           </div>
         </div>
       </div>
-      <PackChart :displayView="displayView" :curerentTableData="curerentTableData" />
+      <PackChart
+        :displayView="displayView"
+        :curerentTableData="curerentTableData"
+      />
     </div>
     <div>
       <button
diff --git a/live_monitor_vue/src/components/6_admin_pages/Diap/index.vue b/live_monitor_vue/src/components/6_admin_pages/Diap/index.vue
index dd09fd9..3ba183b 100644
--- a/live_monitor_vue/src/components/6_admin_pages/Diap/index.vue
+++ b/live_monitor_vue/src/components/6_admin_pages/Diap/index.vue
@@ -1,7 +1,7 @@
 <script>
 
 export default {
-  name: 'Diap',
+  name: 'DiapPage',
   components: {},
   data() {
   },
diff --git a/live_monitor_vue/src/components/6_admin_pages/News/index.vue b/live_monitor_vue/src/components/6_admin_pages/News/index.vue
index 32c2739..7725fa8 100644
--- a/live_monitor_vue/src/components/6_admin_pages/News/index.vue
+++ b/live_monitor_vue/src/components/6_admin_pages/News/index.vue
@@ -1,7 +1,7 @@
 <script>
 
 export default {
-  name: 'News',
+  name: 'NewsPage',
   components: {},
   data() {
   },
diff --git a/live_monitor_vue/src/components/6_admin_pages/Packs/index.vue b/live_monitor_vue/src/components/6_admin_pages/Packs/index.vue
index d70f97e..a21079e 100644
--- a/live_monitor_vue/src/components/6_admin_pages/Packs/index.vue
+++ b/live_monitor_vue/src/components/6_admin_pages/Packs/index.vue
@@ -1,7 +1,7 @@
 <script>
 
 export default {
-  name: 'Packs',
+  name: 'PacksAdminPage',
   components: {},
   data() {
   },
diff --git a/live_monitor_vue/src/components/6_admin_pages/Services/Services.vue b/live_monitor_vue/src/components/6_admin_pages/Services/Services.vue
index 97810a1..c2185d4 100644
--- a/live_monitor_vue/src/components/6_admin_pages/Services/Services.vue
+++ b/live_monitor_vue/src/components/6_admin_pages/Services/Services.vue
@@ -1,30 +1,24 @@
-
-
 <script>
 import {mapGetters, useStore} from "vuex"
 import Service from './ServicesServiceItem.vue'
-import Spinner from "@molecules/VSpinner/VSpinner.vue"
-import Tabulator from "@molecules/VTabulator/VTabulator.vue"
 
 export default {
-  name: 'Services',
+  name: 'ServicesPage',
   components: {
     Service,
-    Spinner,
-    Tabulator,
   },
   props: {
   },
+  setup () {
+    const store = useStore()
+    store.dispatch('services/uploadData')
+  },
   data () {
     return {
       isOpenServices: false,
       titleServicesButton: 'Показать больше'
     }
   },
-  setup (props, {slots}) {
-    const store = useStore()
-    store.dispatch('services/uploadData')
-  },
   computed: {
     ...mapGetters('services', ['services']),
   },
@@ -42,25 +36,42 @@ export default {
 </script>
 
 
-
 <template>
   <div class="col-span-12">
-    <div class="flex flex-col mt-4 shadow-md mb-1 mx-5 bg-white" style="max-width: calc(100vw - 40px); margin-bottom: 30px;">
+    <div
+      class="flex flex-col mt-4 shadow-md mb-1 mx-5 bg-white"
+      style="max-width: calc(100vw - 40px); margin-bottom: 30px;"
+    >
       <div class="flex flex-col flex-wrap justify-between px-4 pb-2 pt-8 w-full">
-        <div class="text-lg font-bold text-center text-gray-600">Информация о сети (кэш)</div>
+        <div class="text-lg font-bold text-center text-gray-600">
+          Информация о сети (кэш)
+        </div>
         <div class="flex flex-col max-w-full">
           <div>
             Сервисы, записывающие данные в кэш
           </div>
-          <div id="serviceList" :class="`flex flex-wrap h-auto flex-row mt-4 overflow-x-auto w-full gap-4 transition-all pb-4 ${isOpenServices ? 'max-h-full' : 'max-h-[220px]'}`">
-            <div v-for="(service, idx) in sortingServices(services)">
-              <Service :idx="idx" :name="service.service || service.name" :service="service" />
+          <div
+            id="serviceList"
+            :class="`flex flex-wrap h-auto flex-row mt-4 overflow-x-auto w-full gap-4 transition-all pb-4 ${isOpenServices ? 'max-h-full' : 'max-h-[220px]'}`"
+          >
+            <div 
+              v-for="(service, idx) in sortingServices(services)"
+              :key="idx"
+            >
+              <Service
+                :idx="idx"
+                :name="service.service || service.name"
+                :service="service"
+              />
             </div>
           </div>
         </div>
       </div>
-      <button @click="toggleServices(isOpenServices)" class="w-full max-h-[90px] py-2.5 px-5 text-sm font-medium text-gray-900 bg-gray-100 border-t border-gray-200 hover:bg-gray-100 hover:text-slate-700 dark:bg-gray-700 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700">   
-        {{titleServicesButton}}
+      <button
+        class="w-full max-h-[90px] py-2.5 px-5 text-sm font-medium text-gray-900 bg-gray-100 border-t border-gray-200 hover:bg-gray-100 hover:text-slate-700 dark:bg-gray-700 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
+        @click="toggleServices(isOpenServices)"
+      >   
+        {{ titleServicesButton }}
       </button>
     </div>
   </div>
diff --git a/live_monitor_vue/src/helpers/dom.js b/live_monitor_vue/src/helpers/dom.js
index f5384ad..6316481 100644
--- a/live_monitor_vue/src/helpers/dom.js
+++ b/live_monitor_vue/src/helpers/dom.js
@@ -1,3 +1,4 @@
+// eslint-disable-next-line no-undef
 export default dom = (() => {
   const getNodeList = (arg) => {
     if (typeof arg === "string" && arg.trim().slice(0, 1) !== "<") {
diff --git a/live_monitor_vue/src/helpers/examle.vue b/live_monitor_vue/src/helpers/examle.vue
index aefd0d4..230347d 100644
--- a/live_monitor_vue/src/helpers/examle.vue
+++ b/live_monitor_vue/src/helpers/examle.vue
@@ -1,13 +1,7 @@
-<template>
-  <div>
-    123
-  </div>
-</template>
-
 <script>
 
 export default {
-  name: 'Name',
+  name: 'NameComponent',
   components: {},
   data() {
   },
@@ -18,3 +12,9 @@ export default {
 }
 
 </script>
+
+<template>
+  <div>
+    123
+  </div>
+</template>
diff --git a/live_monitor_vue/src/router/index.js b/live_monitor_vue/src/router/index.js
index 0771884..6678870 100644
--- a/live_monitor_vue/src/router/index.js
+++ b/live_monitor_vue/src/router/index.js
@@ -1,7 +1,7 @@
 import {createRouter, createWebHistory} from "vue-router";
 import Main from "@pages/Main/index.vue"
 import Auth from "@pages/Auth/index.vue"
-import Communication from "@pages/Communication/index.vue"
+// import Communication from "@pages/Communication/index.vue"
 import LastPacksNum from "@pages/LastPacksNum/index.vue"
 import Fuel from "@pages/Fuel/index.vue"
 import Cron from "@pages/Cron/index.vue"
@@ -12,14 +12,13 @@ import Packs from "@pages/Packs/index.vue"
 import FileViewer from "@pages/FileViewer/index.vue"
 import NotFound from "@pages/404/index.vue"
 import Diap from "@admin_pages/Diap/index.vue"
-import News from "@admin_pages/News/index.vue"
+// import News from "@admin_pages/News/index.vue"
 import Machines from "@pages/Main/Machines/Machines.vue"
 import FinderPacks from "@pages/Main/FinderPacks/FinderPacks.vue"
 import AddUsers from "@pages/Main/AddUsers/AddUsers.vue"
 import Services from "@admin_pages/Services/Services.vue"
-import ServiceManage from "@admin_pages/ServiceManage/index.vue"
-import {get} from "@store/modules/apiHelpers"
-import {cond, T} from 'ramda'
+// import ServiceManage from "@admin_pages/ServiceManage/index.vue"
+// import {get} from "@store/modules/apiHelpers"
 
 
 const routes = [
@@ -120,21 +119,21 @@ const routes = [
 const routerHistory = createWebHistory();
 
 const router = createRouter({
-    history: routerHistory,
-    routes
+  history: routerHistory,
+  routes
 });
 
-const logout = (from, next) => {
-  localStorage.removeItem("token")
-  sessionStorage.setItem("pathname", from.fullPath)
-  next()
-}
+// const logout = (from, next) => {
+//   localStorage.removeItem("token")
+//   sessionStorage.setItem("pathname", from.fullPath)
+//   next()
+// }
 
-const auth_check = async () => {
-  return await get("/api/auth/loginStatus", ({data}) => {
-    return data
-  })
-}
+// const auth_check = async () => {
+//   return await get("/api/auth/loginStatus", ({data}) => {
+//     return data
+//   })
+// }
 
 // router.beforeEach(async (to, from, next) => {
 //   const status = await auth_check()
diff --git a/live_monitor_vue/src/services/ServiceOfMachines.js b/live_monitor_vue/src/services/ServiceOfMachines.js
index 5278327..6621960 100644
--- a/live_monitor_vue/src/services/ServiceOfMachines.js
+++ b/live_monitor_vue/src/services/ServiceOfMachines.js
@@ -1,4 +1,3 @@
-
 class ServiceOfMachines {
   constructor(adapter, store) {
     this.adapter = adapter
diff --git a/live_monitor_vue/src/store/hooks/CopyToClipboard.js b/live_monitor_vue/src/store/hooks/CopyToClipboard.js
index 0eb3235..c81cfd0 100644
--- a/live_monitor_vue/src/store/hooks/CopyToClipboard.js
+++ b/live_monitor_vue/src/store/hooks/CopyToClipboard.js
@@ -18,7 +18,7 @@ export class CopyToClipboard {
 
   copy (text, id) {
     if (!navigator.clipboard) {
-      fallbackCopyTextToClipboard(text)
+      this.fallbackCopyTextToClipboard(text)
       return
     }
     navigator.clipboard.writeText(text).then(function() {
diff --git a/live_monitor_vue/src/store/hooks/Echarts/graphicElements.js b/live_monitor_vue/src/store/hooks/Echarts/graphicElements.js
index a82754e..958e85e 100644
--- a/live_monitor_vue/src/store/hooks/Echarts/graphicElements.js
+++ b/live_monitor_vue/src/store/hooks/Echarts/graphicElements.js
@@ -64,45 +64,45 @@ const viewGraphicsTypesBar = (chartId, title, groupByKey, prevGroupByData, filte
 
   if(groupByKey !== groupByKeys.firstLayout && !isEqualKeyValue(prevGroupByData, groupByKeys.firstLayout, null)) {
 
-       const buttonPrevious = {id: `${filterKey}`, info: {typeEl: 'buttonPrevious', prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters, type: type, groupByValue: groupByValue}, type: 'image', right: windowConfig?.bar?.graphic?.back?.right, top: windowConfig?.bar?.graphic?.back?.top, z: 999, style: {image: '/images/arrow-go-back-line.svg', width: 17, height: 17}}
+    const buttonPrevious = {id: `${filterKey}`, info: {typeEl: 'buttonPrevious', prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters, type: type, groupByValue: groupByValue}, type: 'image', right: windowConfig?.bar?.graphic?.back?.right, top: windowConfig?.bar?.graphic?.back?.top, z: 999, style: {image: '/images/arrow-go-back-line.svg', width: 17, height: 17}}
 
-       elements.push(buttonPrevious)
+    elements.push(buttonPrevious)
   }
-            const elMain = {id: '', info: {typeEl: 'link', filterKey: filterKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters, type: type, groupByValue: groupByValue}, type: 'text', left: windowConfig?.bar?.graphic?.link?.left, top: windowConfig?.bar?.graphic?.link?.top, z: 999, style: {text: 'Главная', fontSize: 10}}
-            const notFirstLayout = !Object.keys(prevGroupByFilters).includes(groupByKeys.firstLayout)
+  const elMain = {id: '', info: {typeEl: 'link', filterKey: filterKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters, type: type, groupByValue: groupByValue}, type: 'text', left: windowConfig?.bar?.graphic?.link?.left, top: windowConfig?.bar?.graphic?.link?.top, z: 999, style: {text: 'Главная', fontSize: 10}}
+  const notFirstLayout = !Object.keys(prevGroupByFilters).includes(groupByKeys.firstLayout)
 
-       for (const groupByFilter in prevGroupByFilters) {
-            if (groupByFilter === groupByKeys.firstLayout) {
-                 const linkTitle = `/ ${prevGroupByFilters[groupByKeys.firstLayout]}`
-                 const leftPos = getTextWidth('Главная ', 10)
-                 elMain.id = `0:link_${groupByFilter}-${linkTitle}`
-                 elements.push(elMain)
-                 const paramsFirst = {id: `1:link_${groupByFilter}-${linkTitle}`, info: {typeEl: 'link', filterKey: filterKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters, type: type, groupByValue: groupByValue}, type: 'text', left: leftPos + windowConfig?.bar?.graphic?.link?.left, top: windowConfig?.bar?.graphic?.link?.top, z: 999, style: {text: linkTitle, fontSize: 10}}
-                 elements.push(paramsFirst)
-            }
-            if (groupByFilter === groupByKeys.secondLayout) {
-                 const linkTitle = ` / ${prevGroupByFilters[groupByKeys.secondLayout]}`
-                 const leftPos = getTextWidth(notFirstLayout ? 'Главная ' : `Главная / ${prevGroupByFilters[groupByKeys.firstLayout]}`, 10)
-                 if(notFirstLayout) {
-                      elMain.id = `0:link_${groupByFilter}-${linkTitle}`
-                      elements.push(elMain)
-                 }
-                 const paramsSecond = {id: `2:link_${groupByFilter}-${linkTitle}`, info: {typeEl: 'link', filterKey: filterKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters, type: type, groupByValue: groupByValue}, type: 'text', left: leftPos + windowConfig?.bar?.graphic?.link?.left, top: windowConfig?.bar?.graphic?.link?.top, z: 999, style: {text: linkTitle, fontSize: 10}}
-                 elements.push(paramsSecond)
-            }
-            if (groupByFilter === groupByKeys.thirdLayout) {
-                 const linkTitle = ` / ${prevGroupByFilters[groupByKeys.thirdLayout]}`
-                 const leftPos = getTextWidth(notFirstLayout ? `Главная / ${prevGroupByFilters[groupByKeys.secondLayout]} ` : `Главная / ${prevGroupByFilters[groupByKeys.firstLayout]} / ${prevGroupByFilters[groupByKeys.secondLayout]}`, 10)
-                 const paramsThird = {id: `3:link_${groupByFilter}-${linkTitle}`, info: {typeEl: 'link', filterKey: filterKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters, type: type, groupByValue: groupByValue}, type: 'text', left: leftPos + windowConfig?.bar?.graphic?.link?.left, top: windowConfig?.bar?.graphic?.link?.top, z: 999, style: {text: linkTitle, fontSize: 10}}
-                 elements.push(paramsThird)
-            }
-            if (groupByFilter === groupByKeys.fourthLayout) {
-                 const linkTitle = ` / ${prevGroupByFilters[groupByKeys.fourthLayout]}`
-                 const leftPos = getTextWidth(notFirstLayout ? `Главная / ${prevGroupByFilters[groupByKeys.secondLayout]} / ${prevGroupByFilters[groupByKeys.thirdLayout]} ` : `Главная / ${prevGroupByFilters[groupByKeys.firstLayout]} / ${prevGroupByFilters[groupByKeys.secondLayout]} / ${prevGroupByFilters[groupByKeys.thirdLayout]}`, 10)
-                 const paramsFourth = {id: `4:link_${groupByFilter}-${linkTitle}`, info: {typeEl: 'link', filterKey: filterKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters, type: type, groupByValue: groupByValue}, type: 'text', left: leftPos + windowConfig?.bar?.graphic?.link?.left, top: windowConfig?.bar?.graphic?.link?.top, z: 999, style: {text: linkTitle, fontSize: 10}}
-                 elements.push(paramsFourth)
-            }
-       }
+  for (const groupByFilter in prevGroupByFilters) {
+    if (groupByFilter === groupByKeys.firstLayout) {
+      const linkTitle = `/ ${prevGroupByFilters[groupByKeys.firstLayout]}`
+      const leftPos = getTextWidth('Главная ', 10)
+      elMain.id = `0:link_${groupByFilter}-${linkTitle}`
+      elements.push(elMain)
+      const paramsFirst = {id: `1:link_${groupByFilter}-${linkTitle}`, info: {typeEl: 'link', filterKey: filterKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters, type: type, groupByValue: groupByValue}, type: 'text', left: leftPos + windowConfig?.bar?.graphic?.link?.left, top: windowConfig?.bar?.graphic?.link?.top, z: 999, style: {text: linkTitle, fontSize: 10}}
+      elements.push(paramsFirst)
+    }
+    if (groupByFilter === groupByKeys.secondLayout) {
+      const linkTitle = ` / ${prevGroupByFilters[groupByKeys.secondLayout]}`
+      const leftPos = getTextWidth(notFirstLayout ? 'Главная ' : `Главная / ${prevGroupByFilters[groupByKeys.firstLayout]}`, 10)
+      if(notFirstLayout) {
+        elMain.id = `0:link_${groupByFilter}-${linkTitle}`
+        elements.push(elMain)
+      }
+      const paramsSecond = {id: `2:link_${groupByFilter}-${linkTitle}`, info: {typeEl: 'link', filterKey: filterKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters, type: type, groupByValue: groupByValue}, type: 'text', left: leftPos + windowConfig?.bar?.graphic?.link?.left, top: windowConfig?.bar?.graphic?.link?.top, z: 999, style: {text: linkTitle, fontSize: 10}}
+      elements.push(paramsSecond)
+    }
+    if (groupByFilter === groupByKeys.thirdLayout) {
+      const linkTitle = ` / ${prevGroupByFilters[groupByKeys.thirdLayout]}`
+      const leftPos = getTextWidth(notFirstLayout ? `Главная / ${prevGroupByFilters[groupByKeys.secondLayout]} ` : `Главная / ${prevGroupByFilters[groupByKeys.firstLayout]} / ${prevGroupByFilters[groupByKeys.secondLayout]}`, 10)
+      const paramsThird = {id: `3:link_${groupByFilter}-${linkTitle}`, info: {typeEl: 'link', filterKey: filterKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters, type: type, groupByValue: groupByValue}, type: 'text', left: leftPos + windowConfig?.bar?.graphic?.link?.left, top: windowConfig?.bar?.graphic?.link?.top, z: 999, style: {text: linkTitle, fontSize: 10}}
+      elements.push(paramsThird)
+    }
+    if (groupByFilter === groupByKeys.fourthLayout) {
+      const linkTitle = ` / ${prevGroupByFilters[groupByKeys.fourthLayout]}`
+      const leftPos = getTextWidth(notFirstLayout ? `Главная / ${prevGroupByFilters[groupByKeys.secondLayout]} / ${prevGroupByFilters[groupByKeys.thirdLayout]} ` : `Главная / ${prevGroupByFilters[groupByKeys.firstLayout]} / ${prevGroupByFilters[groupByKeys.secondLayout]} / ${prevGroupByFilters[groupByKeys.thirdLayout]}`, 10)
+      const paramsFourth = {id: `4:link_${groupByFilter}-${linkTitle}`, info: {typeEl: 'link', filterKey: filterKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters, type: type, groupByValue: groupByValue}, type: 'text', left: leftPos + windowConfig?.bar?.graphic?.link?.left, top: windowConfig?.bar?.graphic?.link?.top, z: 999, style: {text: linkTitle, fontSize: 10}}
+      elements.push(paramsFourth)
+    }
+  }
 
   return elements
 }
diff --git a/live_monitor_vue/src/store/hooks/Echarts/helpers.js b/live_monitor_vue/src/store/hooks/Echarts/helpers.js
index 4ba3e10..78f592e 100644
--- a/live_monitor_vue/src/store/hooks/Echarts/helpers.js
+++ b/live_monitor_vue/src/store/hooks/Echarts/helpers.js
@@ -1,157 +1,159 @@
 import {groupByKeys} from './staticData'
 
 const getTextWidth = (text, font) => {
-     const canvas = getTextWidth.canvas || (getTextWidth.canvas = document.createElement('canvas'));
-     const context = canvas.getContext('2d');
-     context.font = font;
-     const metrics = context.measureText(text);
-     return metrics.width;
+  const canvas = getTextWidth.canvas || (getTextWidth.canvas = document.createElement('canvas'));
+  const context = canvas.getContext('2d');
+  context.font = font;
+  const metrics = context.measureText(text);
+  return metrics.width;
 }
 
 const isEqualKeyValue = (obj, key, value) => {
-     if(Object.keys(obj).length > 0) {
-          if(Object.keys(obj).includes(key) && Object.values(obj).includes(value)) return true
-               else return false
-     } else return true
+  if(Object.keys(obj).length > 0) {
+    if(Object.keys(obj).includes(key) && Object.values(obj).includes(value)) return true
+    else return false
+  } else return true
 }
 
 const chartsFiltersNames = (data) => [...new Set(data.map((el) => el.charts.map((item) => item.name)).flat())]
 const chartsFiltersNamesMl = (data) => [...new Set(data.map((el) => el.map((item) => item.charts.name)).flat().filter(el => el !== undefined))]
 
 const updateBarChartsData = (data, key) => data.map((el) => {
-          return el.filter((item) => {
-          if(item.name === key) {
-               return el
-          }
-     })
+  return el.filter((item) => {
+    if(item.name === key) {
+      return el
+    }
+  })
 }).flat()
 
 const dataFilterTitle = (data, title) => data.map((el) => {
-     return el.reduce((acc, item) => {
-          if(item.name === title || acc !== undefined && acc?.name === title) {
-               if(acc === 0) {
-                    return {name: item.name, count: Number(item.value)}
-               }
-               if(acc?.count >= 0) {
-                    return {name: item.name, count: acc.count + Number(item.value)}
-               }
-          }
-     }, 0)
+  return el.reduce((acc, item) => {
+    if(item.name === title || acc !== undefined && acc?.name === title) {
+      if(acc === 0) {
+        return {name: item.name, count: Number(item.value)}
+      }
+      if(acc?.count >= 0) {
+        return {name: item.name, count: acc.count + Number(item.value)}
+      }
+    }
+  }, 0)
 }).filter((el) => el !== undefined)
 
 const prepareBarTypesData = (data, xAxisData, params) => {
-     if(data.charts.length < chartsFiltersNames(xAxisData).length) {
-          // Если нет фильтруемых данных, то добавляем столбец графика с нулевым значением для каждого элемента el
-          const zeroData = chartsFiltersNames(xAxisData).filter((name) => !data.charts.some(({name: name2}) => name === name2)).map((name) => {
-               return {filterKey: params.filterKey, name: name, value: 0}
-          })
-          const withoutZeroData = data.charts.map((item) => {
-               item.type = params.type
-               item.filterKey = params.filterKey
-               item.groupByKey = params.groupByKey
-               item.groupByValue = params.groupByValue ? params.groupByValue : params.typeId // Для графика типа "types" params.typeId
-               item.groupByData = {[params.groupByKey]: data.yAxisData}
-               item.prevGroupByData = params.prevGroupByFilters
-               return item})
-             return [withoutZeroData, zeroData].flat()
-     } else {
-          return data.charts.map((item) => {
-               item.type = params.type
-               item.filterKey = params.filterKey
-               item.groupByKey = params.groupByKey
-               item.groupByValue = params.groupByValue ? params.groupByValue : params.typeId
-               item.groupByData = {[params.groupByKey]: data.yAxisData}
-               item.prevGroupByData = params.prevGroupByFilters
-               return item
-          })
-     }
+  if(data.charts.length < chartsFiltersNames(xAxisData).length) {
+    // Если нет фильтруемых данных, то добавляем столбец графика с нулевым значением для каждого элемента el
+    const zeroData = chartsFiltersNames(xAxisData).filter((name) => !data.charts.some(({name: name2}) => name === name2)).map((name) => {
+      return {filterKey: params.filterKey, name: name, value: 0}
+    })
+    const withoutZeroData = data.charts.map((item) => {
+      item.type = params.type
+      item.filterKey = params.filterKey
+      item.groupByKey = params.groupByKey
+      item.groupByValue = params.groupByValue ? params.groupByValue : params.typeId // Для графика типа "types" params.typeId
+      item.groupByData = {[params.groupByKey]: data.yAxisData}
+      item.prevGroupByData = params.prevGroupByFilters
+      return item})
+    return [withoutZeroData, zeroData].flat()
+  } else {
+    return data.charts.map((item) => {
+      item.type = params.type
+      item.filterKey = params.filterKey
+      item.groupByKey = params.groupByKey
+      item.groupByValue = params.groupByValue ? params.groupByValue : params.typeId
+      item.groupByData = {[params.groupByKey]: data.yAxisData}
+      item.prevGroupByData = params.prevGroupByFilters
+      return item
+    })
+  }
 }
 
 const prepareBarTypesMlData = (data, params) => {
-     return data.map((item) => {
-          // console.log('item', item)
-          item.charts.type = params.type
-          item.charts.groupByKey = params.groupByKey
-          item.charts.groupByValue = params.groupByValue ? params.groupByValue : params.typeId
-          item.charts.groupByData = {[params.groupByKey]: item.yAxisData}
-          item.charts.prevGroupByData = params.prevGroupByFilters
-          return item.charts
-     })
+  return data.map((item) => {
+    // console.log('item', item)
+    item.charts.type = params.type
+    item.charts.groupByKey = params.groupByKey
+    item.charts.groupByValue = params.groupByValue ? params.groupByValue : params.typeId
+    item.charts.groupByData = {[params.groupByKey]: item.yAxisData}
+    item.charts.prevGroupByData = params.prevGroupByFilters
+    return item.charts
+  })
 }
 
 const groupByBarTypesData = (data, xAxisData, func) => {
-     const dataGroupBy = []
-     const dataCustomTitle = []
+  const dataGroupBy = []
+  const dataCustomTitle = []
 
-     for(let i = 0; i < (func(xAxisData).length); i++) {
-          dataGroupBy.push(updateBarChartsData(data, func(xAxisData)[i]))
-          dataCustomTitle.push(dataFilterTitle(dataGroupBy, func(xAxisData)[i]))
-     }
+  for(let i = 0; i < (func(xAxisData).length); i++) {
+    dataGroupBy.push(updateBarChartsData(data, func(xAxisData)[i]))
+    dataCustomTitle.push(dataFilterTitle(dataGroupBy, func(xAxisData)[i]))
+  }
 
-     return {dataGroupBy: dataGroupBy, dataCustomTitle: dataCustomTitle}
+  return {dataGroupBy: dataGroupBy, dataCustomTitle: dataCustomTitle}
 }
 
 const updatedGroupByData = (idx, prevGroupByFilters, groupByKey, groupByValue) => {
 
-     switch(idx) {
-          case '0': return {[groupByKey]: groupByValue}
-          case '1': 
-               for (const prevGroupByFilter in prevGroupByFilters) {
-                    if(prevGroupByFilter === groupByKeys.secondLayout) {
-                         delete prevGroupByFilters[prevGroupByFilter]
-                    }
-                    if(prevGroupByFilter === groupByKeys.thirdLayout) {
-                         delete prevGroupByFilters[prevGroupByFilter]
-                    }
-                    if(prevGroupByFilter === groupByKeys.fourthLayout) {
-                         delete prevGroupByFilters[prevGroupByFilter]
-                    }
-               }
-               return prevGroupByFilters
-          case '2':
-               for (const prevGroupByFilter in prevGroupByFilters) {
-                    if(prevGroupByFilter === groupByKeys.thirdLayout) {
-                         delete prevGroupByFilters[prevGroupByFilter]
-                    }     
-                    if(prevGroupByFilter === groupByKeys.fourthLayout) {
-                         delete prevGroupByFilters[prevGroupByFilter]
-                    }
-               }
-               return prevGroupByFilters
-          case '3':
-               for (const prevGroupByFilter in prevGroupByFilters) {
-                    if(prevGroupByFilter === groupByKeys.fourthLayout) {
-                         delete prevGroupByFilters[prevGroupByFilter]
-                    }
-               }
-               return prevGroupByFilters
-     }
+  switch(idx) {
+  case '0': return {[groupByKey]: groupByValue}
+  case '1': 
+    for (const prevGroupByFilter in prevGroupByFilters) {
+      if(prevGroupByFilter === groupByKeys.secondLayout) {
+        delete prevGroupByFilters[prevGroupByFilter]
+      }
+      if(prevGroupByFilter === groupByKeys.thirdLayout) {
+        delete prevGroupByFilters[prevGroupByFilter]
+      }
+      if(prevGroupByFilter === groupByKeys.fourthLayout) {
+        delete prevGroupByFilters[prevGroupByFilter]
+      }
+    }
+    return prevGroupByFilters
+  case '2':
+    for (const prevGroupByFilter in prevGroupByFilters) {
+      if(prevGroupByFilter === groupByKeys.thirdLayout) {
+        delete prevGroupByFilters[prevGroupByFilter]
+      }     
+      if(prevGroupByFilter === groupByKeys.fourthLayout) {
+        delete prevGroupByFilters[prevGroupByFilter]
+      }
+    }
+    return prevGroupByFilters
+  case '3':
+    for (const prevGroupByFilter in prevGroupByFilters) {
+      if(prevGroupByFilter === groupByKeys.fourthLayout) {
+        delete prevGroupByFilters[prevGroupByFilter]
+      }
+    }
+    return prevGroupByFilters
+  }
 
 }
 
 const choiceTypeBarTypesCharts = (params) => {
-     switch(params.type) {
-          case 'ml':
-               const yAxisMlData = params.yAxisData.sort().map((el) => {
-                    return `${el.key !== null ? el.key : 'Нет данных'} ${el.val}`
-               }).sort((a, b) => a - b).reverse()
-               const xAxisMlData = params.xAxisData.map((item) => item.map((el) => el))
-               const mlData = xAxisMlData.sort().map((el) => prepareBarTypesMlData(el, params))
-               return {axisData: yAxisMlData, updatedData: groupByBarTypesData(mlData, xAxisMlData, chartsFiltersNamesMl)}
+  switch(params.type) {
+  case 'ml': {
+    const yAxisMlData = params.yAxisData.sort().map((el) => {
+      return `${el.key !== null ? el.key : 'Нет данных'} ${el.val}`
+    }).sort((a, b) => a - b).reverse()
+    const xAxisMlData = params.xAxisData.map((item) => item.map((el) => el))
+    const mlData = xAxisMlData.sort().map((el) => prepareBarTypesMlData(el, params))
+    return {axisData: yAxisMlData, updatedData: groupByBarTypesData(mlData, xAxisMlData, chartsFiltersNamesMl)}
+  }
+  case 'mount': {
+    const xAxisMountData = params.yAxisData.sort((a, b) => a.key - b.key).map((el) => {
+      return `${el.key !== null ? el.key : 'Нет данных'} \n ${el.val}`})
+    const mountData = params.xAxisData.sort().map((el) =>  prepareBarTypesData(el, params.xAxisData, params))
+    return {axisData: xAxisMountData, updatedData: groupByBarTypesData(mountData, params.xAxisData, chartsFiltersNames)}
+  }
 
-          case 'mount':
-               const xAxisMountData = params.yAxisData.sort((a, b) => a.key - b.key).map((el) => {
-                    return `${el.key !== null ? el.key : 'Нет данных'} \n ${el.val}`})
-               const mountData = params.xAxisData.sort().map((el) =>  prepareBarTypesData(el, params.xAxisData, params))
-               return {axisData: xAxisMountData, updatedData: groupByBarTypesData(mountData, params.xAxisData, chartsFiltersNames)}
-
-          default :
-               const yAxisDefaultData = params.yAxisData.sort().map((el) => {
-                    return `${el.key !== null ? el.key : 'Нет данных'} ${el.val}`
-               }).sort((a, b) => a - b).reverse()
-               const defaultData = params.xAxisData.sort().map((el) => prepareBarTypesData(el, params.xAxisData, params))
-                    return {axisData: yAxisDefaultData, updatedData: groupByBarTypesData(defaultData, params.xAxisData, chartsFiltersNames)}
-     }
+  default : {
+    const yAxisDefaultData = params.yAxisData.sort().map((el) => {
+      return `${el.key !== null ? el.key : 'Нет данных'} ${el.val}`
+    }).sort((a, b) => a - b).reverse()
+    const defaultData = params.xAxisData.sort().map((el) => prepareBarTypesData(el, params.xAxisData, params))
+    return {axisData: yAxisDefaultData, updatedData: groupByBarTypesData(defaultData, params.xAxisData, chartsFiltersNames)}
+  }
+  }
 }
 
 export {isEqualKeyValue, getTextWidth, updatedGroupByData, choiceTypeBarTypesCharts}
\ No newline at end of file
diff --git a/live_monitor_vue/src/store/hooks/Echarts/index.js b/live_monitor_vue/src/store/hooks/Echarts/index.js
index 5fe9bf0..7862c96 100644
--- a/live_monitor_vue/src/store/hooks/Echarts/index.js
+++ b/live_monitor_vue/src/store/hooks/Echarts/index.js
@@ -1,12 +1,12 @@
 import * as echarts from "echarts"
 import {
-     TitleComponent,
-     TooltipComponent,
-     LegendComponent
-   } from 'echarts/components';
-   import { PieChart } from 'echarts/charts';
-   import { LabelLayout } from 'echarts/features';
-   import { CanvasRenderer } from 'echarts/renderers';
+  TitleComponent,
+  TooltipComponent,
+  LegendComponent
+} from 'echarts/components';
+import { PieChart } from 'echarts/charts';
+import { LabelLayout } from 'echarts/features';
+import { CanvasRenderer } from 'echarts/renderers';
 
 import {colorList, colorListBar, orderCharts, title, openMachine, groupByKeys, typesCharts} from './staticData'
 import {viewGraphicsPieBar, viewGraphicsTypesBar} from "./graphicElements";
@@ -23,884 +23,884 @@ echarts.use([
 ])
 
 const lineConfig = (params, id, windowConfig) => {
-     const times = params.xAxisData
-     const states = params.yAxisData
+  const times = params.xAxisData
+  const states = params.yAxisData
      
-     const series = [
-          {
-            data: states,
-            type: 'line'
-          }
-        ]
+  const series = [
+    {
+      data: states,
+      type: 'line'
+    }
+  ]
 
-     const axisConfig = axisBarConfig(params.type, times, windowConfig, params.names)
+  const axisConfig = axisBarConfig(params.type, times, windowConfig, params.names)
 
-     return {
-          title: params.title,
-          titleLeft: 'center',
-          grid: {
-               left: '5%',
-               width: '90%',
-               top: 30,
-               containLabel: true
-          },
-          axisConfig,
-          series,
-          windowConfig,
-          graphic: [{id: 'yAxisTitle', type: 'text', left: 40, top: 20, z: 999, style: {text: '%', fontSize: 12}}]
-     }   
+  return {
+    title: params.title,
+    titleLeft: 'center',
+    grid: {
+      left: '5%',
+      width: '90%',
+      top: 30,
+      containLabel: true
+    },
+    axisConfig,
+    series,
+    windowConfig,
+    graphic: [{id: 'yAxisTitle', type: 'text', left: 40, top: 20, z: 999, style: {text: '%', fontSize: 12}}]
+  }   
 }
 
 const linesConfig = (params, id, windowConfig) => {
-     // console.log('params', params)
-     const times = params.xAxisData
-     const text = params.names.yAxis ? params.names.yAxis : 'Гб'
-     const namesLegend = params.charts.map((el) => el.name)
+  // console.log('params', params)
+  const times = params.xAxisData
+  const text = params.names.yAxis ? params.names.yAxis : 'Гб'
+  const namesLegend = params.charts.map((el) => el.name)
      
-     const series = params.charts.map((el) => {
-          return {
-               name: el.name,
-               data: el.value.map((item) => item.state).reverse(),
-               type: 'line'
-          }
-     })
+  const series = params.charts.map((el) => {
+    return {
+      name: el.name,
+      data: el.value.map((item) => item.state).reverse(),
+      type: 'line'
+    }
+  })
 
-     const axisConfig = axisBarConfig(params.type, times, windowConfig, params.names)
+  const axisConfig = axisBarConfig(params.type, times, windowConfig, params.names)
 
-     return {
-          title: params.title,
-          titleLeft: 'center',
-          legend: {
-               textStyle: {
-                    fontSize: windowConfig?.line?.legend?.fontSize
-               },
-               orient: 'horizontal',
-               // top: 360,
-               bottom: windowConfig?.line?.legend?.bottom,
-               // padding: windowConfig?.bar?.legend?.padding,
-               left: 'center',
-               itemGap: windowConfig?.line?.legend?.itemGap,
-               itemWidth: windowConfig?.line?.legend?.itemWidth,
-               itemHeight: windowConfig?.line?.legend?.itemHeight,
-               data: namesLegend
-          },
-          grid: {
-               left: '5%',
-               width: '90%',
-               top: 30,
-               containLabel: true
-          },
-          axisConfig,
-          series,
-          windowConfig,
-          graphic: [{id: 'yAxisTitle', type: 'text', left: 40, top: 20, z: 999, style: {text: text, fontSize: 12}}]
-     }   
+  return {
+    title: params.title,
+    titleLeft: 'center',
+    legend: {
+      textStyle: {
+        fontSize: windowConfig?.line?.legend?.fontSize
+      },
+      orient: 'horizontal',
+      // top: 360,
+      bottom: windowConfig?.line?.legend?.bottom,
+      // padding: windowConfig?.bar?.legend?.padding,
+      left: 'center',
+      itemGap: windowConfig?.line?.legend?.itemGap,
+      itemWidth: windowConfig?.line?.legend?.itemWidth,
+      itemHeight: windowConfig?.line?.legend?.itemHeight,
+      data: namesLegend
+    },
+    grid: {
+      left: '5%',
+      width: '90%',
+      top: 30,
+      containLabel: true
+    },
+    axisConfig,
+    series,
+    windowConfig,
+    graphic: [{id: 'yAxisTitle', type: 'text', left: 40, top: 20, z: 999, style: {text: text, fontSize: 12}}]
+  }   
 }
 
 const linesPackConfig = (params, id, windowConfig) => {
-     console.log('params', params)
-     const times = params.xAxisData
-     const text = params.names.yAxis ? params.names.yAxis : ' '
-     const namesLegend = params.charts.map((el) => el.name)
+  console.log('params', params)
+  const times = params.xAxisData
+  const text = params.names.yAxis ? params.names.yAxis : ' '
+  const namesLegend = params.charts.map((el) => el.name)
      
-     const series = params.charts.map((el) => {
-          return {
-               name: el.name,
-               data: el.value.map((item) => item.state).reverse(),
-               type: 'line'
-          }
-     })
+  const series = params.charts.map((el) => {
+    return {
+      name: el.name,
+      data: el.value.map((item) => item.state).reverse(),
+      type: 'line'
+    }
+  })
 
-     const axisConfig = axisBarConfig(params.type, times, windowConfig, params.names)
+  const axisConfig = axisBarConfig(params.type, times, windowConfig, params.names)
 
-     return {
-          title: params.title,
-          titleLeft: 'center',
-          legend: {
-               textStyle: {
-                    fontSize: windowConfig?.line?.legend?.fontSize
-               },
-               orient: 'horizontal',
-               // top: 360,
-               bottom: windowConfig?.linesPack?.legend?.bottom,
-               // padding: windowConfig?.bar?.legend?.padding,
-               left: 'center',
-               itemGap: windowConfig?.linesPack?.legend?.itemGap,
-               itemWidth: windowConfig?.linesPack?.legend?.itemWidth,
-               itemHeight: windowConfig?.linesPack?.legend?.itemHeight,
-               data: namesLegend
-          },
-          grid: {
-               left: '3%',
-               width: '95%',
-               height: '50%',
-               top: 30,
-               containLabel: true
-          },
-          axisConfig,
-          series,
-          windowConfig,
-          graphic: [{id: 'yAxisTitle', type: 'text', left: 40, top: 20, z: 999, style: {text: text, fontSize: 12}}]
-     }   
+  return {
+    title: params.title,
+    titleLeft: 'center',
+    legend: {
+      textStyle: {
+        fontSize: windowConfig?.line?.legend?.fontSize
+      },
+      orient: 'horizontal',
+      // top: 360,
+      bottom: windowConfig?.linesPack?.legend?.bottom,
+      // padding: windowConfig?.bar?.legend?.padding,
+      left: 'center',
+      itemGap: windowConfig?.linesPack?.legend?.itemGap,
+      itemWidth: windowConfig?.linesPack?.legend?.itemWidth,
+      itemHeight: windowConfig?.linesPack?.legend?.itemHeight,
+      data: namesLegend
+    },
+    grid: {
+      left: '3%',
+      width: '95%',
+      height: '50%',
+      top: 30,
+      containLabel: true
+    },
+    axisConfig,
+    series,
+    windowConfig,
+    graphic: [{id: 'yAxisTitle', type: 'text', left: 40, top: 20, z: 999, style: {text: text, fontSize: 12}}]
+  }   
 }
 
 const pieConfig = (params, id, windowConfig) => {
-     const data = params.machines.map((el, idx) => {
-          el.color = colorList(el.name)
-          el.order = orderCharts(el.name)
-          return el
-     }).sort((a, b) => a.order - b.order)
+  const data = params.machines.map((el) => {
+    el.color = colorList(el.name)
+    el.order = orderCharts(el.name)
+    return el
+  }).sort((a, b) => a.order - b.order)
 
-     const series = [{
-               name: '',
-               type: 'pie',
-               label: {
-                    position: 'inner',
-                    formatter: (d) => {
-                         // console.log('d', d)  
-                         return d.value
-                         },
-                    color: '#FFF',
-                    fontWeight: 'bold'
-                    },
-               minAngle: 15,      
-               center: ['50%', '50%'],
-               radius: ['40%', '70%'],
-               color: data.map((el) => el.color), //26.12.2023
-               itemStyle: {
-                    borderRadius: 5,
-                    borderColor: '#FFF',
-                    borderWidth: 2
-                   },
-               data: data,
-               emphasis: {
-                itemStyle: {
-                     // color: {
-                     //      type: 'radial',
-                     //      x: 0.4,
-                     //      y: 0.3,
-                     //      r: 1,
-                     //      // colorStops: [
-                     //      //   {
-                     //      //     offset: 0,
-                     //      // //     color: `rgb(251, 118, 123, 0.5)`,
-                     //      //     opacity: 0.5
-                     //      //   },
-                     //      //   {
-                     //      //     offset: 1,
-                     //      // //     color: `rgb(204, 46, 72, 0.5)`
-                     //      //     opacity: 0.5
-                     //      //   }
-                     //      // ]
-                     //    },
-                  shadowBlur: 10,
-                  shadowOffsetX: 0,
-                  shadowColor: 'rgba(0, 0, 0, 0.5)',
-                  opacity: 0.7
-                }
-              },
-             }]
+  const series = [{
+    name: '',
+    type: 'pie',
+    label: {
+      position: 'inner',
+      formatter: (d) => {
+        // console.log('d', d)  
+        return d.value
+      },
+      color: '#FFF',
+      fontWeight: 'bold'
+    },
+    minAngle: 15,      
+    center: ['50%', '50%'],
+    radius: ['40%', '70%'],
+    color: data.map((el) => el.color), //26.12.2023
+    itemStyle: {
+      borderRadius: 5,
+      borderColor: '#FFF',
+      borderWidth: 2
+    },
+    data: data,
+    emphasis: {
+      itemStyle: {
+        // color: {
+        //      type: 'radial',
+        //      x: 0.4,
+        //      y: 0.3,
+        //      r: 1,
+        //      // colorStops: [
+        //      //   {
+        //      //     offset: 0,
+        //      // //     color: `rgb(251, 118, 123, 0.5)`,
+        //      //     opacity: 0.5
+        //      //   },
+        //      //   {
+        //      //     offset: 1,
+        //      // //     color: `rgb(204, 46, 72, 0.5)`
+        //      //     opacity: 0.5
+        //      //   }
+        //      // ]
+        //    },
+        shadowBlur: 10,
+        shadowOffsetX: 0,
+        shadowColor: 'rgba(0, 0, 0, 0.5)',
+        opacity: 0.7
+      }
+    },
+  }]
 
-     return {
-          title: title(id, params.countMachines),
-          type: 'pie',
-          legend: {
-               formatter: (title) => {
-                    const [elem] = params.machines.filter((el) => el.name == title) //26.12.2023
-                    return title + ' ' + elem.value
-                    },
-               textStyle: {
-                    fontSize: windowConfig?.pie?.legend?.fontSize
-               },     
-               icon: 'circle',
-               orient: 'horizontal',
-               bottom: 0,
-               left: 'center',
-               itemGap: windowConfig?.pie?.legend?.itemGap,
-               itemWidth: windowConfig?.pie?.legend?.itemWidth,
-               itemHeight: windowConfig?.pie?.legend?.itemHeight,
-               },
-          graphic: [{elements: viewGraphicsPieBar(id, params.period, params.countMachines, title(id, params.countMachines), windowConfig, params.isOpenMenu, params.type)}],
-          series,
-          windowConfig
-     }
+  return {
+    title: title(id, params.countMachines),
+    type: 'pie',
+    legend: {
+      formatter: (title) => {
+        const [elem] = params.machines.filter((el) => el.name == title) //26.12.2023
+        return title + ' ' + elem.value
+      },
+      textStyle: {
+        fontSize: windowConfig?.pie?.legend?.fontSize
+      },     
+      icon: 'circle',
+      orient: 'horizontal',
+      bottom: 0,
+      left: 'center',
+      itemGap: windowConfig?.pie?.legend?.itemGap,
+      itemWidth: windowConfig?.pie?.legend?.itemWidth,
+      itemHeight: windowConfig?.pie?.legend?.itemHeight,
+    },
+    graphic: [{elements: viewGraphicsPieBar(id, params.period, params.countMachines, title(id, params.countMachines), windowConfig, params.isOpenMenu, params.type)}],
+    series,
+    windowConfig
+  }
 }
 
 const barConfig = (params, id, windowConfig) => {
-     // console.log('params', params)
-     const countMachinesWithoutMl = params?.machines?.[params?.machines?.length - 1]?.key === 'routes_without_ml' ? params?.machines?.[params?.machines?.length - 1]?.values : 0
+  // console.log('params', params)
+  const countMachinesWithoutMl = params?.machines?.[params?.machines?.length - 1]?.key === 'routes_without_ml' ? params?.machines?.[params?.machines?.length - 1]?.values : 0
      
-     const data = params?.machines?.map((el, idx) => {
-          el.itemStyle = {color: colorListBar(params.type, el.name)}
-          return el
-     }).sort((a, b) => a?.value - b?.value).reverse()
+  const data = params?.machines?.map((el) => {
+    el.itemStyle = {color: colorListBar(params.type, el.name)}
+    return el
+  }).sort((a, b) => a?.value - b?.value).reverse()
 
-     const xAxisData = data.map((el) => {
-          return `${el.name}`
-     })
+  const xAxisData = data.map((el) => {
+    return `${el.name}`
+  })
 
-     const series = data?.map((chart, idx) => {
-          return {
-               name: `${chart?.name} ${chart?.value}`,
-               type: 'bar',
-               tooltip: {
-                    formatter: value => `${value.marker} ${value.data.name !== null ? value.data.name : 'Нет данных'} ${value.data.value}`
-                  },
-               label: {
-                    show: true,
-                    position: 'inside',
-                    overflow: 'break',
-                    color: '#FFF',
-                    fontWeight: 'bold',
-                    textborderColor: '#ff0000'
-                    // formatter: '{c}'
-                    },
-               labelLine: {
-                     show: true,
-                    lineStyle: {
-                         // color: 'source',
-                         color: 'black',
-                    }
-                    },
-               labelLayout: 
+  const series = data?.map((chart, idx) => {
+    return {
+      name: `${chart?.name} ${chart?.value}`,
+      type: 'bar',
+      tooltip: {
+        formatter: value => `${value.marker} ${value.data.name !== null ? value.data.name : 'Нет данных'} ${value.data.value}`
+      },
+      label: {
+        show: true,
+        position: 'inside',
+        overflow: 'break',
+        color: '#FFF',
+        fontWeight: 'bold',
+        textborderColor: '#ff0000'
+        // formatter: '{c}'
+      },
+      labelLine: {
+        show: true,
+        lineStyle: {
+          // color: 'source',
+          color: 'black',
+        }
+      },
+      labelLayout: 
                (p) => {
-                    if(p.labelRect.width >= p.rect.width) {
-                         return {hideOverlap: true}
-                    }
+                 if(p.labelRect.width >= p.rect.width) {
+                   return {hideOverlap: true}
+                 }
                },
-               scaleLimit: {
-                    min: 1,
-                    max: 5
-                    },
-               itemStyle: {
-                    borderColor: chart?.itemStyle?.color,
-                    color: chart?.itemStyle?.color,
-                    //  borderRadius: 5,
-                    //  borderWidth: 1
-                   },
-               barMinWidth: 25,
-               barMinHeight: 20,
-               barMaxWidth: '90%',
-               barGap: '10%',
-               barCategoryGap: '30%',
-               groupPadding: 2,
-               data: data.map((el, index) => idx === index ? el : ''),    
-               // data: data, // Для мульти данных, то есть больше чем один тип данных в столбце 
-               stack: 'total',
-               sampling: 'average',
-               emphasis: {
-                    itemStyle: {
-                         shadowBlur: 5,
-                         shadowOffsetX: 0,
-                         shadowColor: 'rgba(0, 0, 0, 0.5)',
-                         opacity: 1
-                    }
-              },
-          }
-     })
+      scaleLimit: {
+        min: 1,
+        max: 5
+      },
+      itemStyle: {
+        borderColor: chart?.itemStyle?.color,
+        color: chart?.itemStyle?.color,
+        //  borderRadius: 5,
+        //  borderWidth: 1
+      },
+      barMinWidth: 25,
+      barMinHeight: 20,
+      barMaxWidth: '90%',
+      barGap: '10%',
+      barCategoryGap: '30%',
+      groupPadding: 2,
+      data: data.map((el, index) => idx === index ? el : ''),    
+      // data: data, // Для мульти данных, то есть больше чем один тип данных в столбце 
+      stack: 'total',
+      sampling: 'average',
+      emphasis: {
+        itemStyle: {
+          shadowBlur: 5,
+          shadowOffsetX: 0,
+          shadowColor: 'rgba(0, 0, 0, 0.5)',
+          opacity: 1
+        }
+      },
+    }
+  })
 
-     const axisConfig = axisBarConfig(params.type, xAxisData, windowConfig)
+  const axisConfig = axisBarConfig(params.type, xAxisData, windowConfig)
           
-     return {
-          // label: {
-          //      show: true,
-          //      position: 'inside'
-          //      },
-          title: title(id, params.countMachines, params.countMachines_with_ml, params.countMachines_without_ml ? params.countMachines_without_ml : countMachinesWithoutMl),
-          backgroundColor: '#FFF',
-          legend: {
-               textStyle: {
-                    fontSize: windowConfig?.bar?.legend?.fontSize
-               },
-               orient: 'horizontal',
-               // top: 360,
-               bottom: windowConfig?.bar?.legend?.bottom,
-               // padding: windowConfig?.bar?.legend?.padding,
-               left: 'center',
-               itemGap: windowConfig?.bar?.legend?.itemGap,
-               itemWidth: windowConfig?.bar?.legend?.itemWidth,
-               itemHeight: windowConfig?.bar?.legend?.itemHeight,
-               },
-          grid: {
-               left: '5%',
-               width: '90%',
-               top: 50,
-               containLabel: true
-          },
-          axisConfig,
-          graphic: [{elements: viewGraphicsPieBar(id, params.period, params.countMachines, title(id, params.countMachinesWithMl, countMachinesWithoutMl), windowConfig, params.isOpenMenu, params.type)}],
-          series,
-          windowConfig
-     }
+  return {
+    // label: {
+    //      show: true,
+    //      position: 'inside'
+    //      },
+    title: title(id, params.countMachines, params.countMachines_with_ml, params.countMachines_without_ml ? params.countMachines_without_ml : countMachinesWithoutMl),
+    backgroundColor: '#FFF',
+    legend: {
+      textStyle: {
+        fontSize: windowConfig?.bar?.legend?.fontSize
+      },
+      orient: 'horizontal',
+      // top: 360,
+      bottom: windowConfig?.bar?.legend?.bottom,
+      // padding: windowConfig?.bar?.legend?.padding,
+      left: 'center',
+      itemGap: windowConfig?.bar?.legend?.itemGap,
+      itemWidth: windowConfig?.bar?.legend?.itemWidth,
+      itemHeight: windowConfig?.bar?.legend?.itemHeight,
+    },
+    grid: {
+      left: '5%',
+      width: '90%',
+      top: 50,
+      containLabel: true
+    },
+    axisConfig,
+    graphic: [{elements: viewGraphicsPieBar(id, params.period, params.countMachines, title(id, params.countMachinesWithMl, countMachinesWithoutMl), windowConfig, params.isOpenMenu, params.type)}],
+    series,
+    windowConfig
+  }
 }
 
 const barTypesConfig = (params, id, windowConfig, enableDataZoom) => {
-     console.log('params', params)
-     const isMlType = params.type === typesCharts.typesMl
-     const isMountType = params.type === 'mount'
+  console.log('params', params)
+  const isMlType = params.type === typesCharts.typesMl
+  const isMountType = params.type === 'mount'
 
-     const dataWithoutZero = choiceTypeBarTypesCharts(params).updatedData.dataGroupBy.map((el) => {
-         const result = el.map((item) => {
-               if(item.value === 0) {
-                    item.value = ''
-                    return item
-               }
-               if(item.name === null) {
-                    item.name = 'Нет данных'
-                    return item
-               }
-               return item
-          }).sort((a, b) => {
-               if(a.groupByKey && b.groupByKey) {
-                    (a.groupByData[a.groupByKey] - b.groupByData[b.groupByKey])
-               }})
+  const dataWithoutZero = choiceTypeBarTypesCharts(params).updatedData.dataGroupBy.map((el) => {
+    const result = el.map((item) => {
+      if(item.value === 0) {
+        item.value = ''
+        return item
+      }
+      if(item.name === null) {
+        item.name = 'Нет данных'
+        return item
+      }
+      return item
+    }).sort((a, b) => {
+      if(a.groupByKey && b.groupByKey) {
+        (a.groupByData[a.groupByKey] - b.groupByData[b.groupByKey])
+      }})
 
-               return !isMountType ? result.reverse() : result
-     })
+    return !isMountType ? result.reverse() : result
+  })
      
-     // console.log('dataWithoutZero', dataWithoutZero)
-     const series = dataWithoutZero.map((charts, idx) => {
-          const [title] = choiceTypeBarTypesCharts(params).updatedData.dataCustomTitle.flat().filter((el) => el?.name == charts[0]?.name)
-          return {
-                    name: `${title?.name} ${title?.count} id:${id}`,
-                    type: 'bar',
-                    tooltip: {
-                         formatter: value => `${value.marker} ${value?.data?.name !== null ? value?.data?.name : 'Нет данных'} ${value?.data?.value}`
-                       },
-                    label: {
-                         show: true,
-                         position: 'inside',
-                         overflow: 'break',
-                         color: '#FFF',
-                         fontWeight: 'bold',
-                         textborderColor: '#ff0000'
-                         // formatter: '{c}'
-                         },
-                    labelLine: {
-                         show: true,
-                         lineStyle: {
-                              // color: 'source',
-                              color: 'black',
-                              }
-                         },
-                    labelLayout: (p) => p.labelRect.width <= p.rect.width ? {hideOverlap: true} : {hideOverlap: false},
-                              // return {x: initCharts.getWidth() - 50, moveOverlap: 'shiftY'}
-                              // return {dx: 50, dy: -100}
-                    scaleLimit: {
-                         min: 1,
-                         max: 5
-                         },
-                    itemStyle: {
-                         borderColor: isMlType ? colorListBar(params.type, charts[0]?.name) : colorList(charts[0]?.name),
-                         color: isMlType ? colorListBar(params.type, charts[0]?.name) : colorList(charts[0]?.name),
-                         //  borderRadius: 5,
-                         //  borderWidth: 1
-                        },
-                    // barWidth: 30,
-                    // barMinWidth: 25,
-                    barMaxWidth: 35,
-                    barMinHeight: 30,
-                    barGap: '20%',
-                    barCategoryGap: '10%',
-                    groupPadding: 2,
-                    // data: data.map((el, index) => idx === index ? el : ''), // Для одного типа данных в столбце    
-                    data: charts,
-                    stack: 'total',
-                    sampling: 'average',
-                    large: true,
-                    largeThreshold: 100,
-                    progressiveThreshold: 1000,
-                    emphasis: {
-                         itemStyle: {
-                              shadowBlur: 5,
-                              shadowOffsetX: 0,
-                              shadowColor: 'rgba(0, 0, 0, 0.5)',
-                              opacity: 1
-                         }
-                   },
-          }
-     })
+  // console.log('dataWithoutZero', dataWithoutZero)
+  const series = dataWithoutZero.map((charts) => {
+    const [title] = choiceTypeBarTypesCharts(params).updatedData.dataCustomTitle.flat().filter((el) => el?.name == charts[0]?.name)
+    return {
+      name: `${title?.name} ${title?.count} id:${id}`,
+      type: 'bar',
+      tooltip: {
+        formatter: value => `${value.marker} ${value?.data?.name !== null ? value?.data?.name : 'Нет данных'} ${value?.data?.value}`
+      },
+      label: {
+        show: true,
+        position: 'inside',
+        overflow: 'break',
+        color: '#FFF',
+        fontWeight: 'bold',
+        textborderColor: '#ff0000'
+        // formatter: '{c}'
+      },
+      labelLine: {
+        show: true,
+        lineStyle: {
+          // color: 'source',
+          color: 'black',
+        }
+      },
+      labelLayout: (p) => p.labelRect.width <= p.rect.width ? {hideOverlap: true} : {hideOverlap: false},
+      // return {x: initCharts.getWidth() - 50, moveOverlap: 'shiftY'}
+      // return {dx: 50, dy: -100}
+      scaleLimit: {
+        min: 1,
+        max: 5
+      },
+      itemStyle: {
+        borderColor: isMlType ? colorListBar(params.type, charts[0]?.name) : colorList(charts[0]?.name),
+        color: isMlType ? colorListBar(params.type, charts[0]?.name) : colorList(charts[0]?.name),
+        //  borderRadius: 5,
+        //  borderWidth: 1
+      },
+      // barWidth: 30,
+      // barMinWidth: 25,
+      barMaxWidth: 35,
+      barMinHeight: 30,
+      barGap: '20%',
+      barCategoryGap: '10%',
+      groupPadding: 2,
+      // data: data.map((el, index) => idx === index ? el : ''), // Для одного типа данных в столбце    
+      data: charts,
+      stack: 'total',
+      sampling: 'average',
+      large: true,
+      largeThreshold: 100,
+      progressiveThreshold: 1000,
+      emphasis: {
+        itemStyle: {
+          shadowBlur: 5,
+          shadowOffsetX: 0,
+          shadowColor: 'rgba(0, 0, 0, 0.5)',
+          opacity: 1
+        }
+      },
+    }
+  })
 
-     const axisConfig = axisBarConfig(params.type, choiceTypeBarTypesCharts(params).axisData, windowConfig)
+  const axisConfig = axisBarConfig(params.type, choiceTypeBarTypesCharts(params).axisData, windowConfig)
 
-     return {
-          // label: {
-          //      show: true,
-          //      position: 'inside'
-          //      },
-          title: isMountType? title(id, params.countMounts) : title(id, params.countMachines, params.countMachinesWithMl, params.countMachinesWithoutMl),
-          legend: {
-               // icon: 'path://M224 320c8.823 0 16 7.177 16 16s-7.177 16-16 16-16-7.177-16-16 7.177-16 16-16m0-32c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48zM320 0H128C64 0 0 42.981 0 96v256c0 47.169 50.656 86.391 106.9 94.473l-55.285 55.285c-3.78 3.78-1.103 10.243 4.243 10.243h25.798c3.183 0 6.235-1.264 8.485-3.515L150.627 448h146.745l60.486 60.485a12.002 12.002 0 0 0 8.485 3.515h25.798c5.345 0 8.022-6.463 4.243-10.243L341.1 446.472C397.344 438.391 448 399.169 448 352V96c0-53.019-63-96-128-96zM32 128h384v96H32v-96zm96-96h192c58.237 0 96 37.881 96 64H32c0-32.299 47.552-64 96-64zm192 384H128c-48.448 0-96-31.701-96-64v-96h384v96c0 32.299-47.552 64-96 64z',
-               // backgroundColor: '#ff0000',
-               orient: 'horizontal',
-               textStyle: {
-                    fontSize: windowConfig?.bar?.legend?.fontSize
-               },
-               zLevel: 1,
-               // top: 35,
-               left: 'center',
-               bottom: windowConfig?.bar?.legend?.bottom,
-               itemGap: windowConfig?.bar?.legend?.itemGap,
-               itemWidth: windowConfig?.bar?.legend?.itemWidth,
-               itemHeight: windowConfig?.bar?.legend?.itemHeight,
-               formatter: (e) => {
-                    return e.slice(0, e.indexOf('id') - 1)
-               }
-               // data: legendData
-               },
-          grid: {
-               left: '1%',
-               top: windowConfig?.bar?.grid?.top,
-               width: windowConfig?.bar?.grid?.width,
-               containLabel: true,
-               height: isMountType ? '68%' : 'auto'
-          },
-          dataZoom: [
-               {
-                    type: 'slider',
-                    show: true,
-                    width: 14,
-                    top: windowConfig?.bar?.dataZoom?.top,
-                    right: '3%',
-                    yAxisIndex: 0,
-                    realtime: true,
-                    start: windowConfig?.bar?.dataZoom?.start,
-                    end: 100,
-                    rangeMode: ['value', 'percent'],
-                    zoomLock: true,
-                    brushSelect: false,
-                    minSpan: windowConfig?.bar?.dataZoom?.minSpan,
-                    handleSize: 18,
-                    showDetail: false,
-                    handleIcon: "path://M12 0c-9.432 0-12 2.568-12 12s2.551 12 12 12 12-2.551 12-12-2.568-12-12-12z",
-                    handleStyle: {
-                         color: '#CCCCCC',
-                         borderColor: '#CCCCCC'
-                       }
-               },
-               {
-                    type: 'inside',
-                    yAxisIndex: 0,
-                    start: 70,
-                    end: 100,
-                    zoomOnMouseWheel: false,
-                    moveOnMouseWheel: true,
-                    handleSize: 18
-               },
-             ],
-          graphic: isMountType ? [{elements: viewGraphicsPieBar(id, '', params.countMounts, title(id), windowConfig, params.isOpenMenu, params.type)}] : 
-          [{elements: viewGraphicsTypesBar(id, title(id, isMlType ?  params.countMachinesWithMl :  params.countMachines, params.countMachinesWithoutMl), params.groupByKey, params.prevGroupByData, params.filterKey, params.prevGroupByFilters, params.type, params.groupByValue ? params.groupByValue : params.typeId ? params.typeId : null, params.period, params.yAxisData.length, windowConfig, params.isOpenMenu)}],
-          series,
-          axisConfig,
-          windowConfig,
-          enableDataZoom
-     }
+  return {
+    // label: {
+    //      show: true,
+    //      position: 'inside'
+    //      },
+    title: isMountType? title(id, params.countMounts) : title(id, params.countMachines, params.countMachinesWithMl, params.countMachinesWithoutMl),
+    legend: {
+      // icon: 'path://M224 320c8.823 0 16 7.177 16 16s-7.177 16-16 16-16-7.177-16-16 7.177-16 16-16m0-32c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48zM320 0H128C64 0 0 42.981 0 96v256c0 47.169 50.656 86.391 106.9 94.473l-55.285 55.285c-3.78 3.78-1.103 10.243 4.243 10.243h25.798c3.183 0 6.235-1.264 8.485-3.515L150.627 448h146.745l60.486 60.485a12.002 12.002 0 0 0 8.485 3.515h25.798c5.345 0 8.022-6.463 4.243-10.243L341.1 446.472C397.344 438.391 448 399.169 448 352V96c0-53.019-63-96-128-96zM32 128h384v96H32v-96zm96-96h192c58.237 0 96 37.881 96 64H32c0-32.299 47.552-64 96-64zm192 384H128c-48.448 0-96-31.701-96-64v-96h384v96c0 32.299-47.552 64-96 64z',
+      // backgroundColor: '#ff0000',
+      orient: 'horizontal',
+      textStyle: {
+        fontSize: windowConfig?.bar?.legend?.fontSize
+      },
+      zLevel: 1,
+      // top: 35,
+      left: 'center',
+      bottom: windowConfig?.bar?.legend?.bottom,
+      itemGap: windowConfig?.bar?.legend?.itemGap,
+      itemWidth: windowConfig?.bar?.legend?.itemWidth,
+      itemHeight: windowConfig?.bar?.legend?.itemHeight,
+      formatter: (e) => {
+        return e.slice(0, e.indexOf('id') - 1)
+      }
+      // data: legendData
+    },
+    grid: {
+      left: '1%',
+      top: windowConfig?.bar?.grid?.top,
+      width: windowConfig?.bar?.grid?.width,
+      containLabel: true,
+      height: isMountType ? '68%' : 'auto'
+    },
+    dataZoom: [
+      {
+        type: 'slider',
+        show: true,
+        width: 14,
+        top: windowConfig?.bar?.dataZoom?.top,
+        right: '3%',
+        yAxisIndex: 0,
+        realtime: true,
+        start: windowConfig?.bar?.dataZoom?.start,
+        end: 100,
+        rangeMode: ['value', 'percent'],
+        zoomLock: true,
+        brushSelect: false,
+        minSpan: windowConfig?.bar?.dataZoom?.minSpan,
+        handleSize: 18,
+        showDetail: false,
+        handleIcon: "path://M12 0c-9.432 0-12 2.568-12 12s2.551 12 12 12 12-2.551 12-12-2.568-12-12-12z",
+        handleStyle: {
+          color: '#CCCCCC',
+          borderColor: '#CCCCCC'
+        }
+      },
+      {
+        type: 'inside',
+        yAxisIndex: 0,
+        start: 70,
+        end: 100,
+        zoomOnMouseWheel: false,
+        moveOnMouseWheel: true,
+        handleSize: 18
+      },
+    ],
+    graphic: isMountType ? [{elements: viewGraphicsPieBar(id, '', params.countMounts, title(id), windowConfig, params.isOpenMenu, params.type)}] : 
+      [{elements: viewGraphicsTypesBar(id, title(id, isMlType ?  params.countMachinesWithMl :  params.countMachines, params.countMachinesWithoutMl), params.groupByKey, params.prevGroupByData, params.filterKey, params.prevGroupByFilters, params.type, params.groupByValue ? params.groupByValue : params.typeId ? params.typeId : null, params.period, params.yAxisData.length, windowConfig, params.isOpenMenu)}],
+    series,
+    axisConfig,
+    windowConfig,
+    enableDataZoom
+  }
 }
 
 const config = (params) => {
-    //  console.log('params', params)
-     return {
-          title: {
-               text: params.title,
-               subtextStyle: {
-                    fontSize: 11,
-                    align: 'left'
-               },
-               top: params.windowConfig?.title?.top,
-               left: params.titleLeft ? params.titleLeft : params.windowConfig?.title?.left,
-               textStyle: {
-                    width: params.windowConfig?.title?.width,
-                    fontSize: params.windowConfig?.title?.fontSize,
-                    overflow: 'break',
-               },
+  //  console.log('params', params)
+  return {
+    title: {
+      text: params.title,
+      subtextStyle: {
+        fontSize: 11,
+        align: 'left'
+      },
+      top: params.windowConfig?.title?.top,
+      left: params.titleLeft ? params.titleLeft : params.windowConfig?.title?.left,
+      textStyle: {
+        width: params.windowConfig?.title?.width,
+        fontSize: params.windowConfig?.title?.fontSize,
+        overflow: 'break',
+      },
                
-             },
-             backgroundColor: params.windowConfig?.backgroundColor,
-             tooltip: {trigger: 'item'},
-             legend: params.legend,
-             xAxis: params.axisConfig?.xAxis ? params.axisConfig?.xAxis : '',
-             yAxis: params.axisConfig?.yAxis ? params.axisConfig?.yAxis : '',
-             dataZoom: params.enableDataZoom && params.dataZoom ? params.dataZoom : '',
-             toolbox: {
-                  show: true,
-                     feature: {
-                         mark: {show: true},
-                         // dataView: {show: true, readOnly: false, title: ''},
-                         // magicType: {show: true, type: ['line', 'bar'], title: {line: 'Переключить на линейный график', bar: 'Переключить на график гистограмму'}  },
-                         // restore: {show: true, title: 'Обновить'},
-                         // saveAsImage: {show: true, title: ''}
-                     },
-                     iconStyle: {
-                         borderColor: '#333',
-                         // borderWidth: 0,
-                         // borderType: 'solid'
-                     },
-                     emphasis: {iconStyle: {
-                         borderColor: 'rgba(1, 97, 253, 0.3)',
+    },
+    backgroundColor: params.windowConfig?.backgroundColor,
+    tooltip: {trigger: 'item'},
+    legend: params.legend,
+    xAxis: params.axisConfig?.xAxis ? params.axisConfig?.xAxis : '',
+    yAxis: params.axisConfig?.yAxis ? params.axisConfig?.yAxis : '',
+    dataZoom: params.enableDataZoom && params.dataZoom ? params.dataZoom : '',
+    toolbox: {
+      show: true,
+      feature: {
+        mark: {show: true},
+        // dataView: {show: true, readOnly: false, title: ''},
+        // magicType: {show: true, type: ['line', 'bar'], title: {line: 'Переключить на линейный график', bar: 'Переключить на график гистограмму'}  },
+        // restore: {show: true, title: 'Обновить'},
+        // saveAsImage: {show: true, title: ''}
+      },
+      iconStyle: {
+        borderColor: '#333',
+        // borderWidth: 0,
+        // borderType: 'solid'
+      },
+      emphasis: {iconStyle: {
+        borderColor: 'rgba(1, 97, 253, 0.3)',
 
-                     }},
-                     top: 16,
-                     right: 20,
-              },
-               graphic: params.graphic ? params.graphic : '',
-               grid: params.grid ? params.grid : '',
-               series: params.series
-     }
+      }},
+      top: 16,
+      right: 20,
+    },
+    graphic: params.graphic ? params.graphic : '',
+    grid: params.grid ? params.grid : '',
+    series: params.series
+  }
      
-   }
+}
 
 class ECharts {
-    constructor(id, sizes = {}) {
-      this.id = id
-      this.el = document.getElementById(id)
-      const clientWidth = window.innerWidth
-      const clientHeight = window.innerHeight
-      this.isMobile = clientWidth < 768
-      this.currentWidth = clientWidth - 100
-      // const currentheight = clientHeight + 70
-      this.widthChart = sizes.width ? sizes.width : 450
-      this.heightChart = sizes.height ? sizes.height : 350
-      this.mountHeightChart = 350
-      this.charts = []
-      this.legendFilterData = []
+  constructor(id, sizes = {}) {
+    this.id = id
+    this.el = document.getElementById(id)
+    const clientWidth = window.innerWidth
+    const clientHeight = window.innerHeight
+    this.isMobile = clientWidth < 768
+    this.currentWidth = clientWidth - 100
+    this.currentheight = clientHeight + 70
+    this.widthChart = sizes.width ? sizes.width : 450
+    this.heightChart = sizes.height ? sizes.height : 350
+    this.mountHeightChart = 350
+    this.charts = []
+    this.legendFilterData = []
 
-      this.initCharts = echarts.init(this.el, null, {renderer: 'canvas'})
-      this.initCharts.showLoading()
+    this.initCharts = echarts.init(this.el, null, {renderer: 'canvas'})
+    this.initCharts.showLoading()
 
-      // window.addEventListener('resize', function() {
-      //      this.initCharts.resize()
-      // })
-     console.log('sizes', sizes)
-      this.getRes = this.el.getAttribute("get-res") == "true"
+    // window.addEventListener('resize', function() {
+    //      this.initCharts.resize()
+    // })
+    console.log('sizes', sizes)
+    this.getRes = this.el.getAttribute("get-res") == "true"
       
-     }
+  }
 
-    getChart(id) {
-      if (this.getRes) {
-          return {isGetChart: true, id}
-      }
-    }        
-
-    makeLineCharts(charts) {
-        charts.chartId = this.id
-        this.charts = []
-        this.charts.push(charts)
-        this.initCharts.resize(sizeOptions(this.isMobile ? this.currentWidth : this.widthChart, charts.height ? charts.height : this.heightChart))
-        this.initCharts.setOption(config(lineConfig(charts, this.id, windowConfig(this.isMobile, this.currentWidth))), {
-              replaceMerge: ["series", "yAxis", "xAxis", "grid"],
-            })
-        this.initCharts.hideLoading()
+  getChart(id) {
+    if (this.getRes) {
+      return {isGetChart: true, id}
     }
+  }        
 
-     makeLinesCharts(charts) {
-          console.log('charts', charts)
-     charts.chartId = this.id,
-     this.charts = []
-     this.charts.push(charts)
-     if(this.initCharts) {
-          this.initCharts.resize(sizeOptions(this.isMobile ? this.currentWidth : this.widthChart, charts.height ? charts.height : this.heightChart))
-          this.initCharts.setOption(config(linesConfig(this.charts[0], this.id, windowConfig(this.isMobile, this.currentWidth))), {
-               replaceMerge: ["series", "yAxis", "xAxis", "grid"],
-          })
-     }
-     this.initCharts.hideLoading()
-     }
+  makeLineCharts(charts) {
+    charts.chartId = this.id
+    this.charts = []
+    this.charts.push(charts)
+    this.initCharts.resize(sizeOptions(this.isMobile ? this.currentWidth : this.widthChart, charts.height ? charts.height : this.heightChart))
+    this.initCharts.setOption(config(lineConfig(charts, this.id, windowConfig(this.isMobile, this.currentWidth))), {
+      replaceMerge: ["series", "yAxis", "xAxis", "grid"],
+    })
+    this.initCharts.hideLoading()
+  }
+
+  makeLinesCharts(charts) {
+    console.log('charts', charts)
+    charts.chartId = this.id,
+    this.charts = []
+    this.charts.push(charts)
+    if(this.initCharts) {
+      this.initCharts.resize(sizeOptions(this.isMobile ? this.currentWidth : this.widthChart, charts.height ? charts.height : this.heightChart))
+      this.initCharts.setOption(config(linesConfig(this.charts[0], this.id, windowConfig(this.isMobile, this.currentWidth))), {
+        replaceMerge: ["series", "yAxis", "xAxis", "grid"],
+      })
+    }
+    this.initCharts.hideLoading()
+  }
      
-     makeLinesPackCharts(charts) {
-          console.log('charts', charts)
-     charts.chartId = this.id,
-     this.charts = []
-     this.charts.push(charts)
-     if(this.initCharts) {
-          // this.initCharts.resize(sizeOptions(this.isMobile ? this.currentWidth : this.widthChart, charts.height ? charts.height : this.heightChart))
-          this.initCharts.setOption(config(linesPackConfig(this.charts[0], this.id, windowConfig(this.isMobile, this.currentWidth))), {
-               replaceMerge: ["series", "yAxis", "xAxis", "grid"],
-          })
-     }
-     this.initCharts.hideLoading()
-     }
+  makeLinesPackCharts(charts) {
+    console.log('charts', charts)
+    charts.chartId = this.id,
+    this.charts = []
+    this.charts.push(charts)
+    if(this.initCharts) {
+      // this.initCharts.resize(sizeOptions(this.isMobile ? this.currentWidth : this.widthChart, charts.height ? charts.height : this.heightChart))
+      this.initCharts.setOption(config(linesPackConfig(this.charts[0], this.id, windowConfig(this.isMobile, this.currentWidth))), {
+        replaceMerge: ["series", "yAxis", "xAxis", "grid"],
+      })
+    }
+    this.initCharts.hideLoading()
+  }
      
-     updateLineCharts(charts) {
-     if(this.charts[0].xAxisData[this.charts[0].xAxisData.length - 1] !== charts.xAxisData[charts.xAxisData.length - 1]) {
-          this.charts[0].xAxisData.shift()
-          this.charts[0].xAxisData.push(charts.xAxisData[charts.xAxisData.length - 1])
-          this.charts[0].yAxisData.shift()
-          this.charts[0].yAxisData.push(charts.yAxisData[charts.yAxisData.length - 1])
-          if(this.initCharts) {
-               this.initCharts.setOption({xAxis: [{data: this.charts[0].xAxisData}], series: [{data: this.charts[0].yAxisData}]}, false)
-          }
-     }
-     }
+  updateLineCharts(charts) {
+    if(this.charts[0].xAxisData[this.charts[0].xAxisData.length - 1] !== charts.xAxisData[charts.xAxisData.length - 1]) {
+      this.charts[0].xAxisData.shift()
+      this.charts[0].xAxisData.push(charts.xAxisData[charts.xAxisData.length - 1])
+      this.charts[0].yAxisData.shift()
+      this.charts[0].yAxisData.push(charts.yAxisData[charts.yAxisData.length - 1])
+      if(this.initCharts) {
+        this.initCharts.setOption({xAxis: [{data: this.charts[0].xAxisData}], series: [{data: this.charts[0].yAxisData}]}, false)
+      }
+    }
+  }
      
-     updateLinesCharts(charts) {
-     // console.log('charts', charts)
-     if(this.charts[0].xAxisData[this.charts[0].xAxisData.length - 1] !== charts.xAxisData[charts.xAxisData.length - 1]) {
-          this.charts[0].charts.forEach((el, idx) => {
-               el.value.pop()
-               el.value.unshift(charts.charts[idx].value[0])
-          })
-          this.charts[0].xAxisData.shift()
-          this.charts[0].xAxisData.push(charts.xAxisData[charts.xAxisData.length - 1])
-          if(this.initCharts) {
-               this.initCharts.setOption({xAxis: [{data: this.charts[0].xAxisData}],series: [{data: this.charts[0].charts}]}, false)
-          }
-     }
-     }
+  updateLinesCharts(charts) {
+    // console.log('charts', charts)
+    if(this.charts[0].xAxisData[this.charts[0].xAxisData.length - 1] !== charts.xAxisData[charts.xAxisData.length - 1]) {
+      this.charts[0].charts.forEach((el, idx) => {
+        el.value.pop()
+        el.value.unshift(charts.charts[idx].value[0])
+      })
+      this.charts[0].xAxisData.shift()
+      this.charts[0].xAxisData.push(charts.xAxisData[charts.xAxisData.length - 1])
+      if(this.initCharts) {
+        this.initCharts.setOption({xAxis: [{data: this.charts[0].xAxisData}],series: [{data: this.charts[0].charts}]}, false)
+      }
+    }
+  }
      
-     makePieCharts(charts) {
-     charts.chartId = this.id
-     this.charts = []
-     this.charts.push(charts)
-     const initCharts = echarts.init(this.el, null, sizeOptions(this.widthChart, this.heightChart), {renderer: 'canvas'})
-     initCharts.hideLoading()
-     initCharts.resize(sizeOptions(this.isMobile ? this.currentWidth : this.widthChart, this.heightChart))
-     initCharts.setOption(config(pieConfig(charts, this.id, windowConfig(this.isMobile, this.currentWidth))), true)
-     }
+  makePieCharts(charts) {
+    charts.chartId = this.id
+    this.charts = []
+    this.charts.push(charts)
+    const initCharts = echarts.init(this.el, null, sizeOptions(this.widthChart, this.heightChart), {renderer: 'canvas'})
+    initCharts.hideLoading()
+    initCharts.resize(sizeOptions(this.isMobile ? this.currentWidth : this.widthChart, this.heightChart))
+    initCharts.setOption(config(pieConfig(charts, this.id, windowConfig(this.isMobile, this.currentWidth))), true)
+  }
     
-     makeBarCharts(charts) {
-     charts.chartId = this.el.id
-     this.charts = []
-     this.charts.push(charts)
-     const initCharts = echarts.init(document.getElementById(`${this.el.id}`), null, {renderer: 'canvas'})
-     initCharts.hideLoading() 
-     initCharts.resize(sizeOptions(this.isMobile ? this.currentWidth : this.widthChart, this.heightChart))
-     initCharts.setOption(config(barConfig(charts, this.el.id, windowConfig(this.isMobile, this.currentWidth))), true)
-     }
+  makeBarCharts(charts) {
+    charts.chartId = this.el.id
+    this.charts = []
+    this.charts.push(charts)
+    const initCharts = echarts.init(document.getElementById(`${this.el.id}`), null, {renderer: 'canvas'})
+    initCharts.hideLoading() 
+    initCharts.resize(sizeOptions(this.isMobile ? this.currentWidth : this.widthChart, this.heightChart))
+    initCharts.setOption(config(barConfig(charts, this.el.id, windowConfig(this.isMobile, this.currentWidth))), true)
+  }
 
-     makeBarMountCharts(charts) {
-     // console.log('charts', charts)
-     charts.chartId = this.el.id
-     this.charts = []
-     this.charts.push(charts)
-     this.mountHeightChart = charts.height
-     const initCharts = echarts.init(document.getElementById(`${this.el.id}`), null, {renderer: 'canvas'})
-     initCharts.hideLoading()
-     initCharts.resize(sizeOptions(this.isMobile ? this.currentWidth : this.widthChart, charts.height))
-     initCharts.setOption(config(barTypesConfig(charts, this.el.id, windowConfig(this.isMobile, this.currentWidth))), true)
-     }
+  makeBarMountCharts(charts) {
+    // console.log('charts', charts)
+    charts.chartId = this.el.id
+    this.charts = []
+    this.charts.push(charts)
+    this.mountHeightChart = charts.height
+    const initCharts = echarts.init(document.getElementById(`${this.el.id}`), null, {renderer: 'canvas'})
+    initCharts.hideLoading()
+    initCharts.resize(sizeOptions(this.isMobile ? this.currentWidth : this.widthChart, charts.height))
+    initCharts.setOption(config(barTypesConfig(charts, this.el.id, windowConfig(this.isMobile, this.currentWidth))), true)
+  }
     
-     makeBarTypesCharts(charts) {    
-          charts.chartId = this.el.id
-          this.charts = []
-          this.charts.push(charts)
-          console.log('charts - makeBarTypesCharts', charts.legendFilterData)
-          const initCharts = echarts.init(document.getElementById(`${this.el.id}`), null, {renderer: 'canvas'})
-          // this.heightChart = 270 + (charts?.yAxisData?.length * 27)
-          const countCharts = charts?.yAxisData?.length
-          const enableDataZoom = (countCharts * 35) + 200 > this.heightChart
-          initCharts.hideLoading()
-          initCharts.resize(sizeOptions(this.isMobile ? this.currentWidth : this.widthChart,  this.heightChart))
-          initCharts.setOption(config(barTypesConfig(charts, this.el.id, windowConfig(this.isMobile, this.currentWidth, countCharts), enableDataZoom)), true)
+  makeBarTypesCharts(charts) {    
+    charts.chartId = this.el.id
+    this.charts = []
+    this.charts.push(charts)
+    console.log('charts - makeBarTypesCharts', charts.legendFilterData)
+    const initCharts = echarts.init(document.getElementById(`${this.el.id}`), null, {renderer: 'canvas'})
+    // this.heightChart = 270 + (charts?.yAxisData?.length * 27)
+    const countCharts = charts?.yAxisData?.length
+    const enableDataZoom = (countCharts * 35) + 200 > this.heightChart
+    initCharts.hideLoading()
+    initCharts.resize(sizeOptions(this.isMobile ? this.currentWidth : this.widthChart,  this.heightChart))
+    initCharts.setOption(config(barTypesConfig(charts, this.el.id, windowConfig(this.isMobile, this.currentWidth, countCharts), enableDataZoom)), true)
 
-          let currentLegendCount = 0
-          if(charts.legendFilterData?.length > 0) {
-               charts.legendFilterData?.map((legend) => {
-                    if(legend.id === this.el.id) {
-                         if(this.el.id !== 'routes_types_bar_ml') {
-                              charts.xAxisData.map((chart) => {
-                                   chart.charts.reduce((acc, el) => {
-                                        if(el.name === legend.filterData.name) {
-                                             currentLegendCount += Number(el.value)
-                                        } else {
-                                             return acc
-                                        }
-                                   }, 0)
-                              })
-                         } else {
-                              charts.xAxisData.map((chart) => {
-                                   chart.reduce((acc, el) => {
-                                        if(el.charts.name === legend.filterData.name) {
-                                             currentLegendCount += Number(el.charts.value)
-                                        } else {
-                                             return acc
-                                        }
-                                   }, 0)
-                              })
-                         }
+    let currentLegendCount = 0
+    if(charts.legendFilterData?.length > 0) {
+      charts.legendFilterData?.map((legend) => {
+        if(legend.id === this.el.id) {
+          if(this.el.id !== 'routes_types_bar_ml') {
+            charts.xAxisData.map((chart) => {
+              chart.charts.reduce((acc, el) => {
+                if(el.name === legend.filterData.name) {
+                  currentLegendCount += Number(el.value)
+                } else {
+                  return acc
+                }
+              }, 0)
+            })
+          } else {
+            charts.xAxisData.map((chart) => {
+              chart.reduce((acc, el) => {
+                if(el.charts.name === legend.filterData.name) {
+                  currentLegendCount += Number(el.charts.value)
+                } else {
+                  return acc
+                }
+              }, 0)
+            })
+          }
           
-                         initCharts.dispatchAction({
-                              type: !legend.filterData.value ? 'legendUnSelect' : 'legendSelect',
-                              name: `${legend.filterData.name} ${currentLegendCount} id:${legend.id}`
-                         })
-                    }
-                    currentLegendCount = 0
-               })
-          }
-     }
+          initCharts.dispatchAction({
+            type: !legend.filterData.value ? 'legendUnSelect' : 'legendSelect',
+            name: `${legend.filterData.name} ${currentLegendCount} id:${legend.id}`
+          })
+        }
+        currentLegendCount = 0
+      })
+    }
+  }
 
-     setMenuChart (data) {
-          if (data.groupByInfo.chartId) {
-               this.charts = [data.groupByInfo.data]
-               const [chart] = this.charts
-               chart.chartId = data.groupByInfo.chartId
-               chart.type = data.groupByInfo.type
-               chart.isOpenMenu = data.openMenuChart
-               const initCharts = echarts.init(document.getElementById(`${data.groupByInfo.chartId}`), null, {renderer: 'canvas'})
-               const countCharts = chart?.yAxisData?.length
-               const enableDataZoom = (chart?.yAxisData?.length * 35) + 200 > this.heightChart
-               initCharts.hideLoading()
-               initCharts.resize(sizeOptions(this.isMobile ? this.currentWidth : this.widthChart, data.groupByInfo.chartId.includes('mount') ? chart.height : this.heightChart))
-               if(data.groupByInfo.chartId.includes('pie')) {
-                    initCharts.setOption(config(pieConfig(chart, data.groupByInfo.chartId, windowConfig(this.isMobile, this.currentWidth))), true)
-               } else if (data.groupByInfo.chartId.includes('types_bar')) {
-                    initCharts.setOption(config(barTypesConfig(chart, data.groupByInfo.chartId, windowConfig(this.isMobile, this.currentWidth, countCharts), enableDataZoom)), true)
-               } else if (data.groupByInfo.chartId.includes('mount')) {
-                    initCharts.setOption(config(barTypesConfig(chart, data.groupByInfo.chartId, windowConfig(this.isMobile, this.currentWidth))), true)
-               } else {
-                    initCharts.setOption(config(barConfig(chart, data.groupByInfo.chartId, windowConfig(this.isMobile, this.currentWidth))), true)
-               }
-          }
-     }
+  setMenuChart (data) {
+    if (data.groupByInfo.chartId) {
+      this.charts = [data.groupByInfo.data]
+      const [chart] = this.charts
+      chart.chartId = data.groupByInfo.chartId
+      chart.type = data.groupByInfo.type
+      chart.isOpenMenu = data.openMenuChart
+      const initCharts = echarts.init(document.getElementById(`${data.groupByInfo.chartId}`), null, {renderer: 'canvas'})
+      const countCharts = chart?.yAxisData?.length
+      const enableDataZoom = (chart?.yAxisData?.length * 35) + 200 > this.heightChart
+      initCharts.hideLoading()
+      initCharts.resize(sizeOptions(this.isMobile ? this.currentWidth : this.widthChart, data.groupByInfo.chartId.includes('mount') ? chart.height : this.heightChart))
+      if(data.groupByInfo.chartId.includes('pie')) {
+        initCharts.setOption(config(pieConfig(chart, data.groupByInfo.chartId, windowConfig(this.isMobile, this.currentWidth))), true)
+      } else if (data.groupByInfo.chartId.includes('types_bar')) {
+        initCharts.setOption(config(barTypesConfig(chart, data.groupByInfo.chartId, windowConfig(this.isMobile, this.currentWidth, countCharts), enableDataZoom)), true)
+      } else if (data.groupByInfo.chartId.includes('mount')) {
+        initCharts.setOption(config(barTypesConfig(chart, data.groupByInfo.chartId, windowConfig(this.isMobile, this.currentWidth))), true)
+      } else {
+        initCharts.setOption(config(barConfig(chart, data.groupByInfo.chartId, windowConfig(this.isMobile, this.currentWidth))), true)
+      }
+    }
+  }
 
-     downloadChart (data, updatedData) {
-          if (data.groupByInfo.chartId) {
-               this.charts = [data.groupByInfo.data]
-               const [chart] = this.charts
-               const countCharts = chart?.yAxisData?.length
-               const initCharts = echarts.init(document.getElementById(`${data.groupByInfo.chartId}`), null, {renderer: 'canvas'})
-               const enableDataZoom = (countCharts * 35) + 200 > data.updatedHeight
-               initCharts.hideLoading()
+  downloadChart (data, updatedData) {
+    if (data.groupByInfo.chartId) {
+      this.charts = [data.groupByInfo.data]
+      const [chart] = this.charts
+      const countCharts = chart?.yAxisData?.length
+      const initCharts = echarts.init(document.getElementById(`${data.groupByInfo.chartId}`), null, {renderer: 'canvas'})
+      const enableDataZoom = (countCharts * 35) + 200 > data.updatedHeight
+      initCharts.hideLoading()
                
-               if(data.groupByInfo.chartId.includes('pie')) {
-                    initCharts.setOption(config(pieConfig(chart, data.groupByInfo.chartId, windowConfig(this.isMobile, this.currentWidth))), true)
-                    this.downloadImage(data.groupByInfo.title, this.prepareImage(initCharts))
-               } else if (data.groupByInfo.chartId.includes('types_bar')) {
-                    console.log('this.charts', this.charts)
-                    initCharts.resize(sizeOptions(this.isMobile ? this.currentWidth : this.widthChart, data.groupByInfo.updatedHeight))
-                    initCharts.setOption(config(barTypesConfig(chart, data.groupByInfo.chartId, windowConfig(this.isMobile, data.groupByInfo.updatedHeight, countCharts), enableDataZoom)), true)
+      if(data.groupByInfo.chartId.includes('pie')) {
+        initCharts.setOption(config(pieConfig(chart, data.groupByInfo.chartId, windowConfig(this.isMobile, this.currentWidth))), true)
+        this.downloadImage(data.groupByInfo.title, this.prepareImage(initCharts))
+      } else if (data.groupByInfo.chartId.includes('types_bar')) {
+        console.log('this.charts', this.charts)
+        initCharts.resize(sizeOptions(this.isMobile ? this.currentWidth : this.widthChart, data.groupByInfo.updatedHeight))
+        initCharts.setOption(config(barTypesConfig(chart, data.groupByInfo.chartId, windowConfig(this.isMobile, data.groupByInfo.updatedHeight, countCharts), enableDataZoom)), true)
 
-                    initCharts.on('finished', () => {
-                         if(data.groupByInfo.isDownloadChart) {
-                              console.log('data', data)
-                              this.downloadImage(data.groupByInfo.title, this.prepareImage(initCharts))
-                              data.groupByInfo.isDownloadChart = false
-                              updatedData({action: 'downloadChart', groupByInfo: {...data.groupByInfo, updatedHeight: this.heightChart, data: this.charts}})
-                         }
-                    })
-
-               } else if (data.groupByInfo.chartId.includes('mount')) {
-                    initCharts.setOption(config(barTypesConfig(chart, data.groupByInfo.chartId, windowConfig(this.isMobile, this.currentWidth))), true)
-                    this.downloadImage(data.groupByInfo.title, this.prepareImage(initCharts))
-               } else {
-                    initCharts.setOption(config(barConfig(chart, data.groupByInfo.chartId, windowConfig(this.isMobile, this.currentWidth))), true)
-                    console.log('data.groupByInfo.title', data.groupByInfo.title)
-                    this.downloadImage(data.groupByInfo.title, this.prepareImage(initCharts))
-               }
+        initCharts.on('finished', () => {
+          if(data.groupByInfo.isDownloadChart) {
+            console.log('data', data)
+            this.downloadImage(data.groupByInfo.title, this.prepareImage(initCharts))
+            data.groupByInfo.isDownloadChart = false
+            updatedData({action: 'downloadChart', groupByInfo: {...data.groupByInfo, updatedHeight: this.heightChart, data: this.charts}})
           }
-     }
+        })
+
+      } else if (data.groupByInfo.chartId.includes('mount')) {
+        initCharts.setOption(config(barTypesConfig(chart, data.groupByInfo.chartId, windowConfig(this.isMobile, this.currentWidth))), true)
+        this.downloadImage(data.groupByInfo.title, this.prepareImage(initCharts))
+      } else {
+        initCharts.setOption(config(barConfig(chart, data.groupByInfo.chartId, windowConfig(this.isMobile, this.currentWidth))), true)
+        console.log('data.groupByInfo.title', data.groupByInfo.title)
+        this.downloadImage(data.groupByInfo.title, this.prepareImage(initCharts))
+      }
+    }
+  }
      
-     prepareImage(initCharts) {
-          const img = new Image()
-          img.src = initCharts.getDataURL({type: 'canvas'})
-          const myHeaders = new Headers()
-          const myRequest = new Request(img.src, {
-               method: "GET",
-               headers: myHeaders,
-               mode: "cors",
-               cache: "default",
-          })
-          return myRequest
-     }
+  prepareImage(initCharts) {
+    const img = new Image()
+    img.src = initCharts.getDataURL({type: 'canvas'})
+    const myHeaders = new Headers()
+    const myRequest = new Request(img.src, {
+      method: "GET",
+      headers: myHeaders,
+      mode: "cors",
+      cache: "default",
+    })
+    return myRequest
+  }
 
-     async downloadImage(name, myRequest) {
-          try {
-               const response = await fetch(myRequest)
-               if (!response.ok) {
-                    throw new Error("Network response was not OK")
-               }
-               const myBlob = await response.blob()
-               const imageURL = URL.createObjectURL(myBlob)
-               const link = document.createElement('a')
-               link.href = imageURL
-               if (link.href) {
-                    const openedImage = window.open(link.href, '_blank')
-                    console.log('openedImage', openedImage)
-                    const linkImg = openedImage.document.createElement('a')
-                    linkImg.href = link.href
-                    linkImg.download = name
-                    openedImage.document.body.appendChild(linkImg)
-                    linkImg.click()
-                    openedImage.document.body.removeChild(linkImg)
-               }
-          }
-          catch (error) {
-               console.error("Error:", error)
-          }
-     }
+  async downloadImage(name, myRequest) {
+    try {
+      const response = await fetch(myRequest)
+      if (!response.ok) {
+        throw new Error("Network response was not OK")
+      }
+      const myBlob = await response.blob()
+      const imageURL = URL.createObjectURL(myBlob)
+      const link = document.createElement('a')
+      link.href = imageURL
+      if (link.href) {
+        const openedImage = window.open(link.href, '_blank')
+        console.log('openedImage', openedImage)
+        const linkImg = openedImage.document.createElement('a')
+        linkImg.href = link.href
+        linkImg.download = name
+        openedImage.document.body.appendChild(linkImg)
+        linkImg.click()
+        openedImage.document.body.removeChild(linkImg)
+      }
+    }
+    catch (error) {
+      console.error("Error:", error)
+    }
+  }
 
-     updateLegendFiltersData(params) {
-          const [chart] = this.charts
-          console.log('params - updateLegendFilterData', params)
-          console.log('chart - updateLegendFilterData', chart)
-          if (params.id === chart.chartId) {
-               if(!params.filterData.value) {
-                    this.legendFilterData.push(params)
-                    return this.legendFilterData
-               } else {
-                    const updatedFiltersData = this.legendFilterData.filter((legend) => legend.filterData.name !== params.filterData.name)
-                    this.legendFilterData = updatedFiltersData
-                    return updatedFiltersData
-               }
-          }
-     }
+  updateLegendFiltersData(params) {
+    const [chart] = this.charts
+    console.log('params - updateLegendFilterData', params)
+    console.log('chart - updateLegendFilterData', chart)
+    if (params.id === chart.chartId) {
+      if(!params.filterData.value) {
+        this.legendFilterData.push(params)
+        return this.legendFilterData
+      } else {
+        const updatedFiltersData = this.legendFilterData.filter((legend) => legend.filterData.name !== params.filterData.name)
+        this.legendFilterData = updatedFiltersData
+        return updatedFiltersData
+      }
+    }
+  }
 
-     onClickedBarCharts(updatedData) {
-          this.initCharts.on('click', (e) => {
-               // console.log('e', e)
-               const filterKey = e.data?.filterKey ? e.data?.filterKey : e.data?.filterKey
-               if(filterKey && e.componentType === 'series' && e.data?.type !== 'mount') {
-                    // console.log('this.charts - nextLayoutChart', this.charts)
-                    updatedData({id: this.id, action: 'nextLayoutChart', data: this.charts, prevGroupByData: e.data.groupByData, prevGroupByFilters: e.data.prevGroupByData, filterKey: filterKey, groupByKey: e.data.groupByKey, groupByValue: e.data.groupByValue ? e.data.groupByValue : null, type: e.data.type})
-               }
-               if(e.event?.target?.id && e.info?.typeEl === 'buttonPrevious' && e.componentType === 'graphic') {
-                    // console.log('beforeLayoutChart')
-                    // console.log('e.info', e.info)
-                    updatedData({id: this.el.id, action: 'beforeLayoutChart', filterKey: e.event.target.id, groupByInfo: e.info})
-               }
-               if(e.event?.target?.id && e.info?.typeEl === 'menu' && e.componentType === 'graphic') {
-                    e.info.mountHeightChart = this.mountHeightChart
-                    // console.log('this.charts - menu', this.charts)
-                    updatedData({action: 'openMenuChart', groupByInfo: {...e.info, data: this.charts}})
-               }
-               if(e.event?.target?.id && (e.info?.typeEl === 'download' || e.info?.typeEl === 'downloadTitle') && e.componentType === 'graphic') {
-                    const fullHeight = e.info.countCharts * 35 + 200
-                    e.info.isDownloadChart = true
-                    updatedData({action: 'downloadChart', groupByInfo: {...e.info, updatedHeight: fullHeight, data: this.charts}})
-               }
-               if(e.event?.target?.id && e.info?.typeEl === 'link' && e.componentType === 'graphic') {
-                    const id = e.event?.target?.parent?.id
-                    const idx = id.slice(0, id.indexOf(':'))
-                    const layoutGroupKey = id.slice((id.indexOf('_') + 1), id.indexOf('-')).trim()
-                    const layoutGroupValue = id.slice(id.indexOf('-') + (id.includes('/') ? 3 : 2)).trim()
-                    const isCurrentLayout = Object.values(e.info?.prevGroupByData)[0] === layoutGroupValue
-                    if (isCurrentLayout && Object.keys(e.info.prevGroupByFilters).length > 1) { // Для выхода с первого вложенного слоя группировки
-                        return false
-                    } else {
-                         // console.log('e.info', e.info)
-                         const updatedPrevGroupByFilters = updatedGroupByData(idx, e.info.prevGroupByFilters, layoutGroupKey, layoutGroupValue)
-                         e.info.prevGroupByFilters = updatedPrevGroupByFilters
-                         e.info.prevGroupByData = {[layoutGroupKey]: layoutGroupValue}
-                         updatedData({id: this.el.id, action: 'beforeLayoutChart', filterKey: e.info.filterKey ? e.info.filterKey : null, groupByInfo: e.info})
-                    }
-               }
-               if(e.data?.groupByKey === groupByKeys.fiveLayout) {
-                    openMachine(e.data)
-               }
-          })
+  onClickedBarCharts(updatedData) {
+    this.initCharts.on('click', (e) => {
+      // console.log('e', e)
+      const filterKey = e.data?.filterKey ? e.data?.filterKey : e.data?.filterKey
+      if(filterKey && e.componentType === 'series' && e.data?.type !== 'mount') {
+        // console.log('this.charts - nextLayoutChart', this.charts)
+        updatedData({id: this.id, action: 'nextLayoutChart', data: this.charts, prevGroupByData: e.data.groupByData, prevGroupByFilters: e.data.prevGroupByData, filterKey: filterKey, groupByKey: e.data.groupByKey, groupByValue: e.data.groupByValue ? e.data.groupByValue : null, type: e.data.type})
+      }
+      if(e.event?.target?.id && e.info?.typeEl === 'buttonPrevious' && e.componentType === 'graphic') {
+        // console.log('beforeLayoutChart')
+        // console.log('e.info', e.info)
+        updatedData({id: this.el.id, action: 'beforeLayoutChart', filterKey: e.event.target.id, groupByInfo: e.info})
+      }
+      if(e.event?.target?.id && e.info?.typeEl === 'menu' && e.componentType === 'graphic') {
+        e.info.mountHeightChart = this.mountHeightChart
+        // console.log('this.charts - menu', this.charts)
+        updatedData({action: 'openMenuChart', groupByInfo: {...e.info, data: this.charts}})
+      }
+      if(e.event?.target?.id && (e.info?.typeEl === 'download' || e.info?.typeEl === 'downloadTitle') && e.componentType === 'graphic') {
+        const fullHeight = e.info.countCharts * 35 + 200
+        e.info.isDownloadChart = true
+        updatedData({action: 'downloadChart', groupByInfo: {...e.info, updatedHeight: fullHeight, data: this.charts}})
+      }
+      if(e.event?.target?.id && e.info?.typeEl === 'link' && e.componentType === 'graphic') {
+        const id = e.event?.target?.parent?.id
+        const idx = id.slice(0, id.indexOf(':'))
+        const layoutGroupKey = id.slice((id.indexOf('_') + 1), id.indexOf('-')).trim()
+        const layoutGroupValue = id.slice(id.indexOf('-') + (id.includes('/') ? 3 : 2)).trim()
+        const isCurrentLayout = Object.values(e.info?.prevGroupByData)[0] === layoutGroupValue
+        if (isCurrentLayout && Object.keys(e.info.prevGroupByFilters).length > 1) { // Для выхода с первого вложенного слоя группировки
+          return false
+        } else {
+          // console.log('e.info', e.info)
+          const updatedPrevGroupByFilters = updatedGroupByData(idx, e.info.prevGroupByFilters, layoutGroupKey, layoutGroupValue)
+          e.info.prevGroupByFilters = updatedPrevGroupByFilters
+          e.info.prevGroupByData = {[layoutGroupKey]: layoutGroupValue}
+          updatedData({id: this.el.id, action: 'beforeLayoutChart', filterKey: e.info.filterKey ? e.info.filterKey : null, groupByInfo: e.info})
+        }
+      }
+      if(e.data?.groupByKey === groupByKeys.fiveLayout) {
+        openMachine(e.data)
+      }
+    })
 
-          this.initCharts.on('legendselectchanged', (params) => {
-               if(params.name.indexOf('id:') > 0) {
-                    // Берём все данные производные из имени, так как это активный элемент легенды
-                    const id = params.name.slice((params.name.indexOf('id:') + 3))
-                    const nameIdxEnd = (params.name.indexOf('id:') - 1)
-                    const namePrepare = params.name.slice(0, nameIdxEnd)
-                    const name = namePrepare.slice(0, namePrepare.lastIndexOf(' '))
-                    const updatedLegendFiltersData = this.updateLegendFiltersData({id: this.el.id, filterData: {name: name, value: params.selected[params.name]}})
-                    updatedData({action: 'legendFiltersParams', data: updatedLegendFiltersData})
-               }
+    this.initCharts.on('legendselectchanged', (params) => {
+      if(params.name.indexOf('id:') > 0) {
+        // Берём все данные производные из имени, так как это активный элемент легенды
+        // const id = params.name.slice((params.name.indexOf('id:') + 3))
+        const nameIdxEnd = (params.name.indexOf('id:') - 1)
+        const namePrepare = params.name.slice(0, nameIdxEnd)
+        const name = namePrepare.slice(0, namePrepare.lastIndexOf(' '))
+        const updatedLegendFiltersData = this.updateLegendFiltersData({id: this.el.id, filterData: {name: name, value: params.selected[params.name]}})
+        updatedData({action: 'legendFiltersParams', data: updatedLegendFiltersData})
+      }
                
-          })
-     }
+    })
+  }
 }
 
 export {ECharts}
diff --git a/live_monitor_vue/src/store/hooks/Echarts/staticData.js b/live_monitor_vue/src/store/hooks/Echarts/staticData.js
index f8d04c5..50e2960 100644
--- a/live_monitor_vue/src/store/hooks/Echarts/staticData.js
+++ b/live_monitor_vue/src/store/hooks/Echarts/staticData.js
@@ -1,118 +1,121 @@
 const chartsSetup = {
-     main: [
-          {id: 'commun_pie', type: 'pie', maxHeight: '400px', order: 1},
-          {id: 'commun_pie_cdim', type: 'pie', maxHeight: '400px', order: 2},
-          {id: 'commun_pie_cdrp', type: 'pie', maxHeight: '400px', order: 3},
-          {id: 'commun_pie_mpt_types', type: 'pie', maxHeight: '400px', order: 4},
-          {id: 'commun_pie_gdsm_types', type: 'pie', maxHeight: '400px', order: 5},
-          {id: 'commun_pie_sm_pss_types', type: 'pie', maxHeight: '400px', order: 6},
-          {id: 'routes_pie', type: 'pie', maxHeight: '400px', order: 7},
-          {id: 'rors_pie', type: 'pie', maxHeight: '400px', order: 8},
-          {id: 'routes_bar', type: 'mainMl', maxHeight: '400px', order: 9},
-          {id: 'mount_client_type_bar', type: 'mount', height: '350', maxHeight: '400px', order: 10},
-          {id: 'mount_mounter_type_bar', type: 'mount', height: '500', maxHeight: '600px', order: 11},
-     ],
-     types: [
-          {id: 'commun_types_bar', type: 'default', maxHeight: '400px', order: 1},
-          {id: 'commun_types_bar_cdim', type: 'without_first_layout', maxHeight: '400px', order: 2},
-          {id: 'commun_types_bar_cdrp', type: 'without_first_layout', maxHeight: '400px', order: 3},
-          {id: 'commun_types_bar_mpt_types', type: 'types', maxHeight: '400px', order: 4},
-          {id: 'commun_types_bar_gdsm_types', type: 'types', maxHeight: '400px', order: 5},
-          {id: 'commun_types_bar_sm_pss_types', type: 'types', maxHeight: '400px', order: 6},
-          {id: 'routes_types_bar', type: 'default', maxHeight: '400px', order: 7},
-          {id: 'rors_types_bar', type: 'default', maxHeight: '400px', order: 8},
-          {id: 'routes_types_bar_ml', type: 'ml', maxHeight: '380px', order: 9},
-     ]
+  main: [
+    {id: 'commun_pie', type: 'pie', maxHeight: '400px', order: 1},
+    {id: 'commun_pie_cdim', type: 'pie', maxHeight: '400px', order: 2},
+    {id: 'commun_pie_cdrp', type: 'pie', maxHeight: '400px', order: 3},
+    {id: 'commun_pie_mpt_types', type: 'pie', maxHeight: '400px', order: 4},
+    {id: 'commun_pie_gdsm_types', type: 'pie', maxHeight: '400px', order: 5},
+    {id: 'commun_pie_sm_pss_types', type: 'pie', maxHeight: '400px', order: 6},
+    {id: 'routes_pie', type: 'pie', maxHeight: '400px', order: 7},
+    {id: 'rors_pie', type: 'pie', maxHeight: '400px', order: 8},
+    {id: 'routes_bar', type: 'mainMl', maxHeight: '400px', order: 9},
+    {id: 'mount_client_type_bar', type: 'mount', height: '350', maxHeight: '400px', order: 10},
+    {id: 'mount_mounter_type_bar', type: 'mount', height: '500', maxHeight: '600px', order: 11},
+  ],
+  types: [
+    {id: 'commun_types_bar', type: 'default', maxHeight: '400px', order: 1},
+    {id: 'commun_types_bar_cdim', type: 'without_first_layout', maxHeight: '400px', order: 2},
+    {id: 'commun_types_bar_cdrp', type: 'without_first_layout', maxHeight: '400px', order: 3},
+    {id: 'commun_types_bar_mpt_types', type: 'types', maxHeight: '400px', order: 4},
+    {id: 'commun_types_bar_gdsm_types', type: 'types', maxHeight: '400px', order: 5},
+    {id: 'commun_types_bar_sm_pss_types', type: 'types', maxHeight: '400px', order: 6},
+    {id: 'routes_types_bar', type: 'default', maxHeight: '400px', order: 7},
+    {id: 'rors_types_bar', type: 'default', maxHeight: '400px', order: 8},
+    {id: 'routes_types_bar_ml', type: 'ml', maxHeight: '380px', order: 9},
+  ]
 }
 
 const colorList = (name) => {
-     switch(name) {
-          case 'На связи': return 'rgb(134, 212, 131, 1)'
-          case 'Есть МЛ, выходил на связь': return 'rgb(134, 212, 131, 1)'
-          case 'РОРС': return 'rgb(134, 212, 131, 1)'
-          case 'Не на связи': return 'rgb(255, 114, 114, 1)'
-          case 'Нет МЛ, нет связи': return 'rgb(165, 165, 165, 1)'
-          case 'Не РОРС': return 'rgb(255, 114, 114, 1)'
-          case 'Нет данных': return 'rgb(165, 165, 165, 1)'
-          case 'Есть МЛ, нет связи': return 'rgb(255, 114, 114, 1)'
-          case 'Нет МЛ, выходил на связь': return 'rgb(243, 161, 30, 1)'
-     }
+  switch(name) {
+  case 'На связи': return 'rgb(134, 212, 131, 1)'
+  case 'Есть МЛ, выходил на связь': return 'rgb(134, 212, 131, 1)'
+  case 'РОРС': return 'rgb(134, 212, 131, 1)'
+  case 'Не на связи': return 'rgb(255, 114, 114, 1)'
+  case 'Нет МЛ, нет связи': return 'rgb(165, 165, 165, 1)'
+  case 'Не РОРС': return 'rgb(255, 114, 114, 1)'
+  case 'Нет данных': return 'rgb(165, 165, 165, 1)'
+  case 'Есть МЛ, нет связи': return 'rgb(255, 114, 114, 1)'
+  case 'Нет МЛ, выходил на связь': return 'rgb(243, 161, 30, 1)'
+  }
 }
 
 const colorListBar = (type, name) => {
-     if(type === typesCharts.mainMl || typesCharts.typesMl) {
-          switch(name) {
-               case 'Обычные': return 'rgb(134, 212, 131, 1)'
-               case 'Аварийные': return 'rgb(255, 114, 114, 1)'
-               case 'Прочие': return 'rgb(196, 161, 201, 1)'
-               case 'Ремонтные': return 'rgb(228, 202, 163, 1)'
-               case 'Без выезда': return 'rgb(243, 161, 30, 1)'
-               case 'СПС без МЛ': return 'rgb(165, 165, 165, 1)'
-          }
-     }
+  if(type === typesCharts.mainMl || typesCharts.typesMl) {
+    switch(name) {
+    case 'Обычные': return 'rgb(134, 212, 131, 1)'
+    case 'Аварийные': return 'rgb(255, 114, 114, 1)'
+    case 'Прочие': return 'rgb(196, 161, 201, 1)'
+    case 'Ремонтные': return 'rgb(228, 202, 163, 1)'
+    case 'Без выезда': return 'rgb(243, 161, 30, 1)'
+    case 'СПС без МЛ': return 'rgb(165, 165, 165, 1)'
+    }
+  }
 }
 
 const orderCharts = (name) => {
-     switch(name) {
-          case 'На связи': return 1
-          case 'Есть МЛ, выходил на связь': return 1
-          case 'РОРС': return 1
-          case 'Не на связи': return 2
-          case 'Не РОРС': return 2
-          case 'Есть МЛ, нет связи': return 2
-          case 'Нет МЛ, выходил на связь': return 3
-          case 'Нет МЛ, нет связи': return 5
-          case 'Нет данных': return 5
-     }
+  switch(name) {
+  case 'На связи': return 1
+  case 'Есть МЛ, выходил на связь': return 1
+  case 'РОРС': return 1
+  case 'Не на связи': return 2
+  case 'Не РОРС': return 2
+  case 'Есть МЛ, нет связи': return 2
+  case 'Нет МЛ, выходил на связь': return 3
+  case 'Нет МЛ, нет связи': return 5
+  case 'Нет данных': return 5
+  }
 }
 
-const title = (id, count, countWithoutMl = '') => {
-     switch(id) {
-          case 'commun_pie': return `Связь с СПС`
-          case 'commun_pie_cdim': return `Связь с СПС, ЦДИМ`
-          case 'commun_pie_cdrp': return `Связь с СПС, ЦДРП`
-          case 'commun_types_bar': return `Связь с СПС`
-          case 'commun_types_bar_cdim': return `Связь с СПС, ЦДИМ`
-          case 'commun_types_bar_cdrp': return `Связь с СПС, ЦДРП`
-          case 'commun_pie_mpt_types': return `Наличие связи с МРТ`
-          case 'commun_pie_gdsm_types': return `Наличие связи с ЖДСМ`
-          case 'commun_pie_sm_pss_types': return `Наличие связи с СМ`
-          case 'commun_types_bar_mpt_types': return `Наличие связи с МРТ`
-          case 'commun_types_bar_gdsm_types': return `Наличие связи с ЖДСМ`
-          case 'commun_types_bar_sm_pss_types': return `Наличие связи с СМ`
-          case 'rors_pie': return `РОРС`
-          case 'rors_types_bar': return `РОРС`
-          case 'routes_pie': return `Связь с СПС, МЛ`
-          case 'routes_types_bar': return `Связь с СПС, МЛ`
-          case 'routes_bar': return `Выданные МЛ`
-          case 'routes_types_bar_ml': return `Выданные МЛ`
-          case 'mount_client_type_bar': return `Кол-во монтажей по заказчикам и КР`
-          case 'mount_mounter_type_bar': return `Кол-во монтажей по исполнителям и КР`
-          default: return ''
-     }
+const title = (id) => {
+  switch(id) {
+  case 'commun_pie': return `Связь с СПС`
+  case 'commun_pie_cdim': return `Связь с СПС, ЦДИМ`
+  case 'commun_pie_cdrp': return `Связь с СПС, ЦДРП`
+  case 'commun_types_bar': return `Связь с СПС`
+  case 'commun_types_bar_cdim': return `Связь с СПС, ЦДИМ`
+  case 'commun_types_bar_cdrp': return `Связь с СПС, ЦДРП`
+  case 'commun_pie_mpt_types': return `Наличие связи с МРТ`
+  case 'commun_pie_gdsm_types': return `Наличие связи с ЖДСМ`
+  case 'commun_pie_sm_pss_types': return `Наличие связи с СМ`
+  case 'commun_types_bar_mpt_types': return `Наличие связи с МРТ`
+  case 'commun_types_bar_gdsm_types': return `Наличие связи с ЖДСМ`
+  case 'commun_types_bar_sm_pss_types': return `Наличие связи с СМ`
+  case 'rors_pie': return `РОРС`
+  case 'rors_types_bar': return `РОРС`
+  case 'routes_pie': return `Связь с СПС, МЛ`
+  case 'routes_types_bar': return `Связь с СПС, МЛ`
+  case 'routes_bar': return `Выданные МЛ`
+  case 'routes_types_bar_ml': return `Выданные МЛ`
+  case 'mount_client_type_bar': return `Кол-во монтажей по заказчикам и КР`
+  case 'mount_mounter_type_bar': return `Кол-во монтажей по исполнителям и КР`
+  default: return ''
+  }
 }
 
 const openMachine = (data) => {
-     const [currentEl] = data?.linkData?.filter((el) => el?.machine_type === data?.groupByData[data?.groupByKey])
-     window.open(`/html/askr_devices/analyze_device/${currentEl.device_number}`, '_blank')
+  const currentArr = data?.linkData?.filter((el) => el?.machine_type === data?.groupByData[data?.groupByKey])
+  if (currentArr?.length > 0) {
+    const currentEl = currentArr[0]
+    window.open(`/html/askr_devices/analyze_device/${currentEl.device_number}`, '_blank')
+  }
 }
 
 const groupByKeys = {
-     firstLayout: 'org_type_name',
-     secondLayout: 'railway_name',
-     thirdLayout: 'org_name',
-     fourthLayout: 'type',
-     fiveLayout: 'machine_type',
+  firstLayout: 'org_type_name',
+  secondLayout: 'railway_name',
+  thirdLayout: 'org_name',
+  fourthLayout: 'type',
+  fiveLayout: 'machine_type',
 }
 
 const typesCharts = {
-     default: 'default',
-     without_first_layout: 'without_first_layout',
-     mpt: 'mpt_types',
-     gdsm: 'gdsm_types',
-     sm: 'sm_pss_types',
-     mainMl: 'mainMl',
-     typesMl: 'ml',
+  default: 'default',
+  without_first_layout: 'without_first_layout',
+  mpt: 'mpt_types',
+  gdsm: 'gdsm_types',
+  sm: 'sm_pss_types',
+  mainMl: 'mainMl',
+  typesMl: 'ml',
 }
 
 export {colorList, colorListBar, orderCharts, title, openMachine, groupByKeys, typesCharts, chartsSetup}
\ No newline at end of file
diff --git a/live_monitor_vue/src/store/hooks/Echarts/windowConfigs.js b/live_monitor_vue/src/store/hooks/Echarts/windowConfigs.js
index 3ba69ae..3ec4cc3 100644
--- a/live_monitor_vue/src/store/hooks/Echarts/windowConfigs.js
+++ b/live_monitor_vue/src/store/hooks/Echarts/windowConfigs.js
@@ -1,381 +1,381 @@
 const axisBarConfig = (typeChart, axisData, windowConfig, names = {}) => {
-     return typeChart === 'mount' || typeChart === 'mainMl' || typeChart === 'states' || typeChart === 'packLines' ? {
-          xAxis: {
-               type: 'category',
-               name: names.xAxis ? names.xAxis : '',
-               nameLocation: 'end',
-               nameGap: 35,
-               nameTextStyle: {
-                    verticalAlign: 'top',
-                    align: 'right',
-                    padding: typeChart === 'packLines' ? windowConfig?.linesPack.nameXAxis.padding : [25, 40, 0, 0]
-               },
-               splitLine: {show: true},
-               axisLabel: {
-                    show: true,
-                    color: 'black',
-                    fontSize: windowConfig?.bar?.xAxis?.label?.fontSize,
-                    fontWeight: windowConfig?.bar?.xAxis?.label?.fontWeight,
-                    interval: windowConfig?.bar?.xAxis?.label?.interval,
-                    align: windowConfig?.bar?.xAxis?.label?.align,
-                    hideOverlap: true,
-                  },
-               axisTick: {
-                    show: true,
-                    interval: windowConfig?.bar?.xAxis?.axisTick?.interval,
-                    lineStyle: {
-                         color: 'black',
-                    }
-               },   
-               data: axisData
-               },
-          yAxis: {
-               type: 'value',
-               name: names.xAxis ? names.xAxis : '',
-               // nameLocation: 'end',
-               // nameGap: 35,
-               // nameTextStyle: {
-               //      // verticalAlign: 'top',
-               //      // align: 'right',
-               //      padding: [125, 0, 0, 150]
-               // },
-               splitLine: {show: true},
-               axisLine: {
-                    show: true,
-                    lineStyle: {
-                    //   dashOffset: 10,   
-                      width: 1,
-                      color: 'white',
-                      shadowColor: 'black',
-                      shadowOffsetX: -2
-                    },
-               },
-               axisLabel: {
-                    show: true,
-                    color: 'black',
-                  },
-               axisTick: {
-                    show: true,
-                    lineStyle: {   
-                      color: 'black'
-                    }
-               },
-          },
-     } : {
-          xAxis: {
-               type: 'value',
-               name: names.xAxis ? names.xAxis : '',
-               splitLine: {show: true},
-               axisLabel: {
-                    show: true,
-                    color: 'black',
-                    fontSize: windowConfig?.bar?.xAxis?.label?.fontSize,
-                    fontWeight: windowConfig?.bar?.xAxis?.label?.fontWeight,
-                    interval: windowConfig?.bar?.xAxis?.label?.interval,
-                    align: windowConfig?.bar?.xAxis?.label?.align,
-                    hideOverlap: true,
-                  },
-               axisLine: {
-                    show: true,
-                    lineStyle: {   
-                         color: 'black',
-                    }
-                    },
-               axisTick: {
-                    show: true,
-                    interval: windowConfig?.bar?.xAxis?.axisTick?.interval,
-                    lineStyle: {   
-                         color: 'black'
-                    }
-               },
-               minInterval: 1,
-               },
-          yAxis: {
-               type: 'category',
-               name: names.yAxis ? names.yAxis : '',
-               axisLine: {
-                    show: true,
-                    lineStyle: {
-                    //   dashOffset: 10,   
-                      width: 1,
-                      color: 'white',
-                      shadowColor: 'black',
-                      shadowOffsetX: -2
-                    },
-               },
-               // axisLabel: {
-               //      formatter: (yAxisData) => {
-               //           // return yAxisData.map((el) => {
-               //           //      return `${el?.name} ${el?.value}`
-               //           // })
-               //    }
-               // },
-               axisLabel: {
-                    show: true,
-                    width: windowConfig?.bar?.yAxis?.label?.width,
-                    color: 'black',
-                    fontSize: windowConfig?.bar?.yAxis?.label?.fontSize,
-                    fontWeight: windowConfig?.bar?.yAxis?.label?.fontWeight,
-                    overflow: 'break',
-                  },
-               axisTick: {
-                    show: true,
-                    lineStyle: {   
-                      color: 'black'
-                    }
-               },
-               // fontSize: 10,
-               // offset: -7,
-               data: axisData,
-               splitLine: {
-                    show: true
-                  },
-               // position: windowConfig?.bar?.yAxis?.label?.position,
-               // offset: windowConfig?.bar?.yAxis?.label?.offset,
-               zLevel: 3,
-               // z: 99
-          },
-     }
+  return typeChart === 'mount' || typeChart === 'mainMl' || typeChart === 'states' || typeChart === 'packLines' ? {
+    xAxis: {
+      type: 'category',
+      name: names.xAxis ? names.xAxis : '',
+      nameLocation: 'end',
+      nameGap: 35,
+      nameTextStyle: {
+        verticalAlign: 'top',
+        align: 'right',
+        padding: typeChart === 'packLines' ? windowConfig?.linesPack.nameXAxis.padding : [25, 40, 0, 0]
+      },
+      splitLine: {show: true},
+      axisLabel: {
+        show: true,
+        color: 'black',
+        fontSize: windowConfig?.bar?.xAxis?.label?.fontSize,
+        fontWeight: windowConfig?.bar?.xAxis?.label?.fontWeight,
+        interval: windowConfig?.bar?.xAxis?.label?.interval,
+        align: windowConfig?.bar?.xAxis?.label?.align,
+        hideOverlap: true,
+      },
+      axisTick: {
+        show: true,
+        interval: windowConfig?.bar?.xAxis?.axisTick?.interval,
+        lineStyle: {
+          color: 'black',
+        }
+      },   
+      data: axisData
+    },
+    yAxis: {
+      type: 'value',
+      name: names.xAxis ? names.xAxis : '',
+      // nameLocation: 'end',
+      // nameGap: 35,
+      // nameTextStyle: {
+      //      // verticalAlign: 'top',
+      //      // align: 'right',
+      //      padding: [125, 0, 0, 150]
+      // },
+      splitLine: {show: true},
+      axisLine: {
+        show: true,
+        lineStyle: {
+          //   dashOffset: 10,   
+          width: 1,
+          color: 'white',
+          shadowColor: 'black',
+          shadowOffsetX: -2
+        },
+      },
+      axisLabel: {
+        show: true,
+        color: 'black',
+      },
+      axisTick: {
+        show: true,
+        lineStyle: {   
+          color: 'black'
+        }
+      },
+    },
+  } : {
+    xAxis: {
+      type: 'value',
+      name: names.xAxis ? names.xAxis : '',
+      splitLine: {show: true},
+      axisLabel: {
+        show: true,
+        color: 'black',
+        fontSize: windowConfig?.bar?.xAxis?.label?.fontSize,
+        fontWeight: windowConfig?.bar?.xAxis?.label?.fontWeight,
+        interval: windowConfig?.bar?.xAxis?.label?.interval,
+        align: windowConfig?.bar?.xAxis?.label?.align,
+        hideOverlap: true,
+      },
+      axisLine: {
+        show: true,
+        lineStyle: {   
+          color: 'black',
+        }
+      },
+      axisTick: {
+        show: true,
+        interval: windowConfig?.bar?.xAxis?.axisTick?.interval,
+        lineStyle: {   
+          color: 'black'
+        }
+      },
+      minInterval: 1,
+    },
+    yAxis: {
+      type: 'category',
+      name: names.yAxis ? names.yAxis : '',
+      axisLine: {
+        show: true,
+        lineStyle: {
+          //   dashOffset: 10,   
+          width: 1,
+          color: 'white',
+          shadowColor: 'black',
+          shadowOffsetX: -2
+        },
+      },
+      // axisLabel: {
+      //      formatter: (yAxisData) => {
+      //           // return yAxisData.map((el) => {
+      //           //      return `${el?.name} ${el?.value}`
+      //           // })
+      //    }
+      // },
+      axisLabel: {
+        show: true,
+        width: windowConfig?.bar?.yAxis?.label?.width,
+        color: 'black',
+        fontSize: windowConfig?.bar?.yAxis?.label?.fontSize,
+        fontWeight: windowConfig?.bar?.yAxis?.label?.fontWeight,
+        overflow: 'break',
+      },
+      axisTick: {
+        show: true,
+        lineStyle: {   
+          color: 'black'
+        }
+      },
+      // fontSize: 10,
+      // offset: -7,
+      data: axisData,
+      splitLine: {
+        show: true
+      },
+      // position: windowConfig?.bar?.yAxis?.label?.position,
+      // offset: windowConfig?.bar?.yAxis?.label?.offset,
+      zLevel: 3,
+      // z: 99
+    },
+  }
 }
 
 const windowConfig = (isMobile, currentWidth, countCharts) => {
 
-     const scrollbarParams = (countCharts) => {
-          if(15 < countCharts && countCharts < 40) return {
-               start: 85, minSpan: 5
-          }
-          if(40 < countCharts && countCharts < 70) return {
-               start: 90, minSpan: 5
-          }
-          if(70 < countCharts && countCharts < 100) return {
-               start: 95, minSpan: 5
-          }
-          if(100 < countCharts) return {
-               start: 99, minSpan: 3
-          }
-          return {start: 70, minSpan: 5}
+  const scrollbarParams = (countCharts) => {
+    if(15 < countCharts && countCharts < 40) return {
+      start: 85, minSpan: 5
+    }
+    if(40 < countCharts && countCharts < 70) return {
+      start: 90, minSpan: 5
+    }
+    if(70 < countCharts && countCharts < 100) return {
+      start: 95, minSpan: 5
+    }
+    if(100 < countCharts) return {
+      start: 99, minSpan: 3
+    }
+    return {start: 70, minSpan: 5}
 
-     }
+  }
 
-     if(isMobile) return {
-          title: {
-               width: currentWidth - 90,
-               top: 3,
-               left: 'left',
-               fontSize: 11,
-          },
-          backgroundColor: '#FFF',
-          pie: {
-               legend: {
-                    itemWidth: 15,
-                    itemHeight: 15,
-                    itemGap: 5,
-                    fontSize: 10
-               },
-               graphic: {
-                    period: {
-                         top: 10,
-                         right: 40,
-                         fontSize: 10
-                    },
-                    count: {
-                         top: 'center',
-                         left: 'center',
-                         fontSize: 20
-                    },
-               }
-          },
-          linesPack: {
-               legend: {
-                    bottom: 0,
-                    itemWidth: 25,
-                    itemHeight: 14,
-                    itemGap: 7,
-                    fontSize: 11
-               },
-               nameXAxis: {
-                    padding: [110, 40, 0, 0],
-               }
-          },     
-          bar: {
-               legend: {
-                    bottom: 0,
-                    itemWidth: 10,
-                    itemHeight: 10,
-                    itemGap: 5,
-                    fontSize: 10
-               },
-               grid: {
-                    width: '85%',
-                    top: 40
-               },
-               yAxis: {
-                    label: {width: 40, fontWeight: 'bold', fontSize: 9, position: 'left', offset: -20}
-               },
-               xAxis: {
-                    label: {fontSize: 10, fontWeight: 'bold', interval: 1, align: 'center'},
-                    axisTick: {interval: 1}
-               },
-               dataZoom: {
-                    top: 40,
-                    start: scrollbarParams(countCharts).start,
-                    minSpan: scrollbarParams(countCharts).minSpan,
-               },
-               graphic: {
-                    period: {
-                         top: 8,
-                         right: 50,
-                         fontSize: 10
-                    },
-                    menu: {
-                         top: 5,
-                         right: 0
-                    },
-                    container: {
-                         top: 27,
-                         right: 0
-                    },
-                    rect: {
-                         top: 8,
-                         right: 10
-                    },
-                    download: {
-                         top: 18,
-                         right: 70
-                    },
-                    downloadTitle: {
-                         top: 23,
-                         right: 20
-                    },
-                    back: {
-                         top: 5,
-                         right: 20,
-                    },
-                    link: {
-                         top: 23,
-                         left: 7,
-                    }
-               }
-          }
-     }
-     if(!isMobile) return {
-          title: {
-               width: 'auto',
-               top: 3,
-               left: 'left',
-               fontSize: 16,
-          },
-          backgroundColor: '#FFF',
-          line: {
-               legend: {
-                    bottom: 0,
-                    itemWidth: 25,
-                    itemHeight: 14,
-                    itemGap: 7,
-                    fontSize: 11
-               },
-          },     
-          linesPack: {
-               legend: {
-                    bottom: 0,
-                    itemWidth: 25,
-                    itemHeight: 14,
-                    itemGap: 7,
-                    fontSize: 11
-               },
-               nameXAxis: {
-                    padding: [110, 40, 0, 0],
-               }
-          },     
-          pie: {
-               legend: {
-                    itemWidth: 15,
-                    itemHeight: 15,
-                    itemGap: 10,
-                    fontSize: 12
-               },
-               graphic: {
-                    period: {
-                         top: 10,
-                         right: 30,
-                         fontSize: 12
-                    },
-                    count: {
-                         top: 'center',
-                         left: 'center',
-                         fontSize: 27
-                    },
-               }
-          },
-          bar: {
-               legend: {
-                    bottom: 10,
-                    itemWidth: 25,
-                    itemHeight: 14,
-                    itemGap: 10,
-                    fontSize: 12
-               },
-               grid: {
-                    width: '90%',
-                    top: 50
-               },
-               yAxis: {
-                    label: {fontSize: 13, width: 110, fontWeight: 'normal', position: 'left', offset: 0}
+  if(isMobile) return {
+    title: {
+      width: currentWidth - 90,
+      top: 3,
+      left: 'left',
+      fontSize: 11,
+    },
+    backgroundColor: '#FFF',
+    pie: {
+      legend: {
+        itemWidth: 15,
+        itemHeight: 15,
+        itemGap: 5,
+        fontSize: 10
+      },
+      graphic: {
+        period: {
+          top: 10,
+          right: 40,
+          fontSize: 10
+        },
+        count: {
+          top: 'center',
+          left: 'center',
+          fontSize: 20
+        },
+      }
+    },
+    linesPack: {
+      legend: {
+        bottom: 0,
+        itemWidth: 25,
+        itemHeight: 14,
+        itemGap: 7,
+        fontSize: 11
+      },
+      nameXAxis: {
+        padding: [110, 40, 0, 0],
+      }
+    },     
+    bar: {
+      legend: {
+        bottom: 0,
+        itemWidth: 10,
+        itemHeight: 10,
+        itemGap: 5,
+        fontSize: 10
+      },
+      grid: {
+        width: '85%',
+        top: 40
+      },
+      yAxis: {
+        label: {width: 40, fontWeight: 'bold', fontSize: 9, position: 'left', offset: -20}
+      },
+      xAxis: {
+        label: {fontSize: 10, fontWeight: 'bold', interval: 1, align: 'center'},
+        axisTick: {interval: 1}
+      },
+      dataZoom: {
+        top: 40,
+        start: scrollbarParams(countCharts).start,
+        minSpan: scrollbarParams(countCharts).minSpan,
+      },
+      graphic: {
+        period: {
+          top: 8,
+          right: 50,
+          fontSize: 10
+        },
+        menu: {
+          top: 5,
+          right: 0
+        },
+        container: {
+          top: 27,
+          right: 0
+        },
+        rect: {
+          top: 8,
+          right: 10
+        },
+        download: {
+          top: 18,
+          right: 70
+        },
+        downloadTitle: {
+          top: 23,
+          right: 20
+        },
+        back: {
+          top: 5,
+          right: 20,
+        },
+        link: {
+          top: 23,
+          left: 7,
+        }
+      }
+    }
+  }
+  if(!isMobile) return {
+    title: {
+      width: 'auto',
+      top: 3,
+      left: 'left',
+      fontSize: 16,
+    },
+    backgroundColor: '#FFF',
+    line: {
+      legend: {
+        bottom: 0,
+        itemWidth: 25,
+        itemHeight: 14,
+        itemGap: 7,
+        fontSize: 11
+      },
+    },     
+    linesPack: {
+      legend: {
+        bottom: 0,
+        itemWidth: 25,
+        itemHeight: 14,
+        itemGap: 7,
+        fontSize: 11
+      },
+      nameXAxis: {
+        padding: [110, 40, 0, 0],
+      }
+    },     
+    pie: {
+      legend: {
+        itemWidth: 15,
+        itemHeight: 15,
+        itemGap: 10,
+        fontSize: 12
+      },
+      graphic: {
+        period: {
+          top: 10,
+          right: 30,
+          fontSize: 12
+        },
+        count: {
+          top: 'center',
+          left: 'center',
+          fontSize: 27
+        },
+      }
+    },
+    bar: {
+      legend: {
+        bottom: 10,
+        itemWidth: 25,
+        itemHeight: 14,
+        itemGap: 10,
+        fontSize: 12
+      },
+      grid: {
+        width: '90%',
+        top: 50
+      },
+      yAxis: {
+        label: {fontSize: 13, width: 110, fontWeight: 'normal', position: 'left', offset: 0}
                     
-               },
-               xAxis: {
-                    label: {fontSize: 10, fontWeight: 'normal', interval: 1, align: 'center'}, 
-                    axisTick: {interval: 0}
-               },
-               dataZoom: {
-                    top: 50,
-                    start: scrollbarParams(countCharts).start,
-                    minSpan: scrollbarParams(countCharts).minSpan,
-               },
-               graphic: { 
-                    period: {
-                         top: 10,
-                         right: 60,
-                         fontSize: 12
-                    },
-                    menu: {
-                         top: 7,
-                         right: 5
-                    },
-                    container: {
-                         top: 27,
-                         right: 0
-                    },
-                    rect: {
-                         top: 8,
-                         right: 10
-                    },
-                    download: {
-                         top: 18,
-                         right: 70
-                    },
-                    downloadTitle: {
-                         top: 23,
-                         right: 20
-                    },
-                    back: {
-                         top: 7,
-                         right: 30,
-                    },
-                    link: {
-                         top: 28,
-                         left: 7,
-                    }
-               }
-          }
-     }
+      },
+      xAxis: {
+        label: {fontSize: 10, fontWeight: 'normal', interval: 1, align: 'center'}, 
+        axisTick: {interval: 0}
+      },
+      dataZoom: {
+        top: 50,
+        start: scrollbarParams(countCharts).start,
+        minSpan: scrollbarParams(countCharts).minSpan,
+      },
+      graphic: { 
+        period: {
+          top: 10,
+          right: 60,
+          fontSize: 12
+        },
+        menu: {
+          top: 7,
+          right: 5
+        },
+        container: {
+          top: 27,
+          right: 0
+        },
+        rect: {
+          top: 8,
+          right: 10
+        },
+        download: {
+          top: 18,
+          right: 70
+        },
+        downloadTitle: {
+          top: 23,
+          right: 20
+        },
+        back: {
+          top: 7,
+          right: 30,
+        },
+        link: {
+          top: 28,
+          left: 7,
+        }
+      }
+    }
+  }
 }
 
 const sizeOptions = (width = 600, height = 400) => {
-     return {
-          width: width,
-          height: height
-     }
-   }
+  return {
+    width: width,
+    height: height
+  }
+}
 
 export {axisBarConfig, windowConfig, sizeOptions}   
\ No newline at end of file
diff --git a/live_monitor_vue/src/store/index.js b/live_monitor_vue/src/store/index.js
index 538a0dd..6313215 100644
--- a/live_monitor_vue/src/store/index.js
+++ b/live_monitor_vue/src/store/index.js
@@ -12,6 +12,7 @@ import { store as packs } from '@/store/modules/packs';
 import { store as services } from '@/store/modules/services';
 import { store as logger } from '@/store/modules/logger';
 
+// eslint-disable-next-line no-undef
 let debug = process.env.NODE_ENV !== 'production';
 debug = false;
 
diff --git a/live_monitor_vue/src/store/modules/add_users/StaticData.js b/live_monitor_vue/src/store/modules/add_users/StaticData.js
index 45de61b..1ec37d1 100644
--- a/live_monitor_vue/src/store/modules/add_users/StaticData.js
+++ b/live_monitor_vue/src/store/modules/add_users/StaticData.js
@@ -20,569 +20,569 @@ const columns = [
     log: true,
     render: `
       <div class="flex items-center gap-2">
-        <a target="_blank" href="/html/admin/manage/{{ id }}?prev_page=/\?current_mode=users"><i class="cursor-pointer ri-pencil-line text-slate-700"></i></a>
+        <a target="_blank" href="/html/admin/manage/{{ id }}?prev_page=/?current_mode=users"><i class="cursor-pointer ri-pencil-line text-slate-700"></i></a>
       </div>
     `
   }
 ]
 
 const users = {
-    columns: [
-      {
-        download: false,
-        field: "id",
-        headerFilter: "input",
-        headerFilterPlaceholder: "ID",
-        minWidth: 80,
-        print: false,
-        responsive: 0,
-        sorter: "string",
-        title: "ID",
-        vertAlign: "middle",
-        width: 150
-      },
-      {
-        download: false,
-        field: "fio",
-        headerFilter: "input",
-        headerFilterPlaceholder: "ФИО",
-        minWidth: 80,
-        print: false,
-        responsive: 0,
-        sorter: "string",
-        title: "ФИО",
-        vertAlign: "middle",
-        width: 150
-      },
-      {
-        download: false,
-        field: "login",
-        headerFilter: "input",
-        headerFilterPlaceholder: "Логин",
-        minWidth: 80,
-        print: false,
-        responsive: 0,
-        sorter: "string",
-        title: "Логин",
-        vertAlign: "middle",
-        width: 150
-      },
-      {
-        download: false,
-        field: "actions",
-        headerFilter: "input",
-        headerFilterPlaceholder: "Действия",
-        log: true,
-        minWidth: 80,
-        print: false,
-        render: "\n          <div class=\"flex items-center gap-2\">\n            <a target=\"_blank\" href=\"/html/admin/manage/{{ id }}?prev_page=/?current_mode=users\"><i class=\"cursor-pointer ri-pencil-line text-slate-700\"></i></a>\n          </div>\n        ",
-        responsive: 0,
-        sorter: "string",
-        title: "Действия",
-        vertAlign: "middle"
-      }
-    ],
-    data: [
-      {
-        adminGroup: {id: 1, name: "ОРИС"},
-        adminGroupId: 1,
-        fio: "Шлыков Сергей Николаевич",
-        firstName: "Сергей",
-        id: 1,
-        insertedAt: "2022-03-10 14:51:07",
-        lastName: "Шлыков",
-        locale: "ru-RU",
-        login: "superuser",
-        notes: "### cHdkIFN1cGVyc2VjcmV0 ###",
-        passwordHash: "$2b$12$vZkno0sNHC1mlHYqXHyG7Ow74WfTY5BmgyGnN3G4l.QUygY2MDfA6",
-        secondName: "Николаевич",
-        updatedAt: "2024-01-15 13:09:35"
-      },
-      {
-        adminGroup: {id: 15, name: "Монтаж"},
-        adminGroupId: 15,
-        fio: "User MNTR ",
-        firstName: "MNTR",
-        id: 3,
-        insertedAt: "2022-03-14 07:12:51",
-        lastName: "User",
-        login: "mntr",
-        notes: "### cHdkIFZuaWlUZXN0 ###",
-        passwordHash: "$2b$12$fWS34Bkerqo8rakLvOX1b.QmlhCWZviQoSPDEBSX1QOiKxC3hY6Aq",
-        updatedAt: "2024-01-15 13:09:35"
-      },
-      {
-        adminGroup: {id: 15, name: "Монтаж"},
-        adminGroupId: 15,
-        fio: "Романов Александр ",
-        firstName: "Александр",
-        id: 17,
-        insertedAt: "2022-05-24 15:13:00",
-        lastName: "Романов",
-        login: "RomanovAV",
-        notes: "init pwd: 5Nres551### cHdkIDVOcmVzNTUx ###",
-        passwordHash: "$2b$12$jFDdtPbWQruN0vNmCkEl3uzaWLZxBBYXQC04az6Caj1prQaAz1j8m",
-        updatedAt: "2024-01-15 13:09:35"
-      },
-      {
-        adminGroup: {id: 15, name: "Монтаж"},
-        adminGroupId: 15,
-        fio: "Шмаков Александр Сергеевич",
-        firstName: "Александр",
-        id: 18,
-        insertedAt: "2022-05-24 15:13:00",
-        lastName: "Шмаков",
-        login: "smakov",
-        notes: "init pwd: 9ofVZTC6### cHdkIDlvZlZaVEM2 ###",
-        passwordHash: "$2b$12$G./jAcqdse6GWEX5x58hvepFAOeBobvnO7EOWjQeZxLaS4Odqicpe",
-        secondName: "Сергеевич",
-        updatedAt: "2024-01-15 13:09:36"
-      },
-      {
-        adminGroup: {id: 15, name: "Монтаж"},
-        adminGroupId: 15,
-        fio: "Моисеев Сергей Александрович",
-        firstName: "Сергей",
-        id: 19,
-        insertedAt: "2022-05-24 15:13:00",
-        lastName: "Моисеев",
-        login: "Moiseyev",
-        notes: "init pwd: tVWRFS61### cHdkIHRWV1JGUzYx ###",
-        passwordHash: "$2b$12$KyUjOK8C1a/EqEmnN7gJYeAwG.4kWXuI2OU1UKXtfSojuIZcnBb6e",
-        secondName: "Александрович",
-        updatedAt: "2024-01-15 13:09:36"
-      },
-      {
-        adminGroup: {id: 15, name: "Монтаж"},
-        adminGroupId: 15,
-        fio: "Карнаухов Александр Иванович",
-        firstName: "Александр",
-        id: 20,
-        insertedAt: "2022-05-24 15:13:00",
-        lastName: "Карнаухов",
-        login: "KarnauhovAI",
-        notes: "init pwd: TwgTmHGH### cHdkIFR3Z1RtSEdI ###",
-        passwordHash: "$2b$12$33PWjESsfh7gaDYtddv3EutPFi5bOmqSZBDTp4loiAjLpvhWgj.Hm",
-        secondName: "Иванович",
-        updatedAt: "2024-01-15 13:09:36"
-      },
-      {
-        adminGroup: {id: 15, name: "Монтаж"},
-        adminGroupId: 15,
-        fio: "Бобров Виталий Владимирович",
-        firstName: "Виталий",
-        id: 21,
-        insertedAt: "2022-05-24 15:13:01",
-        lastName: "Бобров",
-        login: "Bobrover",
-        notes: "init pwd: xOUM96vI### cHdkIHhPVU05NnZJ ###",
-        passwordHash: "$2b$12$hEameXqEy.FfGJYO7YXnKunud0Wn2ba4GyIaq4WevdA/XmR/iOaM.",
-        secondName: "Владимирович",
-        updatedAt: "2024-01-15 13:09:36"
-      },
-      {
-        adminGroup: {id: 15, name: "Монтаж"},
-        adminGroupId: 15,
-        fio: "Бурак Денис Александрович",
-        firstName: "Денис",
-        id: 22,
-        insertedAt: "2022-05-24 15:13:01",
-        lastName: "Бурак",
-        login: "BurakD",
-        notes: "init pwd: fzqRutIC### cHdkIGZ6cVJ1dElD ###",
-        passwordHash: "$2b$12$zUISbezh9hVBAW/U32yWjOCxFYS5vPGPGO92h8P/0TLLYymWqBUGW",
-        secondName: "Александрович",
-        updatedAt: "2024-01-15 13:09:37"
-      },
-      {
-        adminGroup: {id: 5, name: "TESTERS"},
-        adminGroupId: 5,
-        fio: "User Test ",
-        firstName: "Test",
-        id: 2,
-        insertedAt: "2022-03-14 07:12:51",
-        lastName: "User",
-        login: "testuser",
-        notes: "### cHdkIE1lZ2FwYXNzd29yZA== ###",
-        passwordHash: "$2b$12$zE14rLaUBdVco9RXE9Hepe0mgkbVIYGa4CwiNrZHbHI0SVCNUVQhW",
-        updatedAt: "2024-01-15 13:50:49"
-      },
-      {
-        adminGroup: {id: 15, name: "Монтаж"},
-        adminGroupId: 15,
-        fio: "Ярцев Андрей Васильевич",
-        firstName: "Андрей",
-        id: 16,
-        insertedAt: "2022-05-24 15:12:59",
-        lastName: "Ярцев",
-        login: "Yartsev.Andrey",
-        notes: "init pwd: iWA8qWsv### cHdkIGlXQThxV3N2 ###",
-        passwordHash: "$2b$12$EAhw4.dUdnSlki0tiFyKI.9HkzfviOYCxqBj/63CNU68rg0idna9i",
-        secondName: "Васильевич",
-        updatedAt: "2024-01-15 13:53:07"
-      },
-      {
-        adminGroup: {id: 15, name: "Монтаж"},
-        adminGroupId: 15,
-        fio: "Данилов Александр Николаевич",
-        firstName: "Александр",
-        id: 23,
-        insertedAt: "2022-05-24 15:13:01",
-        lastName: "Данилов",
-        login: "Danilov.Aleksandr",
-        notes: "init pwd: hEVonP0H### cHdkIGhFVm9uUDBI ###",
-        passwordHash: "$2b$12$B1RtRKd7g6fbqYhXfZ9i/e0cVG9CQzI64D37XplU8yUgHz96EX1HO",
-        secondName: "Николаевич",
-        updatedAt: "2024-01-15 13:09:37"
-      },
-      {
-        adminGroup: {id: 15, name: "Монтаж"},
-        adminGroupId: 15,
-        fio: "Буторин Евгений Львович",
-        firstName: "Евгений",
-        id: 24,
-        insertedAt: "2022-05-24 15:13:01",
-        lastName: "Буторин",
-        login: "butorin",
-        notes: "init pwd: wLsqjX+H### cHdkIHdMc3FqWCtI ###",
-        passwordHash: "$2b$12$.MMVjOpL1ol4jR6n/b8S9exedOszcsxPbShcWdYOEggtGFaDjnJuG",
-        secondName: "Львович",
-        updatedAt: "2024-01-15 13:09:37"
-      },
-      {
-        adminGroup: {id: 15, name: "Монтаж"},
-        adminGroupId: 15,
-        fio: "Иванов Дмитрий ",
-        firstName: "Дмитрий",
-        id: 25,
-        insertedAt: "2022-05-24 15:13:01",
-        lastName: "Иванов",
-        login: "ivanovd",
-        notes: "init pwd: OzaruSHc### cHdkIE96YXJ1U0hj ###",
-        passwordHash: "$2b$12$GBTNgWIRGtlUlfjneY8CCuwkXI5bYnBvjtWRz/u/MQx0fi9VKXfHW",
-        updatedAt: "2024-01-15 13:09:37"
-      },
-      {
-        adminGroup: {id: 15, name: "Монтаж"},
-        adminGroupId: 15,
-        fio: "Ильичев Михаил Сергеевич",
-        firstName: "Михаил",
-        id: 33,
-        insertedAt: "2022-05-24 15:13:03",
-        lastName: "Ильичев",
-        login: "ilyichev.mikhail",
-        notes: "init pwd: NxLW6Xmt### cHdkIE54TFc2WG10 ###",
-        passwordHash: "$2b$12$P8oiAcMG5m0XvuKLy4Dtve8hw7xnczVDnFGwo0eP7HkEKijQyNOWG",
-        secondName: "Сергеевич",
-        updatedAt: "2024-01-15 13:09:37"
-      },
-      {
-        adminGroup: {id: 15, name: "Монтаж"},
-        adminGroupId: 15,
-        fio: "Карелин Артём Дмитриевич",
-        firstName: "Артём",
-        id: 34,
-        insertedAt: "2022-05-24 15:13:03",
-        lastName: "Карелин",
-        login: "karelin.artem",
-        notes: "init pwd: +KD43KXa### cHdkICtLRDQzS1hh ###",
-        passwordHash: "$2b$12$Z6nhsAQLtG5qDndjgHFhzu/AP9oGWEejtWznjua2T/SRLSutLNy.y",
-        secondName: "Дмитриевич",
-        updatedAt: "2024-01-15 13:09:38"
-      },
-      {
-        adminGroup: {id: 15, name: "Монтаж"},
-        adminGroupId: 15,
-        fio: "Машкова Юлия Сергеевна",
-        firstName: "Юлия",
-        id: 35,
-        insertedAt: "2022-05-24 15:13:04",
-        lastName: "Машкова",
-        login: "mashkova",
-        notes: "init pwd: fCD8a2ub### cHdkIGZDRDhhMnVi ###",
-        passwordHash: "$2b$12$D61pVAGUHUXaYF761n0vTuHE7XpO.KG.4FcpfHm3y7IffZuR4OPH2",
-        secondName: "Сергеевна",
-        updatedAt: "2024-01-15 13:09:38"
-      },
-      {
-        adminGroup: {id: 15, name: "Монтаж"},
-        adminGroupId: 15,
-        fio: "Головко Борис Борисович",
-        firstName: "Борис",
-        id: 26,
-        insertedAt: "2022-05-24 15:13:02",
-        lastName: "Головко",
-        login: "GolovkoBB",
-        notes: "init pwd: T8mlO00M### cHdkIFQ4bWxPMDBN ###",
-        passwordHash: "$2b$12$BSWzgTFpgit9Vz0hKtGqUuBa.bn6SL.qi7ra8LoYo0hp6AR5NfO1m",
-        secondName: "Борисович",
-        updatedAt: "2024-01-15 13:09:38"
-      },
-      {
-        adminGroup: {id: 1, name: "ОРИС"},
-        adminGroupId: 1,
-        fio: "Перевязкин Александр Александрович",
-        firstName: "Александр",
-        id: 36,
-        insertedAt: "2022-05-24 15:13:04",
-        lastName: "Перевязкин",
-        login: "Perevyazkin.Alexandr",
-        notes: "init pwd: RCZZfFGe### cHdkIFJDWlpmRkdl ###",
-        passwordHash: "$2b$12$t0VnSxU8Rirbu/50R3JXTeK4fwefglZO8kNC98yDO1FocnUCVTnsW",
-        secondName: "Александрович",
-        updatedAt: "2024-01-15 13:09:39"
-      },
-      {
-        adminGroup: {id: 15, name: "Монтаж"},
-        adminGroupId: 15,
-        fio: "Гордейчук Алексей Владимирович",
-        firstName: "Алексей",
-        id: 27,
-        insertedAt: "2022-05-24 15:13:02",
-        lastName: "Гордейчук",
-        login: "GordeychukAV",
-        notes: "init pwd: b9fmKp1y### cHdkIGI5Zm1LcDF5 ###",
-        passwordHash: "$2b$12$mg7xtqxgDgFovnmqfRy5reb0pL1.XWuXxQzcr6L1OCpAtWRXFrsBW",
-        secondName: "Владимирович",
-        updatedAt: "2024-01-15 13:09:39"
-      },
-      {
-        adminGroup: {id: 1, name: "ОРИС"},
-        adminGroupId: 1,
-        fio: "Котов Кирилл Юрьевич",
-        firstName: "Кирилл",
-        id: 28,
-        insertedAt: "2022-05-24 15:13:02",
-        lastName: "Котов",
-        login: "kotov",
-        notes: "init pwd: 9la1NqNC### cHdkIDlsYTFOcU5D ###",
-        passwordHash: "$2b$12$yIgJUi47b8NcPLVMaTh2SezTbSdXe7kbMWlNd92p/JxxeyK6PK5vm",
-        secondName: "Юрьевич",
-        updatedAt: "2024-01-15 13:09:39"
-      },
-      {
-        adminGroup: {id: 15, name: "Монтаж"},
-        adminGroupId: 15,
-        fio: "Шульгин Алексей Викторович",
-        firstName: "Алексей",
-        id: 29,
-        insertedAt: "2022-05-24 15:13:02",
-        lastName: "Шульгин",
-        login: "Schulgin.Aleksey",
-        notes: "init pwd: MULd4uDy### cHdkIE1VTGQ0dUR5 ###",
-        passwordHash: "$2b$12$rez8rGGiHvHgkxIffxCyp.Ahne1rfgg5khXKLrwmNvwDVrpal0v1a",
-        secondName: "Викторович",
-        updatedAt: "2024-01-15 13:09:39"
-      },
-      {
-        adminGroup: {id: 15, name: "Монтаж"},
-        adminGroupId: 15,
-        fio: "Егоров Максим Валерьевич",
-        firstName: "Максим",
-        id: 30,
-        insertedAt: "2022-05-24 15:13:03",
-        lastName: "Егоров",
-        login: "Egorov.Maxim",
-        notes: "init pwd: uV4ZwuGv### cHdkIHVWNFp3dUd2 ###",
-        passwordHash: "$2b$12$vq32dLtEBAOcvME6h5Bb0.sHGa1DryRwoLcCIyzfcJsisZZ.MvyEi",
-        secondName: "Валерьевич",
-        updatedAt: "2024-01-15 13:09:39"
-      },
-      {
-        adminGroup: {id: 15, name: "Монтаж"},
-        adminGroupId: 15,
-        fio: "Скляров Алексей Николаевич",
-        firstName: "Алексей",
-        id: 31,
-        insertedAt: "2022-05-24 15:13:03",
-        lastName: "Скляров",
-        login: "Sklyarov.Aleksey",
-        notes: "init pwd: RpE5Hy+3### cHdkIFJwRTVIeSsz ###",
-        passwordHash: "$2b$12$Y35oJ8/99n5sryYOoNTu5eYV77fIvgIA2OFkQ26Nw1b3FlXepUx9i",
-        secondName: "Николаевич",
-        updatedAt: "2024-01-15 13:09:40"
-      },
-      {
-        adminGroup: {id: 1, name: "ОРИС"},
-        adminGroupId: 1,
-        fio: "Test Admin ",
-        firstName: "Admin",
-        id: 47,
-        insertedAt: "2023-03-02 08:06:05",
-        lastName: "Test",
-        login: "ta112",
-        notes: "### cHdkIFlROEJ1TG5n ###",
-        passwordHash: "$2b$12$6nuL1xC72rUt30YyGqqr6.5yNQ2vvvQlj2ZJeLrKJ9evqqDE75zAC",
-        phone: "444",
-        updatedAt: "2024-01-15 13:09:43"
-      },
-      {
-        adminGroup: {id: 8, name: "ru_watcher"},
-        adminGroupId: 8,
-        fio: "Packs Manger ",
-        firstName: "Manger",
-        id: 48,
-        insertedAt: "2023-03-15 11:25:23",
-        lastName: "Packs",
-        login: "packs_manger",
-        notes: "### cHdkIFBhY2sxc3Nz ###",
-        passwordHash: "$2b$12$rW9uGhrLum.2pTBYgtumAuy8xCqI9iFiUJ4cprGywYLUKbt/XNW4S",
-        updatedAt: "2024-01-15 13:09:43"
-      },
-      {
-        adminGroup: {id: 1, name: "ОРИС"},
-        adminGroupId: 1,
-        fio: "Иванова Александра Сергеевна",
-        firstName: "Александра",
-        id: 37,
-        insertedAt: "2022-05-25 07:16:20",
-        lastName: "Иванова",
-        login: "sascha",
-        notes: "init pwd: Lenovoinwin### cHdkIExlbm92b2lud2lu ###",
-        passwordHash: "$2b$12$xLWXBi0AYp.QOohHGaURYOp0cuow5eTT24oh1HNXI.ZcOCtzvsVUG",
-        secondName: "Сергеевна",
-        updatedAt: "2024-01-15 13:09:40"
-      },
-      {
-        adminGroup: {id: 15, name: "Монтаж"},
-        adminGroupId: 15,
-        fio: "test_admin_del d d",
-        firstName: "d",
-        id: 49,
-        insertedAt: "2023-03-27 07:31:25",
-        lastName: "test_admin_del",
-        login: "test_admin_del",
-        notes: "### cHdkIHpNSjJ0bVhr ###",
-        passwordHash: "$2b$12$Z0tEFtGnI1iO9kjFXYpIXOwYldhRlNkIcei002qzAy7HVJa7m/I.e",
-        secondName: "d",
-        updatedAt: "2024-01-15 13:09:43"
-      },
-      {
-        adminGroup: {id: 9, name: "kudt_watcher"},
-        adminGroupId: 9,
-        fio: "KUDT Watcher ",
-        firstName: "Watcher",
-        id: 50,
-        insertedAt: "2023-03-28 07:55:01",
-        lastName: "KUDT",
-        login: "KUDT",
-        notes: "### cHdkIFdhdGNoS3VkdA== ###",
-        passwordHash: "$2b$12$r47Teqz/KONX3fx2nVEHtup.NRHynjDqobBmNCV7t7fALQwvFXE.a",
-        updatedAt: "2024-01-15 13:09:43"
-      },
-      {
-        adminGroup: {id: 15, name: "Монтаж"},
-        adminGroupId: 15,
-        fio: "Акулов Егор Пользователь",
-        firstName: "Егор",
-        id: 52,
-        insertedAt: "2023-07-31 12:17:56",
-        lastName: "Акулов",
-        login: "AkulEgor",
-        notes: "### cHdkIDEyQWt1bDEz ###",
-        passwordHash: "$2b$12$37YN2TmjAZjE9dmZXycI4OBKMGVUg.vLcFKwx0sS7mn96hB8V1Iai",
-        secondName: "Пользователь",
-        updatedAt: "2024-01-15 13:09:44"
-      },
-      {
-        adminGroup: {id: 12, name: "free_packs_watcher"},
-        adminGroupId: 12,
-        fio: "Кузнецов Александр Юрьевич",
-        firstName: "Александр",
-        id: 51,
-        insertedAt: "2023-04-25 09:25:08",
-        lastName: "Кузнецов",
-        login: "KuznetsovAY",
-        notes: "### cHdkIEt1ejU2N2F5 ###",
-        passwordHash: "$2b$12$WF7iMKiDxKcWShCGTgWnNu4b1HHCxFIP7YPR60LJlwc/BCBwh575q",
-        secondName: "Юрьевич",
-        updatedAt: "2024-01-15 13:09:44"
-      },
-      {
-        adminGroup: {id: 8, name: "ru_watcher"},
-        adminGroupId: 8,
-        fio: "Ru Watcher ",
-        firstName: "Watcher",
-        id: 46,
-        insertedAt: "2023-03-02 06:31:45",
-        lastName: "Ru",
-        login: "RuWatcher",
-        notes: "### cHdkIEpiWlBqZE05 ###",
-        passwordHash: "$2b$12$naoRmmTeR6WYy6UZWHxFBuhwO3s52/p/MCkZlP.KgWsXrk8sIUz4W",
-        phone: "13",
-        updatedAt: "2024-01-15 13:09:40"
-      },
-      {
-        adminGroup: {id: 15, name: "Монтаж"},
-        adminGroupId: 15,
-        fio: "Ананьев Виталий Сергеевич",
-        firstName: "Виталий",
-        id: 38,
-        insertedAt: "2022-05-31 06:34:02",
-        lastName: "Ананьев",
-        login: "ananev.vitaly",
-        notes: "### cHdkIHNKVWl4U0Zh ###",
-        passwordHash: "$2b$12$JLiIog4a9z2dt8xFP.s/.OBcLHo4cDJgLpCjCxHVQa1rAjmNCIOZG",
-        secondName: "Сергеевич",
-        updatedAt: "2024-01-15 13:09:41"
-      },
-      {
-        adminGroup: {id: 15, name: "Монтаж"},
-        adminGroupId: 15,
-        fio: "Карпенко Иван Васильевич",
-        firstName: "Иван",
-        id: 39,
-        insertedAt: "2022-06-02 09:28:49",
-        lastName: "Карпенко",
-        login: "karpenko.ivan",
-        notes: "### cHdkIDdaNXM3Tldq ###",
-        passwordHash: "$2b$12$she6mqurkOULGSd.PzKxeeMppEDjEMhXPdjuH.zncLkVZEKw0iWT2",
-        secondName: "Васильевич",
-        updatedAt: "2024-01-15 13:09:41"
-      },
-      {
-        adminGroup: {id: 5, name: "TESTERS"},
-        adminGroupId: 5,
-        email: "HasyanovMark@no-mail.xx",
-        fio: "Хасянов Марк х",
-        firstName: "Марк",
-        id: 53,
-        insertedAt: "2023-09-22 10:27:21",
-        lastName: "Хасянов",
-        login: "HasyanovM",
-        notes: "### cHdkIG5ZdzE4dTk2 ###",
-        passwordHash: "$2b$12$Pf2T.EKEWXhE2XBpridtOOuKU6NO5evZoGKGMwg4u1wEtCa1hNxUK",
-        secondName: "х",
-        updatedAt: "2024-01-15 13:09:44"
-      },
-      {
-        adminGroup: {id: 6, name: "ПКФ"},
-        adminGroupId: 6,
-        fio: "Технологии ПКФ ",
-        firstName: "ПКФ",
-        id: 40,
-        insertedAt: "2022-06-02 11:53:48",
-        lastName: "Технологии",
-        login: "pkf_teck",
-        notes: "### cHdkIEFCWDIwSXU3 ###",
-        passwordHash: "$2b$12$JFef9mZEyWmPENZM2VTTWePVfGogTAgnu4dFYHNMDhY6RPWb7zRXG",
-        updatedAt: "2024-01-15 13:09:41"
-      },
-      {
-        adminGroup: {id: 7, name: "ВНИКТ"},
-        adminGroupId: 7,
-        fio: "Ушанов Андрей ",
-        firstName: "Андрей",
-        id: 41,
-        insertedAt: "2022-06-06 10:02:15",
-        lastName: "Ушанов",
-        login: "AUshanov",
-        notes: "### cHdkIFBPU2t1anox ###",
-        passwordHash: "$2b$12$StGexN61k2AGoBnCaC2GSeoYrVRGplRoeOSwXXpj3OJiHoLq9zKCi",
-        updatedAt: "2024-01-15 13:09:41"
-      },
-    ],
-    height: "200px"
-  }
+  columns: [
+    {
+      download: false,
+      field: "id",
+      headerFilter: "input",
+      headerFilterPlaceholder: "ID",
+      minWidth: 80,
+      print: false,
+      responsive: 0,
+      sorter: "string",
+      title: "ID",
+      vertAlign: "middle",
+      width: 150
+    },
+    {
+      download: false,
+      field: "fio",
+      headerFilter: "input",
+      headerFilterPlaceholder: "ФИО",
+      minWidth: 80,
+      print: false,
+      responsive: 0,
+      sorter: "string",
+      title: "ФИО",
+      vertAlign: "middle",
+      width: 150
+    },
+    {
+      download: false,
+      field: "login",
+      headerFilter: "input",
+      headerFilterPlaceholder: "Логин",
+      minWidth: 80,
+      print: false,
+      responsive: 0,
+      sorter: "string",
+      title: "Логин",
+      vertAlign: "middle",
+      width: 150
+    },
+    {
+      download: false,
+      field: "actions",
+      headerFilter: "input",
+      headerFilterPlaceholder: "Действия",
+      log: true,
+      minWidth: 80,
+      print: false,
+      render: "\n          <div class=\"flex items-center gap-2\">\n            <a target=\"_blank\" href=\"/html/admin/manage/{{ id }}?prev_page=/?current_mode=users\"><i class=\"cursor-pointer ri-pencil-line text-slate-700\"></i></a>\n          </div>\n        ",
+      responsive: 0,
+      sorter: "string",
+      title: "Действия",
+      vertAlign: "middle"
+    }
+  ],
+  data: [
+    {
+      adminGroup: {id: 1, name: "ОРИС"},
+      adminGroupId: 1,
+      fio: "Шлыков Сергей Николаевич",
+      firstName: "Сергей",
+      id: 1,
+      insertedAt: "2022-03-10 14:51:07",
+      lastName: "Шлыков",
+      locale: "ru-RU",
+      login: "superuser",
+      notes: "### cHdkIFN1cGVyc2VjcmV0 ###",
+      passwordHash: "$2b$12$vZkno0sNHC1mlHYqXHyG7Ow74WfTY5BmgyGnN3G4l.QUygY2MDfA6",
+      secondName: "Николаевич",
+      updatedAt: "2024-01-15 13:09:35"
+    },
+    {
+      adminGroup: {id: 15, name: "Монтаж"},
+      adminGroupId: 15,
+      fio: "User MNTR ",
+      firstName: "MNTR",
+      id: 3,
+      insertedAt: "2022-03-14 07:12:51",
+      lastName: "User",
+      login: "mntr",
+      notes: "### cHdkIFZuaWlUZXN0 ###",
+      passwordHash: "$2b$12$fWS34Bkerqo8rakLvOX1b.QmlhCWZviQoSPDEBSX1QOiKxC3hY6Aq",
+      updatedAt: "2024-01-15 13:09:35"
+    },
+    {
+      adminGroup: {id: 15, name: "Монтаж"},
+      adminGroupId: 15,
+      fio: "Романов Александр ",
+      firstName: "Александр",
+      id: 17,
+      insertedAt: "2022-05-24 15:13:00",
+      lastName: "Романов",
+      login: "RomanovAV",
+      notes: "init pwd: 5Nres551### cHdkIDVOcmVzNTUx ###",
+      passwordHash: "$2b$12$jFDdtPbWQruN0vNmCkEl3uzaWLZxBBYXQC04az6Caj1prQaAz1j8m",
+      updatedAt: "2024-01-15 13:09:35"
+    },
+    {
+      adminGroup: {id: 15, name: "Монтаж"},
+      adminGroupId: 15,
+      fio: "Шмаков Александр Сергеевич",
+      firstName: "Александр",
+      id: 18,
+      insertedAt: "2022-05-24 15:13:00",
+      lastName: "Шмаков",
+      login: "smakov",
+      notes: "init pwd: 9ofVZTC6### cHdkIDlvZlZaVEM2 ###",
+      passwordHash: "$2b$12$G./jAcqdse6GWEX5x58hvepFAOeBobvnO7EOWjQeZxLaS4Odqicpe",
+      secondName: "Сергеевич",
+      updatedAt: "2024-01-15 13:09:36"
+    },
+    {
+      adminGroup: {id: 15, name: "Монтаж"},
+      adminGroupId: 15,
+      fio: "Моисеев Сергей Александрович",
+      firstName: "Сергей",
+      id: 19,
+      insertedAt: "2022-05-24 15:13:00",
+      lastName: "Моисеев",
+      login: "Moiseyev",
+      notes: "init pwd: tVWRFS61### cHdkIHRWV1JGUzYx ###",
+      passwordHash: "$2b$12$KyUjOK8C1a/EqEmnN7gJYeAwG.4kWXuI2OU1UKXtfSojuIZcnBb6e",
+      secondName: "Александрович",
+      updatedAt: "2024-01-15 13:09:36"
+    },
+    {
+      adminGroup: {id: 15, name: "Монтаж"},
+      adminGroupId: 15,
+      fio: "Карнаухов Александр Иванович",
+      firstName: "Александр",
+      id: 20,
+      insertedAt: "2022-05-24 15:13:00",
+      lastName: "Карнаухов",
+      login: "KarnauhovAI",
+      notes: "init pwd: TwgTmHGH### cHdkIFR3Z1RtSEdI ###",
+      passwordHash: "$2b$12$33PWjESsfh7gaDYtddv3EutPFi5bOmqSZBDTp4loiAjLpvhWgj.Hm",
+      secondName: "Иванович",
+      updatedAt: "2024-01-15 13:09:36"
+    },
+    {
+      adminGroup: {id: 15, name: "Монтаж"},
+      adminGroupId: 15,
+      fio: "Бобров Виталий Владимирович",
+      firstName: "Виталий",
+      id: 21,
+      insertedAt: "2022-05-24 15:13:01",
+      lastName: "Бобров",
+      login: "Bobrover",
+      notes: "init pwd: xOUM96vI### cHdkIHhPVU05NnZJ ###",
+      passwordHash: "$2b$12$hEameXqEy.FfGJYO7YXnKunud0Wn2ba4GyIaq4WevdA/XmR/iOaM.",
+      secondName: "Владимирович",
+      updatedAt: "2024-01-15 13:09:36"
+    },
+    {
+      adminGroup: {id: 15, name: "Монтаж"},
+      adminGroupId: 15,
+      fio: "Бурак Денис Александрович",
+      firstName: "Денис",
+      id: 22,
+      insertedAt: "2022-05-24 15:13:01",
+      lastName: "Бурак",
+      login: "BurakD",
+      notes: "init pwd: fzqRutIC### cHdkIGZ6cVJ1dElD ###",
+      passwordHash: "$2b$12$zUISbezh9hVBAW/U32yWjOCxFYS5vPGPGO92h8P/0TLLYymWqBUGW",
+      secondName: "Александрович",
+      updatedAt: "2024-01-15 13:09:37"
+    },
+    {
+      adminGroup: {id: 5, name: "TESTERS"},
+      adminGroupId: 5,
+      fio: "User Test ",
+      firstName: "Test",
+      id: 2,
+      insertedAt: "2022-03-14 07:12:51",
+      lastName: "User",
+      login: "testuser",
+      notes: "### cHdkIE1lZ2FwYXNzd29yZA== ###",
+      passwordHash: "$2b$12$zE14rLaUBdVco9RXE9Hepe0mgkbVIYGa4CwiNrZHbHI0SVCNUVQhW",
+      updatedAt: "2024-01-15 13:50:49"
+    },
+    {
+      adminGroup: {id: 15, name: "Монтаж"},
+      adminGroupId: 15,
+      fio: "Ярцев Андрей Васильевич",
+      firstName: "Андрей",
+      id: 16,
+      insertedAt: "2022-05-24 15:12:59",
+      lastName: "Ярцев",
+      login: "Yartsev.Andrey",
+      notes: "init pwd: iWA8qWsv### cHdkIGlXQThxV3N2 ###",
+      passwordHash: "$2b$12$EAhw4.dUdnSlki0tiFyKI.9HkzfviOYCxqBj/63CNU68rg0idna9i",
+      secondName: "Васильевич",
+      updatedAt: "2024-01-15 13:53:07"
+    },
+    {
+      adminGroup: {id: 15, name: "Монтаж"},
+      adminGroupId: 15,
+      fio: "Данилов Александр Николаевич",
+      firstName: "Александр",
+      id: 23,
+      insertedAt: "2022-05-24 15:13:01",
+      lastName: "Данилов",
+      login: "Danilov.Aleksandr",
+      notes: "init pwd: hEVonP0H### cHdkIGhFVm9uUDBI ###",
+      passwordHash: "$2b$12$B1RtRKd7g6fbqYhXfZ9i/e0cVG9CQzI64D37XplU8yUgHz96EX1HO",
+      secondName: "Николаевич",
+      updatedAt: "2024-01-15 13:09:37"
+    },
+    {
+      adminGroup: {id: 15, name: "Монтаж"},
+      adminGroupId: 15,
+      fio: "Буторин Евгений Львович",
+      firstName: "Евгений",
+      id: 24,
+      insertedAt: "2022-05-24 15:13:01",
+      lastName: "Буторин",
+      login: "butorin",
+      notes: "init pwd: wLsqjX+H### cHdkIHdMc3FqWCtI ###",
+      passwordHash: "$2b$12$.MMVjOpL1ol4jR6n/b8S9exedOszcsxPbShcWdYOEggtGFaDjnJuG",
+      secondName: "Львович",
+      updatedAt: "2024-01-15 13:09:37"
+    },
+    {
+      adminGroup: {id: 15, name: "Монтаж"},
+      adminGroupId: 15,
+      fio: "Иванов Дмитрий ",
+      firstName: "Дмитрий",
+      id: 25,
+      insertedAt: "2022-05-24 15:13:01",
+      lastName: "Иванов",
+      login: "ivanovd",
+      notes: "init pwd: OzaruSHc### cHdkIE96YXJ1U0hj ###",
+      passwordHash: "$2b$12$GBTNgWIRGtlUlfjneY8CCuwkXI5bYnBvjtWRz/u/MQx0fi9VKXfHW",
+      updatedAt: "2024-01-15 13:09:37"
+    },
+    {
+      adminGroup: {id: 15, name: "Монтаж"},
+      adminGroupId: 15,
+      fio: "Ильичев Михаил Сергеевич",
+      firstName: "Михаил",
+      id: 33,
+      insertedAt: "2022-05-24 15:13:03",
+      lastName: "Ильичев",
+      login: "ilyichev.mikhail",
+      notes: "init pwd: NxLW6Xmt### cHdkIE54TFc2WG10 ###",
+      passwordHash: "$2b$12$P8oiAcMG5m0XvuKLy4Dtve8hw7xnczVDnFGwo0eP7HkEKijQyNOWG",
+      secondName: "Сергеевич",
+      updatedAt: "2024-01-15 13:09:37"
+    },
+    {
+      adminGroup: {id: 15, name: "Монтаж"},
+      adminGroupId: 15,
+      fio: "Карелин Артём Дмитриевич",
+      firstName: "Артём",
+      id: 34,
+      insertedAt: "2022-05-24 15:13:03",
+      lastName: "Карелин",
+      login: "karelin.artem",
+      notes: "init pwd: +KD43KXa### cHdkICtLRDQzS1hh ###",
+      passwordHash: "$2b$12$Z6nhsAQLtG5qDndjgHFhzu/AP9oGWEejtWznjua2T/SRLSutLNy.y",
+      secondName: "Дмитриевич",
+      updatedAt: "2024-01-15 13:09:38"
+    },
+    {
+      adminGroup: {id: 15, name: "Монтаж"},
+      adminGroupId: 15,
+      fio: "Машкова Юлия Сергеевна",
+      firstName: "Юлия",
+      id: 35,
+      insertedAt: "2022-05-24 15:13:04",
+      lastName: "Машкова",
+      login: "mashkova",
+      notes: "init pwd: fCD8a2ub### cHdkIGZDRDhhMnVi ###",
+      passwordHash: "$2b$12$D61pVAGUHUXaYF761n0vTuHE7XpO.KG.4FcpfHm3y7IffZuR4OPH2",
+      secondName: "Сергеевна",
+      updatedAt: "2024-01-15 13:09:38"
+    },
+    {
+      adminGroup: {id: 15, name: "Монтаж"},
+      adminGroupId: 15,
+      fio: "Головко Борис Борисович",
+      firstName: "Борис",
+      id: 26,
+      insertedAt: "2022-05-24 15:13:02",
+      lastName: "Головко",
+      login: "GolovkoBB",
+      notes: "init pwd: T8mlO00M### cHdkIFQ4bWxPMDBN ###",
+      passwordHash: "$2b$12$BSWzgTFpgit9Vz0hKtGqUuBa.bn6SL.qi7ra8LoYo0hp6AR5NfO1m",
+      secondName: "Борисович",
+      updatedAt: "2024-01-15 13:09:38"
+    },
+    {
+      adminGroup: {id: 1, name: "ОРИС"},
+      adminGroupId: 1,
+      fio: "Перевязкин Александр Александрович",
+      firstName: "Александр",
+      id: 36,
+      insertedAt: "2022-05-24 15:13:04",
+      lastName: "Перевязкин",
+      login: "Perevyazkin.Alexandr",
+      notes: "init pwd: RCZZfFGe### cHdkIFJDWlpmRkdl ###",
+      passwordHash: "$2b$12$t0VnSxU8Rirbu/50R3JXTeK4fwefglZO8kNC98yDO1FocnUCVTnsW",
+      secondName: "Александрович",
+      updatedAt: "2024-01-15 13:09:39"
+    },
+    {
+      adminGroup: {id: 15, name: "Монтаж"},
+      adminGroupId: 15,
+      fio: "Гордейчук Алексей Владимирович",
+      firstName: "Алексей",
+      id: 27,
+      insertedAt: "2022-05-24 15:13:02",
+      lastName: "Гордейчук",
+      login: "GordeychukAV",
+      notes: "init pwd: b9fmKp1y### cHdkIGI5Zm1LcDF5 ###",
+      passwordHash: "$2b$12$mg7xtqxgDgFovnmqfRy5reb0pL1.XWuXxQzcr6L1OCpAtWRXFrsBW",
+      secondName: "Владимирович",
+      updatedAt: "2024-01-15 13:09:39"
+    },
+    {
+      adminGroup: {id: 1, name: "ОРИС"},
+      adminGroupId: 1,
+      fio: "Котов Кирилл Юрьевич",
+      firstName: "Кирилл",
+      id: 28,
+      insertedAt: "2022-05-24 15:13:02",
+      lastName: "Котов",
+      login: "kotov",
+      notes: "init pwd: 9la1NqNC### cHdkIDlsYTFOcU5D ###",
+      passwordHash: "$2b$12$yIgJUi47b8NcPLVMaTh2SezTbSdXe7kbMWlNd92p/JxxeyK6PK5vm",
+      secondName: "Юрьевич",
+      updatedAt: "2024-01-15 13:09:39"
+    },
+    {
+      adminGroup: {id: 15, name: "Монтаж"},
+      adminGroupId: 15,
+      fio: "Шульгин Алексей Викторович",
+      firstName: "Алексей",
+      id: 29,
+      insertedAt: "2022-05-24 15:13:02",
+      lastName: "Шульгин",
+      login: "Schulgin.Aleksey",
+      notes: "init pwd: MULd4uDy### cHdkIE1VTGQ0dUR5 ###",
+      passwordHash: "$2b$12$rez8rGGiHvHgkxIffxCyp.Ahne1rfgg5khXKLrwmNvwDVrpal0v1a",
+      secondName: "Викторович",
+      updatedAt: "2024-01-15 13:09:39"
+    },
+    {
+      adminGroup: {id: 15, name: "Монтаж"},
+      adminGroupId: 15,
+      fio: "Егоров Максим Валерьевич",
+      firstName: "Максим",
+      id: 30,
+      insertedAt: "2022-05-24 15:13:03",
+      lastName: "Егоров",
+      login: "Egorov.Maxim",
+      notes: "init pwd: uV4ZwuGv### cHdkIHVWNFp3dUd2 ###",
+      passwordHash: "$2b$12$vq32dLtEBAOcvME6h5Bb0.sHGa1DryRwoLcCIyzfcJsisZZ.MvyEi",
+      secondName: "Валерьевич",
+      updatedAt: "2024-01-15 13:09:39"
+    },
+    {
+      adminGroup: {id: 15, name: "Монтаж"},
+      adminGroupId: 15,
+      fio: "Скляров Алексей Николаевич",
+      firstName: "Алексей",
+      id: 31,
+      insertedAt: "2022-05-24 15:13:03",
+      lastName: "Скляров",
+      login: "Sklyarov.Aleksey",
+      notes: "init pwd: RpE5Hy+3### cHdkIFJwRTVIeSsz ###",
+      passwordHash: "$2b$12$Y35oJ8/99n5sryYOoNTu5eYV77fIvgIA2OFkQ26Nw1b3FlXepUx9i",
+      secondName: "Николаевич",
+      updatedAt: "2024-01-15 13:09:40"
+    },
+    {
+      adminGroup: {id: 1, name: "ОРИС"},
+      adminGroupId: 1,
+      fio: "Test Admin ",
+      firstName: "Admin",
+      id: 47,
+      insertedAt: "2023-03-02 08:06:05",
+      lastName: "Test",
+      login: "ta112",
+      notes: "### cHdkIFlROEJ1TG5n ###",
+      passwordHash: "$2b$12$6nuL1xC72rUt30YyGqqr6.5yNQ2vvvQlj2ZJeLrKJ9evqqDE75zAC",
+      phone: "444",
+      updatedAt: "2024-01-15 13:09:43"
+    },
+    {
+      adminGroup: {id: 8, name: "ru_watcher"},
+      adminGroupId: 8,
+      fio: "Packs Manger ",
+      firstName: "Manger",
+      id: 48,
+      insertedAt: "2023-03-15 11:25:23",
+      lastName: "Packs",
+      login: "packs_manger",
+      notes: "### cHdkIFBhY2sxc3Nz ###",
+      passwordHash: "$2b$12$rW9uGhrLum.2pTBYgtumAuy8xCqI9iFiUJ4cprGywYLUKbt/XNW4S",
+      updatedAt: "2024-01-15 13:09:43"
+    },
+    {
+      adminGroup: {id: 1, name: "ОРИС"},
+      adminGroupId: 1,
+      fio: "Иванова Александра Сергеевна",
+      firstName: "Александра",
+      id: 37,
+      insertedAt: "2022-05-25 07:16:20",
+      lastName: "Иванова",
+      login: "sascha",
+      notes: "init pwd: Lenovoinwin### cHdkIExlbm92b2lud2lu ###",
+      passwordHash: "$2b$12$xLWXBi0AYp.QOohHGaURYOp0cuow5eTT24oh1HNXI.ZcOCtzvsVUG",
+      secondName: "Сергеевна",
+      updatedAt: "2024-01-15 13:09:40"
+    },
+    {
+      adminGroup: {id: 15, name: "Монтаж"},
+      adminGroupId: 15,
+      fio: "test_admin_del d d",
+      firstName: "d",
+      id: 49,
+      insertedAt: "2023-03-27 07:31:25",
+      lastName: "test_admin_del",
+      login: "test_admin_del",
+      notes: "### cHdkIHpNSjJ0bVhr ###",
+      passwordHash: "$2b$12$Z0tEFtGnI1iO9kjFXYpIXOwYldhRlNkIcei002qzAy7HVJa7m/I.e",
+      secondName: "d",
+      updatedAt: "2024-01-15 13:09:43"
+    },
+    {
+      adminGroup: {id: 9, name: "kudt_watcher"},
+      adminGroupId: 9,
+      fio: "KUDT Watcher ",
+      firstName: "Watcher",
+      id: 50,
+      insertedAt: "2023-03-28 07:55:01",
+      lastName: "KUDT",
+      login: "KUDT",
+      notes: "### cHdkIFdhdGNoS3VkdA== ###",
+      passwordHash: "$2b$12$r47Teqz/KONX3fx2nVEHtup.NRHynjDqobBmNCV7t7fALQwvFXE.a",
+      updatedAt: "2024-01-15 13:09:43"
+    },
+    {
+      adminGroup: {id: 15, name: "Монтаж"},
+      adminGroupId: 15,
+      fio: "Акулов Егор Пользователь",
+      firstName: "Егор",
+      id: 52,
+      insertedAt: "2023-07-31 12:17:56",
+      lastName: "Акулов",
+      login: "AkulEgor",
+      notes: "### cHdkIDEyQWt1bDEz ###",
+      passwordHash: "$2b$12$37YN2TmjAZjE9dmZXycI4OBKMGVUg.vLcFKwx0sS7mn96hB8V1Iai",
+      secondName: "Пользователь",
+      updatedAt: "2024-01-15 13:09:44"
+    },
+    {
+      adminGroup: {id: 12, name: "free_packs_watcher"},
+      adminGroupId: 12,
+      fio: "Кузнецов Александр Юрьевич",
+      firstName: "Александр",
+      id: 51,
+      insertedAt: "2023-04-25 09:25:08",
+      lastName: "Кузнецов",
+      login: "KuznetsovAY",
+      notes: "### cHdkIEt1ejU2N2F5 ###",
+      passwordHash: "$2b$12$WF7iMKiDxKcWShCGTgWnNu4b1HHCxFIP7YPR60LJlwc/BCBwh575q",
+      secondName: "Юрьевич",
+      updatedAt: "2024-01-15 13:09:44"
+    },
+    {
+      adminGroup: {id: 8, name: "ru_watcher"},
+      adminGroupId: 8,
+      fio: "Ru Watcher ",
+      firstName: "Watcher",
+      id: 46,
+      insertedAt: "2023-03-02 06:31:45",
+      lastName: "Ru",
+      login: "RuWatcher",
+      notes: "### cHdkIEpiWlBqZE05 ###",
+      passwordHash: "$2b$12$naoRmmTeR6WYy6UZWHxFBuhwO3s52/p/MCkZlP.KgWsXrk8sIUz4W",
+      phone: "13",
+      updatedAt: "2024-01-15 13:09:40"
+    },
+    {
+      adminGroup: {id: 15, name: "Монтаж"},
+      adminGroupId: 15,
+      fio: "Ананьев Виталий Сергеевич",
+      firstName: "Виталий",
+      id: 38,
+      insertedAt: "2022-05-31 06:34:02",
+      lastName: "Ананьев",
+      login: "ananev.vitaly",
+      notes: "### cHdkIHNKVWl4U0Zh ###",
+      passwordHash: "$2b$12$JLiIog4a9z2dt8xFP.s/.OBcLHo4cDJgLpCjCxHVQa1rAjmNCIOZG",
+      secondName: "Сергеевич",
+      updatedAt: "2024-01-15 13:09:41"
+    },
+    {
+      adminGroup: {id: 15, name: "Монтаж"},
+      adminGroupId: 15,
+      fio: "Карпенко Иван Васильевич",
+      firstName: "Иван",
+      id: 39,
+      insertedAt: "2022-06-02 09:28:49",
+      lastName: "Карпенко",
+      login: "karpenko.ivan",
+      notes: "### cHdkIDdaNXM3Tldq ###",
+      passwordHash: "$2b$12$she6mqurkOULGSd.PzKxeeMppEDjEMhXPdjuH.zncLkVZEKw0iWT2",
+      secondName: "Васильевич",
+      updatedAt: "2024-01-15 13:09:41"
+    },
+    {
+      adminGroup: {id: 5, name: "TESTERS"},
+      adminGroupId: 5,
+      email: "HasyanovMark@no-mail.xx",
+      fio: "Хасянов Марк х",
+      firstName: "Марк",
+      id: 53,
+      insertedAt: "2023-09-22 10:27:21",
+      lastName: "Хасянов",
+      login: "HasyanovM",
+      notes: "### cHdkIG5ZdzE4dTk2 ###",
+      passwordHash: "$2b$12$Pf2T.EKEWXhE2XBpridtOOuKU6NO5evZoGKGMwg4u1wEtCa1hNxUK",
+      secondName: "х",
+      updatedAt: "2024-01-15 13:09:44"
+    },
+    {
+      adminGroup: {id: 6, name: "ПКФ"},
+      adminGroupId: 6,
+      fio: "Технологии ПКФ ",
+      firstName: "ПКФ",
+      id: 40,
+      insertedAt: "2022-06-02 11:53:48",
+      lastName: "Технологии",
+      login: "pkf_teck",
+      notes: "### cHdkIEFCWDIwSXU3 ###",
+      passwordHash: "$2b$12$JFef9mZEyWmPENZM2VTTWePVfGogTAgnu4dFYHNMDhY6RPWb7zRXG",
+      updatedAt: "2024-01-15 13:09:41"
+    },
+    {
+      adminGroup: {id: 7, name: "ВНИКТ"},
+      adminGroupId: 7,
+      fio: "Ушанов Андрей ",
+      firstName: "Андрей",
+      id: 41,
+      insertedAt: "2022-06-06 10:02:15",
+      lastName: "Ушанов",
+      login: "AUshanov",
+      notes: "### cHdkIFBPU2t1anox ###",
+      passwordHash: "$2b$12$StGexN61k2AGoBnCaC2GSeoYrVRGplRoeOSwXXpj3OJiHoLq9zKCi",
+      updatedAt: "2024-01-15 13:09:41"
+    },
+  ],
+  height: "200px"
+}
 
 export { columns, users }
\ No newline at end of file
diff --git a/live_monitor_vue/src/store/modules/add_users/index.js b/live_monitor_vue/src/store/modules/add_users/index.js
index 0685ef5..db8b03e 100644
--- a/live_monitor_vue/src/store/modules/add_users/index.js
+++ b/live_monitor_vue/src/store/modules/add_users/index.js
@@ -1,6 +1,5 @@
-import {toRaw} from 'vue'
 import {columns, users} from './StaticData'
-import {equals, isEmpty, uniq} from 'ramda'
+import {isEmpty} from 'ramda'
 
 const initState = {
   adminData: [],
@@ -24,7 +23,7 @@ const mutations = {
 };
 
 const actions = {
-  uploadData: async ({commit, getters, state}, historyData) => {
+  uploadData: async ({commit}, historyData) => {
     try{
 
       /*
@@ -41,7 +40,7 @@ const actions = {
       }
       
       */
-
+      console.log('historyData', historyData)
       const adminList = !isEmpty(users) ? users : []
 
       const report = {
diff --git a/live_monitor_vue/src/store/modules/apiHelpers.js b/live_monitor_vue/src/store/modules/apiHelpers.js
index d350df3..b0bb4bb 100644
--- a/live_monitor_vue/src/store/modules/apiHelpers.js
+++ b/live_monitor_vue/src/store/modules/apiHelpers.js
@@ -21,21 +21,21 @@ const post = async (path, data, onError) => {
       Authorization: `Bearer ${token}`
     }
   })
-  .then(r => r.data)
-  .catch(error => {
-    onError && onError(error)
-    console.error('Error post request:', error)
-    authViewer(error)
-  })
+    .then(r => r.data)
+    .catch(error => {
+      onError && onError(error)
+      console.error('Error post request:', error)
+      authViewer(error)
+    })
 }
 
 const get = async (path, success_callback) => {
   return await axios.get(`${import.meta.env.VITE_API_ADDR}${path}`)
-  .then(success_callback)
-  .catch(error => {
+    .then(success_callback)
+    .catch(error => {
       console.error('Error post request:', error)
       authViewer(error)
-  })
+    })
 }
 
 
diff --git a/live_monitor_vue/src/store/modules/auth/index.js b/live_monitor_vue/src/store/modules/auth/index.js
index abdca25..52949ca 100644
--- a/live_monitor_vue/src/store/modules/auth/index.js
+++ b/live_monitor_vue/src/store/modules/auth/index.js
@@ -1,7 +1,3 @@
-import {get, post} from '../apiHelpers'
-import {groupBy} from 'ramda'
-import {toRaw} from "vue"
-import {cond, T, equals} from 'ramda'
 import axios from 'axios';
 import {orisMenu} from './menuList'
 
diff --git a/live_monitor_vue/src/store/modules/auth/menuList.js b/live_monitor_vue/src/store/modules/auth/menuList.js
index 17deb72..601eeca 100644
--- a/live_monitor_vue/src/store/modules/auth/menuList.js
+++ b/live_monitor_vue/src/store/modules/auth/menuList.js
@@ -1,4 +1,3 @@
-
 const orisMenu = [
   {
     type: "simple_link",
diff --git a/live_monitor_vue/src/store/modules/example/index.js b/live_monitor_vue/src/store/modules/example/index.js
index e7886fa..fd0ae03 100644
--- a/live_monitor_vue/src/store/modules/example/index.js
+++ b/live_monitor_vue/src/store/modules/example/index.js
@@ -1,10 +1,8 @@
-import moment from 'moment'
-
 const initState = {
 }
 
 const state = {
-    ...initState
+  ...initState
 }
 
 const getters = {
@@ -18,9 +16,9 @@ const actions = {
 }
 
 export const store = {
-    namespaced: true,
-    state,
-    getters,
-    mutations,
-    actions,
+  namespaced: true,
+  state,
+  getters,
+  mutations,
+  actions,
 }
diff --git a/live_monitor_vue/src/store/modules/finder_packs/StaticData.js b/live_monitor_vue/src/store/modules/finder_packs/StaticData.js
index fc45e33..1b99e42 100644
--- a/live_monitor_vue/src/store/modules/finder_packs/StaticData.js
+++ b/live_monitor_vue/src/store/modules/finder_packs/StaticData.js
@@ -793,5 +793,4 @@ const packsGroups = [
 ]
 
 
-
 export { packsGroups }
\ No newline at end of file
diff --git a/live_monitor_vue/src/store/modules/finder_packs/index.js b/live_monitor_vue/src/store/modules/finder_packs/index.js
index 4bd02d1..b64e9b8 100644
--- a/live_monitor_vue/src/store/modules/finder_packs/index.js
+++ b/live_monitor_vue/src/store/modules/finder_packs/index.js
@@ -1,6 +1,5 @@
-import {toRaw} from 'vue'
 import {packsGroups} from './StaticData'
-import {equals, isEmpty, uniq} from 'ramda'
+import {isEmpty} from 'ramda'
 
 const initState = {
   
@@ -36,7 +35,7 @@ const mutations = {
 };
 
 const actions = {
-  uploadData: async ({commit, getters, state}, historyData) => {
+  uploadData: async ({commit}) => {
     try{
 
       /*
@@ -81,7 +80,7 @@ const actions = {
       console.error(err)
     }
   },
-  updateSearch: async ({commit, getters, state}, updatedValue) => {
+  updateSearch: async ({commit, state}, updatedValue) => {
     try {
       const groups = state.packsGroupsDefault
       const readyValue = updatedValue?.toLowerCase().split(' ')
diff --git a/live_monitor_vue/src/store/modules/last_packs/index.js b/live_monitor_vue/src/store/modules/last_packs/index.js
index c031ab4..9ba7904 100644
--- a/live_monitor_vue/src/store/modules/last_packs/index.js
+++ b/live_monitor_vue/src/store/modules/last_packs/index.js
@@ -13,7 +13,7 @@ const initState = {
 }
 
 const state = {
-    ...initState
+  ...initState
 }
 
 const getters = {
@@ -35,7 +35,7 @@ const mutations = {
 
 
 const actions = {
-  uploadData: ({commit, state}) => {
+  uploadData: ({state}) => {
     setTimeout(() => {
       state.pageState = 'loading'
     }, 500);
@@ -46,9 +46,9 @@ const actions = {
 }
 
 export const store = {
-    namespaced: true,
-    state,
-    getters,
-    mutations,
-    actions,
+  namespaced: true,
+  state,
+  getters,
+  mutations,
+  actions,
 }
diff --git a/live_monitor_vue/src/store/modules/last_packs_num/index.js b/live_monitor_vue/src/store/modules/last_packs_num/index.js
index aa71460..a50a138 100644
--- a/live_monitor_vue/src/store/modules/last_packs_num/index.js
+++ b/live_monitor_vue/src/store/modules/last_packs_num/index.js
@@ -1,5 +1,3 @@
-import moment from 'moment'
-
 const initState = {
   imei: "",
   pageState: "await", // await | loading | isLoaded | error
@@ -20,7 +18,7 @@ const initState = {
 }
 
 const state = {
-    ...initState
+  ...initState
 }
 
 const getters = {
@@ -38,7 +36,7 @@ const mutations = {
 
 
 const actions = {
-  uploadData: ({commit, state}) => {
+  uploadData: ({state}) => {
     setTimeout(() => {
       state.pageState = 'loading'
     }, 500);
@@ -49,9 +47,9 @@ const actions = {
 }
 
 export const store = {
-    namespaced: true,
-    state,
-    getters,
-    mutations,
-    actions,
+  namespaced: true,
+  state,
+  getters,
+  mutations,
+  actions,
 }
diff --git a/live_monitor_vue/src/store/modules/layoutMachines/StaticData.js b/live_monitor_vue/src/store/modules/layoutMachines/StaticData.js
index b37fd13..1c535b8 100644
--- a/live_monitor_vue/src/store/modules/layoutMachines/StaticData.js
+++ b/live_monitor_vue/src/store/modules/layoutMachines/StaticData.js
@@ -32,39 +32,39 @@ const pagination = {
 
 const selectors = {
   org_name: ["ПЧМ Воронеж", "ПЧМ Фаянсовая",
-   "ПЧМ Топки", "ПЧМ Кочетовка", "ПЧР КЛНГ",
-   "ПЧМ Нижний Новгород", "ПЧМ Новосибирск",
-   "ПЧМ Екатеринбург", "ПЧМ Омск", "ПЧМ Алтай",
-   "ПЧМ Тосно", "ПЧМ Вязьма", "ПМС-46", "ПМС-183",
-   "ПЧМ Тихорецк", "ПЧМ Сызрань",
-   "ПЧМ Хабаровск", null, "ПЧМ Северобайкальск",
-   "ПЧМ Смолино", "ПЧМ Вологда", "ПЧМ Пермь",
-   "ПЧМ Астрахань", "ПЧМ Нигозеро",
-   "ПЧМ Челябинск", "ПЧМ Завитая", "ПМС-217",
-   "ПМС-199", "ПМС-31", "ТрансЭнерго", "ПМС-340",
-   "ОПМС-99", "ПМС-11", "ПМС-77", "ПМС-208", "ПМС-172",
-   "ПМС-12", "ПМС-22",
-   "Экспулуатация БУ прекращена", "ОПМС-68",
-   "ПМС-170", "ОПМС-103", "ПМС-205", "ПМС-152", "ПМС-20",
-   "ПЧМ Тында", "КалугаПутьМаш",
-   "ПЧМ Санкт-Петербург", "ПЧМ Красноярск"],
+    "ПЧМ Топки", "ПЧМ Кочетовка", "ПЧР КЛНГ",
+    "ПЧМ Нижний Новгород", "ПЧМ Новосибирск",
+    "ПЧМ Екатеринбург", "ПЧМ Омск", "ПЧМ Алтай",
+    "ПЧМ Тосно", "ПЧМ Вязьма", "ПМС-46", "ПМС-183",
+    "ПЧМ Тихорецк", "ПЧМ Сызрань",
+    "ПЧМ Хабаровск", null, "ПЧМ Северобайкальск",
+    "ПЧМ Смолино", "ПЧМ Вологда", "ПЧМ Пермь",
+    "ПЧМ Астрахань", "ПЧМ Нигозеро",
+    "ПЧМ Челябинск", "ПЧМ Завитая", "ПМС-217",
+    "ПМС-199", "ПМС-31", "ТрансЭнерго", "ПМС-340",
+    "ОПМС-99", "ПМС-11", "ПМС-77", "ПМС-208", "ПМС-172",
+    "ПМС-12", "ПМС-22",
+    "Экспулуатация БУ прекращена", "ОПМС-68",
+    "ПМС-170", "ОПМС-103", "ПМС-205", "ПМС-152", "ПМС-20",
+    "ПЧМ Тында", "КалугаПутьМаш",
+    "ПЧМ Санкт-Петербург", "ПЧМ Красноярск"],
   org_type_name: ["ЦДИМ", "Другие", "ЦДРП"],
   railway_name: ["Ю-Вост", "Моск", "З-Сиб", "Клг", "Горьк",
-   "Сверд", "Окт", "Заб", "В-Сиб", "С-Кав", "Кбш",
-   "Д-Вост", null, "Ю-Ур", "Сев", "Прив", "РЖД", "Крас"],
+    "Сверд", "Окт", "Заб", "В-Сиб", "С-Кав", "Кбш",
+    "Д-Вост", null, "Ю-Ур", "Сев", "Прив", "РЖД", "Крас"],
   type: ["УТМ", "РПБ", "ПРЛ УПК", "ПУМА", "МДС", "МПТ",
-   "ТЭС", "СПП", "ДСП", "СЧ", "ЩОМ", "RM", "АСГ", "ВПО",
-   "без типа", "ПМГ", "МТГ", "АС", "СМ", "ВПР", "ПСС",
-   "МПК", "АДМ", "АГД", "УК", "АМ", "ПРЛ", "АДЭ",
-   "Унимат", "ВПРС", "ПБ", "Дуоматик", "МВУ",
-   "АВФ-1М.2", "Динамик", "АГС", "ПМА", "ССГ-1", "СЧУ",
-   "АГП", "Унимат компакт", "ДГКу", "СЗ", "ТЭУ",
-   "РБ", "ФАТРА",],
+    "ТЭС", "СПП", "ДСП", "СЧ", "ЩОМ", "RM", "АСГ", "ВПО",
+    "без типа", "ПМГ", "МТГ", "АС", "СМ", "ВПР", "ПСС",
+    "МПК", "АДМ", "АГД", "УК", "АМ", "ПРЛ", "АДЭ",
+    "Унимат", "ВПРС", "ПБ", "Дуоматик", "МВУ",
+    "АВФ-1М.2", "Динамик", "АГС", "ПМА", "ССГ-1", "СЧУ",
+    "АГП", "Унимат компакт", "ДГКу", "СЗ", "ТЭУ",
+    "РБ", "ФАТРА",],
   zav_nomer: ["84", "49", "15", "90", "27", "9", "5", "105", "005", "656",
-   "001", "39", "38", "57", "03", "003", "593", "235", "1453", "1307", "766",
-   "528", "485", "02", "752", "704", "584", "669", "261", "482", "762", "985",
-   "605", "016", "1258", "729", "963", "927", "319", "1154", "1163", "825",
-   "1276", "1062", "1025",]
+    "001", "39", "38", "57", "03", "003", "593", "235", "1453", "1307", "766",
+    "528", "485", "02", "752", "704", "584", "669", "261", "482", "762", "985",
+    "605", "016", "1258", "729", "963", "927", "319", "1154", "1163", "825",
+    "1276", "1062", "1025",]
 }
 
 
@@ -245,163 +245,163 @@ const chartsBarTypesWithoutLayoutParams = [{groupByKey: 'railway_name', filterKe
 
 const charts = {
   pie: {
-  countMachines: 4790,
-  period: 'две недели',
-  machines: [
-  { name: "Есть МЛ, выходил на связь", value: 1048, color: "rgb(134, 212, 131, 1)", order: 1 },
-  { name: "Есть МЛ, нет связи", value: 1048, color: "rgb(134, 212, 131, 1)", order: 2 },
-  { name: "Нет МЛ, выходил на связь", value: 1048, color: "rgb(134, 212, 131, 1)", order: 3 },
-  { name: "Нет МЛ, нет связи", value: 1048, color: "rgb(134, 212, 131, 1)", order: 4 },
-]},
+    countMachines: 4790,
+    period: 'две недели',
+    machines: [
+      { name: "Есть МЛ, выходил на связь", value: 1048, color: "rgb(134, 212, 131, 1)", order: 1 },
+      { name: "Есть МЛ, нет связи", value: 1048, color: "rgb(134, 212, 131, 1)", order: 2 },
+      { name: "Нет МЛ, выходил на связь", value: 1048, color: "rgb(134, 212, 131, 1)", order: 3 },
+      { name: "Нет МЛ, нет связи", value: 1048, color: "rgb(134, 212, 131, 1)", order: 4 },
+    ]},
   mainMl: {
-  countMachinesWithMl: 2916,
-  period: 'две недели',
-  machines: [
-  { key: "routes_common", name: "Обычные", value: 2182, itemStyle: {color: "rgb(134, 212, 131, 1)"}, order: 1 },
-  { key: "routes_emergency", name: "Аварийные", value: 64, itemStyle: {color: "rgb(255, 114, 114, 1)"}, order: 2 },
-  { key: "routes_other", name: "Прочие", value: 259, itemStyle: {color: "rgb(196, 161, 201, 1)"}, order: 3 },
-  { key: "routes_repair", name: "Ремонтные", value: 338, itemStyle: {color: "rgb(228, 202, 163, 1)"}, order: 4 },
-  { key: "routes_without_leaving", name: "Без выезда", value: 73, itemStyle: {color: "rgb(243, 161, 30, 1)"}, order: 5 },
-  { key: "routes_without_ml", name: "СПС без МЛ", value: 3073, itemStyle: {color: "rgb(165, 165, 165, 1)"}, order: 6 },
-]},
-mount_mounter_type_bar: {
-  chartId: "mount_mounter_type_bar",
-  countMounts: 5436,
-  filterKey: "mounter_type",
-  height: 500,
-  type: "mount",
-  xAxisData: [
-    [
-      {
-        charts: [
-          {name: "ВНИИЖТ", value: 92},
-          {name: "Калугапутьмаш", value: 1}
-        ],
-        totalCount: 3,
-        yAxisData: "2016 г."
-      },
-      {
-        charts: [
-          {name: "ВНИИЖТ", value: 349},
-          {name: "КалугаРПМ", value: 9},
-          {name: "Калугапутьмаш", value: 92},
-          {name: "Свердловский РПМ", value: 23},
-          {
-            name: "Тихорецкий завод им Воровского",
-            value: 26
-          },
-          {name: "Тулажелдормаш", value: 8}
-        ],
-        totalCount: 9,
-        yAxisData: "2017 г."
-      },
-      {
-        charts: [
-          {name: "ВНИИЖТ", value: 590},
-          {name: "КалугаРПМ", value: 7},
-          {name: "Калугапутьмаш", value: 73},
-          {name: "Свердловский РПМ", value: 30},
-          {
-            name: "Тихорецкий завод им Воровского",
-            value: 23
-          },
-          {name: "Тулажелдормаш", value: 32}
-        ],
-        totalCount: 11,
-        yAxisData: "2018 г."
-      },
-      {
-        charts: [
-          {name: "ВНИИЖТ", value: 719},
-          {name: "КалугаРПМ", value: 16},
-          {name: "Калугапутьмаш", value: 88},
-          {name: "Свердловский РПМ", value: 20},
-          {
-            name: "Тихорецкий завод им Воровского",
-            value: 33
-          },
-          {name: "Тулажелдормаш", value: 24}
-        ],
-        totalCount: 12,
-        yAxisData: "2019 г."
-      },
-      {
-        charts: [
-          {name: "ВНИИЖТ", value: 594},
-          {name: "КалугаРПМ", value: 18},
-          {name: "Калугапутьмаш", value: 100},
-          {name: "Свердловский РПМ", value: 19},
-          {
-            name: "Тихорецкий завод им Воровского",
-            value: 36
-          },
-          {name: "Тулажелдормаш", value: 31}
-        ],
-        totalCount: 9,
-        yAxisData: "2020 г."
-      },
-      {
-        charts: [
-          {name: "ВНИИЖТ", value: 777},
-          {name: "Инжиниринг Сервис-Путьмаш", value: 10},
-          {name: "КалугаРПМ", value: 5},
-          {name: "Калугапутьмаш", value: 84},
-          {name: "Пермский РПМ", value: 5},
-          {name: "Свердловский РПМ", value: 4},
-          {
-            name: "Тихорецкий завод им Воровского",
-            value: 14
-          },
-          {name: "Тулажелдормаш", value: 28}
-        ],
-        totalCount: 12,
-        yAxisData: "2021 г."
-      },
-      {
-        charts: [
-          {name: "ВНИИЖТ", value: 746},
-          {name: "Инжиниринг Сервис-Путьмаш", value: 10},
-          {name: "КалугаРПМ", value: 4},
-          {name: "Калугапутьмаш", value: 36},
-          {name: "Свердловский РПМ", value: 1},
-          {
-            name: "Тихорецкий завод им Воровского",
-            value: 5
-          },
-          {name: "Тулажелдормаш", value: 20}
-        ],
-        totalCount: 15,
-        yAxisData: "2022 г."
-      },
-      {
-        charts: [
-          {name: "ВНИИЖТ", value: 612},
-          {name: "Инжиниринг Сервис-Путьмаш", value: 4},
-          {name: "КалугаРПМ", value: 3},
-          {name: "Калугапутьмаш", value: 2},
-          {name: "Кировский машзавод", value: 3},
-          {
-            name: "Тихорецкий завод им Воровского",
-            value: 7
-          },
-          {name: "Тулажелдормаш", value: 6}
-        ],
-        totalCount: 10,
-        yAxisData: "2023 г."
-      }
-    ]
+    countMachinesWithMl: 2916,
+    period: 'две недели',
+    machines: [
+      { key: "routes_common", name: "Обычные", value: 2182, itemStyle: {color: "rgb(134, 212, 131, 1)"}, order: 1 },
+      { key: "routes_emergency", name: "Аварийные", value: 64, itemStyle: {color: "rgb(255, 114, 114, 1)"}, order: 2 },
+      { key: "routes_other", name: "Прочие", value: 259, itemStyle: {color: "rgb(196, 161, 201, 1)"}, order: 3 },
+      { key: "routes_repair", name: "Ремонтные", value: 338, itemStyle: {color: "rgb(228, 202, 163, 1)"}, order: 4 },
+      { key: "routes_without_leaving", name: "Без выезда", value: 73, itemStyle: {color: "rgb(243, 161, 30, 1)"}, order: 5 },
+      { key: "routes_without_ml", name: "СПС без МЛ", value: 3073, itemStyle: {color: "rgb(165, 165, 165, 1)"}, order: 6 },
+    ]},
+  mount_mounter_type_bar: {
+    chartId: "mount_mounter_type_bar",
+    countMounts: 5436,
+    filterKey: "mounter_type",
+    height: 500,
+    type: "mount",
+    xAxisData: [
+      [
+        {
+          charts: [
+            {name: "ВНИИЖТ", value: 92},
+            {name: "Калугапутьмаш", value: 1}
+          ],
+          totalCount: 3,
+          yAxisData: "2016 г."
+        },
+        {
+          charts: [
+            {name: "ВНИИЖТ", value: 349},
+            {name: "КалугаРПМ", value: 9},
+            {name: "Калугапутьмаш", value: 92},
+            {name: "Свердловский РПМ", value: 23},
+            {
+              name: "Тихорецкий завод им Воровского",
+              value: 26
+            },
+            {name: "Тулажелдормаш", value: 8}
+          ],
+          totalCount: 9,
+          yAxisData: "2017 г."
+        },
+        {
+          charts: [
+            {name: "ВНИИЖТ", value: 590},
+            {name: "КалугаРПМ", value: 7},
+            {name: "Калугапутьмаш", value: 73},
+            {name: "Свердловский РПМ", value: 30},
+            {
+              name: "Тихорецкий завод им Воровского",
+              value: 23
+            },
+            {name: "Тулажелдормаш", value: 32}
+          ],
+          totalCount: 11,
+          yAxisData: "2018 г."
+        },
+        {
+          charts: [
+            {name: "ВНИИЖТ", value: 719},
+            {name: "КалугаРПМ", value: 16},
+            {name: "Калугапутьмаш", value: 88},
+            {name: "Свердловский РПМ", value: 20},
+            {
+              name: "Тихорецкий завод им Воровского",
+              value: 33
+            },
+            {name: "Тулажелдормаш", value: 24}
+          ],
+          totalCount: 12,
+          yAxisData: "2019 г."
+        },
+        {
+          charts: [
+            {name: "ВНИИЖТ", value: 594},
+            {name: "КалугаРПМ", value: 18},
+            {name: "Калугапутьмаш", value: 100},
+            {name: "Свердловский РПМ", value: 19},
+            {
+              name: "Тихорецкий завод им Воровского",
+              value: 36
+            },
+            {name: "Тулажелдормаш", value: 31}
+          ],
+          totalCount: 9,
+          yAxisData: "2020 г."
+        },
+        {
+          charts: [
+            {name: "ВНИИЖТ", value: 777},
+            {name: "Инжиниринг Сервис-Путьмаш", value: 10},
+            {name: "КалугаРПМ", value: 5},
+            {name: "Калугапутьмаш", value: 84},
+            {name: "Пермский РПМ", value: 5},
+            {name: "Свердловский РПМ", value: 4},
+            {
+              name: "Тихорецкий завод им Воровского",
+              value: 14
+            },
+            {name: "Тулажелдормаш", value: 28}
+          ],
+          totalCount: 12,
+          yAxisData: "2021 г."
+        },
+        {
+          charts: [
+            {name: "ВНИИЖТ", value: 746},
+            {name: "Инжиниринг Сервис-Путьмаш", value: 10},
+            {name: "КалугаРПМ", value: 4},
+            {name: "Калугапутьмаш", value: 36},
+            {name: "Свердловский РПМ", value: 1},
+            {
+              name: "Тихорецкий завод им Воровского",
+              value: 5
+            },
+            {name: "Тулажелдормаш", value: 20}
+          ],
+          totalCount: 15,
+          yAxisData: "2022 г."
+        },
+        {
+          charts: [
+            {name: "ВНИИЖТ", value: 612},
+            {name: "Инжиниринг Сервис-Путьмаш", value: 4},
+            {name: "КалугаРПМ", value: 3},
+            {name: "Калугапутьмаш", value: 2},
+            {name: "Кировский машзавод", value: 3},
+            {
+              name: "Тихорецкий завод им Воровского",
+              value: 7
+            },
+            {name: "Тулажелдормаш", value: 6}
+          ],
+          totalCount: 10,
+          yAxisData: "2023 г."
+        }
+      ]
     
-  ],
-  yAxisData: [
-    {key: "2016 г.", val: 93},
-    {key: "2017 г.", val: 507},
-    {key: "2018 г.", val: 755},
-    {key: "2019 г.", val: 900},
-    {key: "2020 г.", val: 797},
-    {key: "2021 г.", val: 927},
-    {key: "2022 г.", val: 818},
-    {key: "2023 г.", val: 637}
-  ]}
+    ],
+    yAxisData: [
+      {key: "2016 г.", val: 93},
+      {key: "2017 г.", val: 507},
+      {key: "2018 г.", val: 755},
+      {key: "2019 г.", val: 900},
+      {key: "2020 г.", val: 797},
+      {key: "2021 г.", val: 927},
+      {key: "2022 г.", val: 818},
+      {key: "2023 г.", val: 637}
+    ]}
 }
 
 const dataMachines = [
@@ -1305,282 +1305,282 @@ const dataMachines = [
 ]
 
 const dataMount = [
-    {
-      client_type: "ЦДИМ",
-      device_count: 6,
-      mounter_type: "Тулажелдормаш",
-      year: "2023 г."
-    },
-    {
-      client_type: "Трансэнерго",
-      device_count: 1,
-      mounter_type: "ВНИИЖТ",
-      year: "2018 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 86,
-      mounter_type: "Калугапутьмаш",
-      year: "2019 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 593,
-      mounter_type: "ВНИИЖТ",
-      year: "2020 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 589,
-      mounter_type: "ВНИИЖТ",
-      year: "2018 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 12,
-      mounter_type: "Тулажелдормаш",
-      year: "2022 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 8,
-      mounter_type: "Тулажелдормаш",
-      year: "2022 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 3,
-      mounter_type: "Калугапутьмаш",
-      year: "2018 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 347,
-      mounter_type: "ВНИИЖТ",
-      year: "2017 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 8,
-      mounter_type: "Тулажелдормаш",
-      year: "2017 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 1,
-      mounter_type: "КалугаРПМ",
-      year: "2021 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 7,
-      mounter_type: "КалугаРПМ",
-      year: "2018 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 27,
-      mounter_type: "Тихорецкий завод им Воровского",
-      year: "2019 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 1,
-      mounter_type: "Свердловский РПМ",
-      year: "2022 г."
-    },
-    {
-      client_type: "Иные",
-      device_count: 6,
-      mounter_type: "Тихорецкий завод им Воровского",
-      year: "2019 г."
-    },
-    {
-      client_type: "Иные",
-      device_count: 4,
-      mounter_type: "Тихорецкий завод им Воровского",
-      year: "2023 г."
-    },
-    {
-      client_type: "Трансэнерго",
-      device_count: 16,
-      mounter_type: "ВНИИЖТ",
-      year: "2016 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 5,
-      mounter_type: "Пермский РПМ",
-      year: "2021 г."
-    },
-    {
-      client_type: null,
-      device_count: 1,
-      mounter_type: "Инжиниринг Сервис-Путьмаш",
-      year: "2022 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 2,
-      mounter_type: "КалугаРПМ",
-      year: "2022 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 4,
-      mounter_type: "КалугаРПМ",
-      year: "2021 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 2,
-      mounter_type: "Калугапутьмаш",
-      year: "2023 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 80,
-      mounter_type: "Калугапутьмаш",
-      year: "2021 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 2,
-      mounter_type: "КалугаРПМ",
-      year: "2023 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 8,
-      mounter_type: "Тулажелдормаш",
-      year: "2021 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 20,
-      mounter_type: "Свердловский РПМ",
-      year: "2019 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 4,
-      mounter_type: "Тихорецкий завод им Воровского",
-      year: "2022 г."
-    },
-    {
-      client_type: "Трансэнерго",
-      device_count: 1,
-      mounter_type: "ВНИИЖТ",
-      year: "2022 г."
-    },
-    {
-      client_type: "Иные",
-      device_count: 2,
-      mounter_type: "ВНИИЖТ",
-      year: "2017 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 1,
-      mounter_type: "Калугапутьмаш",
-      year: "2016 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 181,
-      mounter_type: "ВНИИЖТ",
-      year: "2023 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 100,
-      mounter_type: "Калугапутьмаш",
-      year: "2020 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 76,
-      mounter_type: "ВНИИЖТ",
-      year: "2016 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 29,
-      mounter_type: "Свердловский РПМ",
-      year: "2018 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 4,
-      mounter_type: "Калугапутьмаш",
-      year: "2021 г."
-    },
-    {
-      client_type: null,
-      device_count: 1,
-      mounter_type: "ВНИИЖТ",
-      year: "2020 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 5,
-      mounter_type: "Тихорецкий завод им Воровского",
-      year: "2021 г."
-    },
-    {
-      client_type: "Иные",
-      device_count: 25,
-      mounter_type: "Тихорецкий завод им Воровского",
-      year: "2020 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 15,
-      mounter_type: "Тулажелдормаш",
-      year: "2019 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 4,
-      mounter_type: "Инжиниринг Сервис-Путьмаш",
-      year: "2023 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 2,
-      mounter_type: "Калугапутьмаш",
-      year: "2019 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 1,
-      mounter_type: "ВНИИЖТ",
-      year: "2022 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 3,
-      mounter_type: "Кировский машзавод",
-      year: "2023 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 26,
-      mounter_type: "Тулажелдормаш",
-      year: "2020 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 3,
-      mounter_type: "Тихорецкий завод им Воровского",
-      year: "2023 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 16,
-      mounter_type: "КалугаРПМ",
-      year: "2019 г."
-    },
+  {
+    client_type: "ЦДИМ",
+    device_count: 6,
+    mounter_type: "Тулажелдормаш",
+    year: "2023 г."
+  },
+  {
+    client_type: "Трансэнерго",
+    device_count: 1,
+    mounter_type: "ВНИИЖТ",
+    year: "2018 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 86,
+    mounter_type: "Калугапутьмаш",
+    year: "2019 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 593,
+    mounter_type: "ВНИИЖТ",
+    year: "2020 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 589,
+    mounter_type: "ВНИИЖТ",
+    year: "2018 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 12,
+    mounter_type: "Тулажелдормаш",
+    year: "2022 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 8,
+    mounter_type: "Тулажелдормаш",
+    year: "2022 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 3,
+    mounter_type: "Калугапутьмаш",
+    year: "2018 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 347,
+    mounter_type: "ВНИИЖТ",
+    year: "2017 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 8,
+    mounter_type: "Тулажелдормаш",
+    year: "2017 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 1,
+    mounter_type: "КалугаРПМ",
+    year: "2021 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 7,
+    mounter_type: "КалугаРПМ",
+    year: "2018 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 27,
+    mounter_type: "Тихорецкий завод им Воровского",
+    year: "2019 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 1,
+    mounter_type: "Свердловский РПМ",
+    year: "2022 г."
+  },
+  {
+    client_type: "Иные",
+    device_count: 6,
+    mounter_type: "Тихорецкий завод им Воровского",
+    year: "2019 г."
+  },
+  {
+    client_type: "Иные",
+    device_count: 4,
+    mounter_type: "Тихорецкий завод им Воровского",
+    year: "2023 г."
+  },
+  {
+    client_type: "Трансэнерго",
+    device_count: 16,
+    mounter_type: "ВНИИЖТ",
+    year: "2016 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 5,
+    mounter_type: "Пермский РПМ",
+    year: "2021 г."
+  },
+  {
+    client_type: null,
+    device_count: 1,
+    mounter_type: "Инжиниринг Сервис-Путьмаш",
+    year: "2022 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 2,
+    mounter_type: "КалугаРПМ",
+    year: "2022 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 4,
+    mounter_type: "КалугаРПМ",
+    year: "2021 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 2,
+    mounter_type: "Калугапутьмаш",
+    year: "2023 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 80,
+    mounter_type: "Калугапутьмаш",
+    year: "2021 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 2,
+    mounter_type: "КалугаРПМ",
+    year: "2023 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 8,
+    mounter_type: "Тулажелдормаш",
+    year: "2021 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 20,
+    mounter_type: "Свердловский РПМ",
+    year: "2019 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 4,
+    mounter_type: "Тихорецкий завод им Воровского",
+    year: "2022 г."
+  },
+  {
+    client_type: "Трансэнерго",
+    device_count: 1,
+    mounter_type: "ВНИИЖТ",
+    year: "2022 г."
+  },
+  {
+    client_type: "Иные",
+    device_count: 2,
+    mounter_type: "ВНИИЖТ",
+    year: "2017 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 1,
+    mounter_type: "Калугапутьмаш",
+    year: "2016 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 181,
+    mounter_type: "ВНИИЖТ",
+    year: "2023 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 100,
+    mounter_type: "Калугапутьмаш",
+    year: "2020 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 76,
+    mounter_type: "ВНИИЖТ",
+    year: "2016 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 29,
+    mounter_type: "Свердловский РПМ",
+    year: "2018 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 4,
+    mounter_type: "Калугапутьмаш",
+    year: "2021 г."
+  },
+  {
+    client_type: null,
+    device_count: 1,
+    mounter_type: "ВНИИЖТ",
+    year: "2020 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 5,
+    mounter_type: "Тихорецкий завод им Воровского",
+    year: "2021 г."
+  },
+  {
+    client_type: "Иные",
+    device_count: 25,
+    mounter_type: "Тихорецкий завод им Воровского",
+    year: "2020 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 15,
+    mounter_type: "Тулажелдормаш",
+    year: "2019 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 4,
+    mounter_type: "Инжиниринг Сервис-Путьмаш",
+    year: "2023 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 2,
+    mounter_type: "Калугапутьмаш",
+    year: "2019 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 1,
+    mounter_type: "ВНИИЖТ",
+    year: "2022 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 3,
+    mounter_type: "Кировский машзавод",
+    year: "2023 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 26,
+    mounter_type: "Тулажелдормаш",
+    year: "2020 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 3,
+    mounter_type: "Тихорецкий завод им Воровского",
+    year: "2023 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 16,
+    mounter_type: "КалугаРПМ",
+    year: "2019 г."
+  },
   
 ]
 
@@ -2366,11 +2366,11 @@ const multiReport = {
       }
     ],
     diagExcludeSps: [993, 1062, 3078, 1136, 1109, 1618, 1085, 2936, 1669, 1045,
-     1739, 1525, 1869, 1461, 1843, 928, 1940, 1907, 1482, 1870, 1813, 1131,
-     1133, 1515, 1800, 2151, 1833, 1068, 1110, 1000, 2904, 926, 2964, 917, 2903,
-     1743, 1738, 1469, 2902, 1478, 999, 1801, 1742, 1139, 1141, 1842, ],
+      1739, 1525, 1869, 1461, 1843, 928, 1940, 1907, 1482, 1870, 1813, 1131,
+      1133, 1515, 1800, 2151, 1833, 1068, 1110, 1000, 2904, 926, 2964, 917, 2903,
+      1743, 1738, 1469, 2902, 1478, 999, 1801, 1742, 1139, 1141, 1842, ],
     diagTables: ["as", "dsp", "dyn", "mpt", "pmg", "rpb", "rs", "schom", "sm",
-     "uk", "uni", "utm", "vpo", ""],
+      "uk", "uni", "utm", "vpo", ""],
     id: 197,
     insertedAt: "2023-03-15 06:27:41",
     isProd: true,
@@ -2423,7 +2423,7 @@ const multiReport = {
 
 const multiPackStructure = [
   // %LiveMonitor.Packages.Models.PackStruct{
-    // __meta__: #Ecto.Schema.Metadata<:loaded, "pack_struct">,
+  // __meta__: #Ecto.Schema.Metadata<:loaded, "pack_struct">,
   {
     id: 197,
     description: null,
@@ -2523,7 +2523,7 @@ const multiPackStructure = [
       }
     ],
     diag_tables: ["as", "dsp", "dyn", "mpt", "pmg", "rpb", "rs", "schom", "sm",
-     "uk", "uni", "utm", "vpo", ""],
+      "uk", "uni", "utm", "vpo", ""],
     diag_exclude_tables: null,
     diag_classifications: null,
     diag_types: null,
@@ -2531,9 +2531,9 @@ const multiPackStructure = [
     diag_exclude_classifications: null,
     diag_exclude_types: null,
     diag_exclude_sps: [993, 1062, 3078, 1136, 1109, 1618, 1085, 2936, 1669,
-     1045, 1739, 1525, 1869, 1461, 1843, 928, 1940, 1907, 1482, 1870, 1813,
-     1131, 1133, 1515, 1800, 2151, 1833, 1068, 1110, 1000, 2904, 926, 2964,
-     ],
+      1045, 1739, 1525, 1869, 1461, 1843, 928, 1940, 1907, 1482, 1870, 1813,
+      1131, 1133, 1515, 1800, 2151, 1833, 1068, 1110, 1000, 2904, 926, 2964,
+    ],
     pack_group_id: 28,
     // pack_group: #Ecto.Association.NotLoaded<association :pack_group is not loaded>,
     inserted_at: "2023-03-15 06:27:41",
@@ -2838,8 +2838,8 @@ const multiPackStructure = [
     diag_classifications: null,
     diag_types: null,
     diag_sps: [993, 1062, 3078, 1136, 1109, 1618, 1085, 2936, 1669, 1045, 1739,
-     1525, 1869, 1461, 1843, 928, 1940, 1907, 1482, 1870, 1813, 1131, 1133,
-     1515, 1800, 2151, 1833, 1068, 1110, 1000, 2904, 926, 2964, 917, ],
+      1525, 1869, 1461, 1843, 928, 1940, 1907, 1482, 1870, 1813, 1131, 1133,
+      1515, 1800, 2151, 1833, 1068, 1110, 1000, 2904, 926, 2964, 917, ],
     diag_exclude_classifications: null,
     diag_exclude_types: null,
     diag_exclude_sps: null,
diff --git a/live_monitor_vue/src/store/modules/layoutMachines/helpers.js b/live_monitor_vue/src/store/modules/layoutMachines/helpers.js
index bc27847..c9d11ba 100644
--- a/live_monitor_vue/src/store/modules/layoutMachines/helpers.js
+++ b/live_monitor_vue/src/store/modules/layoutMachines/helpers.js
@@ -1,5 +1,5 @@
-import {isEmpty, uniq} from 'ramda'
-import {pagination, searchModes} from './StaticData'
+import {isEmpty} from 'ramda'
+import {searchModes} from './StaticData'
 
 const prepareSelects = (selects, selectors) => {
   const updatedSelects = selects.reduce((acc, el) => {
@@ -14,14 +14,14 @@ const prepareSelects = (selects, selectors) => {
   // console.log('updSelects', updatedSelects)
   
   const filteredSelects = updatedSelects.map((el) => ({...el, data: el.data.reduce((acc, select) => {
-      if (select) {
-        const newSelect = {name: select}
-        acc = [...acc, newSelect]
-      } else {
-        acc
-      }
-        return acc
-    }, [])
+    if (select) {
+      const newSelect = {name: select}
+      acc = [...acc, newSelect]
+    } else {
+      acc
+    }
+    return acc
+  }, [])
   })).sort((a, b) => a.order - b.order)
   // console.log('filteredSelects', filteredSelects)
   return filteredSelects
diff --git a/live_monitor_vue/src/store/modules/layoutMachines/helpersCharts.js b/live_monitor_vue/src/store/modules/layoutMachines/helpersCharts.js
index 6a1e36b..ddfd69b 100644
--- a/live_monitor_vue/src/store/modules/layoutMachines/helpersCharts.js
+++ b/live_monitor_vue/src/store/modules/layoutMachines/helpersCharts.js
@@ -1,431 +1,438 @@
 import { chartsFilterParams, chartsGroupByParams, chartsGroupByParams2, chartsFilterKeysMl, chartsMountParams, chartsBarTypesParams, chartsBarTypesGroupByParams, chartsBarTypesWithoutLayoutParams } from "./StaticData"
 import {cond, uniq, has, T} from 'ramda'
 
-  const setPeriodCharts = (filterKeys) => {
-    if (typeof filterKeys === 'array') return {period: 'dayly', title: '24 часа'}
-    switch(filterKeys) {
-      case 'commun': return {period: 'yearly', title: "год"}
-      case 'rors': return {period: 'dayly', title: "на данный момент"}
-      case 'routes': return {period: 'weekly', title: "две недели"}
-      default: return {period: 'dayly', title: "на данный момент"}
+const setPeriodCharts = (filterKeys) => {
+  if (filterKeys && filterKeys.length > 0) return {period: 'dayly', title: '24 часа'}
+  switch(filterKeys) {
+  case 'commun': return {period: 'yearly', title: "год"}
+  case 'rors': return {period: 'dayly', title: "на данный момент"}
+  case 'routes': return {period: 'weekly', title: "две недели"}
+  default: return {period: 'dayly', title: "на данный момент"}
+  }
+}
+
+const setNamesMl = (filterKey) => {
+  if (!filterKey) return null
+  switch(filterKey) {
+  case 'routes_common': return 'Обычные'
+  case 'routes_emergency': return 'Аварийные'
+  case 'routes_other': return 'Прочие'
+  case 'routes_repair': return 'Ремонтные'
+  case 'routes_without_leaving': return 'Без выезда'
+  case 'routes_without_ml': return 'СПС без МЛ'
+  default: return ''
+  }
+}
+
+const setMachinesClass = (typeId) => {
+  if (typeId) {
+    switch(typeId) {
+    case 'mpt_types': return 'МРТ'
+    case 'gdsm_types': return 'ЖДСМ'
+    case 'sm_pss_types': return 'СМ'
+    default: return ''
     }
   }
+}
 
-  const setNamesMl = (filterKey) => {
-    if (!filterKey) return null
-    switch(filterKey) {
-      case 'routes_common': return 'Обычные'
-      case 'routes_emergency': return 'Аварийные'
-      case 'routes_other': return 'Прочие'
-      case 'routes_repair': return 'Ремонтные'
-      case 'routes_without_leaving': return 'Без выезда'
-      case 'routes_without_ml': return 'СПС без МЛ'
-      default: return ''
-    }
+const setFilterValues = (machineValue, filterParams) => {
+  if(filterParams.values.includes(machineValue.toLowerCase())) {
+    return {name: machineValue}
   }
+}
 
-  const setMachinesClass = (typeId) => {
-    if (typeId) {
-      switch(typeId) {
-        case 'mpt_types': return 'МРТ'
-        case 'gdsm_types': return 'ЖДСМ'
-        case 'sm_pss_types': return 'СМ'
-        default: return ''
-      }
-    }
-  }
-
-  const setFilterValues = (machineValue, filterParams) => {
-    if(filterParams.values.includes(machineValue.toLowerCase())) {
-      return {name: machineValue}
-    }
-  }
-
-  const setCountMachinesMl = (arr, counter = 0) => {
-    return arr.reduce((acc, item) => {
-      if (item && item.length > 0) {
-        return setCountMachinesMl(item, acc)
-      } else {
-        if (item.charts?.value) {
-          acc = acc + item.charts?.value
-        } else {
-          acc
-        }
-      }
-      return acc
-    }, counter)
-  }
-
-  /* Charts updated data */
-
-  const chartsPie = (data, filterParams) => {
-    // {list, _resp} = Agents.MachineList.get_machines(set_period_loading_charts(filterKey).period, params) apiHelpers
-
-    const countMachines = data?.length
-    const machines = data.reduce((acc, machine) => {
-      if (machine[filterParams.filterKey]) {
-        acc.push(setFilterValues(machine[filterParams.filterKey], filterParams))
+const setCountMachinesMl = (arr, counter = 0) => {
+  return arr.reduce((acc, item) => {
+    if (item && item.length > 0) {
+      return setCountMachinesMl(item, acc)
+    } else {
+      if (item.charts?.value) {
+        acc = acc + item.charts?.value
       } else {
         acc
       }
-      return acc
-    }, [])
+    }
+    return acc
+  }, counter)
+}
 
-    // const isFilteredMachine = machines.find((el) => filterParams.values.includes(el.name.toLowerCase()))
-    const groupByfiltered = machines.reduce((acc, machine) => {
-      if (filterParams.values.includes(machine.name.toLowerCase())) {
-        const count = machines.filter((el) => el.name === machine.name).length
-        const filteredMachines = {name: machine.name, value: count}
-        acc = uniq([...acc, filteredMachines])
-      } else {
-        acc
-      }
-      return acc
-    }, [])
-    return {countMachines: countMachines, period: setPeriodCharts(filterParams.filterKey).title, machines: groupByfiltered}
-  }
+/* Charts updated data */
 
-  const chartsPieGroupedBy = (data, groupByParams, filterParams) => {
+const chartsPie = (data, filterParams) => {
+  // {list, _resp} = Agents.MachineList.get_machines(set_period_loading_charts(filterKey).period, params) apiHelpers
 
-    const filteredGroupByParams = data.filter((machine) => machine[groupByParams.groupByKey] && machine[groupByParams.groupByKey].toLowerCase() === groupByParams.value)
-    const countMachines = filteredGroupByParams?.length
+  const countMachines = data?.length
+  const machines = data.reduce((acc, machine) => {
+    if (machine[filterParams.filterKey]) {
+      acc.push(setFilterValues(machine[filterParams.filterKey], filterParams))
+    } else {
+      acc
+    }
+    return acc
+  }, [])
 
-    const machines = filteredGroupByParams.reduce((acc, machine) => {
+  // const isFilteredMachine = machines.find((el) => filterParams.values.includes(el.name.toLowerCase()))
+  const groupByfiltered = machines.reduce((acc, machine) => {
+    if (filterParams.values.includes(machine.name.toLowerCase())) {
+      const count = machines.filter((el) => el.name === machine.name).length
+      const filteredMachines = {name: machine.name, value: count}
+      acc = uniq([...acc, filteredMachines])
+    } else {
+      acc
+    }
+    return acc
+  }, [])
+  return {countMachines: countMachines, period: setPeriodCharts(filterParams.filterKey).title, machines: groupByfiltered}
+}
+
+const chartsPieGroupedBy = (data, groupByParams, filterParams) => {
+
+  const filteredGroupByParams = data.filter((machine) => machine[groupByParams.groupByKey] && machine[groupByParams.groupByKey].toLowerCase() === groupByParams.value)
+  const countMachines = filteredGroupByParams?.length
+
+  const machines = filteredGroupByParams.reduce((acc, machine) => {
       
-      if (machine[filterParams.filterKey]) {
-        acc.push(setFilterValues(machine[filterParams.filterKey], filterParams))
-      } else {
-        acc
-      }
-      return acc
-    }, [])
+    if (machine[filterParams.filterKey]) {
+      acc.push(setFilterValues(machine[filterParams.filterKey], filterParams))
+    } else {
+      acc
+    }
+    return acc
+  }, [])
     
-    const filteredMachines = machines.reduce((acc, machine) => {
-      if (filterParams.values.includes(machine.name.toLowerCase())) {
-        const count = machines.filter((el) => el.name === machine.name).length
-        const filteredMachines = {name: machine.name, value: count}
-        acc = uniq([...acc, filteredMachines])
+  const filteredMachines = machines.reduce((acc, machine) => {
+    if (filterParams.values.includes(machine.name.toLowerCase())) {
+      const count = machines.filter((el) => el.name === machine.name).length
+      const filteredMachines = {name: machine.name, value: count}
+      acc = uniq([...acc, filteredMachines])
+    } else {
+      acc
+    }
+    return acc
+  }, [])
+  return {countMachines: countMachines, period: setPeriodCharts(filterParams.filterKey).title, machines: filteredMachines}
+}
+
+const chartsBarGroupedByMl = (data, filterKeysMl) => {
+
+  const machinesWithMl = filterKeysMl.map((filterKey) => {
+    const filteredWithMl = data.reduce((acc, machine) => {
+      if (machine[filterKey] === 0 || machine[filterKey]) {
+        acc = [...acc, {[filterKey]: machine[filterKey]}]
       } else {
         acc
       }
       return acc
     }, [])
-    return {countMachines: countMachines, period: setPeriodCharts(filterParams.filterKey).title, machines: filteredMachines}
-  }
-
-  const chartsBarGroupedByMl = (data, filterKeysMl) => {
-
-    const machinesWithMl = filterKeysMl.map((filterKey) => {
-      const filteredWithMl = data.reduce((acc, machine) => {
-        if (machine[filterKey] === 0 || machine[filterKey]) {
-          acc = [...acc, {[filterKey]: machine[filterKey]}]
-        } else {
-          acc
-        }
-        return acc
-      }, [])
-      const count = filteredWithMl.reduce((acc, machine) => {
-        acc = acc + parseFloat(machine[filterKey])
-        return acc
-      }, 0)
+    const count = filteredWithMl.reduce((acc, machine) => {
+      acc = acc + parseFloat(machine[filterKey])
+      return acc
+    }, 0)
       
-     return {key: filterKey, name: setNamesMl(filterKey), machinesCount: filteredWithMl.length, value: count}
-    })
+    return {key: filterKey, name: setNamesMl(filterKey), machinesCount: filteredWithMl.length, value: count}
+  })
     
-    // console.log('machinesWithMl', machinesWithMl)
+  // console.log('machinesWithMl', machinesWithMl)
 
-    const countMachinesWithMl = Math.floor((machinesWithMl.reduce((acc, machine) => {
-      return acc + machine.machinesCount
-    }, 0)) / filterKeysMl.length)
+  const countMachinesWithMl = Math.floor((machinesWithMl.reduce((acc, machine) => {
+    return acc + machine.machinesCount
+  }, 0)) / filterKeysMl.length)
 
-    const machinesWithoutMl = filterKeysMl.map((filterKey) => {
-      const countNull = data.reduce((acc, machine) => {
-        if (machine[filterKey] === null) {
-          acc = acc + 1
+  const machinesWithoutMl = filterKeysMl.map((filterKey) => {
+    const countNull = data.reduce((acc, machine) => {
+      if (machine[filterKey] === null) {
+        acc = acc + 1
+      } else {
+        acc
+      }
+      return acc
+    }, 0)
+    return {key: filterKey, value: countNull}
+  })
+
+  // console.log('machinesWithoutMl', machinesWithoutMl)
+
+  const countMachinesWithoutMl = Math.floor((machinesWithoutMl.reduce((acc, machine) => {
+    return acc + machine.value
+  }, 0)) / filterKeysMl.length // Либо только машины, если без деления тогда все null МЛ суммируются
+  )
+
+  machinesWithMl.push({key: 'routes_without_ml', name: setNamesMl('routes_without_ml'), value: countMachinesWithoutMl})
+
+  return {countMachinesWithMl: countMachinesWithMl, period: setPeriodCharts(filterKeysMl).title, machines: machinesWithMl}
+}
+
+const chartsBarMount = (data, groupByKey, filterKey, countKey) => {
+
+  const groupByData = Object.groupBy(data, (el) => el[groupByKey])
+
+  const yAxisData = Object.entries(groupByData).map(([key, val]) => ({key: key, val: val.reduce((acc, val) => acc + val[countKey], 0)}))
+  const xAxisData = Object.entries(groupByData).map(([key, groupArr]) => {
+    const groupByFilterData = Object.groupBy(groupArr, (el) => el[filterKey])
+    const newArr = Object.entries(groupByFilterData).map(([key, val]) => ({name: key, value: val.reduce((acc, val) => acc + val[countKey], 0)}))
+    return {yAxisData: key, totalCount: groupArr.length, charts: newArr}
+  })
+
+  const countMounts = yAxisData.reduce((acc, year) => (acc + year.val), 0)
+
+  return {yAxisData: yAxisData, xAxisData: xAxisData, countMounts: countMounts, filterKey: filterKey}
+}
+
+const chartsBarTypes = (data, groupByKey, filterKey, prevGroupByData, prevGroupByFilters) => {
+
+  const countMachines = data.length
+  const groupByData = Object.groupBy(data, (el) => el[groupByKey])
+
+  const yAxisData = Object.entries(groupByData).map(([key, val]) => ({key: key, val: val.length}))
+  const xAxisData = Object.entries(groupByData).map(([key, groupArr]) => {
+    const groupByFilterData = Object.groupBy(groupArr, (el) => el[filterKey])
+    const newArr = Object.entries(groupByFilterData).map(([key, val]) => ({name: key, value: val.length, linkData: groupByKey === 'machine_type' ? val.map((el) => ({machine_type: el.machine_type, device_number: el.device_number})) : ''}))
+    return {yAxisData: key, totalCount: groupArr.length, charts: newArr}
+  })
+
+  return {yAxisData: yAxisData, xAxisData: xAxisData, countMachines: countMachines, period: setPeriodCharts(filterKey).title, filterKey: filterKey, groupByKey: groupByKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters}
+}
+
+const chartsBarTypesGroupedBy = (data, groupByKey, filterKey, prevGroupByData, prevGroupByFilters, typeId) => {
+
+  const machineClass = setMachinesClass(typeId)
+  const machinesFilteredClass = data.filter(({machine_class}) => machine_class === machineClass)
+
+  const groupByData = Object.groupBy(machinesFilteredClass, (el) => el[groupByKey])
+
+  const yAxisData = Object.entries(groupByData).map(([key, val]) => ({key: key, val: val.length}))
+  const xAxisData = Object.entries(groupByData).map(([key, groupArr]) => {
+    const groupByFilterData = Object.groupBy(groupArr, (el) => el[filterKey])
+    const newArr = Object.entries(groupByFilterData).map(([key, val]) => ({name: key, value: val.length, linkData: groupByKey === 'machine_type' ? val.map((el) => ({machine_type: el.machine_type, device_number: el.device_number})) : ''}))
+    return {yAxisData: key, totalCount: groupArr.length, charts: newArr}
+  })
+
+  const countMachines = yAxisData.reduce((acc, type) => acc + type.val, 0)
+
+  return {yAxisData: yAxisData, xAxisData: xAxisData, countMachines: countMachines, period: setPeriodCharts(filterKey).title, filterKey: filterKey, groupByKey: groupByKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters, typeId: typeId}
+}
+  
+const chartsBarTypesWithoutFirstLayout = (data, groupByKey, filterKey, prevGroupByData, prevGroupByFilters, groupByValue) => {
+
+  const groupByData = Object.groupBy(data, (el) => el['org_type_name'])
+  const filteredGroupByData = Object.entries(groupByData).filter(([key, ]) => key === groupByValue)
+
+  if (filteredGroupByData.length === 0) return {yAxisData: [], xAxisData: [], countMachines: 0, period: setPeriodCharts(filterKey).title, filterKey: filterKey, groupByKey: groupByKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters, groupByValue: groupByValue}
+
+  const [groupedByGroupByKeyY] = filteredGroupByData.map(([, groupArr]) => Object.groupBy(groupArr, (el) => el[groupByKey]))
+  const yAxisData = Object.entries(groupedByGroupByKeyY).map(([key, val]) => ({key: key, val: val.length}))
+    
+  const [groupedByGroupByKeyX] = filteredGroupByData.map(([, groupArr]) => Object.groupBy(groupArr, (el) => el[groupByKey]))
+  const xAxisData = Object.entries(groupedByGroupByKeyX).map(([key, groupArr]) => {
+    const groupByFilterData = Object.groupBy(groupArr, (el) => el[filterKey])
+    const newArr = Object.entries(groupByFilterData).map(([key, val]) => ({name: key, value: val.length, linkData: groupByKey === 'machine_type' ? val.map((el) => ({machine_type: el.machine_type, device_number: el.device_number})) : ''}))
+    return {yAxisData: key, totalCount: groupArr.length, charts: newArr}
+  })
+
+  const countMachines = yAxisData.reduce((acc, type) => acc + type.val, 0)
+
+  return {yAxisData: yAxisData, xAxisData: xAxisData, countMachines: countMachines, period: setPeriodCharts(filterKey).title, filterKey: filterKey, groupByKey: groupByKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters, groupByValue: groupByValue}
+}
+
+const chartsBarTypesGroupedByMl = (data, groupByKey, filterKeys, prevGroupByData, prevGroupByFilters) => {
+
+  const groupByData = Object.groupBy(data, (el) => el[groupByKey])
+  const yAxisData = Object.entries(groupByData).map(([key, val]) => {
+    const allValuesArr = filterKeys.map((filterKey) => {
+      const machinesWithMl = val.reduce((acc, el) => {
+        if (el[filterKey] || el[filterKey] === 0) {
+          acc = acc + el[filterKey]
         } else {
           acc
         }
         return acc
       }, 0)
-      return {key: filterKey, value: countNull}
+      const machinesWithoutMl = val.filter((el) => el[filterKey] === null).length
+      return {machinesWithMl: machinesWithMl, machinesWithoutMl: machinesWithoutMl}
     })
-
-    // console.log('machinesWithoutMl', machinesWithoutMl)
-
-    const countMachinesWithoutMl = Math.floor((machinesWithoutMl.reduce((acc, machine) => {
-      return acc + machine.value
-    }, 0)) / filterKeysMl.length // Либо только машины, если без деления тогда все null МЛ суммируются
-    )
-
-    machinesWithMl.push({key: 'routes_without_ml', name: setNamesMl('routes_without_ml'), value: countMachinesWithoutMl})
-
-    return {countMachinesWithMl: countMachinesWithMl, period: setPeriodCharts(filterKeysMl).title, machines: machinesWithMl}
-  }
-
-  const chartsBarMount = (data, groupByKey, filterKey, countKey) => {
-
-    const groupByData = Object.groupBy(data, (el) => el[groupByKey])
-
-    const yAxisData = Object.entries(groupByData).map(([key, val]) => ({key: key, val: val.reduce((acc, val) => acc + val[countKey], 0)}))
-    const xAxisData = Object.entries(groupByData).map(([key, groupArr]) => {
-      const groupByFilterData = Object.groupBy(groupArr, (el) => el[filterKey])
-      const newArr = Object.entries(groupByFilterData).map(([key, val]) => ({name: key, value: val.reduce((acc, val) => acc + val[countKey], 0)}))
-      return {yAxisData: key, totalCount: groupArr.length, charts: newArr}
-    })
-
-    const countMounts = yAxisData.reduce((acc, year) => (acc + year.val), 0)
-
-    return {yAxisData: yAxisData, xAxisData: xAxisData, countMounts: countMounts, filterKey: filterKey}
-  }
-
-  const chartsBarTypes = (data, groupByKey, filterKey, prevGroupByData, prevGroupByFilters) => {
-
-    const countMachines = data.length
-    const groupByData = Object.groupBy(data, (el) => el[groupByKey])
-
-    const yAxisData = Object.entries(groupByData).map(([key, val]) => ({key: key, val: val.length}))
-    const xAxisData = Object.entries(groupByData).map(([key, groupArr]) => {
-      const groupByFilterData = Object.groupBy(groupArr, (el) => el[filterKey])
-      const newArr = Object.entries(groupByFilterData).map(([key, val]) => ({name: key, value: val.length, linkData: groupByKey === 'machine_type' ? val.map((el) => ({machine_type: el.machine_type, device_number: el.device_number})) : ''}))
-      return {yAxisData: key, totalCount: groupArr.length, charts: newArr}
-    })
-
-    return {yAxisData: yAxisData, xAxisData: xAxisData, countMachines: countMachines, period: setPeriodCharts(filterKey).title, filterKey: filterKey, groupByKey: groupByKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters}
-  }
-
-  const chartsBarTypesGroupedBy = (data, groupByKey, filterKey, prevGroupByData, prevGroupByFilters, typeId) => {
-
-    const machineClass = setMachinesClass(typeId)
-    const machinesFilteredClass = data.filter(({machine_class}) => machine_class === machineClass)
-
-    const groupByData = Object.groupBy(machinesFilteredClass, (el) => el[groupByKey])
-
-    const yAxisData = Object.entries(groupByData).map(([key, val]) => ({key: key, val: val.length}))
-    const xAxisData = Object.entries(groupByData).map(([key, groupArr]) => {
-      const groupByFilterData = Object.groupBy(groupArr, (el) => el[filterKey])
-      const newArr = Object.entries(groupByFilterData).map(([key, val]) => ({name: key, value: val.length, linkData: groupByKey === 'machine_type' ? val.map((el) => ({machine_type: el.machine_type, device_number: el.device_number})) : ''}))
-      return {yAxisData: key, totalCount: groupArr.length, charts: newArr}
-    })
-
-    const countMachines = yAxisData.reduce((acc, type) => acc + type.val, 0)
-
-    return {yAxisData: yAxisData, xAxisData: xAxisData, countMachines: countMachines, period: setPeriodCharts(filterKey).title, filterKey: filterKey, groupByKey: groupByKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters, typeId: typeId}
-  }
-  
-  const chartsBarTypesWithoutFirstLayout = (data, groupByKey, filterKey, prevGroupByData, prevGroupByFilters, groupByValue) => {
-
-    const groupByData = Object.groupBy(data, (el) => el['org_type_name'])
-    const filteredGroupByData = Object.entries(groupByData).filter(([key, val]) => key === groupByValue)
-
-    if (filteredGroupByData.length === 0) return {yAxisData: [], xAxisData: [], countMachines: 0, period: setPeriodCharts(filterKey).title, filterKey: filterKey, groupByKey: groupByKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters, groupByValue: groupByValue}
-
-    const [groupedByGroupByKeyY] = filteredGroupByData.map(([key, groupArr]) => Object.groupBy(groupArr, (el) => el[groupByKey]))
-    const yAxisData = Object.entries(groupedByGroupByKeyY).map(([key, val]) => ({key: key, val: val.length}))
-    
-    const [groupedByGroupByKeyX] = filteredGroupByData.map(([key, groupArr]) => Object.groupBy(groupArr, (el) => el[groupByKey]))
-    const xAxisData = Object.entries(groupedByGroupByKeyX).map(([key, groupArr]) => {
-      const groupByFilterData = Object.groupBy(groupArr, (el) => el[filterKey])
-      const newArr = Object.entries(groupByFilterData).map(([key, val]) => ({name: key, value: val.length, linkData: groupByKey === 'machine_type' ? val.map((el) => ({machine_type: el.machine_type, device_number: el.device_number})) : ''}))
-      return {yAxisData: key, totalCount: groupArr.length, charts: newArr}
-    })
-
-    const countMachines = yAxisData.reduce((acc, type) => acc + type.val, 0)
-
-    return {yAxisData: yAxisData, xAxisData: xAxisData, countMachines: countMachines, period: setPeriodCharts(filterKey).title, filterKey: filterKey, groupByKey: groupByKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters, groupByValue: groupByValue}
-  }
-
-  const chartsBarTypesGroupedByMl = (data, groupByKey, filterKeys, prevGroupByData, prevGroupByFilters) => {
-
-    const groupByData = Object.groupBy(data, (el) => el[groupByKey])
-    const yAxisData = Object.entries(groupByData).map(([key, val]) => {
-      const allValuesArr = filterKeys.map((filterKey) => {
-        const machinesWithMl = val.reduce((acc, el) => {
-          if (el[filterKey] || el[filterKey] === 0) {
-            acc = acc + el[filterKey]
-          } else {
-            acc
-          }
-          return acc
-        }, 0)
-        const machinesWithoutMl = val.filter((el) => el[filterKey] === null).length
-        return {machinesWithMl: machinesWithMl, machinesWithoutMl: machinesWithoutMl}
-      })
-      // console.log('allValuesArr', allValuesArr)
-      const countMachinesWithMl = allValuesArr.reduce((acc, count) => (acc + count.machinesWithMl), 0)
-      const countMachinesWithoutMl = allValuesArr.reduce((acc, count) => (acc + count.machinesWithoutMl), 0) / filterKeys.length // Для исключения дублирования делим н а длину filterKeys
+    // console.log('allValuesArr', allValuesArr)
+    const countMachinesWithMl = allValuesArr.reduce((acc, count) => (acc + count.machinesWithMl), 0)
+    const countMachinesWithoutMl = allValuesArr.reduce((acc, count) => (acc + count.machinesWithoutMl), 0) / filterKeys.length // Для исключения дублирования делим н а длину filterKeys
       
-      return {key: key, val: countMachinesWithMl + countMachinesWithoutMl}
+    return {key: key, val: countMachinesWithMl + countMachinesWithoutMl}
+  })
+
+  const xAxisData = Object.entries(groupByData).map(([key, groupArr]) => {
+    return filterKeys.map((filterKey) => {
+      const groupByFilterData = Object.groupBy(groupArr, (el) => el[filterKey])
+      const newArr = Object.entries(groupByFilterData).map(([key, val]) => ({key: filterKey, name: key, value: val.reduce((acc, el) => el[filterKey] ? acc + el[filterKey] : acc, 0), linkData: groupByKey === 'machine_type' ? val.map((el) => ({machine_type: el.machine_type, device_number: el.device_number})) : ''}
+      ))
+      const machinesWithMl = newArr.reduce((acc, type) => {
+        if (type.key === filterKey) {
+          acc = {filterKey: filterKey, name: setNamesMl(filterKey), value: acc?.value + type.value, linkData: type.linkData}
+        } else {
+          acc = {filterKey: filterKey, name: setNamesMl(filterKey), value: acc?.value, linkData: type.linkData}
+        }
+        return acc
+      }, {value: 0})
+      // console.log('machinesWithMl', machinesWithMl)
+      return {yAxisData: key, charts: machinesWithMl}
     })
+  })
 
-    const xAxisData = Object.entries(groupByData).map(([key, groupArr]) => {
-      return filterKeys.map((filterKey) => {
-        const groupByFilterData = Object.groupBy(groupArr, (el) => el[filterKey])
-        const newArr = Object.entries(groupByFilterData).map(([key, val]) => ({key: filterKey, name: key, value: val.reduce((acc, el) => el[filterKey] ? acc + el[filterKey] : acc, 0), linkData: groupByKey === 'machine_type' ? val.map((el) => ({machine_type: el.machine_type, device_number: el.device_number})) : ''}
-        ))
-        const machinesWithMl = newArr.reduce((acc, type) => {
-          if (type.key === filterKey) {
-            acc = {filterKey: filterKey, name: setNamesMl(filterKey), value: acc?.value + type.value, linkData: type.linkData}
-          } else {
-            acc = {filterKey: filterKey, name: setNamesMl(filterKey), value: acc?.value, linkData: type.linkData}
-          }
-          return acc
-        }, {value: 0})
-        // console.log('machinesWithMl', machinesWithMl)
-        return {yAxisData: key, charts: machinesWithMl}
-      })
-    })
+  const machinesWithoutMl =  Object.entries(groupByData).map(([key, val]) => {
+    const countWithoutMl = val.filter((el) => filterKeys.find((filterKey) => el[filterKey] === null)).length
+    return {yAxisData: key, charts: {filterKey: 'routes_without_ml', name: setNamesMl('routes_without_ml'), value: countWithoutMl, linkData: groupByKey === 'machine_type' ? val.map((el) => ({machine_type: el.machine_type, device_number: el.device_number})) : ''}}
+  })
 
-    const machinesWithoutMl =  Object.entries(groupByData).map(([key, val]) => {
-      const countWithoutMl = val.filter((el) => filterKeys.find((filterKey) => el[filterKey] === null)).length
-      return {yAxisData: key, charts: {filterKey: 'routes_without_ml', name: setNamesMl('routes_without_ml'), value: countWithoutMl, linkData: groupByKey === 'machine_type' ? val.map((el) => ({machine_type: el.machine_type, device_number: el.device_number})) : ''}}
-    })
+  const countMachinesWithMl = setCountMachinesMl(xAxisData)
+  const countMachinesWithoutMl = Math.floor(setCountMachinesMl(machinesWithoutMl)) / filterKeys.length
 
-    const countMachinesWithMl = setCountMachinesMl(xAxisData)
-    const countMachinesWithoutMl = Math.floor(setCountMachinesMl(machinesWithoutMl)) / filterKeys.length
+  const updatedXAxisData = xAxisData.reduce((acc, group) => {
+    const isFindGroup = machinesWithoutMl.find((machine) => machine.yAxisData === group[0].yAxisData)
+    if (isFindGroup) {
+      const updatedGroup = [...group, isFindGroup]
+      acc.push(updatedGroup)
+    } else {
+      acc
+    }
+    return acc
+  }, [])
 
-    const updatedXAxisData = xAxisData.reduce((acc, group) => {
-      const isFindGroup = machinesWithoutMl.find((machine) => machine.yAxisData === group[0].yAxisData)
-      if (isFindGroup) {
-        const updatedGroup = [...group, isFindGroup]
-        acc.push(updatedGroup)
-      } else {
-        acc
-      }
-      return acc
-    }, [])
+  // console.log('updatedXAxisData', updatedXAxisData)
 
-    // console.log('updatedXAxisData', updatedXAxisData)
-
-    return {yAxisData: yAxisData, xAxisData: updatedXAxisData, countMachinesWithMl: countMachinesWithMl, countMachinesWithoutMl: countMachinesWithoutMl, period: setPeriodCharts(filterKeys).title, groupByKey: groupByKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters}
-  }
+  return {yAxisData: yAxisData, xAxisData: updatedXAxisData, countMachinesWithMl: countMachinesWithMl, countMachinesWithoutMl: countMachinesWithoutMl, period: setPeriodCharts(filterKeys).title, groupByKey: groupByKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters}
+}
   
-  /* Charts updated data end */
+/* Charts updated data end */
 
 
-  const loadingChartsData = ({chartsSetup, data, dataMount, prevGroupByData, prevGroupByFilters}) => {
+const loadingChartsData = ({chartsSetup, data, dataMount, prevGroupByData, prevGroupByFilters}) => {
 
-    // console.log('dataPie', chartsPie(data, chartsFilterParams[0]))
-    // console.log('dataPieValue', chartsPieGroupByValue(data, chartsGroupByParams[0], chartsFilterParams[0]))
-    // console.log('dataPieTypes', chartsPieGroupedBy(data, chartsGroupByParams2[0], chartsFilterParams[0]))
-    // console.log('dataBarMl', chartsBarGroupedByMl(data, chartsFilterKeysMl))
-    // console.log('dataBarMount', chartsBarMount(dataMount, 'year', 'client_type', 'device_count'))
-    // console.log('chartsBarTypesGroupedByMl', chartsBarTypesGroupedByMl(data, 'org_type_name', chartsFilterKeysMl, {}, {}))
+  // console.log('dataPie', chartsPie(data, chartsFilterParams[0]))
+  // console.log('dataPieValue', chartsPieGroupByValue(data, chartsGroupByParams[0], chartsFilterParams[0]))
+  // console.log('dataPieTypes', chartsPieGroupedBy(data, chartsGroupByParams2[0], chartsFilterParams[0]))
+  // console.log('dataBarMl', chartsBarGroupedByMl(data, chartsFilterKeysMl))
+  // console.log('dataBarMount', chartsBarMount(dataMount, 'year', 'client_type', 'device_count'))
+  // console.log('chartsBarTypesGroupedByMl', chartsBarTypesGroupedByMl(data, 'org_type_name', chartsFilterKeysMl, {}, {}))
 
-    const filteredPie = chartsFilterParams.reduce((acc, param) => {
-      const idChart = `${param.filterKey}_pie`
-      return {...acc, [idChart]: chartsPie(data, param)}}, {}) // Далее объединение всех типов графиков
+  const filteredPie = chartsFilterParams.reduce((acc, param) => {
+    const idChart = `${param.filterKey}_pie`
+    return {...acc, [idChart]: chartsPie(data, param)}}, {}) // Далее объединение всех типов графиков
 
-    const filteredPieGroupByValue = chartsGroupByParams.reduce((acc, param) => {
-      const idChart = `${chartsFilterParams[0].filterKey}_pie_${param.valueId}`
-      return {...acc, [idChart]: chartsPieGroupedBy(data, param, chartsFilterParams[0])}}, {})
+  const filteredPieGroupByValue = chartsGroupByParams.reduce((acc, param) => {
+    const idChart = `${chartsFilterParams[0].filterKey}_pie_${param.valueId}`
+    return {...acc, [idChart]: chartsPieGroupedBy(data, param, chartsFilterParams[0])}}, {})
 
-    const filteredPieGroupByTypes = chartsGroupByParams2.reduce((acc, param) => {
-      const idChart = `${chartsFilterParams[0].filterKey}_pie_${param.valueId}`
-      return {...acc, [idChart]: chartsPieGroupedBy(data, param, chartsFilterParams[0])}}, {})
+  const filteredPieGroupByTypes = chartsGroupByParams2.reduce((acc, param) => {
+    const idChart = `${chartsFilterParams[0].filterKey}_pie_${param.valueId}`
+    return {...acc, [idChart]: chartsPieGroupedBy(data, param, chartsFilterParams[0])}}, {})
 
-    const filteredBarGroupByMl = {[`${chartsFilterParams[1].filterKey}_bar`]: chartsBarGroupedByMl(data, chartsFilterKeysMl)}
+  const filteredBarGroupByMl = {[`${chartsFilterParams[1].filterKey}_bar`]: chartsBarGroupedByMl(data, chartsFilterKeysMl)}
 
-    const filteredBarMount = chartsMountParams.reduce((acc, param) => {
-      const idChart = `mount_${param.filterKey}_bar`
-      return {...acc, [idChart]: chartsBarMount(dataMount, param.groupByKey, param.filterKey, param.countKey)}}, {})
+  const filteredBarMount = chartsMountParams.reduce((acc, param) => {
+    const idChart = `mount_${param.filterKey}_bar`
+    return {...acc, [idChart]: chartsBarMount(dataMount, param.groupByKey, param.filterKey, param.countKey)}}, {})
 
-    const filteredBarTypes = chartsBarTypesParams.reduce((acc, param) => {
-      const idChart = `${param.filterKey}_${param.valueId}_bar`
-      return {...acc, [idChart]: chartsBarTypes(data, param.groupByKey, param.filterKey, prevGroupByData, prevGroupByFilters)}}, {})
+  const filteredBarTypes = chartsBarTypesParams.reduce((acc, param) => {
+    const idChart = `${param.filterKey}_${param.valueId}_bar`
+    return {...acc, [idChart]: chartsBarTypes(data, param.groupByKey, param.filterKey, prevGroupByData, prevGroupByFilters)}}, {})
 
-    const filteredBarGroupByTypes = chartsBarTypesGroupByParams.reduce((acc, param) => {
-      const idChart = `${param.filterKey}_${param.valueId}_bar_${param.typeId}`
-      return {...acc, [idChart]: chartsBarTypesGroupedBy(data, param.groupByKey, param.filterKey, prevGroupByData, prevGroupByFilters, param.typeId)}}, {})
+  const filteredBarGroupByTypes = chartsBarTypesGroupByParams.reduce((acc, param) => {
+    const idChart = `${param.filterKey}_${param.valueId}_bar_${param.typeId}`
+    return {...acc, [idChart]: chartsBarTypesGroupedBy(data, param.groupByKey, param.filterKey, prevGroupByData, prevGroupByFilters, param.typeId)}}, {})
 
-    const filteredBarWithoutLayoutTypes = chartsBarTypesWithoutLayoutParams.reduce((acc, param) => {
-      const idChart = `${param.filterKey}_types_bar_${param.valueId}`
-      return {...acc, [idChart]: chartsBarTypesWithoutFirstLayout(data, param.groupByKey, param.filterKey, prevGroupByData, prevGroupByFilters, param.groupByValue)}}, {})
+  const filteredBarWithoutLayoutTypes = chartsBarTypesWithoutLayoutParams.reduce((acc, param) => {
+    const idChart = `${param.filterKey}_types_bar_${param.valueId}`
+    return {...acc, [idChart]: chartsBarTypesWithoutFirstLayout(data, param.groupByKey, param.filterKey, prevGroupByData, prevGroupByFilters, param.groupByValue)}}, {})
 
-    const filteredBarGroupByMlTypes = {[`${chartsFilterParams[1].filterKey}_types_bar_ml`]: chartsBarTypesGroupedByMl(data, 'org_type_name', chartsFilterKeysMl, prevGroupByData, prevGroupByFilters)}
+  const filteredBarGroupByMlTypes = {[`${chartsFilterParams[1].filterKey}_types_bar_ml`]: chartsBarTypesGroupedByMl(data, 'org_type_name', chartsFilterKeysMl, prevGroupByData, prevGroupByFilters)}
     
-    const allCharts = {...filteredPie, ...filteredPieGroupByValue, ...filteredPieGroupByTypes, ...filteredBarGroupByMl, ...filteredBarMount, ...filteredBarTypes, ...filteredBarGroupByTypes, ...filteredBarWithoutLayoutTypes, ...filteredBarGroupByMlTypes}
+  const allCharts = {...filteredPie, ...filteredPieGroupByValue, ...filteredPieGroupByTypes, ...filteredBarGroupByMl, ...filteredBarMount, ...filteredBarTypes, ...filteredBarGroupByTypes, ...filteredBarWithoutLayoutTypes, ...filteredBarGroupByMlTypes}
 
-    console.log('allCharts', allCharts)
+  console.log('allCharts', allCharts)
 
-    // console.log('this.charts', data)
-      const main = chartsSetup.main.reduce((acc, chart) => {
-        if (allCharts[chart.id]) {
-          const newChart = {...chart, data: allCharts[chart.id]}
-          acc = [...acc, newChart]
-        } else {
-          acc
-        }
-        return acc
-        
-      }, [])
-      const types = chartsSetup.types.reduce((acc, chart) => {
-        if (allCharts[chart.id]) {
-          const newChart = {...chart, data: allCharts[chart.id]}
-          acc = [...acc, newChart]
-        } else {
-          acc
-        }
-        return acc
-        
-      }, [])
-      return {...chartsSetup, main: main, types: types}
-  }
-
-  const setBarTypesChart = (activeChartParams, prevGroupByData, prevGroupByFilters, defaultData, currentData) => {
-    switch (activeChartParams.type) {
-      case 'default':
-        const dataDefault = chartsBarTypes(defaultData, activeChartParams.groupByKey, activeChartParams.filterKey, prevGroupByData, prevGroupByFilters)
-        // const updatedData = currentData.types.reduce((acc, chart) => {
-        //   if (chart.id === activeChartParams.id) {
-        //     const newChart = {...chart, data: data}
-        //     acc = [...acc, newChart]
-        //   } else {
-        //     acc = [...acc, chart]
-        //   }
-        //   return acc
-        // }, [])
-        // return {main: currentData.main, types: updatedData}
-        return dataDefault
-      case 'without_first_layout': 
-      const dataWithoutFirstLayout = chartsBarTypesWithoutFirstLayout(defaultData, activeChartParams.groupByKey, activeChartParams.filterKey, prevGroupByData, prevGroupByFilters, activeChartParams.groupByValue)
-        return dataWithoutFirstLayout
-      case 'types': 
-      const dataGroupBy = chartsBarTypesGroupedBy(defaultData, activeChartParams.groupByKey, activeChartParams.filterKey, prevGroupByData, prevGroupByFilters, activeChartParams.groupByValue)
-        return dataGroupBy
-      case 'ml': 
-      const dataMl = chartsBarTypesGroupedByMl(defaultData, activeChartParams.groupByKey, chartsFilterKeysMl, prevGroupByData, prevGroupByFilters)
-        return dataMl
+  // console.log('this.charts', data)
+  const main = chartsSetup.main.reduce((acc, chart) => {
+    if (allCharts[chart.id]) {
+      const newChart = {...chart, data: allCharts[chart.id]}
+      acc = [...acc, newChart]
+    } else {
+      acc
     }
+    return acc
+        
+  }, [])
+  const types = chartsSetup.types.reduce((acc, chart) => {
+    if (allCharts[chart.id]) {
+      const newChart = {...chart, data: allCharts[chart.id]}
+      acc = [...acc, newChart]
+    } else {
+      acc
+    }
+    return acc
+        
+  }, [])
+  return {...chartsSetup, main: main, types: types}
+}
+
+const setBarTypesChart = (activeChartParams, prevGroupByData, prevGroupByFilters, defaultData) => {
+  switch (activeChartParams.type) {
+  case 'default': {
+    const dataDefault = chartsBarTypes(defaultData, activeChartParams.groupByKey, activeChartParams.filterKey, prevGroupByData, prevGroupByFilters)
+    // const updatedData = currentData.types.reduce((acc, chart) => {
+    //   if (chart.id === activeChartParams.id) {
+    //     const newChart = {...chart, data: data}
+    //     acc = [...acc, newChart]
+    //   } else {
+    //     acc = [...acc, chart]
+    //   }
+    //   return acc
+    // }, [])
+    // return {main: currentData.main, types: updatedData}
+    return dataDefault
   }
+    
+  case 'without_first_layout': {
+    const dataWithoutFirstLayout = chartsBarTypesWithoutFirstLayout(defaultData, activeChartParams.groupByKey, activeChartParams.filterKey, prevGroupByData, prevGroupByFilters, activeChartParams.groupByValue)
+    return dataWithoutFirstLayout
+  }
+    
+  case 'types': {
+    const dataGroupBy = chartsBarTypesGroupedBy(defaultData, activeChartParams.groupByKey, activeChartParams.filterKey, prevGroupByData, prevGroupByFilters, activeChartParams.groupByValue)
+    return dataGroupBy
+  }
+    
+  case 'ml': {
+    const dataMl = chartsBarTypesGroupedByMl(defaultData, activeChartParams.groupByKey, chartsFilterKeysMl, prevGroupByData, prevGroupByFilters)
+    return dataMl
+  }
+  }
+}
   
-  const setNextLayoutGroupByKey = (groupByKey, prevGroupByValue) => {
-    if (prevGroupByValue === 'без типа') return null
-    switch (groupByKey) {
-      case 'org_type_name': return 'railway_name'
-      case 'railway_name': return 'org_name'
-      case 'org_name': return 'type'
-      case 'type': return 'machine_type'
-      case 'zav_nomer': return 'machine_type'
-      default: return null
-    }
+const setNextLayoutGroupByKey = (groupByKey, prevGroupByValue) => {
+  if (prevGroupByValue === 'без типа') return null
+  switch (groupByKey) {
+  case 'org_type_name': return 'railway_name'
+  case 'railway_name': return 'org_name'
+  case 'org_name': return 'type'
+  case 'type': return 'machine_type'
+  case 'zav_nomer': return 'machine_type'
+  default: return null
   }
+}
 
-  const setBeforeLayoutGroupByData = (prevGroupByData, prevGroupByFilters, type) => {
-    return cond([
-      [has('type'), () => ({org_name: prevGroupByFilters['org_name']})],
-      [has('org_name'), () => ({railway_name: prevGroupByFilters['railway_name']})],
-      [has('railway_name'), () => (type === 'without_first_layout' ? {} : {org_type_name: prevGroupByFilters['org_type_name']})],
-      [T, () => {}],
-    ])(prevGroupByData)
+const setBeforeLayoutGroupByData = (prevGroupByData, prevGroupByFilters, type) => {
+  return cond([
+    [has('type'), () => ({org_name: prevGroupByFilters['org_name']})],
+    [has('org_name'), () => ({railway_name: prevGroupByFilters['railway_name']})],
+    [has('railway_name'), () => (type === 'without_first_layout' ? {} : {org_type_name: prevGroupByFilters['org_type_name']})],
+    [T, () => {}],
+  ])(prevGroupByData)
+}
+
+const typesCharts = (type) => {
+  switch (type) {
+  case 'pie': return true
+  case 'mount': return true
+  case 'mainMl': return true
+  default: return false
   }
+}
 
-  const typesCharts = (type) => {
-    switch (type) {
-      case 'pie': return true
-      case 'mount': return true
-      case 'mainMl': return true
-      default: return false
-    }
-  }
-
-  export { loadingChartsData, setBarTypesChart, setNextLayoutGroupByKey, setBeforeLayoutGroupByData, typesCharts }
\ No newline at end of file
+export { loadingChartsData, setBarTypesChart, setNextLayoutGroupByKey, setBeforeLayoutGroupByData, typesCharts }
\ No newline at end of file
diff --git a/live_monitor_vue/src/store/modules/layoutMachines/index.js b/live_monitor_vue/src/store/modules/layoutMachines/index.js
index 5fd1793..7483e30 100644
--- a/live_monitor_vue/src/store/modules/layoutMachines/index.js
+++ b/live_monitor_vue/src/store/modules/layoutMachines/index.js
@@ -1,11 +1,11 @@
 import {toRaw} from 'vue'
-import {searchModes, leftTopButtons, rightTopButtons, selects, selectors, charts, dataMachines, dataMount, pagination, machineInfo, reportPacks, report, packStructure, multiReport, multiPackStructure} from './StaticData'
+import {searchModes, leftTopButtons, rightTopButtons, selects, selectors, dataMachines, dataMount, pagination, machineInfo, reportPacks, multiReport, multiPackStructure} from './StaticData'
 import { chartsSetup } from '@/store/hooks/Echarts/staticData.js';
 import { prepareSelects, mergedMachines, setUpdatedDataMachines, colorSelection, loadingPagination, setPagination } from './helpers';
 import { loadingChartsData, setBarTypesChart, setNextLayoutGroupByKey, setBeforeLayoutGroupByData, typesCharts } from './helpersCharts';
 import { fetchColumn, prepareSetPackColumns } from '@organisms/PackColumns';
-import { get } from '../apiHelpers';
-import {equals, isEmpty, uniq} from 'ramda'
+// import { get } from '../apiHelpers';
+import {equals, isEmpty} from 'ramda'
 
 const initState = {
   leftTopButtons: leftTopButtons,
@@ -210,7 +210,7 @@ const actions = {
           break
         }
         if (updatedSelect.key === 'removed' && newSelected && (selectedSelects[curSelect.key] && selectedSelects[curSelect.key].length > 0)) {
-            updatedSelects[curSelect.key] = selectedSelects[curSelect.key].filter((el) => el.name !== newSelected.name)
+          updatedSelects[curSelect.key] = selectedSelects[curSelect.key].filter((el) => el.name !== newSelected.name)
           break
         } 
         if (updatedSelect.key === 'set' && newSelected && (selectedSelects[curSelect.key] && selectedSelects[curSelect.key].length > 0)) {
@@ -235,56 +235,61 @@ const actions = {
       console.error(err)
     }
   },
-  updateCharts: async ({commit, getters, state}, updatedData) => {
+  updateCharts: async ({commit, state}, updatedData) => {
     try {
       switch(updatedData.action) {
-        case 'nextLayoutChart':
-          // console.log('updatedDataNext', updatedData)
-          const prevGroupByFiltersNext = updatedData.prevGroupByFilters
-          const updatedFiltersNext = {...prevGroupByFiltersNext, ...updatedData.prevGroupByData}
-          const prevGroupByValue = updatedData.prevGroupByData.type ? updatedData.prevGroupByData.type : null
-          const groupByKeyNext = setNextLayoutGroupByKey(updatedData.groupByKey, prevGroupByValue)
-          if (groupByKeyNext) {
-            const activeChartData = {id: updatedData.id, data: updatedData.data, groupByKey: groupByKeyNext, filterKey: updatedData.filterKey, type: updatedData.type, groupByValue: updatedData.groupByValue}
-            const newData = setBarTypesChart(activeChartData, updatedData.prevGroupByData, updatedFiltersNext, state.machinesDataDefault, toRaw(state.chartsData))
-            return commit('setActiveChartData', {...activeChartData, data: newData})
-          }
-          break
-        case 'beforeLayoutChart':
-          // console.log('updatedDataBefore', updatedData)
-          const prevGroupByData = updatedData.groupByInfo.prevGroupByData
-          const prevGroupByFiltersBefore = updatedData.groupByInfo.prevGroupByFilters
-          const groupByKeyBefore = Object.keys(prevGroupByData)[0] // Получаем уже предыдущее значение ключа
-          delete prevGroupByFiltersBefore[groupByKeyBefore] // Удаляем значение после вычисления prevGroupByData, так как подымаемся на уровень выше, сохраняя актуальное значение для фильтрации
-          const isOnlyFiltersParams = equals(prevGroupByData, prevGroupByFiltersBefore)
-          const updatedPrevGroupByDataBefore = isOnlyFiltersParams ? {} : setBeforeLayoutGroupByData(prevGroupByData, prevGroupByFiltersBefore, updatedData.groupByInfo.type)
-          if (groupByKeyBefore) {
-            const activeChartData = {id: updatedData.id, data: updatedData.data, groupByKey: groupByKeyBefore, filterKey: updatedData.filterKey, type: updatedData.groupByInfo.type, groupByValue: updatedData.groupByInfo.groupByValue}
-            const newData = setBarTypesChart(activeChartData, updatedPrevGroupByDataBefore, prevGroupByFiltersBefore, state.machinesDataDefault, toRaw(state.chartsData))
-            return commit('setActiveChartData', {...activeChartData, data: newData})
-          }
-          break
-        case 'openMenuChart':
-          // console.log('updatedDataOpen', updatedData)
-          const openMenuChart = toRaw(state.activeMenuChartData.openMenuChart)
-          updatedData.groupByInfo.data[0].type = updatedData.groupByInfo.type
-          const activeChartDataMenu = {chartId: updatedData.groupByInfo.chartId, data: updatedData.groupByInfo.data, groupByKey: updatedData.groupByInfo.groupByKey, filterKey: updatedData.groupByInfo.filterKey, type: updatedData.groupByInfo.type, groupByValue: updatedData.groupByInfo.groupByValue}
-          const newDataMenu = setBarTypesChart(activeChartDataMenu, updatedData.groupByInfo.prevGroupByData, updatedData.groupByInfo.prevGroupByFilters, state.machinesDataDefault, toRaw(state.chartsData))
-          const isNotTypesChartsMenu = typesCharts(updatedData.groupByInfo.type)
-          const toggleActiveMenuChartData = {openMenuChart: !openMenuChart, groupByInfo: {...activeChartDataMenu, data: isNotTypesChartsMenu ?  updatedData.groupByInfo.data[0] : newDataMenu}}
-          commit('setActiveMenuChartData', toggleActiveMenuChartData)
-          break
-        case 'downloadChart':
-          // console.log('updatedDataDownload', updatedData)
-          const activeChartDataDownload = {chartId: updatedData.groupByInfo.chartId, isDownloadChart: updatedData.groupByInfo.isDownloadChart, data: updatedData.groupByInfo.data, groupByKey: updatedData.groupByInfo.groupByKey, prevGroupByData: updatedData.groupByInfo.prevGroupByData, prevGroupByFilters: updatedData.groupByInfo.prevGroupByFilters, filterKey: updatedData.groupByInfo.filterKey, type: updatedData.groupByInfo.type, groupByValue: updatedData.groupByInfo.groupByValue}
-          const newDataDownload = setBarTypesChart(activeChartDataDownload, updatedData.groupByInfo.prevGroupByData, updatedData.groupByInfo.prevGroupByFilters, state.machinesDataDefault, toRaw(state.chartsData))
-          const isNotTypesChartsDownload = typesCharts(updatedData.groupByInfo.type)
-          const downloadActiveMenuChartData = {openMenuChart: false, groupByInfo: {...updatedData.groupByInfo, data: isNotTypesChartsDownload ?  updatedData.groupByInfo.data[0] : newDataDownload}}
-          commit('setActiveMenuChartData', downloadActiveMenuChartData)
-          break
-        case 'legendFiltersParams':
-          commit('setLegendFiltersParams', updatedData.data)
-        default: return false
+      case 'nextLayoutChart': {
+        // console.log('updatedDataNext', updatedData)
+        const prevGroupByFiltersNext = updatedData.prevGroupByFilters
+        const updatedFiltersNext = {...prevGroupByFiltersNext, ...updatedData.prevGroupByData}
+        const prevGroupByValue = updatedData.prevGroupByData.type ? updatedData.prevGroupByData.type : null
+        const groupByKeyNext = setNextLayoutGroupByKey(updatedData.groupByKey, prevGroupByValue)
+        if (groupByKeyNext) {
+          const activeChartData = {id: updatedData.id, data: updatedData.data, groupByKey: groupByKeyNext, filterKey: updatedData.filterKey, type: updatedData.type, groupByValue: updatedData.groupByValue}
+          const newData = setBarTypesChart(activeChartData, updatedData.prevGroupByData, updatedFiltersNext, state.machinesDataDefault, toRaw(state.chartsData))
+          return commit('setActiveChartData', {...activeChartData, data: newData})
+        }
+        break
+      }
+      case 'beforeLayoutChart': {
+        // console.log('updatedDataBefore', updatedData)
+        const prevGroupByData = updatedData.groupByInfo.prevGroupByData
+        const prevGroupByFiltersBefore = updatedData.groupByInfo.prevGroupByFilters
+        const groupByKeyBefore = Object.keys(prevGroupByData)[0] // Получаем уже предыдущее значение ключа
+        delete prevGroupByFiltersBefore[groupByKeyBefore] // Удаляем значение после вычисления prevGroupByData, так как подымаемся на уровень выше, сохраняя актуальное значение для фильтрации
+        const isOnlyFiltersParams = equals(prevGroupByData, prevGroupByFiltersBefore)
+        const updatedPrevGroupByDataBefore = isOnlyFiltersParams ? {} : setBeforeLayoutGroupByData(prevGroupByData, prevGroupByFiltersBefore, updatedData.groupByInfo.type)
+        if (groupByKeyBefore) {
+          const activeChartData = {id: updatedData.id, data: updatedData.data, groupByKey: groupByKeyBefore, filterKey: updatedData.filterKey, type: updatedData.groupByInfo.type, groupByValue: updatedData.groupByInfo.groupByValue}
+          const newData = setBarTypesChart(activeChartData, updatedPrevGroupByDataBefore, prevGroupByFiltersBefore, state.machinesDataDefault, toRaw(state.chartsData))
+          return commit('setActiveChartData', {...activeChartData, data: newData})
+        }
+        break
+      }
+      case 'openMenuChart': {
+        // console.log('updatedDataOpen', updatedData)
+        const openMenuChart = toRaw(state.activeMenuChartData.openMenuChart)
+        updatedData.groupByInfo.data[0].type = updatedData.groupByInfo.type
+        const activeChartDataMenu = {chartId: updatedData.groupByInfo.chartId, data: updatedData.groupByInfo.data, groupByKey: updatedData.groupByInfo.groupByKey, filterKey: updatedData.groupByInfo.filterKey, type: updatedData.groupByInfo.type, groupByValue: updatedData.groupByInfo.groupByValue}
+        const newDataMenu = setBarTypesChart(activeChartDataMenu, updatedData.groupByInfo.prevGroupByData, updatedData.groupByInfo.prevGroupByFilters, state.machinesDataDefault, toRaw(state.chartsData))
+        const isNotTypesChartsMenu = typesCharts(updatedData.groupByInfo.type)
+        const toggleActiveMenuChartData = {openMenuChart: !openMenuChart, groupByInfo: {...activeChartDataMenu, data: isNotTypesChartsMenu ?  updatedData.groupByInfo.data[0] : newDataMenu}}
+        commit('setActiveMenuChartData', toggleActiveMenuChartData)
+        break
+      }
+      case 'downloadChart': {
+        // console.log('updatedDataDownload', updatedData)
+        const activeChartDataDownload = {chartId: updatedData.groupByInfo.chartId, isDownloadChart: updatedData.groupByInfo.isDownloadChart, data: updatedData.groupByInfo.data, groupByKey: updatedData.groupByInfo.groupByKey, prevGroupByData: updatedData.groupByInfo.prevGroupByData, prevGroupByFilters: updatedData.groupByInfo.prevGroupByFilters, filterKey: updatedData.groupByInfo.filterKey, type: updatedData.groupByInfo.type, groupByValue: updatedData.groupByInfo.groupByValue}
+        const newDataDownload = setBarTypesChart(activeChartDataDownload, updatedData.groupByInfo.prevGroupByData, updatedData.groupByInfo.prevGroupByFilters, state.machinesDataDefault, toRaw(state.chartsData))
+        const isNotTypesChartsDownload = typesCharts(updatedData.groupByInfo.type)
+        const downloadActiveMenuChartData = {openMenuChart: false, groupByInfo: {...updatedData.groupByInfo, data: isNotTypesChartsDownload ?  updatedData.groupByInfo.data[0] : newDataDownload}}
+        commit('setActiveMenuChartData', downloadActiveMenuChartData)
+        break
+      }
+      case 'legendFiltersParams':
+        commit('setLegendFiltersParams', updatedData.data)
+        break
+      default: return false
       }
     } catch (err) {
       console.error(err)
@@ -302,7 +307,7 @@ const actions = {
       console.error(err)
     }
   },
-  openMapModal: async ({commit, state}, machine) => {
+  openMapModal: async ({commit}, machine) => {
     try {
       // Добавить запрос на получение координат
       /*
@@ -317,7 +322,7 @@ const actions = {
       console.error(err)
     }
   },
-  openDataModal: async ({commit, state}, machine) => {
+  openDataModal: async ({commit}) => {
     try {
 
       // Добавить запрос на получение пакетов и информации о машине
@@ -355,7 +360,7 @@ const actions = {
       console.error(err)
     }
   },
-  loadPack: async ({commit, state}, packNumber) => {
+  loadPack: async ({commit}, packNumber) => {
     try {
 
       /* Получение данных о пакете
@@ -398,7 +403,7 @@ const actions = {
       console.error(err)
     }
   },
-  updateModePack: async ({commit, getters, state}, updatedMode) => {
+  updateModePack: async ({commit, state}, updatedMode) => {
     try {
       const structPackDefault = toRaw(state.structPackDefault)
       const currentReport = multiReport[updatedMode] ? multiReport[updatedMode] : []
diff --git a/live_monitor_vue/src/store/modules/machines/StaticData.js b/live_monitor_vue/src/store/modules/machines/StaticData.js
index b37fd13..1c535b8 100644
--- a/live_monitor_vue/src/store/modules/machines/StaticData.js
+++ b/live_monitor_vue/src/store/modules/machines/StaticData.js
@@ -32,39 +32,39 @@ const pagination = {
 
 const selectors = {
   org_name: ["ПЧМ Воронеж", "ПЧМ Фаянсовая",
-   "ПЧМ Топки", "ПЧМ Кочетовка", "ПЧР КЛНГ",
-   "ПЧМ Нижний Новгород", "ПЧМ Новосибирск",
-   "ПЧМ Екатеринбург", "ПЧМ Омск", "ПЧМ Алтай",
-   "ПЧМ Тосно", "ПЧМ Вязьма", "ПМС-46", "ПМС-183",
-   "ПЧМ Тихорецк", "ПЧМ Сызрань",
-   "ПЧМ Хабаровск", null, "ПЧМ Северобайкальск",
-   "ПЧМ Смолино", "ПЧМ Вологда", "ПЧМ Пермь",
-   "ПЧМ Астрахань", "ПЧМ Нигозеро",
-   "ПЧМ Челябинск", "ПЧМ Завитая", "ПМС-217",
-   "ПМС-199", "ПМС-31", "ТрансЭнерго", "ПМС-340",
-   "ОПМС-99", "ПМС-11", "ПМС-77", "ПМС-208", "ПМС-172",
-   "ПМС-12", "ПМС-22",
-   "Экспулуатация БУ прекращена", "ОПМС-68",
-   "ПМС-170", "ОПМС-103", "ПМС-205", "ПМС-152", "ПМС-20",
-   "ПЧМ Тында", "КалугаПутьМаш",
-   "ПЧМ Санкт-Петербург", "ПЧМ Красноярск"],
+    "ПЧМ Топки", "ПЧМ Кочетовка", "ПЧР КЛНГ",
+    "ПЧМ Нижний Новгород", "ПЧМ Новосибирск",
+    "ПЧМ Екатеринбург", "ПЧМ Омск", "ПЧМ Алтай",
+    "ПЧМ Тосно", "ПЧМ Вязьма", "ПМС-46", "ПМС-183",
+    "ПЧМ Тихорецк", "ПЧМ Сызрань",
+    "ПЧМ Хабаровск", null, "ПЧМ Северобайкальск",
+    "ПЧМ Смолино", "ПЧМ Вологда", "ПЧМ Пермь",
+    "ПЧМ Астрахань", "ПЧМ Нигозеро",
+    "ПЧМ Челябинск", "ПЧМ Завитая", "ПМС-217",
+    "ПМС-199", "ПМС-31", "ТрансЭнерго", "ПМС-340",
+    "ОПМС-99", "ПМС-11", "ПМС-77", "ПМС-208", "ПМС-172",
+    "ПМС-12", "ПМС-22",
+    "Экспулуатация БУ прекращена", "ОПМС-68",
+    "ПМС-170", "ОПМС-103", "ПМС-205", "ПМС-152", "ПМС-20",
+    "ПЧМ Тында", "КалугаПутьМаш",
+    "ПЧМ Санкт-Петербург", "ПЧМ Красноярск"],
   org_type_name: ["ЦДИМ", "Другие", "ЦДРП"],
   railway_name: ["Ю-Вост", "Моск", "З-Сиб", "Клг", "Горьк",
-   "Сверд", "Окт", "Заб", "В-Сиб", "С-Кав", "Кбш",
-   "Д-Вост", null, "Ю-Ур", "Сев", "Прив", "РЖД", "Крас"],
+    "Сверд", "Окт", "Заб", "В-Сиб", "С-Кав", "Кбш",
+    "Д-Вост", null, "Ю-Ур", "Сев", "Прив", "РЖД", "Крас"],
   type: ["УТМ", "РПБ", "ПРЛ УПК", "ПУМА", "МДС", "МПТ",
-   "ТЭС", "СПП", "ДСП", "СЧ", "ЩОМ", "RM", "АСГ", "ВПО",
-   "без типа", "ПМГ", "МТГ", "АС", "СМ", "ВПР", "ПСС",
-   "МПК", "АДМ", "АГД", "УК", "АМ", "ПРЛ", "АДЭ",
-   "Унимат", "ВПРС", "ПБ", "Дуоматик", "МВУ",
-   "АВФ-1М.2", "Динамик", "АГС", "ПМА", "ССГ-1", "СЧУ",
-   "АГП", "Унимат компакт", "ДГКу", "СЗ", "ТЭУ",
-   "РБ", "ФАТРА",],
+    "ТЭС", "СПП", "ДСП", "СЧ", "ЩОМ", "RM", "АСГ", "ВПО",
+    "без типа", "ПМГ", "МТГ", "АС", "СМ", "ВПР", "ПСС",
+    "МПК", "АДМ", "АГД", "УК", "АМ", "ПРЛ", "АДЭ",
+    "Унимат", "ВПРС", "ПБ", "Дуоматик", "МВУ",
+    "АВФ-1М.2", "Динамик", "АГС", "ПМА", "ССГ-1", "СЧУ",
+    "АГП", "Унимат компакт", "ДГКу", "СЗ", "ТЭУ",
+    "РБ", "ФАТРА",],
   zav_nomer: ["84", "49", "15", "90", "27", "9", "5", "105", "005", "656",
-   "001", "39", "38", "57", "03", "003", "593", "235", "1453", "1307", "766",
-   "528", "485", "02", "752", "704", "584", "669", "261", "482", "762", "985",
-   "605", "016", "1258", "729", "963", "927", "319", "1154", "1163", "825",
-   "1276", "1062", "1025",]
+    "001", "39", "38", "57", "03", "003", "593", "235", "1453", "1307", "766",
+    "528", "485", "02", "752", "704", "584", "669", "261", "482", "762", "985",
+    "605", "016", "1258", "729", "963", "927", "319", "1154", "1163", "825",
+    "1276", "1062", "1025",]
 }
 
 
@@ -245,163 +245,163 @@ const chartsBarTypesWithoutLayoutParams = [{groupByKey: 'railway_name', filterKe
 
 const charts = {
   pie: {
-  countMachines: 4790,
-  period: 'две недели',
-  machines: [
-  { name: "Есть МЛ, выходил на связь", value: 1048, color: "rgb(134, 212, 131, 1)", order: 1 },
-  { name: "Есть МЛ, нет связи", value: 1048, color: "rgb(134, 212, 131, 1)", order: 2 },
-  { name: "Нет МЛ, выходил на связь", value: 1048, color: "rgb(134, 212, 131, 1)", order: 3 },
-  { name: "Нет МЛ, нет связи", value: 1048, color: "rgb(134, 212, 131, 1)", order: 4 },
-]},
+    countMachines: 4790,
+    period: 'две недели',
+    machines: [
+      { name: "Есть МЛ, выходил на связь", value: 1048, color: "rgb(134, 212, 131, 1)", order: 1 },
+      { name: "Есть МЛ, нет связи", value: 1048, color: "rgb(134, 212, 131, 1)", order: 2 },
+      { name: "Нет МЛ, выходил на связь", value: 1048, color: "rgb(134, 212, 131, 1)", order: 3 },
+      { name: "Нет МЛ, нет связи", value: 1048, color: "rgb(134, 212, 131, 1)", order: 4 },
+    ]},
   mainMl: {
-  countMachinesWithMl: 2916,
-  period: 'две недели',
-  machines: [
-  { key: "routes_common", name: "Обычные", value: 2182, itemStyle: {color: "rgb(134, 212, 131, 1)"}, order: 1 },
-  { key: "routes_emergency", name: "Аварийные", value: 64, itemStyle: {color: "rgb(255, 114, 114, 1)"}, order: 2 },
-  { key: "routes_other", name: "Прочие", value: 259, itemStyle: {color: "rgb(196, 161, 201, 1)"}, order: 3 },
-  { key: "routes_repair", name: "Ремонтные", value: 338, itemStyle: {color: "rgb(228, 202, 163, 1)"}, order: 4 },
-  { key: "routes_without_leaving", name: "Без выезда", value: 73, itemStyle: {color: "rgb(243, 161, 30, 1)"}, order: 5 },
-  { key: "routes_without_ml", name: "СПС без МЛ", value: 3073, itemStyle: {color: "rgb(165, 165, 165, 1)"}, order: 6 },
-]},
-mount_mounter_type_bar: {
-  chartId: "mount_mounter_type_bar",
-  countMounts: 5436,
-  filterKey: "mounter_type",
-  height: 500,
-  type: "mount",
-  xAxisData: [
-    [
-      {
-        charts: [
-          {name: "ВНИИЖТ", value: 92},
-          {name: "Калугапутьмаш", value: 1}
-        ],
-        totalCount: 3,
-        yAxisData: "2016 г."
-      },
-      {
-        charts: [
-          {name: "ВНИИЖТ", value: 349},
-          {name: "КалугаРПМ", value: 9},
-          {name: "Калугапутьмаш", value: 92},
-          {name: "Свердловский РПМ", value: 23},
-          {
-            name: "Тихорецкий завод им Воровского",
-            value: 26
-          },
-          {name: "Тулажелдормаш", value: 8}
-        ],
-        totalCount: 9,
-        yAxisData: "2017 г."
-      },
-      {
-        charts: [
-          {name: "ВНИИЖТ", value: 590},
-          {name: "КалугаРПМ", value: 7},
-          {name: "Калугапутьмаш", value: 73},
-          {name: "Свердловский РПМ", value: 30},
-          {
-            name: "Тихорецкий завод им Воровского",
-            value: 23
-          },
-          {name: "Тулажелдормаш", value: 32}
-        ],
-        totalCount: 11,
-        yAxisData: "2018 г."
-      },
-      {
-        charts: [
-          {name: "ВНИИЖТ", value: 719},
-          {name: "КалугаРПМ", value: 16},
-          {name: "Калугапутьмаш", value: 88},
-          {name: "Свердловский РПМ", value: 20},
-          {
-            name: "Тихорецкий завод им Воровского",
-            value: 33
-          },
-          {name: "Тулажелдормаш", value: 24}
-        ],
-        totalCount: 12,
-        yAxisData: "2019 г."
-      },
-      {
-        charts: [
-          {name: "ВНИИЖТ", value: 594},
-          {name: "КалугаРПМ", value: 18},
-          {name: "Калугапутьмаш", value: 100},
-          {name: "Свердловский РПМ", value: 19},
-          {
-            name: "Тихорецкий завод им Воровского",
-            value: 36
-          },
-          {name: "Тулажелдормаш", value: 31}
-        ],
-        totalCount: 9,
-        yAxisData: "2020 г."
-      },
-      {
-        charts: [
-          {name: "ВНИИЖТ", value: 777},
-          {name: "Инжиниринг Сервис-Путьмаш", value: 10},
-          {name: "КалугаРПМ", value: 5},
-          {name: "Калугапутьмаш", value: 84},
-          {name: "Пермский РПМ", value: 5},
-          {name: "Свердловский РПМ", value: 4},
-          {
-            name: "Тихорецкий завод им Воровского",
-            value: 14
-          },
-          {name: "Тулажелдормаш", value: 28}
-        ],
-        totalCount: 12,
-        yAxisData: "2021 г."
-      },
-      {
-        charts: [
-          {name: "ВНИИЖТ", value: 746},
-          {name: "Инжиниринг Сервис-Путьмаш", value: 10},
-          {name: "КалугаРПМ", value: 4},
-          {name: "Калугапутьмаш", value: 36},
-          {name: "Свердловский РПМ", value: 1},
-          {
-            name: "Тихорецкий завод им Воровского",
-            value: 5
-          },
-          {name: "Тулажелдормаш", value: 20}
-        ],
-        totalCount: 15,
-        yAxisData: "2022 г."
-      },
-      {
-        charts: [
-          {name: "ВНИИЖТ", value: 612},
-          {name: "Инжиниринг Сервис-Путьмаш", value: 4},
-          {name: "КалугаРПМ", value: 3},
-          {name: "Калугапутьмаш", value: 2},
-          {name: "Кировский машзавод", value: 3},
-          {
-            name: "Тихорецкий завод им Воровского",
-            value: 7
-          },
-          {name: "Тулажелдормаш", value: 6}
-        ],
-        totalCount: 10,
-        yAxisData: "2023 г."
-      }
-    ]
+    countMachinesWithMl: 2916,
+    period: 'две недели',
+    machines: [
+      { key: "routes_common", name: "Обычные", value: 2182, itemStyle: {color: "rgb(134, 212, 131, 1)"}, order: 1 },
+      { key: "routes_emergency", name: "Аварийные", value: 64, itemStyle: {color: "rgb(255, 114, 114, 1)"}, order: 2 },
+      { key: "routes_other", name: "Прочие", value: 259, itemStyle: {color: "rgb(196, 161, 201, 1)"}, order: 3 },
+      { key: "routes_repair", name: "Ремонтные", value: 338, itemStyle: {color: "rgb(228, 202, 163, 1)"}, order: 4 },
+      { key: "routes_without_leaving", name: "Без выезда", value: 73, itemStyle: {color: "rgb(243, 161, 30, 1)"}, order: 5 },
+      { key: "routes_without_ml", name: "СПС без МЛ", value: 3073, itemStyle: {color: "rgb(165, 165, 165, 1)"}, order: 6 },
+    ]},
+  mount_mounter_type_bar: {
+    chartId: "mount_mounter_type_bar",
+    countMounts: 5436,
+    filterKey: "mounter_type",
+    height: 500,
+    type: "mount",
+    xAxisData: [
+      [
+        {
+          charts: [
+            {name: "ВНИИЖТ", value: 92},
+            {name: "Калугапутьмаш", value: 1}
+          ],
+          totalCount: 3,
+          yAxisData: "2016 г."
+        },
+        {
+          charts: [
+            {name: "ВНИИЖТ", value: 349},
+            {name: "КалугаРПМ", value: 9},
+            {name: "Калугапутьмаш", value: 92},
+            {name: "Свердловский РПМ", value: 23},
+            {
+              name: "Тихорецкий завод им Воровского",
+              value: 26
+            },
+            {name: "Тулажелдормаш", value: 8}
+          ],
+          totalCount: 9,
+          yAxisData: "2017 г."
+        },
+        {
+          charts: [
+            {name: "ВНИИЖТ", value: 590},
+            {name: "КалугаРПМ", value: 7},
+            {name: "Калугапутьмаш", value: 73},
+            {name: "Свердловский РПМ", value: 30},
+            {
+              name: "Тихорецкий завод им Воровского",
+              value: 23
+            },
+            {name: "Тулажелдормаш", value: 32}
+          ],
+          totalCount: 11,
+          yAxisData: "2018 г."
+        },
+        {
+          charts: [
+            {name: "ВНИИЖТ", value: 719},
+            {name: "КалугаРПМ", value: 16},
+            {name: "Калугапутьмаш", value: 88},
+            {name: "Свердловский РПМ", value: 20},
+            {
+              name: "Тихорецкий завод им Воровского",
+              value: 33
+            },
+            {name: "Тулажелдормаш", value: 24}
+          ],
+          totalCount: 12,
+          yAxisData: "2019 г."
+        },
+        {
+          charts: [
+            {name: "ВНИИЖТ", value: 594},
+            {name: "КалугаРПМ", value: 18},
+            {name: "Калугапутьмаш", value: 100},
+            {name: "Свердловский РПМ", value: 19},
+            {
+              name: "Тихорецкий завод им Воровского",
+              value: 36
+            },
+            {name: "Тулажелдормаш", value: 31}
+          ],
+          totalCount: 9,
+          yAxisData: "2020 г."
+        },
+        {
+          charts: [
+            {name: "ВНИИЖТ", value: 777},
+            {name: "Инжиниринг Сервис-Путьмаш", value: 10},
+            {name: "КалугаРПМ", value: 5},
+            {name: "Калугапутьмаш", value: 84},
+            {name: "Пермский РПМ", value: 5},
+            {name: "Свердловский РПМ", value: 4},
+            {
+              name: "Тихорецкий завод им Воровского",
+              value: 14
+            },
+            {name: "Тулажелдормаш", value: 28}
+          ],
+          totalCount: 12,
+          yAxisData: "2021 г."
+        },
+        {
+          charts: [
+            {name: "ВНИИЖТ", value: 746},
+            {name: "Инжиниринг Сервис-Путьмаш", value: 10},
+            {name: "КалугаРПМ", value: 4},
+            {name: "Калугапутьмаш", value: 36},
+            {name: "Свердловский РПМ", value: 1},
+            {
+              name: "Тихорецкий завод им Воровского",
+              value: 5
+            },
+            {name: "Тулажелдормаш", value: 20}
+          ],
+          totalCount: 15,
+          yAxisData: "2022 г."
+        },
+        {
+          charts: [
+            {name: "ВНИИЖТ", value: 612},
+            {name: "Инжиниринг Сервис-Путьмаш", value: 4},
+            {name: "КалугаРПМ", value: 3},
+            {name: "Калугапутьмаш", value: 2},
+            {name: "Кировский машзавод", value: 3},
+            {
+              name: "Тихорецкий завод им Воровского",
+              value: 7
+            },
+            {name: "Тулажелдормаш", value: 6}
+          ],
+          totalCount: 10,
+          yAxisData: "2023 г."
+        }
+      ]
     
-  ],
-  yAxisData: [
-    {key: "2016 г.", val: 93},
-    {key: "2017 г.", val: 507},
-    {key: "2018 г.", val: 755},
-    {key: "2019 г.", val: 900},
-    {key: "2020 г.", val: 797},
-    {key: "2021 г.", val: 927},
-    {key: "2022 г.", val: 818},
-    {key: "2023 г.", val: 637}
-  ]}
+    ],
+    yAxisData: [
+      {key: "2016 г.", val: 93},
+      {key: "2017 г.", val: 507},
+      {key: "2018 г.", val: 755},
+      {key: "2019 г.", val: 900},
+      {key: "2020 г.", val: 797},
+      {key: "2021 г.", val: 927},
+      {key: "2022 г.", val: 818},
+      {key: "2023 г.", val: 637}
+    ]}
 }
 
 const dataMachines = [
@@ -1305,282 +1305,282 @@ const dataMachines = [
 ]
 
 const dataMount = [
-    {
-      client_type: "ЦДИМ",
-      device_count: 6,
-      mounter_type: "Тулажелдормаш",
-      year: "2023 г."
-    },
-    {
-      client_type: "Трансэнерго",
-      device_count: 1,
-      mounter_type: "ВНИИЖТ",
-      year: "2018 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 86,
-      mounter_type: "Калугапутьмаш",
-      year: "2019 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 593,
-      mounter_type: "ВНИИЖТ",
-      year: "2020 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 589,
-      mounter_type: "ВНИИЖТ",
-      year: "2018 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 12,
-      mounter_type: "Тулажелдормаш",
-      year: "2022 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 8,
-      mounter_type: "Тулажелдормаш",
-      year: "2022 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 3,
-      mounter_type: "Калугапутьмаш",
-      year: "2018 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 347,
-      mounter_type: "ВНИИЖТ",
-      year: "2017 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 8,
-      mounter_type: "Тулажелдормаш",
-      year: "2017 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 1,
-      mounter_type: "КалугаРПМ",
-      year: "2021 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 7,
-      mounter_type: "КалугаРПМ",
-      year: "2018 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 27,
-      mounter_type: "Тихорецкий завод им Воровского",
-      year: "2019 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 1,
-      mounter_type: "Свердловский РПМ",
-      year: "2022 г."
-    },
-    {
-      client_type: "Иные",
-      device_count: 6,
-      mounter_type: "Тихорецкий завод им Воровского",
-      year: "2019 г."
-    },
-    {
-      client_type: "Иные",
-      device_count: 4,
-      mounter_type: "Тихорецкий завод им Воровского",
-      year: "2023 г."
-    },
-    {
-      client_type: "Трансэнерго",
-      device_count: 16,
-      mounter_type: "ВНИИЖТ",
-      year: "2016 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 5,
-      mounter_type: "Пермский РПМ",
-      year: "2021 г."
-    },
-    {
-      client_type: null,
-      device_count: 1,
-      mounter_type: "Инжиниринг Сервис-Путьмаш",
-      year: "2022 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 2,
-      mounter_type: "КалугаРПМ",
-      year: "2022 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 4,
-      mounter_type: "КалугаРПМ",
-      year: "2021 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 2,
-      mounter_type: "Калугапутьмаш",
-      year: "2023 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 80,
-      mounter_type: "Калугапутьмаш",
-      year: "2021 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 2,
-      mounter_type: "КалугаРПМ",
-      year: "2023 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 8,
-      mounter_type: "Тулажелдормаш",
-      year: "2021 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 20,
-      mounter_type: "Свердловский РПМ",
-      year: "2019 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 4,
-      mounter_type: "Тихорецкий завод им Воровского",
-      year: "2022 г."
-    },
-    {
-      client_type: "Трансэнерго",
-      device_count: 1,
-      mounter_type: "ВНИИЖТ",
-      year: "2022 г."
-    },
-    {
-      client_type: "Иные",
-      device_count: 2,
-      mounter_type: "ВНИИЖТ",
-      year: "2017 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 1,
-      mounter_type: "Калугапутьмаш",
-      year: "2016 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 181,
-      mounter_type: "ВНИИЖТ",
-      year: "2023 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 100,
-      mounter_type: "Калугапутьмаш",
-      year: "2020 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 76,
-      mounter_type: "ВНИИЖТ",
-      year: "2016 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 29,
-      mounter_type: "Свердловский РПМ",
-      year: "2018 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 4,
-      mounter_type: "Калугапутьмаш",
-      year: "2021 г."
-    },
-    {
-      client_type: null,
-      device_count: 1,
-      mounter_type: "ВНИИЖТ",
-      year: "2020 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 5,
-      mounter_type: "Тихорецкий завод им Воровского",
-      year: "2021 г."
-    },
-    {
-      client_type: "Иные",
-      device_count: 25,
-      mounter_type: "Тихорецкий завод им Воровского",
-      year: "2020 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 15,
-      mounter_type: "Тулажелдормаш",
-      year: "2019 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 4,
-      mounter_type: "Инжиниринг Сервис-Путьмаш",
-      year: "2023 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 2,
-      mounter_type: "Калугапутьмаш",
-      year: "2019 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 1,
-      mounter_type: "ВНИИЖТ",
-      year: "2022 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 3,
-      mounter_type: "Кировский машзавод",
-      year: "2023 г."
-    },
-    {
-      client_type: "ЦДРП",
-      device_count: 26,
-      mounter_type: "Тулажелдормаш",
-      year: "2020 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 3,
-      mounter_type: "Тихорецкий завод им Воровского",
-      year: "2023 г."
-    },
-    {
-      client_type: "ЦДИМ",
-      device_count: 16,
-      mounter_type: "КалугаРПМ",
-      year: "2019 г."
-    },
+  {
+    client_type: "ЦДИМ",
+    device_count: 6,
+    mounter_type: "Тулажелдормаш",
+    year: "2023 г."
+  },
+  {
+    client_type: "Трансэнерго",
+    device_count: 1,
+    mounter_type: "ВНИИЖТ",
+    year: "2018 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 86,
+    mounter_type: "Калугапутьмаш",
+    year: "2019 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 593,
+    mounter_type: "ВНИИЖТ",
+    year: "2020 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 589,
+    mounter_type: "ВНИИЖТ",
+    year: "2018 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 12,
+    mounter_type: "Тулажелдормаш",
+    year: "2022 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 8,
+    mounter_type: "Тулажелдормаш",
+    year: "2022 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 3,
+    mounter_type: "Калугапутьмаш",
+    year: "2018 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 347,
+    mounter_type: "ВНИИЖТ",
+    year: "2017 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 8,
+    mounter_type: "Тулажелдормаш",
+    year: "2017 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 1,
+    mounter_type: "КалугаРПМ",
+    year: "2021 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 7,
+    mounter_type: "КалугаРПМ",
+    year: "2018 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 27,
+    mounter_type: "Тихорецкий завод им Воровского",
+    year: "2019 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 1,
+    mounter_type: "Свердловский РПМ",
+    year: "2022 г."
+  },
+  {
+    client_type: "Иные",
+    device_count: 6,
+    mounter_type: "Тихорецкий завод им Воровского",
+    year: "2019 г."
+  },
+  {
+    client_type: "Иные",
+    device_count: 4,
+    mounter_type: "Тихорецкий завод им Воровского",
+    year: "2023 г."
+  },
+  {
+    client_type: "Трансэнерго",
+    device_count: 16,
+    mounter_type: "ВНИИЖТ",
+    year: "2016 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 5,
+    mounter_type: "Пермский РПМ",
+    year: "2021 г."
+  },
+  {
+    client_type: null,
+    device_count: 1,
+    mounter_type: "Инжиниринг Сервис-Путьмаш",
+    year: "2022 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 2,
+    mounter_type: "КалугаРПМ",
+    year: "2022 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 4,
+    mounter_type: "КалугаРПМ",
+    year: "2021 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 2,
+    mounter_type: "Калугапутьмаш",
+    year: "2023 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 80,
+    mounter_type: "Калугапутьмаш",
+    year: "2021 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 2,
+    mounter_type: "КалугаРПМ",
+    year: "2023 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 8,
+    mounter_type: "Тулажелдормаш",
+    year: "2021 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 20,
+    mounter_type: "Свердловский РПМ",
+    year: "2019 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 4,
+    mounter_type: "Тихорецкий завод им Воровского",
+    year: "2022 г."
+  },
+  {
+    client_type: "Трансэнерго",
+    device_count: 1,
+    mounter_type: "ВНИИЖТ",
+    year: "2022 г."
+  },
+  {
+    client_type: "Иные",
+    device_count: 2,
+    mounter_type: "ВНИИЖТ",
+    year: "2017 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 1,
+    mounter_type: "Калугапутьмаш",
+    year: "2016 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 181,
+    mounter_type: "ВНИИЖТ",
+    year: "2023 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 100,
+    mounter_type: "Калугапутьмаш",
+    year: "2020 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 76,
+    mounter_type: "ВНИИЖТ",
+    year: "2016 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 29,
+    mounter_type: "Свердловский РПМ",
+    year: "2018 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 4,
+    mounter_type: "Калугапутьмаш",
+    year: "2021 г."
+  },
+  {
+    client_type: null,
+    device_count: 1,
+    mounter_type: "ВНИИЖТ",
+    year: "2020 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 5,
+    mounter_type: "Тихорецкий завод им Воровского",
+    year: "2021 г."
+  },
+  {
+    client_type: "Иные",
+    device_count: 25,
+    mounter_type: "Тихорецкий завод им Воровского",
+    year: "2020 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 15,
+    mounter_type: "Тулажелдормаш",
+    year: "2019 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 4,
+    mounter_type: "Инжиниринг Сервис-Путьмаш",
+    year: "2023 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 2,
+    mounter_type: "Калугапутьмаш",
+    year: "2019 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 1,
+    mounter_type: "ВНИИЖТ",
+    year: "2022 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 3,
+    mounter_type: "Кировский машзавод",
+    year: "2023 г."
+  },
+  {
+    client_type: "ЦДРП",
+    device_count: 26,
+    mounter_type: "Тулажелдормаш",
+    year: "2020 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 3,
+    mounter_type: "Тихорецкий завод им Воровского",
+    year: "2023 г."
+  },
+  {
+    client_type: "ЦДИМ",
+    device_count: 16,
+    mounter_type: "КалугаРПМ",
+    year: "2019 г."
+  },
   
 ]
 
@@ -2366,11 +2366,11 @@ const multiReport = {
       }
     ],
     diagExcludeSps: [993, 1062, 3078, 1136, 1109, 1618, 1085, 2936, 1669, 1045,
-     1739, 1525, 1869, 1461, 1843, 928, 1940, 1907, 1482, 1870, 1813, 1131,
-     1133, 1515, 1800, 2151, 1833, 1068, 1110, 1000, 2904, 926, 2964, 917, 2903,
-     1743, 1738, 1469, 2902, 1478, 999, 1801, 1742, 1139, 1141, 1842, ],
+      1739, 1525, 1869, 1461, 1843, 928, 1940, 1907, 1482, 1870, 1813, 1131,
+      1133, 1515, 1800, 2151, 1833, 1068, 1110, 1000, 2904, 926, 2964, 917, 2903,
+      1743, 1738, 1469, 2902, 1478, 999, 1801, 1742, 1139, 1141, 1842, ],
     diagTables: ["as", "dsp", "dyn", "mpt", "pmg", "rpb", "rs", "schom", "sm",
-     "uk", "uni", "utm", "vpo", ""],
+      "uk", "uni", "utm", "vpo", ""],
     id: 197,
     insertedAt: "2023-03-15 06:27:41",
     isProd: true,
@@ -2423,7 +2423,7 @@ const multiReport = {
 
 const multiPackStructure = [
   // %LiveMonitor.Packages.Models.PackStruct{
-    // __meta__: #Ecto.Schema.Metadata<:loaded, "pack_struct">,
+  // __meta__: #Ecto.Schema.Metadata<:loaded, "pack_struct">,
   {
     id: 197,
     description: null,
@@ -2523,7 +2523,7 @@ const multiPackStructure = [
       }
     ],
     diag_tables: ["as", "dsp", "dyn", "mpt", "pmg", "rpb", "rs", "schom", "sm",
-     "uk", "uni", "utm", "vpo", ""],
+      "uk", "uni", "utm", "vpo", ""],
     diag_exclude_tables: null,
     diag_classifications: null,
     diag_types: null,
@@ -2531,9 +2531,9 @@ const multiPackStructure = [
     diag_exclude_classifications: null,
     diag_exclude_types: null,
     diag_exclude_sps: [993, 1062, 3078, 1136, 1109, 1618, 1085, 2936, 1669,
-     1045, 1739, 1525, 1869, 1461, 1843, 928, 1940, 1907, 1482, 1870, 1813,
-     1131, 1133, 1515, 1800, 2151, 1833, 1068, 1110, 1000, 2904, 926, 2964,
-     ],
+      1045, 1739, 1525, 1869, 1461, 1843, 928, 1940, 1907, 1482, 1870, 1813,
+      1131, 1133, 1515, 1800, 2151, 1833, 1068, 1110, 1000, 2904, 926, 2964,
+    ],
     pack_group_id: 28,
     // pack_group: #Ecto.Association.NotLoaded<association :pack_group is not loaded>,
     inserted_at: "2023-03-15 06:27:41",
@@ -2838,8 +2838,8 @@ const multiPackStructure = [
     diag_classifications: null,
     diag_types: null,
     diag_sps: [993, 1062, 3078, 1136, 1109, 1618, 1085, 2936, 1669, 1045, 1739,
-     1525, 1869, 1461, 1843, 928, 1940, 1907, 1482, 1870, 1813, 1131, 1133,
-     1515, 1800, 2151, 1833, 1068, 1110, 1000, 2904, 926, 2964, 917, ],
+      1525, 1869, 1461, 1843, 928, 1940, 1907, 1482, 1870, 1813, 1131, 1133,
+      1515, 1800, 2151, 1833, 1068, 1110, 1000, 2904, 926, 2964, 917, ],
     diag_exclude_classifications: null,
     diag_exclude_types: null,
     diag_exclude_sps: null,
diff --git a/live_monitor_vue/src/store/modules/machines/helpers.js b/live_monitor_vue/src/store/modules/machines/helpers.js
index bc27847..c9d11ba 100644
--- a/live_monitor_vue/src/store/modules/machines/helpers.js
+++ b/live_monitor_vue/src/store/modules/machines/helpers.js
@@ -1,5 +1,5 @@
-import {isEmpty, uniq} from 'ramda'
-import {pagination, searchModes} from './StaticData'
+import {isEmpty} from 'ramda'
+import {searchModes} from './StaticData'
 
 const prepareSelects = (selects, selectors) => {
   const updatedSelects = selects.reduce((acc, el) => {
@@ -14,14 +14,14 @@ const prepareSelects = (selects, selectors) => {
   // console.log('updSelects', updatedSelects)
   
   const filteredSelects = updatedSelects.map((el) => ({...el, data: el.data.reduce((acc, select) => {
-      if (select) {
-        const newSelect = {name: select}
-        acc = [...acc, newSelect]
-      } else {
-        acc
-      }
-        return acc
-    }, [])
+    if (select) {
+      const newSelect = {name: select}
+      acc = [...acc, newSelect]
+    } else {
+      acc
+    }
+    return acc
+  }, [])
   })).sort((a, b) => a.order - b.order)
   // console.log('filteredSelects', filteredSelects)
   return filteredSelects
diff --git a/live_monitor_vue/src/store/modules/machines/helpersCharts.js b/live_monitor_vue/src/store/modules/machines/helpersCharts.js
index 6a1e36b..6e4be6f 100644
--- a/live_monitor_vue/src/store/modules/machines/helpersCharts.js
+++ b/live_monitor_vue/src/store/modules/machines/helpersCharts.js
@@ -1,431 +1,435 @@
 import { chartsFilterParams, chartsGroupByParams, chartsGroupByParams2, chartsFilterKeysMl, chartsMountParams, chartsBarTypesParams, chartsBarTypesGroupByParams, chartsBarTypesWithoutLayoutParams } from "./StaticData"
 import {cond, uniq, has, T} from 'ramda'
 
-  const setPeriodCharts = (filterKeys) => {
-    if (typeof filterKeys === 'array') return {period: 'dayly', title: '24 часа'}
-    switch(filterKeys) {
-      case 'commun': return {period: 'yearly', title: "год"}
-      case 'rors': return {period: 'dayly', title: "на данный момент"}
-      case 'routes': return {period: 'weekly', title: "две недели"}
-      default: return {period: 'dayly', title: "на данный момент"}
+const setPeriodCharts = (filterKeys) => {
+  if (filterKeys && filterKeys.length > 0) return {period: 'dayly', title: '24 часа'}
+  switch(filterKeys) {
+  case 'commun': return {period: 'yearly', title: "год"}
+  case 'rors': return {period: 'dayly', title: "на данный момент"}
+  case 'routes': return {period: 'weekly', title: "две недели"}
+  default: return {period: 'dayly', title: "на данный момент"}
+  }
+}
+
+const setNamesMl = (filterKey) => {
+  if (!filterKey) return null
+  switch(filterKey) {
+  case 'routes_common': return 'Обычные'
+  case 'routes_emergency': return 'Аварийные'
+  case 'routes_other': return 'Прочие'
+  case 'routes_repair': return 'Ремонтные'
+  case 'routes_without_leaving': return 'Без выезда'
+  case 'routes_without_ml': return 'СПС без МЛ'
+  default: return ''
+  }
+}
+
+const setMachinesClass = (typeId) => {
+  if (typeId) {
+    switch(typeId) {
+    case 'mpt_types': return 'МРТ'
+    case 'gdsm_types': return 'ЖДСМ'
+    case 'sm_pss_types': return 'СМ'
+    default: return ''
     }
   }
+}
 
-  const setNamesMl = (filterKey) => {
-    if (!filterKey) return null
-    switch(filterKey) {
-      case 'routes_common': return 'Обычные'
-      case 'routes_emergency': return 'Аварийные'
-      case 'routes_other': return 'Прочие'
-      case 'routes_repair': return 'Ремонтные'
-      case 'routes_without_leaving': return 'Без выезда'
-      case 'routes_without_ml': return 'СПС без МЛ'
-      default: return ''
-    }
+const setFilterValues = (machineValue, filterParams) => {
+  if(filterParams.values.includes(machineValue.toLowerCase())) {
+    return {name: machineValue}
   }
+}
 
-  const setMachinesClass = (typeId) => {
-    if (typeId) {
-      switch(typeId) {
-        case 'mpt_types': return 'МРТ'
-        case 'gdsm_types': return 'ЖДСМ'
-        case 'sm_pss_types': return 'СМ'
-        default: return ''
-      }
-    }
-  }
-
-  const setFilterValues = (machineValue, filterParams) => {
-    if(filterParams.values.includes(machineValue.toLowerCase())) {
-      return {name: machineValue}
-    }
-  }
-
-  const setCountMachinesMl = (arr, counter = 0) => {
-    return arr.reduce((acc, item) => {
-      if (item && item.length > 0) {
-        return setCountMachinesMl(item, acc)
-      } else {
-        if (item.charts?.value) {
-          acc = acc + item.charts?.value
-        } else {
-          acc
-        }
-      }
-      return acc
-    }, counter)
-  }
-
-  /* Charts updated data */
-
-  const chartsPie = (data, filterParams) => {
-    // {list, _resp} = Agents.MachineList.get_machines(set_period_loading_charts(filterKey).period, params) apiHelpers
-
-    const countMachines = data?.length
-    const machines = data.reduce((acc, machine) => {
-      if (machine[filterParams.filterKey]) {
-        acc.push(setFilterValues(machine[filterParams.filterKey], filterParams))
+const setCountMachinesMl = (arr, counter = 0) => {
+  return arr.reduce((acc, item) => {
+    if (item && item.length > 0) {
+      return setCountMachinesMl(item, acc)
+    } else {
+      if (item.charts?.value) {
+        acc = acc + item.charts?.value
       } else {
         acc
       }
-      return acc
-    }, [])
+    }
+    return acc
+  }, counter)
+}
 
-    // const isFilteredMachine = machines.find((el) => filterParams.values.includes(el.name.toLowerCase()))
-    const groupByfiltered = machines.reduce((acc, machine) => {
-      if (filterParams.values.includes(machine.name.toLowerCase())) {
-        const count = machines.filter((el) => el.name === machine.name).length
-        const filteredMachines = {name: machine.name, value: count}
-        acc = uniq([...acc, filteredMachines])
-      } else {
-        acc
-      }
-      return acc
-    }, [])
-    return {countMachines: countMachines, period: setPeriodCharts(filterParams.filterKey).title, machines: groupByfiltered}
-  }
+/* Charts updated data */
 
-  const chartsPieGroupedBy = (data, groupByParams, filterParams) => {
+const chartsPie = (data, filterParams) => {
+  // {list, _resp} = Agents.MachineList.get_machines(set_period_loading_charts(filterKey).period, params) apiHelpers
 
-    const filteredGroupByParams = data.filter((machine) => machine[groupByParams.groupByKey] && machine[groupByParams.groupByKey].toLowerCase() === groupByParams.value)
-    const countMachines = filteredGroupByParams?.length
+  const countMachines = data?.length
+  const machines = data.reduce((acc, machine) => {
+    if (machine[filterParams.filterKey]) {
+      acc.push(setFilterValues(machine[filterParams.filterKey], filterParams))
+    } else {
+      acc
+    }
+    return acc
+  }, [])
 
-    const machines = filteredGroupByParams.reduce((acc, machine) => {
+  // const isFilteredMachine = machines.find((el) => filterParams.values.includes(el.name.toLowerCase()))
+  const groupByfiltered = machines.reduce((acc, machine) => {
+    if (filterParams.values.includes(machine.name.toLowerCase())) {
+      const count = machines.filter((el) => el.name === machine.name).length
+      const filteredMachines = {name: machine.name, value: count}
+      acc = uniq([...acc, filteredMachines])
+    } else {
+      acc
+    }
+    return acc
+  }, [])
+  return {countMachines: countMachines, period: setPeriodCharts(filterParams.filterKey).title, machines: groupByfiltered}
+}
+
+const chartsPieGroupedBy = (data, groupByParams, filterParams) => {
+
+  const filteredGroupByParams = data.filter((machine) => machine[groupByParams.groupByKey] && machine[groupByParams.groupByKey].toLowerCase() === groupByParams.value)
+  const countMachines = filteredGroupByParams?.length
+
+  const machines = filteredGroupByParams.reduce((acc, machine) => {
       
-      if (machine[filterParams.filterKey]) {
-        acc.push(setFilterValues(machine[filterParams.filterKey], filterParams))
-      } else {
-        acc
-      }
-      return acc
-    }, [])
+    if (machine[filterParams.filterKey]) {
+      acc.push(setFilterValues(machine[filterParams.filterKey], filterParams))
+    } else {
+      acc
+    }
+    return acc
+  }, [])
     
-    const filteredMachines = machines.reduce((acc, machine) => {
-      if (filterParams.values.includes(machine.name.toLowerCase())) {
-        const count = machines.filter((el) => el.name === machine.name).length
-        const filteredMachines = {name: machine.name, value: count}
-        acc = uniq([...acc, filteredMachines])
+  const filteredMachines = machines.reduce((acc, machine) => {
+    if (filterParams.values.includes(machine.name.toLowerCase())) {
+      const count = machines.filter((el) => el.name === machine.name).length
+      const filteredMachines = {name: machine.name, value: count}
+      acc = uniq([...acc, filteredMachines])
+    } else {
+      acc
+    }
+    return acc
+  }, [])
+  return {countMachines: countMachines, period: setPeriodCharts(filterParams.filterKey).title, machines: filteredMachines}
+}
+
+const chartsBarGroupedByMl = (data, filterKeysMl) => {
+
+  const machinesWithMl = filterKeysMl.map((filterKey) => {
+    const filteredWithMl = data.reduce((acc, machine) => {
+      if (machine[filterKey] === 0 || machine[filterKey]) {
+        acc = [...acc, {[filterKey]: machine[filterKey]}]
       } else {
         acc
       }
       return acc
     }, [])
-    return {countMachines: countMachines, period: setPeriodCharts(filterParams.filterKey).title, machines: filteredMachines}
-  }
-
-  const chartsBarGroupedByMl = (data, filterKeysMl) => {
-
-    const machinesWithMl = filterKeysMl.map((filterKey) => {
-      const filteredWithMl = data.reduce((acc, machine) => {
-        if (machine[filterKey] === 0 || machine[filterKey]) {
-          acc = [...acc, {[filterKey]: machine[filterKey]}]
-        } else {
-          acc
-        }
-        return acc
-      }, [])
-      const count = filteredWithMl.reduce((acc, machine) => {
-        acc = acc + parseFloat(machine[filterKey])
-        return acc
-      }, 0)
+    const count = filteredWithMl.reduce((acc, machine) => {
+      acc = acc + parseFloat(machine[filterKey])
+      return acc
+    }, 0)
       
-     return {key: filterKey, name: setNamesMl(filterKey), machinesCount: filteredWithMl.length, value: count}
-    })
+    return {key: filterKey, name: setNamesMl(filterKey), machinesCount: filteredWithMl.length, value: count}
+  })
     
-    // console.log('machinesWithMl', machinesWithMl)
+  // console.log('machinesWithMl', machinesWithMl)
 
-    const countMachinesWithMl = Math.floor((machinesWithMl.reduce((acc, machine) => {
-      return acc + machine.machinesCount
-    }, 0)) / filterKeysMl.length)
+  const countMachinesWithMl = Math.floor((machinesWithMl.reduce((acc, machine) => {
+    return acc + machine.machinesCount
+  }, 0)) / filterKeysMl.length)
 
-    const machinesWithoutMl = filterKeysMl.map((filterKey) => {
-      const countNull = data.reduce((acc, machine) => {
-        if (machine[filterKey] === null) {
-          acc = acc + 1
+  const machinesWithoutMl = filterKeysMl.map((filterKey) => {
+    const countNull = data.reduce((acc, machine) => {
+      if (machine[filterKey] === null) {
+        acc = acc + 1
+      } else {
+        acc
+      }
+      return acc
+    }, 0)
+    return {key: filterKey, value: countNull}
+  })
+
+  // console.log('machinesWithoutMl', machinesWithoutMl)
+
+  const countMachinesWithoutMl = Math.floor((machinesWithoutMl.reduce((acc, machine) => {
+    return acc + machine.value
+  }, 0)) / filterKeysMl.length // Либо только машины, если без деления тогда все null МЛ суммируются
+  )
+
+  machinesWithMl.push({key: 'routes_without_ml', name: setNamesMl('routes_without_ml'), value: countMachinesWithoutMl})
+
+  return {countMachinesWithMl: countMachinesWithMl, period: setPeriodCharts(filterKeysMl).title, machines: machinesWithMl}
+}
+
+const chartsBarMount = (data, groupByKey, filterKey, countKey) => {
+
+  const groupByData = Object.groupBy(data, (el) => el[groupByKey])
+
+  const yAxisData = Object.entries(groupByData).map(([key, val]) => ({key: key, val: val.reduce((acc, val) => acc + val[countKey], 0)}))
+  const xAxisData = Object.entries(groupByData).map(([key, groupArr]) => {
+    const groupByFilterData = Object.groupBy(groupArr, (el) => el[filterKey])
+    const newArr = Object.entries(groupByFilterData).map(([key, val]) => ({name: key, value: val.reduce((acc, val) => acc + val[countKey], 0)}))
+    return {yAxisData: key, totalCount: groupArr.length, charts: newArr}
+  })
+
+  const countMounts = yAxisData.reduce((acc, year) => (acc + year.val), 0)
+
+  return {yAxisData: yAxisData, xAxisData: xAxisData, countMounts: countMounts, filterKey: filterKey}
+}
+
+const chartsBarTypes = (data, groupByKey, filterKey, prevGroupByData, prevGroupByFilters) => {
+
+  const countMachines = data.length
+  const groupByData = Object.groupBy(data, (el) => el[groupByKey])
+
+  const yAxisData = Object.entries(groupByData).map(([key, val]) => ({key: key, val: val.length}))
+  const xAxisData = Object.entries(groupByData).map(([key, groupArr]) => {
+    const groupByFilterData = Object.groupBy(groupArr, (el) => el[filterKey])
+    const newArr = Object.entries(groupByFilterData).map(([key, val]) => ({name: key, value: val.length, linkData: groupByKey === 'machine_type' ? val.map((el) => ({machine_type: el.machine_type, device_number: el.device_number})) : ''}))
+    return {yAxisData: key, totalCount: groupArr.length, charts: newArr}
+  })
+
+  return {yAxisData: yAxisData, xAxisData: xAxisData, countMachines: countMachines, period: setPeriodCharts(filterKey).title, filterKey: filterKey, groupByKey: groupByKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters}
+}
+
+const chartsBarTypesGroupedBy = (data, groupByKey, filterKey, prevGroupByData, prevGroupByFilters, typeId) => {
+
+  const machineClass = setMachinesClass(typeId)
+  const machinesFilteredClass = data.filter(({machine_class}) => machine_class === machineClass)
+
+  const groupByData = Object.groupBy(machinesFilteredClass, (el) => el[groupByKey])
+
+  const yAxisData = Object.entries(groupByData).map(([key, val]) => ({key: key, val: val.length}))
+  const xAxisData = Object.entries(groupByData).map(([key, groupArr]) => {
+    const groupByFilterData = Object.groupBy(groupArr, (el) => el[filterKey])
+    const newArr = Object.entries(groupByFilterData).map(([key, val]) => ({name: key, value: val.length, linkData: groupByKey === 'machine_type' ? val.map((el) => ({machine_type: el.machine_type, device_number: el.device_number})) : ''}))
+    return {yAxisData: key, totalCount: groupArr.length, charts: newArr}
+  })
+
+  const countMachines = yAxisData.reduce((acc, type) => acc + type.val, 0)
+
+  return {yAxisData: yAxisData, xAxisData: xAxisData, countMachines: countMachines, period: setPeriodCharts(filterKey).title, filterKey: filterKey, groupByKey: groupByKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters, typeId: typeId}
+}
+  
+const chartsBarTypesWithoutFirstLayout = (data, groupByKey, filterKey, prevGroupByData, prevGroupByFilters, groupByValue) => {
+
+  const groupByData = Object.groupBy(data, (el) => el['org_type_name'])
+  const filteredGroupByData = Object.entries(groupByData).filter(([key, ]) => key === groupByValue)
+
+  if (filteredGroupByData.length === 0) return {yAxisData: [], xAxisData: [], countMachines: 0, period: setPeriodCharts(filterKey).title, filterKey: filterKey, groupByKey: groupByKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters, groupByValue: groupByValue}
+
+  const [groupedByGroupByKeyY] = filteredGroupByData.map(([, groupArr]) => Object.groupBy(groupArr, (el) => el[groupByKey]))
+  const yAxisData = Object.entries(groupedByGroupByKeyY).map(([key, val]) => ({key: key, val: val.length}))
+    
+  const [groupedByGroupByKeyX] = filteredGroupByData.map(([, groupArr]) => Object.groupBy(groupArr, (el) => el[groupByKey]))
+  const xAxisData = Object.entries(groupedByGroupByKeyX).map(([key, groupArr]) => {
+    const groupByFilterData = Object.groupBy(groupArr, (el) => el[filterKey])
+    const newArr = Object.entries(groupByFilterData).map(([key, val]) => ({name: key, value: val.length, linkData: groupByKey === 'machine_type' ? val.map((el) => ({machine_type: el.machine_type, device_number: el.device_number})) : ''}))
+    return {yAxisData: key, totalCount: groupArr.length, charts: newArr}
+  })
+
+  const countMachines = yAxisData.reduce((acc, type) => acc + type.val, 0)
+
+  return {yAxisData: yAxisData, xAxisData: xAxisData, countMachines: countMachines, period: setPeriodCharts(filterKey).title, filterKey: filterKey, groupByKey: groupByKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters, groupByValue: groupByValue}
+}
+
+const chartsBarTypesGroupedByMl = (data, groupByKey, filterKeys, prevGroupByData, prevGroupByFilters) => {
+
+  const groupByData = Object.groupBy(data, (el) => el[groupByKey])
+  const yAxisData = Object.entries(groupByData).map(([key, val]) => {
+    const allValuesArr = filterKeys.map((filterKey) => {
+      const machinesWithMl = val.reduce((acc, el) => {
+        if (el[filterKey] || el[filterKey] === 0) {
+          acc = acc + el[filterKey]
         } else {
           acc
         }
         return acc
       }, 0)
-      return {key: filterKey, value: countNull}
+      const machinesWithoutMl = val.filter((el) => el[filterKey] === null).length
+      return {machinesWithMl: machinesWithMl, machinesWithoutMl: machinesWithoutMl}
     })
-
-    // console.log('machinesWithoutMl', machinesWithoutMl)
-
-    const countMachinesWithoutMl = Math.floor((machinesWithoutMl.reduce((acc, machine) => {
-      return acc + machine.value
-    }, 0)) / filterKeysMl.length // Либо только машины, если без деления тогда все null МЛ суммируются
-    )
-
-    machinesWithMl.push({key: 'routes_without_ml', name: setNamesMl('routes_without_ml'), value: countMachinesWithoutMl})
-
-    return {countMachinesWithMl: countMachinesWithMl, period: setPeriodCharts(filterKeysMl).title, machines: machinesWithMl}
-  }
-
-  const chartsBarMount = (data, groupByKey, filterKey, countKey) => {
-
-    const groupByData = Object.groupBy(data, (el) => el[groupByKey])
-
-    const yAxisData = Object.entries(groupByData).map(([key, val]) => ({key: key, val: val.reduce((acc, val) => acc + val[countKey], 0)}))
-    const xAxisData = Object.entries(groupByData).map(([key, groupArr]) => {
-      const groupByFilterData = Object.groupBy(groupArr, (el) => el[filterKey])
-      const newArr = Object.entries(groupByFilterData).map(([key, val]) => ({name: key, value: val.reduce((acc, val) => acc + val[countKey], 0)}))
-      return {yAxisData: key, totalCount: groupArr.length, charts: newArr}
-    })
-
-    const countMounts = yAxisData.reduce((acc, year) => (acc + year.val), 0)
-
-    return {yAxisData: yAxisData, xAxisData: xAxisData, countMounts: countMounts, filterKey: filterKey}
-  }
-
-  const chartsBarTypes = (data, groupByKey, filterKey, prevGroupByData, prevGroupByFilters) => {
-
-    const countMachines = data.length
-    const groupByData = Object.groupBy(data, (el) => el[groupByKey])
-
-    const yAxisData = Object.entries(groupByData).map(([key, val]) => ({key: key, val: val.length}))
-    const xAxisData = Object.entries(groupByData).map(([key, groupArr]) => {
-      const groupByFilterData = Object.groupBy(groupArr, (el) => el[filterKey])
-      const newArr = Object.entries(groupByFilterData).map(([key, val]) => ({name: key, value: val.length, linkData: groupByKey === 'machine_type' ? val.map((el) => ({machine_type: el.machine_type, device_number: el.device_number})) : ''}))
-      return {yAxisData: key, totalCount: groupArr.length, charts: newArr}
-    })
-
-    return {yAxisData: yAxisData, xAxisData: xAxisData, countMachines: countMachines, period: setPeriodCharts(filterKey).title, filterKey: filterKey, groupByKey: groupByKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters}
-  }
-
-  const chartsBarTypesGroupedBy = (data, groupByKey, filterKey, prevGroupByData, prevGroupByFilters, typeId) => {
-
-    const machineClass = setMachinesClass(typeId)
-    const machinesFilteredClass = data.filter(({machine_class}) => machine_class === machineClass)
-
-    const groupByData = Object.groupBy(machinesFilteredClass, (el) => el[groupByKey])
-
-    const yAxisData = Object.entries(groupByData).map(([key, val]) => ({key: key, val: val.length}))
-    const xAxisData = Object.entries(groupByData).map(([key, groupArr]) => {
-      const groupByFilterData = Object.groupBy(groupArr, (el) => el[filterKey])
-      const newArr = Object.entries(groupByFilterData).map(([key, val]) => ({name: key, value: val.length, linkData: groupByKey === 'machine_type' ? val.map((el) => ({machine_type: el.machine_type, device_number: el.device_number})) : ''}))
-      return {yAxisData: key, totalCount: groupArr.length, charts: newArr}
-    })
-
-    const countMachines = yAxisData.reduce((acc, type) => acc + type.val, 0)
-
-    return {yAxisData: yAxisData, xAxisData: xAxisData, countMachines: countMachines, period: setPeriodCharts(filterKey).title, filterKey: filterKey, groupByKey: groupByKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters, typeId: typeId}
-  }
-  
-  const chartsBarTypesWithoutFirstLayout = (data, groupByKey, filterKey, prevGroupByData, prevGroupByFilters, groupByValue) => {
-
-    const groupByData = Object.groupBy(data, (el) => el['org_type_name'])
-    const filteredGroupByData = Object.entries(groupByData).filter(([key, val]) => key === groupByValue)
-
-    if (filteredGroupByData.length === 0) return {yAxisData: [], xAxisData: [], countMachines: 0, period: setPeriodCharts(filterKey).title, filterKey: filterKey, groupByKey: groupByKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters, groupByValue: groupByValue}
-
-    const [groupedByGroupByKeyY] = filteredGroupByData.map(([key, groupArr]) => Object.groupBy(groupArr, (el) => el[groupByKey]))
-    const yAxisData = Object.entries(groupedByGroupByKeyY).map(([key, val]) => ({key: key, val: val.length}))
-    
-    const [groupedByGroupByKeyX] = filteredGroupByData.map(([key, groupArr]) => Object.groupBy(groupArr, (el) => el[groupByKey]))
-    const xAxisData = Object.entries(groupedByGroupByKeyX).map(([key, groupArr]) => {
-      const groupByFilterData = Object.groupBy(groupArr, (el) => el[filterKey])
-      const newArr = Object.entries(groupByFilterData).map(([key, val]) => ({name: key, value: val.length, linkData: groupByKey === 'machine_type' ? val.map((el) => ({machine_type: el.machine_type, device_number: el.device_number})) : ''}))
-      return {yAxisData: key, totalCount: groupArr.length, charts: newArr}
-    })
-
-    const countMachines = yAxisData.reduce((acc, type) => acc + type.val, 0)
-
-    return {yAxisData: yAxisData, xAxisData: xAxisData, countMachines: countMachines, period: setPeriodCharts(filterKey).title, filterKey: filterKey, groupByKey: groupByKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters, groupByValue: groupByValue}
-  }
-
-  const chartsBarTypesGroupedByMl = (data, groupByKey, filterKeys, prevGroupByData, prevGroupByFilters) => {
-
-    const groupByData = Object.groupBy(data, (el) => el[groupByKey])
-    const yAxisData = Object.entries(groupByData).map(([key, val]) => {
-      const allValuesArr = filterKeys.map((filterKey) => {
-        const machinesWithMl = val.reduce((acc, el) => {
-          if (el[filterKey] || el[filterKey] === 0) {
-            acc = acc + el[filterKey]
-          } else {
-            acc
-          }
-          return acc
-        }, 0)
-        const machinesWithoutMl = val.filter((el) => el[filterKey] === null).length
-        return {machinesWithMl: machinesWithMl, machinesWithoutMl: machinesWithoutMl}
-      })
-      // console.log('allValuesArr', allValuesArr)
-      const countMachinesWithMl = allValuesArr.reduce((acc, count) => (acc + count.machinesWithMl), 0)
-      const countMachinesWithoutMl = allValuesArr.reduce((acc, count) => (acc + count.machinesWithoutMl), 0) / filterKeys.length // Для исключения дублирования делим н а длину filterKeys
+    // console.log('allValuesArr', allValuesArr)
+    const countMachinesWithMl = allValuesArr.reduce((acc, count) => (acc + count.machinesWithMl), 0)
+    const countMachinesWithoutMl = allValuesArr.reduce((acc, count) => (acc + count.machinesWithoutMl), 0) / filterKeys.length // Для исключения дублирования делим н а длину filterKeys
       
-      return {key: key, val: countMachinesWithMl + countMachinesWithoutMl}
+    return {key: key, val: countMachinesWithMl + countMachinesWithoutMl}
+  })
+
+  const xAxisData = Object.entries(groupByData).map(([key, groupArr]) => {
+    return filterKeys.map((filterKey) => {
+      const groupByFilterData = Object.groupBy(groupArr, (el) => el[filterKey])
+      const newArr = Object.entries(groupByFilterData).map(([key, val]) => ({key: filterKey, name: key, value: val.reduce((acc, el) => el[filterKey] ? acc + el[filterKey] : acc, 0), linkData: groupByKey === 'machine_type' ? val.map((el) => ({machine_type: el.machine_type, device_number: el.device_number})) : ''}
+      ))
+      const machinesWithMl = newArr.reduce((acc, type) => {
+        if (type.key === filterKey) {
+          acc = {filterKey: filterKey, name: setNamesMl(filterKey), value: acc?.value + type.value, linkData: type.linkData}
+        } else {
+          acc = {filterKey: filterKey, name: setNamesMl(filterKey), value: acc?.value, linkData: type.linkData}
+        }
+        return acc
+      }, {value: 0})
+      // console.log('machinesWithMl', machinesWithMl)
+      return {yAxisData: key, charts: machinesWithMl}
     })
+  })
 
-    const xAxisData = Object.entries(groupByData).map(([key, groupArr]) => {
-      return filterKeys.map((filterKey) => {
-        const groupByFilterData = Object.groupBy(groupArr, (el) => el[filterKey])
-        const newArr = Object.entries(groupByFilterData).map(([key, val]) => ({key: filterKey, name: key, value: val.reduce((acc, el) => el[filterKey] ? acc + el[filterKey] : acc, 0), linkData: groupByKey === 'machine_type' ? val.map((el) => ({machine_type: el.machine_type, device_number: el.device_number})) : ''}
-        ))
-        const machinesWithMl = newArr.reduce((acc, type) => {
-          if (type.key === filterKey) {
-            acc = {filterKey: filterKey, name: setNamesMl(filterKey), value: acc?.value + type.value, linkData: type.linkData}
-          } else {
-            acc = {filterKey: filterKey, name: setNamesMl(filterKey), value: acc?.value, linkData: type.linkData}
-          }
-          return acc
-        }, {value: 0})
-        // console.log('machinesWithMl', machinesWithMl)
-        return {yAxisData: key, charts: machinesWithMl}
-      })
-    })
+  const machinesWithoutMl =  Object.entries(groupByData).map(([key, val]) => {
+    const countWithoutMl = val.filter((el) => filterKeys.find((filterKey) => el[filterKey] === null)).length
+    return {yAxisData: key, charts: {filterKey: 'routes_without_ml', name: setNamesMl('routes_without_ml'), value: countWithoutMl, linkData: groupByKey === 'machine_type' ? val.map((el) => ({machine_type: el.machine_type, device_number: el.device_number})) : ''}}
+  })
 
-    const machinesWithoutMl =  Object.entries(groupByData).map(([key, val]) => {
-      const countWithoutMl = val.filter((el) => filterKeys.find((filterKey) => el[filterKey] === null)).length
-      return {yAxisData: key, charts: {filterKey: 'routes_without_ml', name: setNamesMl('routes_without_ml'), value: countWithoutMl, linkData: groupByKey === 'machine_type' ? val.map((el) => ({machine_type: el.machine_type, device_number: el.device_number})) : ''}}
-    })
+  const countMachinesWithMl = setCountMachinesMl(xAxisData)
+  const countMachinesWithoutMl = Math.floor(setCountMachinesMl(machinesWithoutMl)) / filterKeys.length
 
-    const countMachinesWithMl = setCountMachinesMl(xAxisData)
-    const countMachinesWithoutMl = Math.floor(setCountMachinesMl(machinesWithoutMl)) / filterKeys.length
+  const updatedXAxisData = xAxisData.reduce((acc, group) => {
+    const isFindGroup = machinesWithoutMl.find((machine) => machine.yAxisData === group[0].yAxisData)
+    if (isFindGroup) {
+      const updatedGroup = [...group, isFindGroup]
+      acc.push(updatedGroup)
+    } else {
+      acc
+    }
+    return acc
+  }, [])
 
-    const updatedXAxisData = xAxisData.reduce((acc, group) => {
-      const isFindGroup = machinesWithoutMl.find((machine) => machine.yAxisData === group[0].yAxisData)
-      if (isFindGroup) {
-        const updatedGroup = [...group, isFindGroup]
-        acc.push(updatedGroup)
-      } else {
-        acc
-      }
-      return acc
-    }, [])
+  // console.log('updatedXAxisData', updatedXAxisData)
 
-    // console.log('updatedXAxisData', updatedXAxisData)
-
-    return {yAxisData: yAxisData, xAxisData: updatedXAxisData, countMachinesWithMl: countMachinesWithMl, countMachinesWithoutMl: countMachinesWithoutMl, period: setPeriodCharts(filterKeys).title, groupByKey: groupByKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters}
-  }
+  return {yAxisData: yAxisData, xAxisData: updatedXAxisData, countMachinesWithMl: countMachinesWithMl, countMachinesWithoutMl: countMachinesWithoutMl, period: setPeriodCharts(filterKeys).title, groupByKey: groupByKey, prevGroupByData: prevGroupByData, prevGroupByFilters: prevGroupByFilters}
+}
   
-  /* Charts updated data end */
+/* Charts updated data end */
 
 
-  const loadingChartsData = ({chartsSetup, data, dataMount, prevGroupByData, prevGroupByFilters}) => {
+const loadingChartsData = ({chartsSetup, data, dataMount, prevGroupByData, prevGroupByFilters}) => {
 
-    // console.log('dataPie', chartsPie(data, chartsFilterParams[0]))
-    // console.log('dataPieValue', chartsPieGroupByValue(data, chartsGroupByParams[0], chartsFilterParams[0]))
-    // console.log('dataPieTypes', chartsPieGroupedBy(data, chartsGroupByParams2[0], chartsFilterParams[0]))
-    // console.log('dataBarMl', chartsBarGroupedByMl(data, chartsFilterKeysMl))
-    // console.log('dataBarMount', chartsBarMount(dataMount, 'year', 'client_type', 'device_count'))
-    // console.log('chartsBarTypesGroupedByMl', chartsBarTypesGroupedByMl(data, 'org_type_name', chartsFilterKeysMl, {}, {}))
+  // console.log('dataPie', chartsPie(data, chartsFilterParams[0]))
+  // console.log('dataPieValue', chartsPieGroupByValue(data, chartsGroupByParams[0], chartsFilterParams[0]))
+  // console.log('dataPieTypes', chartsPieGroupedBy(data, chartsGroupByParams2[0], chartsFilterParams[0]))
+  // console.log('dataBarMl', chartsBarGroupedByMl(data, chartsFilterKeysMl))
+  // console.log('dataBarMount', chartsBarMount(dataMount, 'year', 'client_type', 'device_count'))
+  // console.log('chartsBarTypesGroupedByMl', chartsBarTypesGroupedByMl(data, 'org_type_name', chartsFilterKeysMl, {}, {}))
 
-    const filteredPie = chartsFilterParams.reduce((acc, param) => {
-      const idChart = `${param.filterKey}_pie`
-      return {...acc, [idChart]: chartsPie(data, param)}}, {}) // Далее объединение всех типов графиков
+  const filteredPie = chartsFilterParams.reduce((acc, param) => {
+    const idChart = `${param.filterKey}_pie`
+    return {...acc, [idChart]: chartsPie(data, param)}}, {}) // Далее объединение всех типов графиков
 
-    const filteredPieGroupByValue = chartsGroupByParams.reduce((acc, param) => {
-      const idChart = `${chartsFilterParams[0].filterKey}_pie_${param.valueId}`
-      return {...acc, [idChart]: chartsPieGroupedBy(data, param, chartsFilterParams[0])}}, {})
+  const filteredPieGroupByValue = chartsGroupByParams.reduce((acc, param) => {
+    const idChart = `${chartsFilterParams[0].filterKey}_pie_${param.valueId}`
+    return {...acc, [idChart]: chartsPieGroupedBy(data, param, chartsFilterParams[0])}}, {})
 
-    const filteredPieGroupByTypes = chartsGroupByParams2.reduce((acc, param) => {
-      const idChart = `${chartsFilterParams[0].filterKey}_pie_${param.valueId}`
-      return {...acc, [idChart]: chartsPieGroupedBy(data, param, chartsFilterParams[0])}}, {})
+  const filteredPieGroupByTypes = chartsGroupByParams2.reduce((acc, param) => {
+    const idChart = `${chartsFilterParams[0].filterKey}_pie_${param.valueId}`
+    return {...acc, [idChart]: chartsPieGroupedBy(data, param, chartsFilterParams[0])}}, {})
 
-    const filteredBarGroupByMl = {[`${chartsFilterParams[1].filterKey}_bar`]: chartsBarGroupedByMl(data, chartsFilterKeysMl)}
+  const filteredBarGroupByMl = {[`${chartsFilterParams[1].filterKey}_bar`]: chartsBarGroupedByMl(data, chartsFilterKeysMl)}
 
-    const filteredBarMount = chartsMountParams.reduce((acc, param) => {
-      const idChart = `mount_${param.filterKey}_bar`
-      return {...acc, [idChart]: chartsBarMount(dataMount, param.groupByKey, param.filterKey, param.countKey)}}, {})
+  const filteredBarMount = chartsMountParams.reduce((acc, param) => {
+    const idChart = `mount_${param.filterKey}_bar`
+    return {...acc, [idChart]: chartsBarMount(dataMount, param.groupByKey, param.filterKey, param.countKey)}}, {})
 
-    const filteredBarTypes = chartsBarTypesParams.reduce((acc, param) => {
-      const idChart = `${param.filterKey}_${param.valueId}_bar`
-      return {...acc, [idChart]: chartsBarTypes(data, param.groupByKey, param.filterKey, prevGroupByData, prevGroupByFilters)}}, {})
+  const filteredBarTypes = chartsBarTypesParams.reduce((acc, param) => {
+    const idChart = `${param.filterKey}_${param.valueId}_bar`
+    return {...acc, [idChart]: chartsBarTypes(data, param.groupByKey, param.filterKey, prevGroupByData, prevGroupByFilters)}}, {})
 
-    const filteredBarGroupByTypes = chartsBarTypesGroupByParams.reduce((acc, param) => {
-      const idChart = `${param.filterKey}_${param.valueId}_bar_${param.typeId}`
-      return {...acc, [idChart]: chartsBarTypesGroupedBy(data, param.groupByKey, param.filterKey, prevGroupByData, prevGroupByFilters, param.typeId)}}, {})
+  const filteredBarGroupByTypes = chartsBarTypesGroupByParams.reduce((acc, param) => {
+    const idChart = `${param.filterKey}_${param.valueId}_bar_${param.typeId}`
+    return {...acc, [idChart]: chartsBarTypesGroupedBy(data, param.groupByKey, param.filterKey, prevGroupByData, prevGroupByFilters, param.typeId)}}, {})
 
-    const filteredBarWithoutLayoutTypes = chartsBarTypesWithoutLayoutParams.reduce((acc, param) => {
-      const idChart = `${param.filterKey}_types_bar_${param.valueId}`
-      return {...acc, [idChart]: chartsBarTypesWithoutFirstLayout(data, param.groupByKey, param.filterKey, prevGroupByData, prevGroupByFilters, param.groupByValue)}}, {})
+  const filteredBarWithoutLayoutTypes = chartsBarTypesWithoutLayoutParams.reduce((acc, param) => {
+    const idChart = `${param.filterKey}_types_bar_${param.valueId}`
+    return {...acc, [idChart]: chartsBarTypesWithoutFirstLayout(data, param.groupByKey, param.filterKey, prevGroupByData, prevGroupByFilters, param.groupByValue)}}, {})
 
-    const filteredBarGroupByMlTypes = {[`${chartsFilterParams[1].filterKey}_types_bar_ml`]: chartsBarTypesGroupedByMl(data, 'org_type_name', chartsFilterKeysMl, prevGroupByData, prevGroupByFilters)}
+  const filteredBarGroupByMlTypes = {[`${chartsFilterParams[1].filterKey}_types_bar_ml`]: chartsBarTypesGroupedByMl(data, 'org_type_name', chartsFilterKeysMl, prevGroupByData, prevGroupByFilters)}
     
-    const allCharts = {...filteredPie, ...filteredPieGroupByValue, ...filteredPieGroupByTypes, ...filteredBarGroupByMl, ...filteredBarMount, ...filteredBarTypes, ...filteredBarGroupByTypes, ...filteredBarWithoutLayoutTypes, ...filteredBarGroupByMlTypes}
+  const allCharts = {...filteredPie, ...filteredPieGroupByValue, ...filteredPieGroupByTypes, ...filteredBarGroupByMl, ...filteredBarMount, ...filteredBarTypes, ...filteredBarGroupByTypes, ...filteredBarWithoutLayoutTypes, ...filteredBarGroupByMlTypes}
 
-    console.log('allCharts', allCharts)
+  console.log('allCharts', allCharts)
 
-    // console.log('this.charts', data)
-      const main = chartsSetup.main.reduce((acc, chart) => {
-        if (allCharts[chart.id]) {
-          const newChart = {...chart, data: allCharts[chart.id]}
-          acc = [...acc, newChart]
-        } else {
-          acc
-        }
-        return acc
-        
-      }, [])
-      const types = chartsSetup.types.reduce((acc, chart) => {
-        if (allCharts[chart.id]) {
-          const newChart = {...chart, data: allCharts[chart.id]}
-          acc = [...acc, newChart]
-        } else {
-          acc
-        }
-        return acc
-        
-      }, [])
-      return {...chartsSetup, main: main, types: types}
-  }
-
-  const setBarTypesChart = (activeChartParams, prevGroupByData, prevGroupByFilters, defaultData, currentData) => {
-    switch (activeChartParams.type) {
-      case 'default':
-        const dataDefault = chartsBarTypes(defaultData, activeChartParams.groupByKey, activeChartParams.filterKey, prevGroupByData, prevGroupByFilters)
-        // const updatedData = currentData.types.reduce((acc, chart) => {
-        //   if (chart.id === activeChartParams.id) {
-        //     const newChart = {...chart, data: data}
-        //     acc = [...acc, newChart]
-        //   } else {
-        //     acc = [...acc, chart]
-        //   }
-        //   return acc
-        // }, [])
-        // return {main: currentData.main, types: updatedData}
-        return dataDefault
-      case 'without_first_layout': 
-      const dataWithoutFirstLayout = chartsBarTypesWithoutFirstLayout(defaultData, activeChartParams.groupByKey, activeChartParams.filterKey, prevGroupByData, prevGroupByFilters, activeChartParams.groupByValue)
-        return dataWithoutFirstLayout
-      case 'types': 
-      const dataGroupBy = chartsBarTypesGroupedBy(defaultData, activeChartParams.groupByKey, activeChartParams.filterKey, prevGroupByData, prevGroupByFilters, activeChartParams.groupByValue)
-        return dataGroupBy
-      case 'ml': 
-      const dataMl = chartsBarTypesGroupedByMl(defaultData, activeChartParams.groupByKey, chartsFilterKeysMl, prevGroupByData, prevGroupByFilters)
-        return dataMl
+  // console.log('this.charts', data)
+  const main = chartsSetup.main.reduce((acc, chart) => {
+    if (allCharts[chart.id]) {
+      const newChart = {...chart, data: allCharts[chart.id]}
+      acc = [...acc, newChart]
+    } else {
+      acc
     }
+    return acc
+        
+  }, [])
+  const types = chartsSetup.types.reduce((acc, chart) => {
+    if (allCharts[chart.id]) {
+      const newChart = {...chart, data: allCharts[chart.id]}
+      acc = [...acc, newChart]
+    } else {
+      acc
+    }
+    return acc
+        
+  }, [])
+  return {...chartsSetup, main: main, types: types}
+}
+
+const setBarTypesChart = (activeChartParams, prevGroupByData, prevGroupByFilters, defaultData) => {
+  switch (activeChartParams.type) {
+  case 'default': {
+    const dataDefault = chartsBarTypes(defaultData, activeChartParams.groupByKey, activeChartParams.filterKey, prevGroupByData, prevGroupByFilters)
+    // const updatedData = currentData.types.reduce((acc, chart) => {
+    //   if (chart.id === activeChartParams.id) {
+    //     const newChart = {...chart, data: data}
+    //     acc = [...acc, newChart]
+    //   } else {
+    //     acc = [...acc, chart]
+    //   }
+    //   return acc
+    // }, [])
+    // return {main: currentData.main, types: updatedData}
+    return dataDefault
   }
+  case 'without_first_layout': {
+    const dataWithoutFirstLayout = chartsBarTypesWithoutFirstLayout(defaultData, activeChartParams.groupByKey, activeChartParams.filterKey, prevGroupByData, prevGroupByFilters, activeChartParams.groupByValue)
+    return dataWithoutFirstLayout
+  }
+  case 'types': {
+    const dataGroupBy = chartsBarTypesGroupedBy(defaultData, activeChartParams.groupByKey, activeChartParams.filterKey, prevGroupByData, prevGroupByFilters, activeChartParams.groupByValue)
+    return dataGroupBy
+  }
+  case 'ml': {
+    const dataMl = chartsBarTypesGroupedByMl(defaultData, activeChartParams.groupByKey, chartsFilterKeysMl, prevGroupByData, prevGroupByFilters)
+    return dataMl
+  }
+  }
+}
   
-  const setNextLayoutGroupByKey = (groupByKey, prevGroupByValue) => {
-    if (prevGroupByValue === 'без типа') return null
-    switch (groupByKey) {
-      case 'org_type_name': return 'railway_name'
-      case 'railway_name': return 'org_name'
-      case 'org_name': return 'type'
-      case 'type': return 'machine_type'
-      case 'zav_nomer': return 'machine_type'
-      default: return null
-    }
+const setNextLayoutGroupByKey = (groupByKey, prevGroupByValue) => {
+  if (prevGroupByValue === 'без типа') return null
+  switch (groupByKey) {
+  case 'org_type_name': return 'railway_name'
+  case 'railway_name': return 'org_name'
+  case 'org_name': return 'type'
+  case 'type': return 'machine_type'
+  case 'zav_nomer': return 'machine_type'
+  default: return null
   }
+}
 
-  const setBeforeLayoutGroupByData = (prevGroupByData, prevGroupByFilters, type) => {
-    return cond([
-      [has('type'), () => ({org_name: prevGroupByFilters['org_name']})],
-      [has('org_name'), () => ({railway_name: prevGroupByFilters['railway_name']})],
-      [has('railway_name'), () => (type === 'without_first_layout' ? {} : {org_type_name: prevGroupByFilters['org_type_name']})],
-      [T, () => {}],
-    ])(prevGroupByData)
+const setBeforeLayoutGroupByData = (prevGroupByData, prevGroupByFilters, type) => {
+  return cond([
+    [has('type'), () => ({org_name: prevGroupByFilters['org_name']})],
+    [has('org_name'), () => ({railway_name: prevGroupByFilters['railway_name']})],
+    [has('railway_name'), () => (type === 'without_first_layout' ? {} : {org_type_name: prevGroupByFilters['org_type_name']})],
+    [T, () => {}],
+  ])(prevGroupByData)
+}
+
+const typesCharts = (type) => {
+  switch (type) {
+  case 'pie': return true
+  case 'mount': return true
+  case 'mainMl': return true
+  default: return false
   }
+}
 
-  const typesCharts = (type) => {
-    switch (type) {
-      case 'pie': return true
-      case 'mount': return true
-      case 'mainMl': return true
-      default: return false
-    }
-  }
-
-  export { loadingChartsData, setBarTypesChart, setNextLayoutGroupByKey, setBeforeLayoutGroupByData, typesCharts }
\ No newline at end of file
+export { loadingChartsData, setBarTypesChart, setNextLayoutGroupByKey, setBeforeLayoutGroupByData, typesCharts }
\ No newline at end of file
diff --git a/live_monitor_vue/src/store/modules/machines/index.js b/live_monitor_vue/src/store/modules/machines/index.js
index e9b19ac..96905c0 100644
--- a/live_monitor_vue/src/store/modules/machines/index.js
+++ b/live_monitor_vue/src/store/modules/machines/index.js
@@ -1,5 +1,3 @@
-import {equals, isEmpty} from 'ramda'
-
 const initState = {
   modalMachines: [],
 };
diff --git a/live_monitor_vue/src/store/modules/main/index.js b/live_monitor_vue/src/store/modules/main/index.js
index a670a65..2408868 100644
--- a/live_monitor_vue/src/store/modules/main/index.js
+++ b/live_monitor_vue/src/store/modules/main/index.js
@@ -1,4 +1,3 @@
-import {toRaw} from 'vue'
 import {pages} from './StaticData'
 
 const initState = {
@@ -32,15 +31,15 @@ const actions = {
   uploadData: async ({commit}, path) => {
     try{
       switch(path) {
-        case '/finder_packs':
-          commit('setPage', pages[1])
-          break
-        case '/add_users':
-          commit('setPage', pages[2])
-          break
-        default:
-          commit('setPage', pages[0])
-          break
+      case '/finder_packs':
+        commit('setPage', pages[1])
+        break
+      case '/add_users':
+        commit('setPage', pages[2])
+        break
+      default:
+        commit('setPage', pages[0])
+        break
       }
       
     } catch(err) {
diff --git a/live_monitor_vue/src/store/modules/packs/StaticData.js b/live_monitor_vue/src/store/modules/packs/StaticData.js
index 0516f92..7281b83 100644
--- a/live_monitor_vue/src/store/modules/packs/StaticData.js
+++ b/live_monitor_vue/src/store/modules/packs/StaticData.js
@@ -252,10 +252,10 @@ const packStruct = [
 
 
 const packsNames = ["Диагностика УК (7681)", "Диагностика УК (7682)",
-"Диагностика УК (7683)", "Диагностика УК (7684)",
-"Диагностика УК (7685)", "Тест УК(9473)",
-"УК 25/25(9473)", "УК 25/25(9475)", "УК 25/28СП(9473)",
-"УК 25/28СП(9475)", "УК 25/9-18(9473)", "УК 25/9-18(9475)"]
+  "Диагностика УК (7683)", "Диагностика УК (7684)",
+  "Диагностика УК (7685)", "Тест УК(9473)",
+  "УК 25/25(9473)", "УК 25/25(9475)", "УК 25/28СП(9473)",
+  "УК 25/28СП(9475)", "УК 25/9-18(9473)", "УК 25/9-18(9475)"]
 
 const data = {
   askr_logs: [
@@ -273,10 +273,10 @@ const data = {
       geo: 
       // %Geo.Point{
         {
-        coordinates: [136.150181, 49.90781],
-        srid: 4326,
-        properties: {}
-      },
+          coordinates: [136.150181, 49.90781],
+          srid: 4326,
+          properties: {}
+        },
       is_valid: true,
       voltage: 25.93,
       pack_lon: 136.150181,
@@ -319,10 +319,10 @@ const data = {
       geo: 
       // %Geo.Point{
         {
-        coordinates: [136.15018899999998, 49.907799],
-        srid: 4326,
-        properties: {}
-      },
+          coordinates: [136.15018899999998, 49.907799],
+          srid: 4326,
+          properties: {}
+        },
       is_valid: true,
       voltage: 25.89,
       pack_lon: 136.150189,
@@ -365,10 +365,10 @@ const data = {
       geo: 
       // %Geo.Point{
         {
-        coordinates: [136.15018899999998, 49.907801],
-        srid: 4326,
-        properties: {}
-      },
+          coordinates: [136.15018899999998, 49.907801],
+          srid: 4326,
+          properties: {}
+        },
       is_valid: true,
       voltage: 25.77,
       pack_lon: 136.150189,
@@ -411,10 +411,10 @@ const data = {
       geo: 
       // %Geo.Point{
         {
-        coordinates: [136.15018, 49.907806],
-        srid: 4326,
-        properties: {}
-      },
+          coordinates: [136.15018, 49.907806],
+          srid: 4326,
+          properties: {}
+        },
       is_valid: true,
       voltage: 25.87,
       pack_lon: 136.15018,
@@ -457,10 +457,10 @@ const data = {
       geo: 
       // %Geo.Point{
         {
-        coordinates: [136.150184, 49.907799],
-        srid: 4326,
-        properties: {}
-      },
+          coordinates: [136.150184, 49.907799],
+          srid: 4326,
+          properties: {}
+        },
       is_valid: true,
       voltage: 25.88,
       pack_lon: 136.150184,
@@ -503,10 +503,10 @@ const data = {
       geo: 
       // %Geo.Point{
         {
-        coordinates: [136.15018, 49.907807],
-        srid: 4326,
-        properties: {}
-      },
+          coordinates: [136.15018, 49.907807],
+          srid: 4326,
+          properties: {}
+        },
       is_valid: true,
       voltage: 25.94,
       pack_lon: 136.15018,
@@ -549,10 +549,10 @@ const data = {
       geo: 
       // %Geo.Point{
         {
-        coordinates: [136.150181, 49.907799999999995],
-        srid: 4326,
-        properties: {}
-      },
+          coordinates: [136.150181, 49.907799999999995],
+          srid: 4326,
+          properties: {}
+        },
       is_valid: true,
       voltage: 25.84,
       pack_lon: 136.150181,
@@ -595,10 +595,10 @@ const data = {
       geo: 
       // %Geo.Point{
         {
-        coordinates: [136.150181, 49.907810999999995],
-        srid: 4326,
-        properties: {}
-      },
+          coordinates: [136.150181, 49.907810999999995],
+          srid: 4326,
+          properties: {}
+        },
       is_valid: true,
       voltage: 25.93,
       pack_lon: 136.150181,
@@ -641,10 +641,10 @@ const data = {
       geo: 
       // %Geo.Point{
         {
-        coordinates: [136.15018, 49.90781],
-        srid: 4326,
-        properties: {}
-      },
+          coordinates: [136.15018, 49.90781],
+          srid: 4326,
+          properties: {}
+        },
       is_valid: true,
       voltage: 25.91,
       pack_lon: 136.15018,
@@ -687,10 +687,10 @@ const data = {
       geo: 
       // %Geo.Point{
         {
-        coordinates: [136.15017899999998, 49.907809],
-        srid: 4326,
-        properties: {}
-      },
+          coordinates: [136.15017899999998, 49.907809],
+          srid: 4326,
+          properties: {}
+        },
       is_valid: true,
       voltage: 25.91,
       pack_lon: 136.150179,
@@ -733,10 +733,10 @@ const data = {
       geo: 
       // %Geo.Point{
         {
-        coordinates: [136.150185, 49.907799999999995],
-        srid: 4326,
-        properties: {}
-      },
+          coordinates: [136.150185, 49.907799999999995],
+          srid: 4326,
+          properties: {}
+        },
       is_valid: true,
       voltage: 25.61,
       pack_lon: 136.150185,
@@ -779,10 +779,10 @@ const data = {
       geo: 
       // %Geo.Point{
         {
-        coordinates: [136.15018799999999, 49.907803],
-        srid: 4326,
-        properties: {}
-      },
+          coordinates: [136.15018799999999, 49.907803],
+          srid: 4326,
+          properties: {}
+        },
       is_valid: true,
       voltage: 25.49,
       pack_lon: 136.150188,
@@ -824,10 +824,10 @@ const data = {
       geo: 
       // %Geo.Point{
         {
-        coordinates: [136.150184, 49.907796999999995],
-        srid: 4326,
-        properties: {}
-      },
+          coordinates: [136.150184, 49.907796999999995],
+          srid: 4326,
+          properties: {}
+        },
       is_valid: true,
       voltage: 25.6,
       pack_lon: 136.150184,
@@ -868,10 +868,10 @@ const data = {
       geo: 
       // %Geo.Point{
         {
-        coordinates: [136.150184, 49.907796999999995],
-        srid: 4326,
-        properties: {}
-      },
+          coordinates: [136.150184, 49.907796999999995],
+          srid: 4326,
+          properties: {}
+        },
       is_valid: true,
       voltage: 25.62,
       pack_lon: 136.150184,
@@ -911,10 +911,10 @@ const data = {
       geo: 
       // %Geo.Point{
         {
-        coordinates: [136.15018999999998, 49.907802],
-        srid: 4326,
-        properties: {}
-      },
+          coordinates: [136.15018999999998, 49.907802],
+          srid: 4326,
+          properties: {}
+        },
       is_valid: true,
       voltage: 25.88,
       pack_lon: 136.15019,
diff --git a/live_monitor_vue/src/store/modules/packs/index.js b/live_monitor_vue/src/store/modules/packs/index.js
index a8f9a6b..cdb89c3 100644
--- a/live_monitor_vue/src/store/modules/packs/index.js
+++ b/live_monitor_vue/src/store/modules/packs/index.js
@@ -2,7 +2,7 @@ import {toRaw} from 'vue'
 import {pageSettings, packStruct, packsNames, data} from './StaticData'
 import {fetchColumn} from '@organisms/PackColumns';
 import {loadingPagination, setPagination} from './helpers';
-import {equals, is, isEmpty, uniq} from 'ramda'
+import {isEmpty, uniq} from 'ramda'
 import moment from'moment'
 
 const initState = {
@@ -65,7 +65,7 @@ const mutations = {
 };
 
 const actions = {
-  uploadData: async ({commit, getters, state}, params) => {
+  uploadData: async ({commit, getters}, params) => {
     try{
 
       /*
@@ -109,7 +109,7 @@ const actions = {
 
       */
 
-        // imei 864004043403283
+      // imei 864004043403283
 
       console.log('params', toRaw(params))
       console.log('getters.isLoading', toRaw(getters.isLoading))
@@ -186,7 +186,7 @@ const actions = {
       console.error(err)
     }
   },
-  updatePackSettings: async ({commit, getters, state}, updatedData) => {
+  updatePackSettings: async ({commit, getters}, updatedData) => {
     try {
       console.log('updatedData', updatedData)
       const packsSettings = toRaw(getters.packsSettings)
@@ -198,7 +198,7 @@ const actions = {
       console.error(err)
     }
   },
-  updateSelects: async ({dispatch, commit, getters, state}, updatedSelect) => {
+  updateSelects: async ({commit, getters}, updatedSelect) => {
     try {
 
       const dataSource = toRaw(getters.tableData).dataSource
diff --git a/live_monitor_vue/src/store/modules/services/StaticData.js b/live_monitor_vue/src/store/modules/services/StaticData.js
index 355f7ec..ed03b19 100644
--- a/live_monitor_vue/src/store/modules/services/StaticData.js
+++ b/live_monitor_vue/src/store/modules/services/StaticData.js
@@ -1,22 +1,22 @@
-const servicesNames = ["check_scand_api_2EC27AEA12AAC9E5B013", "niflheim",
-"scand_client_B0C8B117F3AB40D5869C",
-"local_local_cdrp@172.25.78.64_E66972859C7734FBAB11",
-"cronex_9354617E3A5A69493AC0",
-"local_lm_api@172.25.78.153_36C091D060A018177B49",
-"db_loader_7C6C7680BAC92D4BFD8C", "sql_inserter_B2751775DD1FC358682A",
-"authentication_service_F2AE8881F984DFE1A4BD", "cdrp",
-"asgard_82DB735B1F03E8A5BA0E", "alfheim_90556327D9DC81351EE2", "GStore",
-"alfheim_1B3027982471601E45E8", "cronex", "comm_client_diap_1",
-"cdrp_B2E275BA9E7E79D4D2D6", "authentication_service",
-"comm_client_diap_1_8348C79D6407CDB752FD", "sql_sup_F66176648815DC42BD4D",
-"periodic_tasks_228605BF57BD5DE8C94B",
-"integration_pk_gip_F6797EF2E89795090B4D", "live_monitor_EA3F27068ABA3C4F5D7F",
-"snotra_EC6E797D24F8E93C536F", "thor_70B46C452D3105A6AF09",
-"kudt_diag_3D0E0652B99B208E8519", "snotra", "live_monitor", "sql_sup",
-"comm_client_diap_2_B2FAA49D7F5EF167DF1D", "niflheim_829F2F30E9FD2539D3E7",
-"comm_client_diap_repl_6BA0746DB5CFB506AC7A", "pack_rrnr_DDCE13940E392EB3456A",
-"local_local_live_monitor@172.25.78.151_CD55455FB92AB74F178B", "alfheim",
-"local_fuel_api@172.25.78.98_C215EA176A84C84A6CEC"]
+// const servicesNames = ["check_scand_api_2EC27AEA12AAC9E5B013", "niflheim",
+//   "scand_client_B0C8B117F3AB40D5869C",
+//   "local_local_cdrp@172.25.78.64_E66972859C7734FBAB11",
+//   "cronex_9354617E3A5A69493AC0",
+//   "local_lm_api@172.25.78.153_36C091D060A018177B49",
+//   "db_loader_7C6C7680BAC92D4BFD8C", "sql_inserter_B2751775DD1FC358682A",
+//   "authentication_service_F2AE8881F984DFE1A4BD", "cdrp",
+//   "asgard_82DB735B1F03E8A5BA0E", "alfheim_90556327D9DC81351EE2", "GStore",
+//   "alfheim_1B3027982471601E45E8", "cronex", "comm_client_diap_1",
+//   "cdrp_B2E275BA9E7E79D4D2D6", "authentication_service",
+//   "comm_client_diap_1_8348C79D6407CDB752FD", "sql_sup_F66176648815DC42BD4D",
+//   "periodic_tasks_228605BF57BD5DE8C94B",
+//   "integration_pk_gip_F6797EF2E89795090B4D", "live_monitor_EA3F27068ABA3C4F5D7F",
+//   "snotra_EC6E797D24F8E93C536F", "thor_70B46C452D3105A6AF09",
+//   "kudt_diag_3D0E0652B99B208E8519", "snotra", "live_monitor", "sql_sup",
+//   "comm_client_diap_2_B2FAA49D7F5EF167DF1D", "niflheim_829F2F30E9FD2539D3E7",
+//   "comm_client_diap_repl_6BA0746DB5CFB506AC7A", "pack_rrnr_DDCE13940E392EB3456A",
+//   "local_local_live_monitor@172.25.78.151_CD55455FB92AB74F178B", "alfheim",
+//   "local_fuel_api@172.25.78.98_C215EA176A84C84A6CEC"]
 
 
 // const servicesNotConnected = [
diff --git a/live_monitor_vue/src/store/modules/services/helpers.js b/live_monitor_vue/src/store/modules/services/helpers.js
index cd7b643..6203349 100644
--- a/live_monitor_vue/src/store/modules/services/helpers.js
+++ b/live_monitor_vue/src/store/modules/services/helpers.js
@@ -60,7 +60,7 @@ class Services {
       if (serviceNameArr?.length > 0) {
         if (serviceNameArr[serviceNameArr.length - 1].length > 15)
           serviceCode = serviceNameArr[serviceNameArr.length - 1]
-        serviceIp = serviceNameArr.reduce((acc, el, idx) => {
+        serviceIp = serviceNameArr.reduce((acc, el) => {
           const ipIdx = el.indexOf('@')
           if (ipIdx !== -1) {
             acc = el.slice(ipIdx)
diff --git a/live_monitor_vue/src/store/modules/services/index.js b/live_monitor_vue/src/store/modules/services/index.js
index fb529b7..3edbad7 100644
--- a/live_monitor_vue/src/store/modules/services/index.js
+++ b/live_monitor_vue/src/store/modules/services/index.js
@@ -52,10 +52,10 @@ const actions = {
     }
   },
 
-  uploadServiceData: async ({}, service) => {  
+  uploadServiceData: async (service) => {
     try{
       const serviceNew = new Service(service)
-      const getCache = serviceNew.getCashe(service)
+      serviceNew.getCashe(service)
     } catch (err) {
       console.error(err)
     }
diff --git a/live_monitor_vue/tests/services/ServiceOfMachines.test.js b/live_monitor_vue/tests/services/ServiceOfMachines.test.js
index 4526735..33e302a 100644
--- a/live_monitor_vue/tests/services/ServiceOfMachines.test.js
+++ b/live_monitor_vue/tests/services/ServiceOfMachines.test.js
@@ -1,4 +1,4 @@
-import {expect, describe, vi, test, beforeEach} from 'vitest'
+import {expect, describe, test, beforeEach} from 'vitest'
 import ServiceOfMachines from "@services/ServiceOfMachines.js"
 import {AdapterOfMachines, appModalListMachines} from "@mocks/machines.js"
 import { createStore } from "vuex"
@@ -23,12 +23,6 @@ describe('test ServiceOfMachines', () => {
     expect(result).toEqual(appModalListMachines)
   })
 
-  test('test putModalMachines', async () => {
-    await serviceOfMachines.putModalMachines(appModalListMachines)
-    const result = store.getters['machines/modalMachines']
-    expect(result).toEqual(appModalListMachines)
-  })
-
   test('test makeFetchAndPutModalMachines', async () => {
     const funcResult = await serviceOfMachines.makeFetchAndPutModalMachines()
     const storeResult = store.getters['machines/modalMachines']