diff --git a/app/Http/Controllers/Web/StatisticController.php b/app/Http/Controllers/Web/StatisticController.php
index d057afe..3b32157 100644
--- a/app/Http/Controllers/Web/StatisticController.php
+++ b/app/Http/Controllers/Web/StatisticController.php
@@ -25,6 +25,7 @@ class StatisticController extends Controller
$queryEndDate = $request->query('endAt');
$dateRange = $this->dateService->getDateRangeFromRequest($request, $user);
$isRangeOneDay = $this->dateService->isRangeOneDay($dateRange->startDate, $dateRange->endDate);
+ $queryStartOfDateRange = $dateRange->start()->copy()->startOfYear();
// Генерируем ключ кэша на основе параметров запроса
// $cacheKey = $this->generateCacheKey($user, $startDate, $endDate, $isRangeOneDay);
@@ -49,6 +50,7 @@ class StatisticController extends Controller
],
'isOneDay' => $isRangeOneDay,
'recipientPlanOfYear' => $finalData['recipientPlanOfYear'],
+ 'startOfYear' => $queryStartOfDateRange->format('d.m.Y')
]);
}
diff --git a/resources/js/Pages/Statistic/Components/OutcomeColumn.vue b/resources/js/Pages/Statistic/Components/OutcomeColumn.vue
index f9bdb67..8468605 100644
--- a/resources/js/Pages/Statistic/Components/OutcomeColumn.vue
+++ b/resources/js/Pages/Statistic/Components/OutcomeColumn.vue
@@ -1,7 +1,7 @@
@@ -69,12 +83,14 @@ const typePlan = computed(() => {
-
+
{{ value }}
-
+
+
planTooltipShow = show"
>
{
- План: {{ plan.period_plan }}, выполнено: {{ value }}
+ План: {{ plan.period_plan }}
- Долг с начала года: {{ plan.debt_from_year }}
+ Долг с {{ startOfYear }}: {{ plan.debt_from_year }}
diff --git a/resources/js/Pages/Statistic/Index.vue b/resources/js/Pages/Statistic/Index.vue
index 0045f1d..8fde915 100644
--- a/resources/js/Pages/Statistic/Index.vue
+++ b/resources/js/Pages/Statistic/Index.vue
@@ -43,6 +43,9 @@ const props = defineProps({
recipientPlanOfYear: {
type: Object,
default: {}
+ },
+ startOfYear: {
+ type: String
}
})
@@ -183,7 +186,8 @@ const columns = ref([
{
isTotalRow: row.isTotalRow,
value: row.outcome,
- plan: row.plan
+ plan: row.plan,
+ startOfYear: props.startOfYear
}
)
}