diff --git a/src/assets/css/style.css b/src/assets/css/style.css
index 7e4268c..934f459 100755
--- a/src/assets/css/style.css
+++ b/src/assets/css/style.css
@@ -1261,6 +1261,10 @@ body {
   margin-bottom: 0.25rem;
 }
 
+.mb-10 {
+  margin-bottom: 2.5rem;
+}
+
 .mb-2 {
   margin-bottom: 0.5rem;
 }
@@ -1373,10 +1377,6 @@ body {
   margin-top: 1.5rem;
 }
 
-.mb-10 {
-  margin-bottom: 2.5rem;
-}
-
 .box-border {
   box-sizing: border-box;
 }
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_DispatchingTimeGangguan.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_DispatchingTimeGangguan.vue
index 8f6b166..0f07149 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_DispatchingTimeGangguan.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_DispatchingTimeGangguan.vue
@@ -183,9 +183,7 @@ const filterData = (params: any) => {
   })
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
-      queryResult.data.monalisaDispatchingTimeGangguan.forEach((item: any) => {
-        data.value = [...data.value, { ...item }]
-      })
+      data.value = queryResult.data.monalisaDispatchingTimeGangguan
     }
     console.log(queryResult.data)
     console.log(queryResult.loading)
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ENSGangguan.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ENSGangguan.vue
index 8f4c199..297d283 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ENSGangguan.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ENSGangguan.vue
@@ -3,98 +3,36 @@
     <Type2 @update:filters="(value) => (filters = value)" />
   </Filters>
   <div id="data">
-    <DxDataGrid
-      class="max-h-[calc(100vh-140px)] mb-10"
-      :data-source="data"
-      :show-column-lines="true"
-      :show-row-lines="false"
-      :show-borders="true"
-      :row-alternation-enabled="true"
-      :hover-state-enabled="true"
-      @selection-changed="onSelectionChanged"
-      @exporting="onExporting"
-      :allow-column-resizing="true"
-      column-resizing-mode="widget"
-      :word-wrap-enabled="true"
-    >
+    <DxDataGrid class="max-h-[calc(100vh-140px)] mb-10" :data-source="data" :show-column-lines="true"
+      :show-row-lines="false" :show-borders="true" :row-alternation-enabled="true" :hover-state-enabled="true"
+      @selection-changed="onSelectionChanged" @exporting="onExporting" :allow-column-resizing="true"
+      column-resizing-mode="widget" :word-wrap-enabled="true">
       <DxSelection mode="single" />
       <DxPaging :enabled="false" />
       <DxScrolling column-rendering-mode="virtual" mode="virtual" />
-      <DxLoadPanel
-        :position="position"
-        :show-indicator="showIndicator"
-        :show-pane="showPane"
-        :shading="shading"
-        v-if="loading"
-        v-model:visible="loading"
-        :enabled="true"
-      />
+      <DxLoadPanel :position="position" :show-indicator="showIndicator" :show-pane="showPane" :shading="shading"
+        v-if="loading" v-model:visible="loading" :enabled="true" />
       <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
-      <DxExport
-        :enabled="true"
-        :formats="['pdf', 'xlsx', 'document']"
-        :allow-export-selected-data="false"
-      />
+      <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_posko" 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="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>
         <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="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>
       </DxColumn>
     </DxDataGrid>
@@ -137,28 +75,34 @@ const dataDetail = ref<any>()
 const showDetail = ref(false)
 const monalisaRekapitulasiEnsGangguan = gql`
   query DaftarmonalisaRekapitulasiEnsGangguan(
-    $regional: String
-    $posko: Int
+    #$regional: String
+    $idUlp: Int
     $idUid: Int
     $idUp3: Int
     $bulan: Int
     $tahun: Int
   ) {
     monalisaRekapitulasiEnsGangguan(
-      regional: $regional
-      posko: $posko
+      #regional: $regional
+      idUlp: $idUlp
       idUid: $idUid
       idUp3: $idUp3
       bulan: $bulan
       tahun: $tahun
     ) {
-      jumlah_bulan
-      jumlah_bulan_n_1
-      jumlah_tahun
-      jumlah_tahun_n_1
-      nama_posko
-      persen_bulan
-      persen_tahun
+      nama_regional
+      id_uid
+      nama_uid
+      id_up3
+      nama_up3
+      id_ulp
+      nama_ulp
+      mom_bulan_ini
+      mom_bulan_kemarin
+      persen_mom
+      yoy_tahun_ini
+      yoy_tahun_kemarin
+      persen_yoy
     }
   }
 `
