diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_DispatchingTimeGangguan.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_DispatchingTimeGangguan.vue
index 0f07149..e18f2bc 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_DispatchingTimeGangguan.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_DispatchingTimeGangguan.vue
@@ -24,17 +24,17 @@
       <DxColumn alignment="center" caption="Jumlah Dispatching Time Gangguan" css-class="custom-table-column">
         <DxColumn alignment="center" caption="MoM" css-class="custom-table-column">
           <DxColumn :width="150" alignment="center" data-field="mom_bulan_kemarin" data-type="number"
-            :caption="`${getMonthName(bulanSekarang)} ${tahunLalu}`" css-class="custom-table-column" />
+            :caption="`${getMonthName(currentMonth)} ${lastYear}`" css-class="custom-table-column" />
           <DxColumn :width="150" alignment="center" data-field="mom_bulan_ini" data-type="number"
-            :caption="`${getMonthName(bulanSekarang)} ${tahunSekarang}`" css-class="custom-table-column" />
+            :caption="`${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column" />
           <DxColumn :width="150" alignment="center" data-field="persen_mom" data-type="number" caption="%"
             css-class="custom-table-column" />
         </DxColumn>
         <DxColumn alignment="center" caption="YoY" css-class="custom-table-column">
           <DxColumn :width="150" alignment="center" data-field="yoy_tahun_kemarin" data-type="number"
