diff --git a/src/components/DatePicker.vue b/src/components/DatePicker.vue
index 2228ef0..a906023 100755
--- a/src/components/DatePicker.vue
+++ b/src/components/DatePicker.vue
@@ -16,7 +16,7 @@ const customShortcuts = () => {
       label: 'Last 15 Days',
       atClick: () => {
         const date = new Date()
-        return [new Date(date.setDate(date.getDate() + 1)), date]
+        return [new Date(date.setDate(date.getDate() - 15)), new Date()]
       }
     },
     {
diff --git a/src/components/Form/FiltersType/Type2.vue b/src/components/Form/FiltersType/Type2.vue
index 6b98562..23a28de 100755
--- a/src/components/Form/FiltersType/Type2.vue
+++ b/src/components/Form/FiltersType/Type2.vue
@@ -15,6 +15,7 @@ import {
 } from './reference'
 import { onMounted, ref } from 'vue'
 import { getMonthName } from '@/utils/texts'
+
 const uidPlaceholder = 'Semua Unit Induk Distribusi/Wilayah'
 const up3Placholder = 'Semua Unit Pelaksanaan Pelayanan Pelanggan'
 const ulpPlaceholder = 'Semua Unit Layanan Pelanggan'
@@ -42,6 +43,7 @@ const tahunIndex = years.value.findIndex((year) => year.id === tahun.value.id)
 if (tahunIndex !== -1) {
   years.value.splice(tahunIndex, 1)
 }
+
 const data = ref({
   regional: regional.value,
   uid: uid.value,
@@ -60,6 +62,7 @@ const setRegional = (value: any) => {
   uid.value = { id: 0, name: uidPlaceholder }
   data.value.regional = value
 }
+
 const setUid = (value: any) => {
   uid.value = value
   selectedUid(value)
@@ -79,15 +82,18 @@ const setUlp = (value: any) => {
   selectedUp3Ulp(value)
   data.value.ulp = value
 }
+
 const setMonth = (value: any) => {
   bulan.value = value
   data.value.bulan = value
   console.log(data.value)
 }
+
 const setYear = (value: any) => {
   tahun.value = value
   data.value.tahun = value
 }
+
 onMounted(() => {
   emit('update:filters', data.value)
   fetchRegional()
@@ -98,25 +104,48 @@ onMounted(() => {
   <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
     <label class="block mb-2 font-semibold text-gray-800 sm:mb-0">Regional:</label>
 
-    <Select @update:selected="setRegional($event)" :data="itemsRegional" :placeholder="regionalPlaceholder" />
+    <Select
+      @update:selected="setRegional($event)"
+      :data="itemsRegional"
+      :placeholder="regionalPlaceholder"
+    />
   </div>
 
   <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="block mb-2 font-semibold text-gray-800 sm:mb-0">Unit Induk Distribusi/Wilayah:</label>
+    <label class="block mb-2 font-semibold text-gray-800 sm:mb-0"
+      >Unit Induk Distribusi/Wilayah:</label
+    >
 
-    <Select @update:selected="setUid($event)" :data="itemsUid" :placeholder="uidPlaceholder" />
+    <Select
+      @update:selected="setUid($event)"
+      :data="itemsUid"
+      :selected="uid"
+      :placeholder="uidPlaceholder"
+    />
   </div>
 
   <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
-    <label class="block mb-2 font-semibold text-gray-800 sm:mb-0">Unit Pelaksanaan Pelayanan Pelanggan:</label>
+    <label class="block mb-2 font-semibold text-gray-800 sm:mb-0"
+      >Unit Pelaksanaan Pelayanan Pelanggan:</label
+    >
 
-    <Select @update:selected="setUp3($event)" :data="itemsUp3" :placeholder="up3Placholder" />
+    <Select
+      @update:selected="setUp3($event)"
+      :selected="uppp"
+      :data="itemsUp3"
+      :placeholder="up3Placholder"
+    />
   </div>
 
   <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
     <label class="block mb-2 font-semibold text-gray-800 sm:mb-0">Unit Layanan Pelanggan:</label>
 
-    <Select @update:selected="setUlp($event)" :data="itemsUlp" :placeholder="ulpPlaceholder" />
+    <Select
+      @update:selected="setUlp($event)"
+      :data="itemsUlp"
+      :selected="ulp"
+      :placeholder="ulpPlaceholder"
+    />
   </div>
 
   <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
diff --git a/src/components/Pages/Gangguan/Table_1.vue b/src/components/Pages/Gangguan/Table_1.vue
index 37ca612..610d6d7 100755
--- a/src/components/Pages/Gangguan/Table_1.vue
+++ b/src/components/Pages/Gangguan/Table_1.vue
@@ -4,57 +4,200 @@
   </Filters>
 
   <div id="dataTable">
-    <DxDataGrid class="max-h-[calc(100vh-140px)]" :remote-operations="true" :data-source="data" key-expr="no_laporan"
-      :show-column-lines="true" :show-row-lines="false" :show-borders="true" :row-alternation-enabled="true"
-      :hover-state-enabled="true" @selection-changed="onSelectionChanged" :column-width="100" @exporting="onExporting"
-      :allow-column-resizing="true" column-resizing-mode="widget">
+    <DxDataGrid
+      class="max-h-[calc(100vh-140px)]"
+      :remote-operations="true"
+      :data-source="data"
+      key-expr="no_laporan"
+      :show-column-lines="true"
+      :show-row-lines="false"
+      :show-borders="true"
+      :row-alternation-enabled="true"
+      :hover-state-enabled="true"
+      @selection-changed="onSelectionChanged"
+      :column-width="100"
+      @exporting="onExporting"
+      :allow-column-resizing="true"
+      column-resizing-mode="widget"
+    >
       <DxPaging :page-size="5" :enabled="true" />
-      <DxPager :visible="true" :allowed-page-sizes="[5, 10, 20]" display-mode="full" :show-page-size-selector="true"
-        :show-info="true" :show-navigation-buttons="true" />
+      <DxPager
+        :visible="true"
+        :allowed-page-sizes="[5, 10, 20]"
+        display-mode="full"
+        :show-page-size-selector="true"
+        :show-info="true"
+        :show-navigation-buttons="true"
+      />
       <DxSelection mode="single" />
       <!-- <DxScrolling column-rendering-mode="virtual" mode="virtual" row-rendering-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" />
-      <DxColumn css-class="custom-table-column" :width="50" alignment="center"
-        :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1" data-type="number" caption="No" />
-      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="no_laporan"
-        caption="No Laporan" cell-template="data" />
-      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="pembuat_laporan"
-        caption="Pembuat Laporan" cell-template="data" />
-      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="waktu_lapor"
-        caption="Tgl Lapor" cell-template="data" />
-      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="waktu_dialihkan"
-        caption="Tgl Dialihkan" cell-template="data" />
-      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="waktu_response"
-        caption="Tgl Response" cell-template="data" />
-      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="waktu_recovery"
-        caption="Tgl Recovery" cell-template="data" />
-      <DxColumn css-class="custom-table-column" :width="170" alignment="center" data-field="durasi_response_time"
-        caption="Durasi Response Time" cell-template="data" />
-      <DxColumn css-class="custom-table-column" :width="170" alignment="center" data-field="durasi_recovery_time"
-        caption="Durasi Recovery Time" cell-template="data" />
-      <DxColumn css-class="custom-table-column" :width="170" alignment="center" data-field="nama_posko_lama"
-        caption="Posko Awal" cell-template="data" />
-      <DxColumn css-class="custom-table-column" :width="170" alignment="center" data-field="nama_posko_baru"
-        caption="Posko Tujuan" cell-template="data" />
-      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="status_akhir" caption="Status"
-        cell-template="data" />
-      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="idpel_nometer"
-        caption="IDPEL/NO METER" cell-template="data" />
-      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="nama_pelapor"
-        caption="Nama Pelapor" cell-template="data" />
-      <DxColumn css-class="custom-table-column" :width="170" alignment="center" data-field="alamat_pelapor"
-        caption="Alamat Pelapor" cell-template="data" />
-      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="no_telp_pelapor"
-        caption="No Telp Pelapor" cell-template="data" />
-      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="keterangan_pelapor"
-        caption="Keterangan Pelapor" cell-template="data" />
-      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="media" caption="Sumber Lapor"
-        cell-template="data" />
-      <DxColumn css-class="custom-table-column" :width="170" alignment="center" data-field="posko" caption="Posko"
-        cell-template="data" />
+      <DxExport
+        :enabled="true"
+        :formats="['pdf', 'xlsx', 'document']"
+        :allow-export-selected-data="false"
+      />
+      <DxColumn
+        css-class="custom-table-column"
+        :width="50"
+        alignment="center"
+        :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1"
+        data-type="number"
+        caption="No"
+      />
+      <DxColumn
+        css-class="custom-table-column"
+        :width="150"
+        alignment="center"
+        data-field="no_laporan"
+        caption="No Laporan"
+        cell-template="data"
+      />
+      <DxColumn
+        css-class="custom-table-column"
+        :width="150"
+        alignment="center"
+        data-field="pembuat_laporan"
+        caption="Pembuat Laporan"
+        cell-template="data"
+      />
+      <DxColumn
+        css-class="custom-table-column"
+        :width="150"
+        alignment="center"
+        data-field="waktu_lapor"
+        caption="Tgl Lapor"
+        cell-template="data"
+      />
+      <DxColumn
+        css-class="custom-table-column"
+        :width="150"
+        alignment="center"
+        data-field="waktu_dialihkan"
+        caption="Tgl Dialihkan"
+        cell-template="data"
+      />
+      <DxColumn
+        css-class="custom-table-column"
+        :width="150"
+        alignment="center"
+        data-field="waktu_response"
+        caption="Tgl Response"
+        cell-template="data"
+      />
+      <DxColumn
+        css-class="custom-table-column"
+        :width="150"
+        alignment="center"
+        data-field="waktu_recovery"
+        caption="Tgl Recovery"
+        cell-template="data"
+      />
+      <DxColumn
+        css-class="custom-table-column"
+        :width="170"
+        alignment="center"
+        data-field="durasi_response_time"
+        caption="Durasi Response Time"
+        cell-template="data"
+      />
+      <DxColumn
+        css-class="custom-table-column"
+        :width="170"
+        alignment="center"
+        data-field="durasi_recovery_time"
+        caption="Durasi Recovery Time"
+        cell-template="data"
+      />
+      <DxColumn
+        css-class="custom-table-column"
+        :width="170"
+        alignment="center"
+        data-field="nama_posko_lama"
+        caption="Posko Awal"
+        cell-template="data"
+      />
+      <DxColumn
+        css-class="custom-table-column"
+        :width="170"
+        alignment="center"
+        data-field="nama_posko_baru"
+        caption="Posko Tujuan"
+        cell-template="data"
+      />
+      <DxColumn
+        css-class="custom-table-column"
+        :width="150"
+        alignment="center"
+        data-field="status_akhir"
+        caption="Status"
+        cell-template="data"
+      />
+      <DxColumn
+        css-class="custom-table-column"
+        :width="150"
+        alignment="center"
+        data-field="idpel_nometer"
+        caption="IDPEL/NO METER"
+        cell-template="data"
+      />
+      <DxColumn
+        css-class="custom-table-column"
+        :width="150"
+        alignment="center"
+        data-field="nama_pelapor"
+        caption="Nama Pelapor"
+        cell-template="data"
+      />
+      <DxColumn
+        css-class="custom-table-column"
+        :width="170"
+        alignment="center"
+        data-field="alamat_pelapor"
+        caption="Alamat Pelapor"
+        cell-template="data"
+      />
+      <DxColumn
+        css-class="custom-table-column"
+        :width="150"
+        alignment="center"
+        data-field="no_telp_pelapor"
+        caption="No Telp Pelapor"
+        cell-template="data"
+      />
+      <DxColumn
+        css-class="custom-table-column"
+        :width="150"
+        alignment="center"
+        data-field="keterangan_pelapor"
+        caption="Keterangan Pelapor"
+        cell-template="data"
+      />
+      <DxColumn
+        css-class="custom-table-column"
+        :width="150"
+        alignment="center"
+        data-field="media"
+        caption="Sumber Lapor"
+        cell-template="data"
+      />
+      <DxColumn
+        css-class="custom-table-column"
+        :width="170"
+        alignment="center"
+        data-field="nama_posko_lama"
+        caption="Posko"
+        cell-template="data"
+      />
       <template #data="{ data }">
         <p class="cursor-pointer" @click="showData()">
           {{ data.text }}
@@ -63,7 +206,11 @@
     </DxDataGrid>
   </div>
 
-  <DetailDialog :open="showDetail" title="Daftar Gangguan Dialihkan ke Posko Lain" @on-close="closeDetail">
+  <DetailDialog
+    :open="showDetail"
+    title="Daftar Gangguan Dialihkan ke Posko Lain"
+    @on-close="closeDetail"
+  >
     <div class="w-full p-4 space-y-2 bg-white rounded-xl">
       <div class="flex flex-row items-center justify-between w-full">
         <h3 class="text-sm font-medium w-[170px] text-gray-800">No Laporan:</h3>
@@ -132,7 +279,12 @@
 
       <div class="flex flex-row items-center justify-between w-full">
         <h3 class="text-sm font-medium w-[170px] text-gray-800">Alamat Pelapor:</h3>
-        <InputText :readonly="true" type="textarea" :value="dataDetail?.alamat_pelapor" class-name="flex-1 h-[56px]" />
+        <InputText
+          :readonly="true"
+          type="textarea"
+          :value="dataDetail?.alamat_pelapor"
+          class-name="flex-1 h-[56px]"
+        />
       </div>
 
       <div class="flex flex-row items-center justify-between w-full">
diff --git a/src/components/Pages/Gangguan/Table_12.vue b/src/components/Pages/Gangguan/Table_12.vue
index 2511d54..9653365 100755
--- a/src/components/Pages/Gangguan/Table_12.vue
+++ b/src/components/Pages/Gangguan/Table_12.vue
@@ -52,14 +52,14 @@
       <DxColumn
         :width="120"
         alignment="center"
-        data-field="id_regu"
+        data-field="kode_regu"
         caption="Kode"
         css-class="custom-table-column"
       />
       <DxColumn
         :width="120"
         alignment="center"
-        data-field="id_regu"
+        data-field="kode_regu"
         caption="Kode"
         css-class="custom-table-column"
         group-index="0"
@@ -388,7 +388,7 @@ const GET_REKAPITULASI_GANGGUAN_PER_REGU = gql`
       idUid: $idUid
       idUp3: $idUp3
     ) {
-      id_regu
+      kode_regu
       nama_regu
       avg_durasi_recovery
       avg_durasi_response
@@ -473,7 +473,7 @@ const filterData = (params: any) => {
       queryResult.data.rekapitulasiGangguanPerRegu.forEach((item: any) => {
         const entry = {
           no: Number(i++),
-          id_regu: item.id_regu,
+          kode_regu: item.kode_regu,
           nama_regu: item.nama_regu,
           laporan: {
             total: item.total,
diff --git a/src/components/Pages/Gangguan/Table_13.vue b/src/components/Pages/Gangguan/Table_13.vue
index b8d7cf8..6df1ec7 100755
--- a/src/components/Pages/Gangguan/Table_13.vue
+++ b/src/components/Pages/Gangguan/Table_13.vue
@@ -48,6 +48,15 @@
         data-type="number"
         caption="No"
       />
+      <DxColumn
+        :width="120"
+        alignment="center"
+        data-field="nama_uid"
+        caption="Nama UID"
+        css-class="custom-table-column"
+        group-index="0"
+        v-if="filters.groupBy"
+      />
       <DxColumn
         :width="170"
         alignment="center"
@@ -290,6 +299,8 @@ const GET_REKAPITULASI_GANGGUAN_PER_TANGGAL = gql`
       idUid: $idUid
       idUp3: $idUp3
     ) {
+      id_uid
+      nama_uid
       nama_posko
       avg_durasi_recovery
       avg_durasi_response
@@ -345,5 +356,7 @@ const filterData = (params: any) => {
   })
 }
 
-const filters = ref()
+const filters = ref({
+  groupBy: false
+})
 </script>
diff --git a/src/components/Pages/Gangguan/Table_14.vue b/src/components/Pages/Gangguan/Table_14.vue
index be08cd3..e00ea06 100755
--- a/src/components/Pages/Gangguan/Table_14.vue
+++ b/src/components/Pages/Gangguan/Table_14.vue
@@ -54,10 +54,12 @@
       />
       <DxColumn
         :width="170"
-        alignment="center"
         data-field="media"
         caption="Nama Media"
+        alignment="center"
+        cell-template="data"
         css-class="custom-table-column"
+        header-cell-template="title-header"
       />
       <DxColumn alignment="center" caption="Tanggal" css-class="custom-table-column">
         <DxColumn
@@ -77,6 +79,17 @@
         caption="Total"
         css-class="custom-table-column"
       />
+
+      <template #data="{ data }">
+        <p class="text-left cursor-pointer">
+          {{ data.text }}
+        </p>
+      </template>
+      <template #title-header="{ data }">
+        <p class="text-center w-full">
+          {{ data.column.caption }}
+        </p>
+      </template>
     </DxDataGrid>
   </div>
 </template>
diff --git a/src/components/Pages/Gangguan/Table_3.vue b/src/components/Pages/Gangguan/Table_3.vue
index c53f922..597782e 100755
--- a/src/components/Pages/Gangguan/Table_3.vue
+++ b/src/components/Pages/Gangguan/Table_3.vue
@@ -235,6 +235,9 @@ const GET_DAFTAR_GANGGUAN_RESPONSE_TIME = gql`
       idpel_nometer
       keterangan_pelapor
       media
+      penyebab
+      referensi_marking
+      tindakan
       nama_pelapor
       is_marking
       no_laporan
diff --git a/src/components/Pages/Keluhan/Table_27.vue b/src/components/Pages/Keluhan/Table_27.vue
index 802c810..802eda7 100755
--- a/src/components/Pages/Keluhan/Table_27.vue
+++ b/src/components/Pages/Keluhan/Table_27.vue
@@ -71,21 +71,21 @@
       <DxColumn
         :width="170"
         alignment="center"
-        data-field=""
+        data-field="nama_uid"
         caption="UI Dist."
         css-class="custom-table-column"
       />
       <DxColumn
         :width="170"
         alignment="center"
-        data-field=""
+        data-field="nama_ulp"
         caption="ULP"
         css-class="custom-table-column"
       />
       <DxColumn
         :width="170"
         alignment="center"
-        data-field=""
+        data-field="idpel_nometer"
         caption="IDPEL/NO METER"
         css-class="custom-table-column"
       />
@@ -122,7 +122,7 @@
       <DxColumn
         :width="150"
         alignment="center"
-        data-field=""
+        data-field="status_akhir"
         caption="APKT Status"
         css-class="custom-table-column"
       />
@@ -157,14 +157,14 @@
       <DxColumn
         :width="170"
         alignment="center"
-        data-field=""
+        data-field="nama_issuetype"
         caption="Issue Type"
         css-class="custom-table-column"
       />
       <DxColumn
         :width="170"
         alignment="center"
-        data-field=""
+        data-field="nama_subissuetype"
         caption="Sub Issue Type"
         css-class="custom-table-column"
       />
@@ -250,19 +250,18 @@ const GET_DATA = gql`
       idUp3: $idUp3
     ) {
       alamat_pelapor
-      durasi_recovery_time
-      durasi_response_time
-      id_keluhan
       idpel_nometer
       keterangan_pelapor
       media
+      nama_uid
+      nama_ulp
       nama_pelapor
       no_laporan
+      nama_issuetype
+      nama_subissuetype
       no_telp_pelapor
-      idUlp
       status_akhir
       waktu_recovery
-      waktu_response
     }
   }
 `
@@ -272,8 +271,7 @@ const { onResult, onError, loading, refetch } = useQuery(GET_DATA, {
   dateTo: new Date('2023-10-01').toISOString().slice(0, 10),
   idUlp: 0,
   idUid: 0,
-  idUp3: 0,
-  media: 'Twitter'
+  idUp3: 0
 })
 const filters = ref()
 
@@ -290,8 +288,7 @@ const filterData = (params: any) => {
       : new Date().toISOString().slice(0, 10),
     idUlp: idUlp ? idUlp.id : 0,
     idUid: uid ? uid.id : 0,
-    idUp3: up3 ? up3.id : 0,
-    media: media
+    idUp3: up3 ? up3.id : 0
   })
 
   onResult((queryResult) => {
diff --git a/src/components/Pages/Monalisa/Table_36.vue b/src/components/Pages/Monalisa/Table_36.vue
index c4c9011..ffd615d 100755
--- a/src/components/Pages/Monalisa/Table_36.vue
+++ b/src/components/Pages/Monalisa/Table_36.vue
@@ -1,176 +1,322 @@
 <template>
-    <Filters @run-search="() => filterData(filters)" class="mb-4">
-        <Type2 @update:filters="(value) => filters = value" />
-    </Filters>
-    <div id="data">
-        <DxDataGrid class="max-h-[calc(100vh-140px)]" :remote-operations="true" :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.sync="loading" :enabled="true" />
-            <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
-            <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
-            <DxColumnFixing :enabled="true" />
+  <Filters
+    :report-button="true"
+    @reset-form="data = []"
+    @run-search="() => filterData(filters)"
+    class="mb-4"
+  >
+    <Type2 @update:filters="(value) => (filters = value)" />
+  </Filters>
 
-            <DxColumn alignment="center" data-type="text" data-field="nama_posko" caption="Nama Unit"
-                css-class="custom-table-column" />
-            <DxColumn alignment="center" caption="Jumlah Kali 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>
-                <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>
-            </DxColumn>
-        </DxDataGrid>
-    </div>
+  <div id="data">
+    <DxDataGrid
+      class="max-h-[calc(100vh-140px)]"
+      :remote-operations="true"
+      :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.sync="loading"
+        :enabled="true"
+      />
+      <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
+      <DxExport
+        :enabled="true"
+        :formats="['pdf', 'xlsx', 'document']"
+        :allow-export-selected-data="false"
+      />
+      <DxColumnFixing :enabled="true" />
+
+      <DxColumn
+        alignment="center"
+        :min-width="170"
+        data-type="text"
+        data-field="nama_ulp"
+        caption="Nama Unit"
+        css-class="custom-table-column"
+        :group-index="0"
+      />
+      <DxColumn
+        alignment="center"
+        :min-width="170"
+        data-type="text"
+        data-field="nama_ulp"
+        caption="Nama Unit"
+        css-class="custom-table-column"
+      />
+      <DxColumn alignment="center" caption="Jumlah 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"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="mom_bulan_ini"
+            data-type="number"
+            :caption="`${getMonthName(bulanSekarang)} ${tahunSekarang}`"
+            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"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="yoy_tahun_ini"
+            data-type="number"
+            :caption="`s.d ${getMonthName(bulanSekarang)} ${tahunSekarang}`"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="persen_yoy"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+          />
+        </DxColumn>
+      </DxColumn>
+
+      <!-- <DxSummary>
+        <DxGroupItem :show-in-group-footer="true" column="nama_ulp" display-format="Total" />
+        <DxGroupItem
+          :show-in-group-footer="true"
+          column="mom_bulan_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+        />
+        <DxGroupItem
+          :show-in-group-footer="true"
+          column="mom_bulan_ini"
+          summary-type="sum"
+          display-format="{0}"
+        />
+        <DxGroupItem
+          :show-in-group-footer="true"
+          column="persen_mom"
+          summary-type="sum"
+          display-format="{0}"
+        />
+        <DxGroupItem
+          :show-in-group-footer="true"
+          column="yoy_tahun_kemarin"
+          summary-type="sum"
+          display-format="{0}"
+        />
+        <DxGroupItem
+          :show-in-group-footer="true"
+          column="yoy_tahun_ini"
+          summary-type="sum"
+          display-format="{0}"
+        />
+        <DxGroupItem
+          :show-in-group-footer="true"
+          column="persen_yoy"
+          summary-type="sum"
+          display-format="{0}"
+        />
+      </DxSummary> -->
+    </DxDataGrid>
+  </div>
 </template>
 
 <script setup lang="ts">
 import Filters from '@/components/Form/Filters.vue'
 import Type2 from '@/components/Form/FiltersType/Type2.vue'
-import { onMounted, ref, } from 'vue'
+import { ref } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import { getMonthName } from '@/utils/texts'
 import {
-    DxColumn,
-    DxColumnFixing,
-    DxExport,
-    DxLoadPanel,
-    DxPaging,
-    DxScrolling,
-    DxSearchPanel,
-    DxSelection
+  DxColumn,
+  DxColumnFixing,
+  DxExport,
+  DxGroupItem,
+  DxLoadPanel,
+  DxPaging,
+  DxScrolling,
+  DxSearchPanel,
+  DxSelection,
+  DxSummary
 } from 'devextreme-vue/data-grid'
 import { jsPDF } from 'jspdf'
 import { exportDataGrid as exportToPdf } from 'devextreme/pdf_exporter'
 import { exportDataGrid as exportToExcel } from 'devextreme/excel_exporter'
 import { saveAs } from 'file-saver'
 import { Workbook } from 'exceljs'
-
 import { useQuery } from '@vue/apollo-composable'
 import gql from 'graphql-tag'
+
 const position = { of: '#data' }
 const showIndicator = ref(true)
 const shading = ref(true)
 const showPane = ref(true)
 const data = ref<any[]>([])
 
-const dataDetail = ref<any>()
-const showDetail = ref(false)
-
 const onExporting = (e: any) => {
-    if (e.format === 'pdf') {
-        const doc = new jsPDF()
+  if (e.format === 'pdf') {
+    const doc = new jsPDF()
 
-        exportToPdf({
-            jsPDFDocument: doc,
-            component: e.component,
-            indent: 5
-        }).then(() => {
-            doc.save(`.pdf`)
-        })
-    } else {
-        const workbook = new Workbook()
-        const worksheet = workbook.addWorksheet('Employees')
+    exportToPdf({
+      jsPDFDocument: doc,
+      component: e.component,
+      indent: 5
+    }).then(() => {
+      doc.save(`.pdf`)
+    })
+  } else {
+    const workbook = new Workbook()
+    const worksheet = workbook.addWorksheet('Employees')
 
-        exportToExcel({
-            component: e.component,
-            worksheet,
-            autoFilterEnabled: true
-        }).then(() => {
-            workbook.xlsx.writeBuffer().then((buffer: any) => {
-                saveAs(new Blob([buffer], { type: 'application/octet-stream' }), 'DataGrid.xlsx')
-            })
-        })
+    exportToExcel({
+      component: e.component,
+      worksheet,
+      autoFilterEnabled: true
+    }).then(() => {
+      workbook.xlsx.writeBuffer().then((buffer: any) => {
+        saveAs(new Blob([buffer], { type: 'application/octet-stream' }), 'DataGrid.xlsx')
+      })
+    })
 
-        e.cancel = true
-    }
+    e.cancel = true
+  }
 }
+
 const tahunSekarang = ref(new Date().getFullYear())
 const bulanSekarang = ref(new Date().getMonth())
 const tahunLalu = ref(tahunSekarang.value - 1)
+
+// const MONALISAJUMLAHKALIGANGGUAN = gql`
+//   query DaftarMonalisaJumlahKaliGangguan(
+//     $regional: Int
+//     $idUid: Int
+//     $idUp3: Int
+//     $idUlp: Int
+//     $bulan: Int
+//     $tahun: Int
+//   ) {
+//     monalisaJumlahKaliGangguan(
+//       regional: $regional
+//       idUid: $idUid
+//       idUp3: $idUp3
+//       $idUlp: $idUlp
+//       bulan: $bulan
+//       tahun: $tahun
+//     ) {
+//       jumlah_bulan
+//       jumlah_bulan_n_1
+//       jumlah_tahun
+//       jumlah_tahun_n_1
+//       nama_posko
+//       persen_bulan
+//       persen_tahun
+//     }
+//   }
+// `
+
 const MONALISAJUMLAHKALIGANGGUAN = gql`
   query DaftarMonalisaJumlahKaliGangguan(
-    $regional: Int
-    $posko: Int
     $idUid: Int
     $idUp3: Int
+    $idUlp: Int
     $bulan: Int
     $tahun: Int
   ) {
     monalisaJumlahKaliGangguan(
-      regional: $regional
-      posko: $posko
       idUid: $idUid
       idUp3: $idUp3
+      idUlp: $idUlp
       bulan: $bulan
       tahun: $tahun
     ) {
-      jumlah_bulan
-      jumlah_bulan_n_1
-      jumlah_tahun
-      jumlah_tahun_n_1
-      nama_posko
-      persen_bulan
-      persen_tahun
+      nama_ulp
+      mom_bulan_ini
+      mom_bulan_kemarin
+      persen_mom
+      yoy_tahun_ini
+      yoy_tahun_kemarin
+      persen_yoy
     }
   }
 `
+
 const { onResult, onError, loading, refetch } = useQuery(MONALISAJUMLAHKALIGANGGUAN, {
-    regional: 0,
-    posko: 0,
-    idUid: 0,
-    idUp3: 0,
-    bulan: bulanSekarang.value,
-    tahun: tahunSekarang.value
+  // regional: 0,
+  idUp3: 0,
+  idUid: 0,
+  idUlp: 0,
+  bulan: bulanSekarang.value,
+  tahun: tahunSekarang.value
 })
 
 const filterData = (params: any) => {
-    const { regional, posko, 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,
-        idUid: idUid ? idUid.id : 0,
-        idUp3: idUp3 ? idUp3.id : 0,
-        bulan: bulan ? bulan.id : bulanSekarang.value,
-        tahun: bulan ? tahun.id : tahunSekarang.value
-    })
-    onResult((queryResult) => {
-        if (queryResult.data != undefined) {
-            data.value = queryResult.data.monalisaJumlahKaliGangguan;
-        }
-        console.log(queryResult.data)
-        console.log(queryResult.loading)
-        console.log(queryResult.networkStatus)
-    })
-    onError((error) => {
-        console.log(error)
-    })
+  const { regional, idUlp, idUid, idUp3, bulan, tahun } = params
+  bulanSekarang.value = bulan.id
+  tahunSekarang.value = tahun.id
+  tahunLalu.value = tahun.id - 1
+  refetch({
+    // regional: regional,
+    idUid: idUid ? idUid.id : 0,
+    idUp3: idUp3 ? idUp3.id : 0,
+    idUlp: idUlp ? idUlp.id : 0,
+    bulan: bulan ? bulan.id : bulanSekarang.value,
+    tahun: bulan ? tahun.id : tahunSekarang.value
+  })
+  onResult((queryResult) => {
+    if (queryResult.data != undefined) {
+      data.value = queryResult.data.monalisaJumlahKaliGangguan
+    }
+    console.log(queryResult.data)
+    console.log(queryResult.loading)
+    console.log(queryResult.networkStatus)
+  })
+  onError((error) => {
+    console.log(error)
+  })
 }
+
 const onSelectionChanged = ({ selectedRowsData }: any) => {
-    const data = selectedRowsData[0]
-    console.log(data)
+  const data = selectedRowsData[0]
+  console.log(data)
 }
-onMounted(() => {
-    console.log(bulanSekarang.value)
-});
-const filters = ref();
+
+const filters = ref()
 </script>
diff --git a/src/components/Pages/Monalisa/Table_37.vue b/src/components/Pages/Monalisa/Table_37.vue
index 9538367..f5a3551 100755
--- a/src/components/Pages/Monalisa/Table_37.vue
+++ b/src/components/Pages/Monalisa/Table_37.vue
@@ -1,42 +1,125 @@
 <template>
-    <Filters @run-search="() => filterData(filters)" class="mb-4">
-        <Type2 @update:filters="(value) => filters = value" />
-    </Filters>
-    <div id="data">
-        <DxDataGrid class="max-h-[calc(100vh-140px)]" :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" />
-            <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
-            <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
-            <DxColumnFixing :enabled="true" />
+  <Filters
+    @reset-form="data = []"
+    :report-button="true"
+    @run-search="() => filterData(filters)"
+    class="mb-4"
+  >
+    <Type2 @update:filters="(value) => (filters = value)" />
+  </Filters>
 
-            <DxColumn alignment="center" data-field="nama_posko" caption="Nama Unit" css-class="custom-table-column" />
-            <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="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>
-            </DxColumn>
-        </DxDataGrid>
-    </div>
+  <div id="data">
+    <DxDataGrid
+      class="max-h-[calc(100vh-140px)]"
+      :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"
+      />
+      <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
+      <DxExport
+        :enabled="true"
+        :formats="['pdf', 'xlsx', 'document']"
+        :allow-export-selected-data="false"
+      />
+      <DxColumnFixing :enabled="true" />
+
+      <DxColumn
+        alignment="center"
+        :min-width="170"
+        data-type="text"
+        data-field="nama_ulp"
+        caption="Nama Unit"
+        css-class="custom-table-column"
+        :group-index="0"
+      />
+      <DxColumn
+        alignment="center"
+        :min-width="170"
+        data-type="text"
+        data-field="nama_ulp"
+        caption="Nama Unit"
+        css-class="custom-table-column"
+      />
+      <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"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="mom_bulan_ini"
+            data-type="number"
+            :caption="`${getMonthName(bulanSekarang)} ${tahunSekarang}`"
+            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"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="yoy_tahun_ini"
+            data-type="number"
+            :caption="`s.d ${getMonthName(bulanSekarang)} ${tahunSekarang}`"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="persen_yoy"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+          />
+        </DxColumn>
+      </DxColumn>
+    </DxDataGrid>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -45,129 +128,155 @@ import Type2 from '@/components/Form/FiltersType/Type2.vue'
 import { ref } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
-    DxColumn,
-    DxColumnFixing,
-    DxExport,
-    DxLoadPanel,
-    DxPaging,
-    DxScrolling,
-    DxSearchPanel,
-    DxSelection
+  DxColumn,
+  DxColumnFixing,
+  DxExport,
+  DxLoadPanel,
+  DxPaging,
+  DxScrolling,
+  DxSearchPanel,
+  DxSelection
 } from 'devextreme-vue/data-grid'
 import { jsPDF } from 'jspdf'
 import { exportDataGrid as exportToPdf } from 'devextreme/pdf_exporter'
 import { exportDataGrid as exportToExcel } from 'devextreme/excel_exporter'
 import { saveAs } from 'file-saver'
 import { Workbook } from 'exceljs'
-const tahunSekarang = ref(new Date().getFullYear())
-const bulanSekarang = ref(new Date().getMonth())
-const tahunLalu = ref(tahunSekarang.value - 1)
 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 position = { of: '#data' }
 const showIndicator = ref(true)
 const shading = ref(true)
 const showPane = ref(true)
 const data = ref<any[]>([])
-const dataDetail = ref<any>()
-const showDetail = ref(false)
 
 const onExporting = (e: any) => {
-    if (e.format === 'pdf') {
-        const doc = new jsPDF()
+  if (e.format === 'pdf') {
+    const doc = new jsPDF()
 
-        exportToPdf({
-            jsPDFDocument: doc,
-            component: e.component,
-            indent: 5
-        }).then(() => {
-            doc.save(`.pdf`)
-        })
-    } else {
-        const workbook = new Workbook()
-        const worksheet = workbook.addWorksheet('Employees')
+    exportToPdf({
+      jsPDFDocument: doc,
+      component: e.component,
+      indent: 5
+    }).then(() => {
+      doc.save(`.pdf`)
+    })
+  } else {
+    const workbook = new Workbook()
+    const worksheet = workbook.addWorksheet('Employees')
 
-        exportToExcel({
-            component: e.component,
-            worksheet,
-            autoFilterEnabled: true
-        }).then(() => {
-            workbook.xlsx.writeBuffer().then((buffer: any) => {
-                saveAs(new Blob([buffer], { type: 'application/octet-stream' }), 'DataGrid.xlsx')
-            })
-        })
+    exportToExcel({
+      component: e.component,
+      worksheet,
+      autoFilterEnabled: true
+    }).then(() => {
+      workbook.xlsx.writeBuffer().then((buffer: any) => {
+        saveAs(new Blob([buffer], { type: 'application/octet-stream' }), 'DataGrid.xlsx')
+      })
+    })
 
-        e.cancel = true
-    }
+    e.cancel = true
+  }
 }
+
+// const monalisaDispatchingTimeGangguan = gql`
+//   query DaftarmonalisaDispatchingTimeGangguan(
+//     $regional: String
+//     $posko: Int
+//     $idUid: Int
+//     $idUp3: Int
+//     $bulan: Int
+//     $tahun: Int
+//   ) {
+//     monalisaDispatchingTimeGangguan(
+//       regional: $regional
+//       posko: $posko
+//       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
+//     }
+//   }
+// `
+
 const monalisaDispatchingTimeGangguan = gql`
   query DaftarmonalisaDispatchingTimeGangguan(
-    $regional: String
-    $posko: Int
     $idUid: Int
     $idUp3: Int
+    $idUlp: Int
     $bulan: Int
     $tahun: Int
   ) {
     monalisaDispatchingTimeGangguan(
-      regional: $regional
-      posko: $posko
       idUid: $idUid
       idUp3: $idUp3
+      idUlp: $idUlp
       bulan: $bulan
       tahun: $tahun
     ) {
-      jumlah_bulan
-      jumlah_bulan_n_1
-      jumlah_tahun
-      jumlah_tahun_n_1
-      nama_posko
-      persen_bulan
-      persen_tahun
+      nama_ulp
+      mom_bulan_ini
+      mom_bulan_kemarin
+      persen_mom
+      yoy_tahun_ini
+      yoy_tahun_kemarin
+      persen_yoy
     }
   }
 `
+
 const { onResult, onError, loading, refetch } = useQuery(monalisaDispatchingTimeGangguan, {
-    regional: '',
-    posko: '',
-    idUid: 0,
-    idUp3: 0,
-    bulan: 10,
-    tahun: 2023
+  // regional: 0,
+  idUp3: 0,
+  idUid: 0,
+  idUlp: 0,
+  bulan: bulanSekarang.value,
+  tahun: tahunSekarang.value
 })
+
 const filterData = (params: any) => {
-    const { regional, posko, 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,
-        idUid: idUid ? idUid.id : 0,
-        idUp3: idUp3 ? idUp3.id : 0,
-        bulan: bulan ? bulan.id : 10,
-        tahun: bulan ? tahun.id : 2023
-    })
-    onResult((queryResult) => {
-        if (queryResult.data != undefined) {
-            queryResult.data.monalisaDispatchingTimeGangguan.forEach((item: any) => {
-                data.value = [
-                    ...data.value, { ...item }
-                ]
-            })
-        }
-        console.log(queryResult.data)
-        console.log(queryResult.loading)
-        console.log(queryResult.networkStatus)
-    })
-    onError((error) => {
-        console.log(error)
-    })
+  const { regional, idUlp, idUid, idUp3, bulan, tahun } = params
+  bulanSekarang.value = bulan.id
+  tahunSekarang.value = tahun.id
+  tahunLalu.value = tahun.id - 1
+  refetch({
+    // regional: regional,
+    idUid: idUid ? idUid.id : 0,
+    idUp3: idUp3 ? idUp3.id : 0,
+    idUlp: idUlp ? idUlp.id : 0,
+    bulan: bulan ? bulan.id : bulanSekarang.value,
+    tahun: bulan ? tahun.id : tahunSekarang.value
+  })
+  onResult((queryResult) => {
+    if (queryResult.data != undefined) {
+      queryResult.data.monalisaDispatchingTimeGangguan.forEach((item: any) => {
+        data.value = [...data.value, { ...item }]
+      })
+    }
+    console.log(queryResult.data)
+    console.log(queryResult.loading)
+    console.log(queryResult.networkStatus)
+  })
+  onError((error) => {
+    console.log(error)
+  })
 }
 const onSelectionChanged = ({ selectedRowsData }: any) => {
-    const data = selectedRowsData[0]
-    console.log(data)
+  const data = selectedRowsData[0]
+  console.log(data)
 }
 
 const filters = ref()
diff --git a/src/components/Pages/Monalisa/Table_38.vue b/src/components/Pages/Monalisa/Table_38.vue
index 532bb07..0fd0ee1 100755
--- a/src/components/Pages/Monalisa/Table_38.vue
+++ b/src/components/Pages/Monalisa/Table_38.vue
@@ -1,42 +1,125 @@
 <template>
-    <Filters @run-search="() => filterData(filters)" class="mb-4">
-        <Type2 @update:filters="(value) => filters = value" />
-    </Filters>
-    <div id="data">
-        <DxDataGrid class="max-h-[calc(100vh-140px)]" :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" />
-            <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
-            <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
-            <DxColumnFixing :enabled="true" />
+  <Filters
+    :report-button="true"
+    @reset-form="data = []"
+    @run-search="() => filterData(filters)"
+    class="mb-4"
+  >
+    <Type2 @update:filters="(value) => (filters = value)" />
+  </Filters>
 
-            <DxColumn alignment="center" data-field="nama_posko" caption="Nama Unit" css-class="custom-table-column" />
-            <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="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>
-            </DxColumn>
-        </DxDataGrid>
-    </div>
+  <div id="data">
+    <DxDataGrid
+      class="max-h-[calc(100vh-140px)]"
+      :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"
+      />
+      <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
+      <DxExport
+        :enabled="true"
+        :formats="['pdf', 'xlsx', 'document']"
+        :allow-export-selected-data="false"
+      />
+      <DxColumnFixing :enabled="true" />
+
+      <DxColumn
+        alignment="center"
+        :min-width="170"
+        data-type="text"
+        data-field="nama_ulp"
+        caption="Nama Unit"
+        css-class="custom-table-column"
+        :group-index="0"
+      />
+      <DxColumn
+        alignment="center"
+        :min-width="170"
+        data-type="text"
+        data-field="nama_ulp"
+        caption="Nama Unit"
+        css-class="custom-table-column"
+      />
+      <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"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="mom_bulan_ini"
+            data-type="number"
+            :caption="`${getMonthName(bulanSekarang)} ${tahunSekarang}`"
+            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"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="yoy_tahun_ini"
+            data-type="number"
+            :caption="`s.d ${getMonthName(bulanSekarang)} ${tahunSekarang}`"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="persen_yoy"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+          />
+        </DxColumn>
+      </DxColumn>
+    </DxDataGrid>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -44,7 +127,16 @@ import Filters from '@/components/Form/Filters.vue'
 import Type2 from '@/components/Form/FiltersType/Type2.vue'
 import { ref } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
-import { DxColumn, DxColumnFixing, DxExport, DxLoadPanel, DxPaging, DxScrolling, DxSearchPanel, DxSelection } from 'devextreme-vue/data-grid'
+import {
+  DxColumn,
+  DxColumnFixing,
+  DxExport,
+  DxLoadPanel,
+  DxPaging,
+  DxScrolling,
+  DxSearchPanel,
+  DxSelection
+} from 'devextreme-vue/data-grid'
 import { jsPDF } from 'jspdf'
 import { exportDataGrid as exportToPdf } from 'devextreme/pdf_exporter'
 import { exportDataGrid as exportToExcel } from 'devextreme/excel_exporter'
@@ -57,106 +149,141 @@ import { getMonthName } from '@/utils/texts'
 const tahunSekarang = ref(new Date().getFullYear())
 const bulanSekarang = ref(new Date().getMonth())
 const tahunLalu = ref(tahunSekarang.value - 1)
-const position = { of: '#data' };
-const showIndicator = ref(true);
-const shading = ref(true);
-const showPane = ref(true);
+const position = { of: '#data' }
+const showIndicator = ref(true)
+const shading = ref(true)
+const showPane = ref(true)
 const data = ref<any[]>([])
-const dataDetail = ref<any>()
-const showDetail = ref(false)
+
+// const monalisaRecoveryTimeGangguan = gql`
+//   query DaftarmonalisaRecoveryTimeGangguan(
+//     $regional: regional
+//     $posko: Int
+//     $idUid: Int
+//     $idUp3: Int
+//     $bulan: Int
+//     $tahun: Int
+//   ) {
+//     monalisaRecoveryTimeGangguan(
+//       regional: $regional
+//       posko: $posko
+//       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
+//     }
+//   }
+// `
 
 const monalisaRecoveryTimeGangguan = gql`
-  query DaftarmonalisaRecoveryTimeGangguan($regional:regional, $posko: Int, $idUid: Int, $idUp3: Int,$bulan: Int, $tahun: Int) {
+  query DaftarmonalisaRecoveryTimeGangguan(
+    $idUid: Int
+    $idUp3: Int
+    $idUlp: Int
+    $bulan: Int
+    $tahun: Int
+  ) {
     monalisaRecoveryTimeGangguan(
-      regional:$regional
-      posko: $posko
       idUid: $idUid
       idUp3: $idUp3
+      idUlp: $idUlp
       bulan: $bulan
       tahun: $tahun
     ) {
-        jumlah_bulan
-        jumlah_bulan_n_1
-        jumlah_tahun
-        jumlah_tahun_n_1
-        nama_posko
-        persen_bulan
-        persen_tahun
+      nama_ulp
+      mom_bulan_ini
+      mom_bulan_kemarin
+      persen_mom
+      yoy_tahun_ini
+      yoy_tahun_kemarin
+      persen_yoy
     }
   }
-`;
-const { onResult, onError, loading, refetch } = useQuery(monalisaRecoveryTimeGangguan, {
-    regional: 0,
-    posko: 0,
-    idUid: 0,
-    idUp3: 0,
-    bulan: 10,
-    tahun: 2023,
-})
-const filterData = (params: any) => {
+`
 
-    const { regional, posko, 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,
-        idUid: idUid ? idUid.id : 0,
-        idUp3: idUp3 ? idUp3.id : 0,
-        bulan: bulan ? bulan.id : 10,
-        tahun: bulan ? tahun.id : 2023
-    })
-    onResult(queryResult => {
-        if (queryResult.data != undefined) {
-            queryResult.data.monalisaRecoveryTimeGangguan.forEach((item: any) => {
-                data.value = [...data.value, {
-                    ...item,
-                }];
-            });
-        }
-        console.log(queryResult.data)
-        console.log(queryResult.loading)
-        console.log(queryResult.networkStatus)
-    })
-    onError((error) => {
-        console.log(error)
-    })
+const { onResult, onError, loading, refetch } = useQuery(monalisaRecoveryTimeGangguan, {
+  // regional: 0,
+  idUp3: 0,
+  idUid: 0,
+  idUlp: 0,
+  bulan: bulanSekarang.value,
+  tahun: tahunSekarang.value
+})
+
+const filterData = (params: any) => {
+  const { regional, idUlp, idUid, idUp3, bulan, tahun } = params
+  bulanSekarang.value = bulan.id
+  tahunSekarang.value = tahun.id
+  tahunLalu.value = tahun.id - 1
+  refetch({
+    // regional: regional,
+    idUid: idUid ? idUid.id : 0,
+    idUp3: idUp3 ? idUp3.id : 0,
+    idUlp: idUlp ? idUlp.id : 0,
+    bulan: bulan ? bulan.id : bulanSekarang.value,
+    tahun: bulan ? tahun.id : tahunSekarang.value
+  })
+  onResult((queryResult) => {
+    if (queryResult.data != undefined) {
+      queryResult.data.monalisaRecoveryTimeGangguan.forEach((item: any) => {
+        data.value = [
+          ...data.value,
+          {
+            ...item
+          }
+        ]
+      })
+    }
+    console.log(queryResult.data)
+    console.log(queryResult.loading)
+    console.log(queryResult.networkStatus)
+  })
+  onError((error) => {
+    console.log(error)
+  })
 }
 
 const onExporting = (e: any) => {
-    if (e.format === 'pdf') {
-        const doc = new jsPDF()
+  if (e.format === 'pdf') {
+    const doc = new jsPDF()
 
-        exportToPdf({
-            jsPDFDocument: doc,
-            component: e.component,
-            indent: 5,
-        }).then(() => {
-            doc.save(`.pdf`)
-        })
-    } else {
-        const workbook = new Workbook()
-        const worksheet = workbook.addWorksheet('Employees')
+    exportToPdf({
+      jsPDFDocument: doc,
+      component: e.component,
+      indent: 5
+    }).then(() => {
+      doc.save(`.pdf`)
+    })
+  } else {
+    const workbook = new Workbook()
+    const worksheet = workbook.addWorksheet('Employees')
 
-        exportToExcel({
-            component: e.component,
-            worksheet,
-            autoFilterEnabled: true,
-        }).then(() => {
-            workbook.xlsx.writeBuffer().then((buffer: any) => {
-                saveAs(new Blob([buffer], { type: 'application/octet-stream' }), 'DataGrid.xlsx')
-            })
-        })
+    exportToExcel({
+      component: e.component,
+      worksheet,
+      autoFilterEnabled: true
+    }).then(() => {
+      workbook.xlsx.writeBuffer().then((buffer: any) => {
+        saveAs(new Blob([buffer], { type: 'application/octet-stream' }), 'DataGrid.xlsx')
+      })
+    })
 
-        e.cancel = true
-    }
+    e.cancel = true
+  }
 }
 
 const onSelectionChanged = ({ selectedRowsData }: any) => {
-    const data = selectedRowsData[0]
-    console.log(data)
+  const data = selectedRowsData[0]
+  console.log(data)
 }
 
 const filters = ref()
-</script>
\ No newline at end of file
+</script>
diff --git a/src/components/Pages/Monalisa/Table_39.vue b/src/components/Pages/Monalisa/Table_39.vue
index d3ac6e4..b4fc643 100755
--- a/src/components/Pages/Monalisa/Table_39.vue
+++ b/src/components/Pages/Monalisa/Table_39.vue
@@ -1,42 +1,125 @@
 <template>
-    <Filters @run-search="() => filterData(filters)" class="mb-4">
-        <Type2 @update:filters="(value) => filters = value" />
-    </Filters>
-    <div id="data">
-        <DxDataGrid class="max-h-[calc(100vh-140px)]" :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" />
-            <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
-            <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
-            <DxColumnFixing :enabled="true" />
+  <Filters
+    @reset-form="data = []"
+    :report-button="true"
+    @run-search="() => filterData(filters)"
+    class="mb-4"
+  >
+    <Type2 @update:filters="(value) => (filters = value)" />
+  </Filters>
 
-            <DxColumn alignment="center" data-field="nama_posko" caption="Nama Unit" css-class="custom-table-column" />
-            <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="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>
-            </DxColumn>
-        </DxDataGrid>
-    </div>
+  <div id="data">
+    <DxDataGrid
+      class="max-h-[calc(100vh-140px)]"
+      :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"
+      />
+      <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
+      <DxExport
+        :enabled="true"
+        :formats="['pdf', 'xlsx', 'document']"
+        :allow-export-selected-data="false"
+      />
+      <DxColumnFixing :enabled="true" />
+
+      <DxColumn
+        alignment="center"
+        :min-width="170"
+        data-type="text"
+        data-field="nama_ulp"
+        caption="Nama Unit"
+        css-class="custom-table-column"
+        :group-index="0"
+      />
+      <DxColumn
+        alignment="center"
+        :min-width="170"
+        data-type="text"
+        data-field="nama_ulp"
+        caption="Nama Unit"
+        css-class="custom-table-column"
+      />
+      <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"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="mom_bulan_ini"
+            data-type="number"
+            :caption="`${getMonthName(bulanSekarang)} ${tahunSekarang}`"
+            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"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="yoy_tahun_ini"
+            data-type="number"
+            :caption="`s.d ${getMonthName(bulanSekarang)} ${tahunSekarang}`"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="persen_yoy"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+          />
+        </DxColumn>
+      </DxColumn>
+    </DxDataGrid>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -45,14 +128,14 @@ import Type2 from '@/components/Form/FiltersType/Type2.vue'
 import { ref } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
-    DxColumn,
-    DxColumnFixing,
-    DxExport,
-    DxLoadPanel,
-    DxPaging,
-    DxScrolling,
-    DxSearchPanel,
-    DxSelection
+  DxColumn,
+  DxColumnFixing,
+  DxExport,
+  DxLoadPanel,
+  DxPaging,
+  DxScrolling,
+  DxSearchPanel,
+  DxSelection
 } from 'devextreme-vue/data-grid'
 import { jsPDF } from 'jspdf'
 import { exportDataGrid as exportToPdf } from 'devextreme/pdf_exporter'
@@ -60,118 +143,146 @@ import { exportDataGrid as exportToExcel } from 'devextreme/excel_exporter'
 import { saveAs } from 'file-saver'
 import { Workbook } from 'exceljs'
 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)
-import { useQuery } from '@vue/apollo-composable'
-import { getMonthName } from '@/utils/texts'
 const position = { of: '#data' }
 const showIndicator = ref(true)
 const shading = ref(true)
 const showPane = ref(true)
 const data = ref<any[]>([])
-const dataDetail = ref<any>()
-const showDetail = ref(false)
+
+// const monalisaResponseTimeKeluhan = gql`
+//   query DaftarmonalisaResponseTimeKeluhan(
+//     $regional: String
+//     $posko: Int
+//     $idUid: Int
+//     $idUp3: Int
+//     $bulan: Int
+//     $tahun: Int
+//   ) {
+//     monalisaResponseTimeKeluhan(
+//       regional: $regional
+//       posko: $posko
+//       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
+//     }
+//   }
+// `
+
 const monalisaResponseTimeKeluhan = gql`
   query DaftarmonalisaResponseTimeKeluhan(
-    $regional: String
-    $posko: Int
     $idUid: Int
     $idUp3: Int
+    $idUlp: Int
     $bulan: Int
     $tahun: Int
   ) {
     monalisaResponseTimeKeluhan(
-      regional: $regional
-      posko: $posko
       idUid: $idUid
       idUp3: $idUp3
+      idUlp: $idUlp
       bulan: $bulan
       tahun: $tahun
     ) {
-      jumlah_bulan
-      jumlah_bulan_n_1
-      jumlah_tahun
-      jumlah_tahun_n_1
-      nama_posko
-      persen_bulan
-      persen_tahun
+      nama_ulp
+      mom_bulan_ini
+      mom_bulan_kemarin
+      persen_mom
+      yoy_tahun_ini
+      yoy_tahun_kemarin
+      persen_yoy
     }
   }
 `
+
 const { onResult, onError, loading, refetch } = useQuery(monalisaResponseTimeKeluhan, {
-    bulan: 10,
-    tahun: 2023,
-    regional: '',
-    posko: '',
-    idUid: 0,
-    idUp3: 0
+  // regional: 0,
+  idUp3: 0,
+  idUid: 0,
+  idUlp: 0,
+  bulan: bulanSekarang.value,
+  tahun: tahunSekarang.value
 })
+
 const filterData = (params: any) => {
-    const { regional, posko, 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,
-        idUid: idUid ? idUid.id : 0,
-        idUp3: idUp3 ? idUp3.id : 0,
-        bulan: bulan ? bulan.id : 10,
-        tahun: bulan ? tahun.id : 2023
-    })
-    onResult((queryResult) => {
-        if (queryResult.data != undefined) {
-            queryResult.data.monalisaResponseTimeKeluhan.forEach((item: any) => {
-                data.value = [
-                    ...data.value,
-                    {
-                        ...item
-                    }
-                ]
-            })
-        }
-        console.log(queryResult.data)
-        console.log(queryResult.loading)
-        console.log(queryResult.networkStatus)
-    })
-    onError((error) => {
-        console.log(error)
-    })
+  const { regional, idUlp, idUid, idUp3, bulan, tahun } = params
+  bulanSekarang.value = bulan.id
+  tahunSekarang.value = tahun.id
+  tahunLalu.value = tahun.id - 1
+  refetch({
+    // regional: regional,
+    idUid: idUid ? idUid.id : 0,
+    idUp3: idUp3 ? idUp3.id : 0,
+    idUlp: idUlp ? idUlp.id : 0,
+    bulan: bulan ? bulan.id : bulanSekarang.value,
+    tahun: bulan ? tahun.id : tahunSekarang.value
+  })
+  onResult((queryResult) => {
+    if (queryResult.data != undefined) {
+      queryResult.data.monalisaResponseTimeKeluhan.forEach((item: any) => {
+        data.value = [
+          ...data.value,
+          {
+            ...item
+          }
+        ]
+      })
+    }
+    console.log(queryResult.data)
+    console.log(queryResult.loading)
+    console.log(queryResult.networkStatus)
+  })
+  onError((error) => {
+    console.log(error)
+  })
 }
 
 const onExporting = (e: any) => {
-    if (e.format === 'pdf') {
-        const doc = new jsPDF()
+  if (e.format === 'pdf') {
+    const doc = new jsPDF()
 
-        exportToPdf({
-            jsPDFDocument: doc,
-            component: e.component,
-            indent: 5
-        }).then(() => {
-            doc.save(`.pdf`)
-        })
-    } else {
-        const workbook = new Workbook()
-        const worksheet = workbook.addWorksheet('Employees')
+    exportToPdf({
+      jsPDFDocument: doc,
+      component: e.component,
+      indent: 5
+    }).then(() => {
+      doc.save(`.pdf`)
+    })
+  } else {
+    const workbook = new Workbook()
+    const worksheet = workbook.addWorksheet('Employees')
 
-        exportToExcel({
-            component: e.component,
-            worksheet,
-            autoFilterEnabled: true
-        }).then(() => {
-            workbook.xlsx.writeBuffer().then((buffer: any) => {
-                saveAs(new Blob([buffer], { type: 'application/octet-stream' }), 'DataGrid.xlsx')
-            })
-        })
+    exportToExcel({
+      component: e.component,
+      worksheet,
+      autoFilterEnabled: true
+    }).then(() => {
+      workbook.xlsx.writeBuffer().then((buffer: any) => {
+        saveAs(new Blob([buffer], { type: 'application/octet-stream' }), 'DataGrid.xlsx')
+      })
+    })
 
-        e.cancel = true
-    }
+    e.cancel = true
+  }
 }
 
 const onSelectionChanged = ({ selectedRowsData }: any) => {
-    const data = selectedRowsData[0]
-    console.log(data)
+  const data = selectedRowsData[0]
+  console.log(data)
 }
 
 const filters = ref()