@@ -166,18 +110,18 @@ const { onResult, onError, loading, refetch } = useQuery(monalisaRekapitulasiEns
   bulan: 10,
   tahun: 2023,
   regional: '',
-  posko: '',
+  idUlp: 0,
   idUid: 0,
   idUp3: 0
 })
 const filterData = (params: any) => {
-  const { regional, posko, idUid, idUp3, bulan, tahun } = params
+  const { regional, ulp, idUid, idUp3, bulan, tahun } = params
   bulanSekarang.value = bulan.id
   tahunSekarang.value = tahun.id
   tahunLalu.value = tahun.id - 1
   refetch({
     regional: regional,
-    posko: posko ? posko.id : 0,
+    idUlp: ulp ? ulp.id : 0,
     idUid: idUid ? idUid.id : 0,
     idUp3: idUp3 ? idUp3.id : 0,
     bulan: bulan ? bulan.id : 10,
@@ -185,14 +129,7 @@ const filterData = (params: any) => {
   })
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
-      queryResult.data.monalisaRekapitulasiEnsGangguan.forEach((item: any) => {
-        data.value = [
-          ...data.value,
-          {
-            ...item
-          }
-        ]
-      })
+      data.value = queryResult.data.monalisaRekapitulasiEnsGangguan
     }
     console.log(queryResult.data)
     console.log(queryResult.loading)
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanBelumSelesai.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanBelumSelesai.vue
index 7c669ee..94bdff5 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanBelumSelesai.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanBelumSelesai.vue
@@ -3,71 +3,27 @@
     <Type2 @update:filters="(value) => (filters = value)" />
   </Filters>
   <div id="data">
-    <DxDataGrid
-      class="max-h-[calc(100vh-140px)] mb-10"
-      :data-source="data"
-      :show-column-lines="true"
-      :show-row-lines="false"
-      :show-borders="true"
-      :row-alternation-enabled="true"
-      :hover-state-enabled="true"
-      @selection-changed="onSelectionChanged"
-      @exporting="onExporting"
-      :allow-column-resizing="true"
-      column-resizing-mode="widget"
-      :word-wrap-enabled="true"
-    >
+    <DxDataGrid class="max-h-[calc(100vh-140px)] mb-10" :data-source="data" :show-column-lines="true"
+      :show-row-lines="false" :show-borders="true" :row-alternation-enabled="true" :hover-state-enabled="true"
+      @selection-changed="onSelectionChanged" @exporting="onExporting" :allow-column-resizing="true"
+      column-resizing-mode="widget" :word-wrap-enabled="true">
       <DxSelection mode="single" />
       <DxPaging :enabled="false" />
       <DxScrolling column-rendering-mode="virtual" mode="virtual" />
-      <DxLoadPanel
-        :position="position"
-        :show-indicator="showIndicator"
-        :show-pane="showPane"
-        :shading="shading"
-        v-if="loading"
-        v-model:visible="loading"
-        :enabled="true"
-      />
+      <DxLoadPanel :position="position" :show-indicator="showIndicator" :show-pane="showPane" :shading="shading"
+        v-if="loading" v-model:visible="loading" :enabled="true" />
       <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
-      <DxExport
-        :enabled="true"
-        :formats="['pdf', 'xlsx', 'document']"
-        :allow-export-selected-data="false"
-      />
+      <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_posko" 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"
-          css-class="custom-table-column"
-        />
-        <DxColumn
-          :width="150"
-          alignment="center"
-          data-field="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"
-        />
+        <DxColumn :width="150" alignment="center" data-field="gangguan" data-type="number" caption="Gangguan"
+          css-class="custom-table-column" />
+        <DxColumn :width="150" alignment="center" data-field="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" />
       </DxColumn>
     </DxDataGrid>
   </div>
@@ -108,59 +64,58 @@ const dataDetail = ref<any>()
 const showDetail = ref(false)
 const monalisaGangguanBelumSelesai = gql`
   query DaftarmonalisaGangguanBelumSelesai(
-    $regional: String
-    $posko: Int
+    #$regional: String
+    $idUlp: Int
     $idUid: Int
     $idUp3: Int
     $bulan: Int
     $tahun: Int
   ) {
     monalisaGangguanBelumSelesai(
-      regional: $regional
-      posko: $posko
+      #regional: $regional
+      idUlp: $idUlp
       idUid: $idUid
       idUp3: $idUp3
       bulan: $bulan
       tahun: $tahun
     ) {
-      gangguan
-      informasi
-      nama_posko
+      nama_regional
+      id_uid
+      nama_uid
+      id_up3
+      nama_up3
+      id_ulp
+      nama_ulp
+      jumlah_gangguan
+      jumlah_informasi
       total
     }
   }
 `
 const { onResult, onError, loading, refetch } = useQuery(monalisaGangguanBelumSelesai, {
   regional: '',
-  posko: '',
+  idUlp: 0,
   idUid: 0,
   idUp3: 0,
   bulan: 10,
   tahun: 2023
 })
 const filterData = (params: any) => {
-  const { regional, posko, idUid, idUp3, bulan, tahun } = params
+  const { regional, ulp, uid, up3, bulan, tahun } = params
   bulanSekarang.value = bulan.id
   tahunSekarang.value = tahun.id
   tahunLalu.value = tahun.id - 1
   refetch({
     regional: regional,
-    posko: posko ? posko.id : 0,
-    idUid: idUid ? idUid.id : 0,
-    idUp3: idUp3 ? idUp3.id : 0,
+    idUlp: ulp ? ulp.id : 0,
+    idUid: uid ? uid.id : 0,
+    idUp3: up3 ? up3.id : 0,
     bulan: bulan ? bulan.id : 10,
     tahun: bulan ? tahun.id : 2023
   })
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
-      queryResult.data.monalisaGangguanBelumSelesai.forEach((item: any) => {
-        data.value = [
-          ...data.value,
-          {
-            ...item
-          }
-        ]
-      })
+      data.value = queryResult.data.monalisaGangguanBelumSelesai
     }
     console.log(queryResult.data)
     console.log(queryResult.loading)
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanPerJenisGangguan.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanPerJenisGangguan.vue
index 334bdff..5bed7bd 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanPerJenisGangguan.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanPerJenisGangguan.vue
@@ -109,14 +109,7 @@ const filterData = (params: any) => {
   })
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
-      queryResult.data.monalisaGangguanPerJenisGangguan.forEach((item: any) => {
-        data.value = [
-          ...data.value,
-          {
-            ...item
-          }
-        ]
-      })
+      data.value = queryResult.data.monalisaGangguanPerJenisGangguan
     }
     console.log(queryResult.data)
     console.log(queryResult.loading)
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahDDRPTRCTGangguan.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahDDRPTRCTGangguan.vue
index abd71d5..57508e6 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahDDRPTRCTGangguan.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahDDRPTRCTGangguan.vue
@@ -179,9 +179,7 @@ const filterData = (params: any) => {
   })
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
-      queryResult.data.monalisaJumlahDurasiRptRctGangguan.forEach((item: any) => {
-        data.value = [...data.value, { ...item }]
-      })
+      data.value = queryResult.data.monalisaJumlahDurasiRptRctGangguan
     }
     console.log(queryResult.data)
     console.log(queryResult.loading)
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_LaporUlang.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_LaporUlang.vue
index b64496c..4dbde6e 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_LaporUlang.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_LaporUlang.vue
@@ -75,28 +75,34 @@ const dataDetail = ref<any>()
 const showDetail = ref(false)
 const monalisaRekapitulasiLaporUlangGangguan = gql`
   query DaftarmonalisaRekapitulasiLaporUlangGangguan(
-    $regional: String
-    $posko: Int
+    #$regional: String
+    $idUlp: Int
     $idUid: Int
     $idUp3: Int
     $bulan: Int
     $tahun: Int
   ) {
     monalisaRekapitulasiLaporUlangGangguan(
-      regional: $regional
-      posko: $posko
+      #regional: $regional
+      idUlp: $idUlp
       idUid: $idUid
       idUp3: $idUp3
       bulan: $bulan
       tahun: $tahun
     ) {
-      jumlah_bulan
-      jumlah_bulan_n_1
-      jumlah_tahun
-      jumlah_tahun_n_1
-      nama_posko
-      persen_bulan
-      persen_tahun
+      nama_regional
+      id_uid
+      nama_uid
+      id_up3
+      nama_up3
+      id_ulp
+      nama_ulp
+      mom_bulan_ini
+      mom_bulan_kemarin
+      persen_mom
+      yoy_tahun_ini
+      yoy_tahun_kemarin
+      persen_yoy
     }
   }
 `
