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 @@