From 70cb21c9af3d6e1844c67537eee44b3df525b403 Mon Sep 17 00:00:00 2001 From: SergeyVS Date: Tue, 2 Apr 2024 16:59:42 +0300 Subject: [PATCH] fixed eslint errors --- .../2_molecules/MapModal/helpers.js | 17 +++--- .../2_molecules/VDatepicker/VDatepicker.vue | 2 +- .../2_molecules/VTabulator/VTabulator.vue | 5 +- .../VTabulator/VTabulatorPagination.vue | 9 ++- .../2_molecules/VTabulator/helper.js | 13 +++-- .../2_molecules/VTabulator/presetConfig.js | 47 ---------------- .../2_molecules/VTabulator/stringFunction.js | 42 ++++++-------- .../src/components/3_organisms/PackColumns.js | 2 +- .../3_organisms/PackView/Button.vue | 4 +- .../components/3_organisms/PackView/index.vue | 19 ++++--- .../AppContainer/AppContainerRightPanel.vue | 1 - .../src/components/5_pages/Auth/index.vue | 2 +- .../src/components/5_pages/Cron/Task.vue | 3 +- .../components/5_pages/Cron/TaskHistory.vue | 1 - .../src/components/5_pages/Cron/index.vue | 3 +- .../5_pages/Main/AddUsers/AddUsers.vue | 2 +- .../5_pages/Main/FinderPacks/FinderPacks.vue | 7 ++- .../5_pages/Main/Machines/Charts.vue | 32 ++++++----- .../Main/Machines/DataModal/DataModal.vue | 55 ++++++++++--------- .../Main/Machines/DataModal/helpers.js | 4 +- .../5_pages/Main/Machines/Filters.vue | 10 ++-- .../5_pages/Main/Machines/Machine.vue | 8 +-- .../5_pages/Main/Machines/Machines.vue | 7 ++- .../5_pages/Main/Machines/Table.vue | 5 +- .../src/components/5_pages/Main/index.vue | 9 +-- .../src/components/5_pages/Packs/index.vue | 6 +- .../components/6_admin_pages/Diap/index.vue | 2 +- .../components/6_admin_pages/News/index.vue | 2 +- .../components/6_admin_pages/Packs/index.vue | 2 +- .../6_admin_pages/Services/Services.vue | 13 ++--- live_monitor_vue/src/helpers/dom.js | 1 + live_monitor_vue/src/helpers/examle.vue | 2 +- live_monitor_vue/src/router/index.js | 29 +++++----- .../src/store/hooks/CopyToClipboard.js | 2 +- .../src/store/hooks/Echarts/helpers.js | 10 ++-- .../src/store/hooks/Echarts/index.js | 10 ++-- .../src/store/hooks/Echarts/staticData.js | 9 ++- live_monitor_vue/src/store/index.js | 1 + .../src/store/modules/add_users/StaticData.js | 2 +- .../src/store/modules/add_users/index.js | 7 +-- .../src/store/modules/auth/index.js | 4 -- .../src/store/modules/example/index.js | 2 - .../src/store/modules/finder_packs/index.js | 7 +-- .../src/store/modules/last_packs/index.js | 2 +- .../src/store/modules/last_packs_num/index.js | 4 +- .../store/modules/layoutMachines/helpers.js | 4 +- .../modules/layoutMachines/helpersCharts.js | 25 ++++++--- .../src/store/modules/layoutMachines/index.js | 29 ++++++---- .../src/store/modules/machines/helpers.js | 4 +- .../store/modules/machines/helpersCharts.js | 22 +++++--- .../src/store/modules/machines/index.js | 2 - .../src/store/modules/main/index.js | 1 - .../src/store/modules/packs/index.js | 8 +-- .../src/store/modules/services/StaticData.js | 38 ++++++------- .../src/store/modules/services/helpers.js | 2 +- .../src/store/modules/services/index.js | 2 +- .../tests/services/ServiceOfMachines.test.js | 8 +-- 57 files changed, 255 insertions(+), 316 deletions(-) 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/VTabulator/VTabulator.vue b/live_monitor_vue/src/components/2_molecules/VTabulator/VTabulator.vue index 626a043..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 + "(" + count + " записей)"; }, }; 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 b9e0c48..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,10 +1,9 @@