-            :caption="`s.d ${getMonthName(bulanSekarang)} ${tahunLalu}`" css-class="custom-table-column" />
+            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`" css-class="custom-table-column" />
           <DxColumn :width="150" alignment="center" data-field="yoy_tahun_ini" data-type="number"
-            :caption="`s.d ${getMonthName(bulanSekarang)} ${tahunSekarang}`" css-class="custom-table-column" />
+            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column" />
           <DxColumn :width="150" alignment="center" data-field="persen_yoy" data-type="number" caption="%"
             css-class="custom-table-column" />
         </DxColumn>
@@ -67,9 +67,9 @@ import { useQuery } from '@vue/apollo-composable'
 import gql from 'graphql-tag'
 import { getMonthName } from '@/utils/texts'
 
-const tahunSekarang = ref(new Date().getFullYear())
-const bulanSekarang = ref(new Date().getMonth())
-const tahunLalu = ref(tahunSekarang.value - 1)
+const currentYear = ref(new Date().getFullYear())
+const currentMonth = ref(new Date().getMonth())
+const lastYear = ref(currentYear.value - 1)
 const position = { of: '#data' }
 const showIndicator = ref(true)
 const shading = ref(true)
@@ -164,22 +164,22 @@ const { onResult, onError, loading, refetch } = useQuery(monalisaDispatchingTime
   idUp3: 0,
   idUid: 0,
   idUlp: 0,
-  bulan: bulanSekarang.value,
-  tahun: tahunSekarang.value
+  bulan: currentMonth.value,
+  tahun: currentYear.value
 })
 
 const filterData = (params: any) => {
   const { regional, ulp, uid, up3, bulan, tahun } = params
-  bulanSekarang.value = bulan.id
-  tahunSekarang.value = tahun.id
-  tahunLalu.value = tahun.id - 1
+  currentMonth.value = bulan.id
+  currentYear.value = tahun.id
+  lastYear.value = tahun.id - 1
   refetch({
     // regional: regional,
     idUid: uid ? uid.id : 0,
     idUp3: up3 ? up3.id : 0,
     idUlp: ulp ? ulp.id : 0,
-    bulan: bulan ? bulan.id : bulanSekarang.value,
-    tahun: bulan ? tahun.id : tahunSekarang.value
+    bulan: bulan ? bulan.id : currentMonth.value,
+    tahun: bulan ? tahun.id : currentYear.value
   })
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ENSGangguan.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ENSGangguan.vue
index 297d283..d351035 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ENSGangguan.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ENSGangguan.vue
@@ -16,25 +16,29 @@
       <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
       <DxColumnFixing :enabled="true" />
 
-      <DxColumn alignment="center" data-field="nama_posko" caption="Nama Unit" css-class="custom-table-column" />
+      <DxColumn :width="200" alignment="center" data-field="nama_ulp" caption="Nama Unit"
+        css-class="custom-table-column" />
       <DxColumn alignment="center" caption="ENS Gangguan" css-class="custom-table-column">
         <DxColumn alignment="center" caption="MoM" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="jumlah_bulan" data-type="number"
-            :caption="`${getMonthName(bulanSekarang)} ${tahunLalu}`" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="jumlah_bulan_n_1" data-type="number"
-            :caption="`${getMonthName(bulanSekarang)} ${tahunSekarang}`" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="persen_bulan" data-type="number" caption="%"
-            css-class="custom-table-column" />
+          <DxColumn :width="150" alignment="center" data-field="mom_bulan_kemarin" data-type="number"
+            :caption="`${getMonthName(currentMonth)} ${lastYear}`" css-class="custom-table-column" />
+          <DxColumn :width="150" alignment="center" data-field="mom_bulan_ini" data-type="number"
+            :caption="`${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column" />
+          <DxColumn :width="150" alignment="center" data-field="persen_mom" data-type="number" caption="%"
+            css-class="custom-table-column" cell-template="percent" />
         </DxColumn>
         <DxColumn alignment="center" caption="YoY" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="jumlah_tahun" data-type="number"
-            :caption="`s.d ${getMonthName(bulanSekarang)} ${tahunLalu}`" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="jumlah_tahun_n_1" data-type="number"
-            :caption="`s.d ${getMonthName(bulanSekarang)} ${tahunSekarang}`" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="persen_tahun" data-type="number" caption="%"
-            css-class="custom-table-column" />
+          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_kemarin" data-type="number"
+            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`" css-class="custom-table-column" />
+          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_ini" data-type="number"
+            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column" />
+          <DxColumn :width="150" alignment="center" data-field="persen_yoy" data-type="number" caption="%"
+            css-class="custom-table-column" cell-template="percent" />
         </DxColumn>
       </DxColumn>
+      <template #percent="{ data }">
+        {{ data.text }}%
+      </template>
     </DxDataGrid>
   </div>
 </template>
@@ -63,9 +67,9 @@ import { useQuery } from '@vue/apollo-composable'
 import gql from 'graphql-tag'
 import { getMonthName } from '@/utils/texts'
 
-const tahunSekarang = ref(new Date().getFullYear())
-const bulanSekarang = ref(new Date().getMonth())
-const tahunLalu = ref(tahunSekarang.value - 1)
+const currentYear = ref(new Date().getFullYear())
+const currentMonth = ref(new Date().getMonth())
+const lastYear = ref(currentYear.value - 1)
 const position = { of: '#data' }
 const showIndicator = ref(true)
 const shading = ref(true)
@@ -115,15 +119,15 @@ const { onResult, onError, loading, refetch } = useQuery(monalisaRekapitulasiEns
   idUp3: 0
 })
 const filterData = (params: any) => {
-  const { regional, ulp, idUid, idUp3, bulan, tahun } = params
-  bulanSekarang.value = bulan.id
-  tahunSekarang.value = tahun.id
-  tahunLalu.value = tahun.id - 1
+  const { regional, ulp, uid, up3, bulan, tahun } = params
+  currentMonth.value = bulan.id
+  currentYear.value = tahun.id
+  lastYear.value = tahun.id - 1
   refetch({
     regional: regional,
     idUlp: ulp ? ulp.id : 0,
-    idUid: idUid ? idUid.id : 0,
-    idUp3: idUp3 ? idUp3.id : 0,
+    idUid: uid ? uid.id : 0,
+    idUp3: up3 ? up3.id : 0,
     bulan: bulan ? bulan.id : 10,
     tahun: bulan ? tahun.id : 2023
   })
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanBelumSelesai.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanBelumSelesai.vue
index 94bdff5..bb41015 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanBelumSelesai.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanBelumSelesai.vue
@@ -16,11 +16,11 @@
       <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
       <DxColumnFixing :enabled="true" />
 
-      <DxColumn alignment="center" data-field="nama_posko" caption="Nama Unit" css-class="custom-table-column" />
+      <DxColumn alignment="center" data-field="nama_ulp" caption="Nama Unit" css-class="custom-table-column" />
       <DxColumn alignment="center" caption="Tahun" css-class="custom-table-column">
-        <DxColumn :width="150" alignment="center" data-field="gangguan" data-type="number" caption="Gangguan"
+        <DxColumn :width="150" alignment="center" data-field="jumlah_gangguan" data-type="number" caption="Gangguan"
           css-class="custom-table-column" />
-        <DxColumn :width="150" alignment="center" data-field="informasi" data-type="number" caption="Informasi"
+        <DxColumn :width="150" alignment="center" data-field="jumlah_informasi" data-type="number" caption="Informasi"
           css-class="custom-table-column" />
         <DxColumn :width="150" alignment="center" data-field="total" data-type="number" caption="Total"
           css-class="custom-table-column" />
@@ -52,9 +52,9 @@ import { Workbook } from 'exceljs'
 import { useQuery } from '@vue/apollo-composable'
 import gql from 'graphql-tag'
 
-const tahunSekarang = ref(new Date().getFullYear())
-const bulanSekarang = ref(new Date().getMonth())
-const tahunLalu = ref(tahunSekarang.value - 1)
+const currentYear = ref(new Date().getFullYear())
+const currentMonth = ref(new Date().getMonth())
+const lastYear = ref(currentYear.value - 1)
 const position = { of: '#data' }
 const showIndicator = ref(true)
 const shading = ref(true)
@@ -102,9 +102,9 @@ const { onResult, onError, loading, refetch } = useQuery(monalisaGangguanBelumSe
 })
 const filterData = (params: any) => {
   const { regional, ulp, uid, up3, bulan, tahun } = params
-  bulanSekarang.value = bulan.id
-  tahunSekarang.value = tahun.id
-  tahunLalu.value = tahun.id - 1
+  currentMonth.value = bulan.id
+  currentYear.value = tahun.id
+  lastYear.value = tahun.id - 1
   refetch({
     regional: regional,
     idUlp: ulp ? ulp.id : 0,
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanPerJenisGangguan.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanPerJenisGangguan.vue
index 5bed7bd..b1c2834 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanPerJenisGangguan.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanPerJenisGangguan.vue
@@ -23,10 +23,12 @@
         css-class="custom-table-column" />
       <DxColumn :width="170" alignment="center" data-field="jumlah" caption="Jumlah" css-class="custom-table-column" />
       <DxColumn :width="120" alignment="center" data-field="persen" caption="%" css-class="custom-table-column"
-        cell-template="percent" />
+        data-type="number" cell-template="percent" />
 
-      <template #percent="data">
-        {{ data.text }}%
+      <template #percent="{ data }">
+        <p class="cursor-pointer">
+          {{ data.text }}%
+        </p>
       </template>
     </DxDataGrid>
   </div>
@@ -54,9 +56,9 @@ import { saveAs } from 'file-saver'
 import { Workbook } from 'exceljs'
 import { useQuery } from '@vue/apollo-composable'
 import gql from 'graphql-tag'
-const tahunSekarang = ref(new Date().getFullYear())
-const bulanSekarang = ref(new Date().getMonth())
-const tahunLalu = ref(tahunSekarang.value - 1)
+const currentYear = ref(new Date().getFullYear())
+const currentMonth = ref(new Date().getMonth())
+const lastYear = ref(currentYear.value - 1)
 const position = { of: '#data' }
 const showIndicator = ref(true)
 const shading = ref(true)
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahDDRPTRCTGangguan.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahDDRPTRCTGangguan.vue
index 57508e6..72270a4 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahDDRPTRCTGangguan.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahDDRPTRCTGangguan.vue
@@ -16,7 +16,7 @@
       <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
       <DxColumnFixing :enabled="true" />
 
-      <DxColumn alignment="center" data-field="nama_posko" caption="Nama Unit" css-class="custom-table-column" />
+      <DxColumn alignment="center" data-field="nama_ulp" caption="Nama Unit" css-class="custom-table-column" />
       <DxColumn alignment="center" caption="Jumlah dan Durasi RPT & RCT Gangguan" css-class="custom-table-column">
         <DxColumn alignment="center" :caption="`${getMonthName(currentMonth)} ${currentYear}`"
           css-class="custom-table-column">
@@ -48,8 +48,8 @@
         <DxColumn alignment="center" :caption="`s.d ${getMonthName(currentMonth)} ${currentYear} `"
           css-class="custom-table-column">
           <DxColumn alignment="center" caption="Total RPT" css-class="custom-table-column">
-            <DxColumn :width="150" alignment="center" caption="a" data-type="number" data-field="total_rpt_sampai_bulan"
-              css-class="custom-table-column" />
+            <DxColumn :width="150" alignment="center" caption="a" data-type="number"
+              data-field="total_durasi_response_time_tahun_ini" css-class="custom-table-column" />
           </DxColumn>
           <DxColumn alignment="center" caption="Jumlah Gangguan" css-class="custom-table-column">
             <DxColumn :width="150" alignment="center" caption="b" data-type="number"
@@ -60,8 +60,8 @@
               data-field="rpt_gangguan_sampai_bulan" css-class="custom-table-column" />
           </DxColumn>
           <DxColumn alignment="center" caption="Total RCT" css-class="custom-table-column">
-            <DxColumn :width="150" alignment="center" caption="d" data-type="number" data-field="total_rct_sampai_bulan"
-              css-class="custom-table-column" />
+            <DxColumn :width="150" alignment="center" caption="d" data-type="number"
+              data-field="total_durasi_recovery_time_tahun_ini" css-class="custom-table-column" />
           </DxColumn>
           <DxColumn alignment="center" caption="Jumlah Gangguan" css-class="custom-table-column">
             <DxColumn :width="150" alignment="center" caption="e" data-type="number"
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_LaporUlang.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_LaporUlang.vue
index 4dbde6e..ac3cdf1 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_LaporUlang.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_LaporUlang.vue
@@ -16,25 +16,29 @@
       <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
       <DxColumnFixing :enabled="true" />
 
-      <DxColumn alignment="center" data-field="nama_posko" caption="Nama Unit" css-class="custom-table-column" />
+      <DxColumn :width="200" alignment="center" data-field="nama_ulp" caption="Nama Unit"
+        css-class="custom-table-column" />
       <DxColumn alignment="center" caption="Lapor Ulang Gangguan" css-class="custom-table-column">
         <DxColumn alignment="center" caption="MoM" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="jumlah_bulan" data-type="number"
-            :caption="`${getMonthName(bulanSekarang)} ${tahunLalu}`" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="jumlah_bulan_n_1" data-type="number"
-            :caption="`${getMonthName(bulanSekarang)} ${tahunSekarang}`" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="persen_bulan" data-type="number" caption="%"
-            css-class="custom-table-column" />
+          <DxColumn :width="150" alignment="center" data-field="mom_bulan_kemarin" data-type="number"
+            :caption="`${getMonthName(currentMonth)} ${lastYear}`" css-class="custom-table-column" />
+          <DxColumn :width="150" alignment="center" data-field="mom_bulan_ini" data-type="number"
+            :caption="`${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column" />
+          <DxColumn :width="150" alignment="center" data-field="persen_mom" data-type="number" caption="%"
+            css-class="custom-table-column" cell-template="percent" />
         </DxColumn>
         <DxColumn alignment="center" caption="YoY" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="jumlah_tahun" data-type="number"
-            :caption="`s.d ${getMonthName(bulanSekarang)} ${tahunLalu}`" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="jumlah_tahun_n_1" data-type="number"
-            :caption="`s.d ${getMonthName(bulanSekarang)} ${tahunSekarang}`" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="persen_tahun" data-type="number" caption="%"
-            css-class="custom-table-column" />
+          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_kemarin" data-type="number"
+            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`" css-class="custom-table-column" />
+          <DxColumn :width="150" alignment="center" data-field="yoy_tahun_ini" data-type="number"
+            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column" />
+          <DxColumn :width="150" alignment="center" data-field="persen_yoy" data-type="number" caption="%"
+            css-class="custom-table-column" cell-template="percent" />
         </DxColumn>
       </DxColumn>
+      <template #percent="{ data }">
+        {{ data.text }}%
+      </template>
     </DxDataGrid>
   </div>
 </template>
@@ -63,9 +67,9 @@ import { useQuery } from '@vue/apollo-composable'
 import gql from 'graphql-tag'
 import { getMonthName } from '@/utils/texts'
 
-const tahunSekarang = ref(new Date().getFullYear())
-const bulanSekarang = ref(new Date().getMonth())
-const tahunLalu = ref(tahunSekarang.value - 1)
+const currentYear = ref(new Date().getFullYear())
+const currentMonth = ref(new Date().getMonth())
+const lastYear = ref(currentYear.value - 1)
 const position = { of: '#data' }
 const showIndicator = ref(true)
 const shading = ref(true)
@@ -116,9 +120,9 @@ const { onResult, onError, loading, refetch } = useQuery(monalisaRekapitulasiLap
 })
 const filterData = (params: any) => {
   const { regional, ulp, uid, up3, bulan, tahun } = params
-  bulanSekarang.value = bulan.id
-  tahunSekarang.value = tahun.id
-  tahunLalu.value = tahun.id - 1
+  currentMonth.value = bulan.id
+  currentYear.value = tahun.id
+  lastYear.value = tahun.id - 1
   refetch({
     regional: regional,
     idUlp: ulp ? ulp.id : 0,
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_RecoveryTimeGangguan.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_RecoveryTimeGangguan.vue
index ec20dcf..af1cd1a 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_RecoveryTimeGangguan.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_RecoveryTimeGangguan.vue
@@ -24,17 +24,17 @@
       <DxColumn alignment="center" caption="Jumlah RCT Kali Gangguan" css-class="custom-table-column">
         <DxColumn alignment="center" caption="MoM" css-class="custom-table-column">
           <DxColumn :width="150" alignment="center" data-field="mom_bulan_kemarin" data-type="number"
-            :caption="`${getMonthName(bulanSekarang)} ${tahunLalu}`" css-class="custom-table-column" />
+            :caption="`${getMonthName(currentMonth)} ${lastYear}`" css-class="custom-table-column" />
           <DxColumn :width="150" alignment="center" data-field="mom_bulan_ini" data-type="number"
-            :caption="`${getMonthName(bulanSekarang)} ${tahunSekarang}`" css-class="custom-table-column" />
+            :caption="`${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column" />
           <DxColumn :width="150" alignment="center" data-field="persen_mom" data-type="number" caption="%"
             css-class="custom-table-column" />
         </DxColumn>
         <DxColumn alignment="center" caption="YoY" css-class="custom-table-column">
           <DxColumn :width="150" alignment="center" data-field="yoy_tahun_kemarin" data-type="number"
-            :caption="`s.d ${getMonthName(bulanSekarang)} ${tahunLalu}`" css-class="custom-table-column" />
+            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`" css-class="custom-table-column" />
           <DxColumn :width="150" alignment="center" data-field="yoy_tahun_ini" data-type="number"
-            :caption="`s.d ${getMonthName(bulanSekarang)} ${tahunSekarang}`" css-class="custom-table-column" />
+            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column" />
           <DxColumn :width="150" alignment="center" data-field="persen_yoy" data-type="number" caption="%"
             css-class="custom-table-column" />
         </DxColumn>
@@ -67,9 +67,9 @@ import { useQuery } from '@vue/apollo-composable'
 import gql from 'graphql-tag'
 import { getMonthName } from '@/utils/texts'
 
-const tahunSekarang = ref(new Date().getFullYear())
-const bulanSekarang = ref(new Date().getMonth())
-const tahunLalu = ref(tahunSekarang.value - 1)
+const currentYear = ref(new Date().getFullYear())
+const currentMonth = ref(new Date().getMonth())
+const lastYear = ref(currentYear.value - 1)
 const position = { of: '#data' }
 const showIndicator = ref(true)
 const shading = ref(true)
@@ -135,22 +135,22 @@ const { onResult, onError, loading, refetch } = useQuery(monalisaRecoveryTimeGan
   idUp3: 0,
   idUid: 0,
   idUlp: 0,
-  bulan: bulanSekarang.value,
-  tahun: tahunSekarang.value
+  bulan: currentMonth.value,
+  tahun: currentYear.value
 })
 
 const filterData = (params: any) => {
   const { regional, ulp, uid, up3, bulan, tahun } = params
-  bulanSekarang.value = bulan.id
-  tahunSekarang.value = tahun.id
-  tahunLalu.value = tahun.id - 1
+  currentMonth.value = bulan.id
+  currentYear.value = tahun.id
+  lastYear.value = tahun.id - 1
   refetch({
     // regional: regional,
     idUid: uid ? uid.id : 0,
     idUp3: up3 ? up3.id : 0,
     idUlp: ulp ? ulp.id : 0,
-    bulan: bulan ? bulan.id : bulanSekarang.value,
-    tahun: bulan ? tahun.id : tahunSekarang.value
+    bulan: bulan ? bulan.id : currentMonth.value,
+    tahun: bulan ? tahun.id : currentYear.value
   })
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ResponseTimeGangguan.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ResponseTimeGangguan.vue
index 809eee2..9f80deb 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ResponseTimeGangguan.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ResponseTimeGangguan.vue
@@ -24,17 +24,17 @@
       <DxColumn alignment="center" caption="Jumlah RPT Kali Gangguan" css-class="custom-table-column">
         <DxColumn alignment="center" caption="MoM" css-class="custom-table-column">
           <DxColumn :width="150" alignment="center" data-field="mom_bulan_kemarin" data-type="number"
-            :caption="`${getMonthName(bulanSekarang)} ${tahunLalu}`" css-class="custom-table-column" />
+            :caption="`${getMonthName(currentMonth)} ${lastYear}`" css-class="custom-table-column" />
           <DxColumn :width="150" alignment="center" data-field="mom_bulan_ini" data-type="number"
-            :caption="`${getMonthName(bulanSekarang)} ${tahunSekarang}`" css-class="custom-table-column" />
+            :caption="`${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column" />
           <DxColumn :width="150" alignment="center" data-field="persen_mom" data-type="number" caption="%"
             css-class="custom-table-column" />
         </DxColumn>
         <DxColumn alignment="center" caption="YoY" css-class="custom-table-column">
           <DxColumn :width="150" alignment="center" data-field="yoy_tahun_kemarin" data-type="number"
-            :caption="`s.d ${getMonthName(bulanSekarang)} ${tahunLalu}`" css-class="custom-table-column" />
+            :caption="`s.d ${getMonthName(currentMonth)} ${lastYear}`" css-class="custom-table-column" />
           <DxColumn :width="150" alignment="center" data-field="yoy_tahun_ini" data-type="number"
-            :caption="`s.d ${getMonthName(bulanSekarang)} ${tahunSekarang}`" css-class="custom-table-column" />
+            :caption="`s.d ${getMonthName(currentMonth)} ${currentYear}`" css-class="custom-table-column" />
           <DxColumn :width="150" alignment="center" data-field="persen_yoy" data-type="number" caption="%"
             css-class="custom-table-column" />
         </DxColumn>
@@ -67,9 +67,9 @@ import gql from 'graphql-tag'
 import { useQuery } from '@vue/apollo-composable'
 import { getMonthName } from '@/utils/texts'
 
-const tahunSekarang = ref(new Date().getFullYear())
-const bulanSekarang = ref(new Date().getMonth())
-const tahunLalu = ref(tahunSekarang.value - 1)
+const currentYear = ref(new Date().getFullYear())
+const currentMonth = ref(new Date().getMonth())
+const lastYear = ref(currentYear.value - 1)
 const position = { of: '#data' }
 const showIndicator = ref(true)
 const shading = ref(true)
@@ -135,22 +135,22 @@ const { onResult, onError, loading, refetch } = useQuery(monalisaResponseTimeKel
   idUp3: 0,
   idUid: 0,
   idUlp: 0,
-  bulan: bulanSekarang.value,
-  tahun: tahunSekarang.value
+  bulan: currentMonth.value,
+  tahun: currentYear.value
 })
 
 const filterData = (params: any) => {
   const { regional, ulp, uid, up3, bulan, tahun } = params
-  bulanSekarang.value = bulan.id
-  tahunSekarang.value = tahun.id
-  tahunLalu.value = tahun.id - 1
+  currentMonth.value = bulan.id
+  currentYear.value = tahun.id
+  lastYear.value = tahun.id - 1
   refetch({
     // regional: regional,
     idUid: uid ? uid.id : 0,
     idUp3: up3 ? up3.id : 0,
     idUlp: ulp ? ulp.id : 0,
-    bulan: bulan ? bulan.id : bulanSekarang.value,
-    tahun: bulan ? tahun.id : tahunSekarang.value
+    bulan: bulan ? bulan.id : currentMonth.value,
+    tahun: bulan ? tahun.id : currentYear.value
   })
   onResult((queryResult) => {
     if (queryResult.data != undefined) {