From 040c83c4d14cbb504e5d7ffd97350c2177e87bc4 Mon Sep 17 00:00:00 2001
From: Brusnitsyn <andrew.brusnitsyn@gmail.com>
Date: Mon, 6 Jul 2026 13:58:56 +0000
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=BE=D1=86=D0=B5=D0=BD=D1=82-=D0=B1=D0=B5=D0=B9=D0=B4?=
 =?UTF-8?q?=D0=B6=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../js/Pages/Statistic/Components/OutcomeColumn.vue   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/resources/js/Pages/Statistic/Components/OutcomeColumn.vue b/resources/js/Pages/Statistic/Components/OutcomeColumn.vue
index d222128..9a0162e 100644
--- a/resources/js/Pages/Statistic/Components/OutcomeColumn.vue
+++ b/resources/js/Pages/Statistic/Components/OutcomeColumn.vue
@@ -43,6 +43,13 @@ const typePlan = computed(() => {
     if (props.plan.debt_from_year > 10) return 'warning'
     return 'success'
 })
+
+// % выполнения плана именно за выбранный период (не с начала года)
+const periodPercent = computed(() => {
+    const planForPeriod = Number(props.plan?.period_plan ?? 0)
+    if (!planForPeriod) return 0
+    return Math.round((Number(props.value) * 100) / planForPeriod)
+})
 </script>
 
 <template>
@@ -71,13 +78,13 @@ const typePlan = computed(() => {
                   :arrow="false"
         >
             <template #trigger>
-                <NTag :type="percentType(plan.cumulative_percent)"
+                <NTag :type="percentType(periodPercent)"
                       round
                       :bordered="false"
                       size="tiny"
                       class="absolute! -right-1.5 bottom-2.5 text-xs"
                 >
-                    {{ plan.cumulative_percent }}%
+                    {{ periodPercent }}%
                 </NTag>
             </template>
             <NSpace vertical>