@@ -104,18 +110,18 @@ const { onResult, onError, loading, refetch } = useQuery(monalisaRekapitulasiLap
   bulan: 10,
   tahun: 2023,
   regional: '',
-  posko: '',
+  idUlp: 0,
   idUid: 0,
   idUp3: 0
 })
 const filterData = (params: any) => {
-  const { regional, posko, uid, up3, bulan, tahun } = params
+  const { regional, ulp, uid, up3, bulan, tahun } = params
   bulanSekarang.value = bulan.id
   tahunSekarang.value = tahun.id
   tahunLalu.value = tahun.id - 1
   refetch({
     regional: regional,
-    posko: posko ? posko.id : 0,
+    idUlp: ulp ? ulp.id : 0,
     idUid: uid ? uid.id : 0,
     idUp3: up3 ? up3.id : 0,
     bulan: bulan ? bulan.id : 10,
@@ -123,14 +129,7 @@ const filterData = (params: any) => {
   })
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
-      queryResult.data.monalisaRekapitulasiLaporUlangGangguan.forEach((item: any) => {
-        data.value = [
-          ...data.value,
-          {
-            ...item
-          }
-        ]
-      })
+      data.value = queryResult.data.monalisaRekapitulasiLaporUlangGangguan
     }
     console.log(queryResult.data)
     console.log(queryResult.loading)
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_RecoveryTimeGangguan.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_RecoveryTimeGangguan.vue
index 8780cd1..ec20dcf 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_RecoveryTimeGangguan.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_RecoveryTimeGangguan.vue
@@ -154,14 +154,7 @@ const filterData = (params: any) => {
   })
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
-      queryResult.data.monalisaRecoveryTimeGangguan.forEach((item: any) => {
-        data.value = [
-          ...data.value,
-          {
-            ...item
-          }
-        ]
-      })
+      data.value = queryResult.data.monalisaRecoveryTimeGangguan
     }
     console.log(queryResult.data)
     console.log(queryResult.loading)
diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ResponseTimeGangguan.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ResponseTimeGangguan.vue
index 6f45c67..809eee2 100755
--- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ResponseTimeGangguan.vue
+++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ResponseTimeGangguan.vue
@@ -154,14 +154,7 @@ const filterData = (params: any) => {
   })
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
-      queryResult.data.monalisaResponseTimeKeluhan.forEach((item: any) => {
-        data.value = [
-          ...data.value,
-          {
-            ...item
-          }
-        ]
-      })
+      data.value = queryResult.data.monalisaResponseTimeKeluhan
     }
     console.log(queryResult.data)
     console.log(queryResult.loading)