diff --git a/src/Map/Layers/FilteredWorkingPoints.jsx b/src/Map/Layers/FilteredWorkingPoints.jsx index bb989cb..f757271 100644 --- a/src/Map/Layers/FilteredWorkingPoints.jsx +++ b/src/Map/Layers/FilteredWorkingPoints.jsx @@ -19,8 +19,8 @@ export const FilteredWorkingPoints = () => { const regionFilterExpression = useRegionFilterExpression(region); const deltaExpression = [ - [">=", ["get", "delta_first"], deltaTraffic[0]], - ["<=", ["get", "delta_first"], deltaTraffic[1]], + [">=", ["get", "delta_current"], deltaTraffic[0]], + ["<=", ["get", "delta_current"], deltaTraffic[1]], ]; const factExpression = [ diff --git a/src/Map/Popup/mode-popup/config.js b/src/Map/Popup/mode-popup/config.js index d7f6c1a..2c6df83 100644 --- a/src/Map/Popup/mode-popup/config.js +++ b/src/Map/Popup/mode-popup/config.js @@ -62,9 +62,9 @@ export const residentialPopupConfig = [ ]; export const workingPointFields = [ - { name: "План", field: "plan_first" }, + { name: "План", field: "plan_current" }, { name: "Факт", field: "fact" }, - { name: "Расхождение с прогнозом", field: "delta_first" }, + { name: "Расхождение с прогнозом", field: "delta_current" }, { name: "Зрелость", field: "age_day" }, { name: "id постамата", field: "postamat_id", empty: "Не указан" }, ]; diff --git a/src/modules/Sidebar/WorkingPointsFilters/WorkingPointsFilters.jsx b/src/modules/Sidebar/WorkingPointsFilters/WorkingPointsFilters.jsx index bdf180d..4101979 100644 --- a/src/modules/Sidebar/WorkingPointsFilters/WorkingPointsFilters.jsx +++ b/src/modules/Sidebar/WorkingPointsFilters/WorkingPointsFilters.jsx @@ -23,7 +23,7 @@ const useGetDataRange = () => { { select: (data) => { return { - deltaTraffic: [data.delta_first[0], data.delta_first[1]], + deltaTraffic: [data.delta_current[0], data.delta_current[1]], factTraffic: [data.fact[0], data.fact[1]], age: [data.age_day[0], data.age_day[1]], }; diff --git a/src/modules/Table/WorkingTable/WorkingTable.jsx b/src/modules/Table/WorkingTable/WorkingTable.jsx index 9559c9b..89b5f8b 100644 --- a/src/modules/Table/WorkingTable/WorkingTable.jsx +++ b/src/modules/Table/WorkingTable/WorkingTable.jsx @@ -25,7 +25,7 @@ export const WorkingTable = ({ fullWidth }) => { page, page_size: pageSize, "status[]": [STATUSES.working], - "delta_first[]": deltaTraffic, + "delta_current[]": deltaTraffic, "fact[]": factTraffic, "age_day[]": age, }); diff --git a/src/modules/Table/WorkingTable/useColumns.jsx b/src/modules/Table/WorkingTable/useColumns.jsx index f2913ad..d988161 100644 --- a/src/modules/Table/WorkingTable/useColumns.jsx +++ b/src/modules/Table/WorkingTable/useColumns.jsx @@ -71,8 +71,8 @@ export const useColumns = () => { }, { title: "План", - dataIndex: "plan_first", - key: "plan_first", + dataIndex: "plan_current", + key: "plan_current", width: "120px", ellipsis: true, }, @@ -85,8 +85,8 @@ export const useColumns = () => { }, { title: "Расхождение с прогнозом", - dataIndex: "delta_first", - key: "delta_first", + dataIndex: "delta_current", + key: "delta_current", width: "120px", ellipsis: true, }, diff --git a/src/modules/Table/WorkingTable/useExportWorkingData.js b/src/modules/Table/WorkingTable/useExportWorkingData.js index da58d36..c9f7c03 100644 --- a/src/modules/Table/WorkingTable/useExportWorkingData.js +++ b/src/modules/Table/WorkingTable/useExportWorkingData.js @@ -14,7 +14,7 @@ export const useExportWorkingData = (enabled, onSettled) => { async () => { const params = new URLSearchParams({ "status[]": [STATUSES.working], - "delta_first[]": deltaTraffic, + "delta_current[]": deltaTraffic, "fact[]": factTraffic, "age_day[]": age, });