diff --git a/src/components/Form/FiltersType/Type13.vue b/src/components/Form/FiltersType/Type13.vue
index 5fbe1cc..d53ea88 100755
--- a/src/components/Form/FiltersType/Type13.vue
+++ b/src/components/Form/FiltersType/Type13.vue
@@ -2,44 +2,54 @@
 import Select from '@/components/Select.vue'
 import DatePicker from '@/components/DatePicker.vue'
 import InlineRadioGroup from '@/components/Form/InlineRadioGroup.vue'
-import { selectedUid, selectedUp3Ulp, selectedUlp, fetchUid, itemsUid, itemsUp3, itemsUlp } from './reference';
-import { onMounted, ref } from 'vue';
-const uidPlaceholder = 'Semua Unit Induk Distribusi/Wilayah';
-const up3Placeholder = 'Semua Unit Pelaksanaan Pelayanan Pelanggan';
-const ulpPlaceholder = 'Semua Unit Layanan Pelanggan';
-const up3 = ref({ id: 0, name: up3Placeholder });
-const uid = ref({ id: 0, name: uidPlaceholder });
-const ulp = ref({ id: 0, name: ulpPlaceholder });
+import {
+  selectedUid,
+  selectedUp3Ulp,
+  selectedUlp,
+  fetchUid,
+  itemsUid,
+  itemsUp3,
+  itemsUlp
+} from './reference'
+import { onMounted, ref } from 'vue'
+
+const uidPlaceholder = 'Semua Unit Induk Distribusi/Wilayah'
+const up3Placeholder = 'Semua Unit Pelaksanaan Pelayanan Pelanggan'
+const ulpPlaceholder = 'Semua Unit Layanan Pelanggan'
+const up3 = ref({ id: 0, name: up3Placeholder })
+const uid = ref({ id: 0, name: uidPlaceholder })
+const ulp = ref({ id: 0, name: ulpPlaceholder })
 const emit = defineEmits(['update:filters'])
 const data = ref({
   uid: uid.value,
   up3: up3.value,
   ulp: ulp.value,
   periode: '',
-  group: 1
+  groupBy: false
 })
+
 const setUid = (value: any) => {
-  uid.value = value;
-  selectedUid(value);
-  up3.value = { id: 0, name: up3Placeholder };
-  data.value.uid = value;
-};
+  uid.value = value
+  selectedUid(value)
+  up3.value = { id: 0, name: up3Placeholder }
+  data.value.uid = value
+}
 
 const setUp3 = (value: any) => {
-  up3.value = value;
-  selectedUp3Ulp(value);
-  ulp.value = { id: 0, name: ulpPlaceholder };
-  data.value.up3 = value;
-};
+  up3.value = value
+  selectedUp3Ulp(value)
+  ulp.value = { id: 0, name: ulpPlaceholder }
+  data.value.up3 = value
+}
 
 const setUlp = (value: any) => {
-  ulp.value = value;
-  selectedUlp(value);
-  data.value.ulp = value;
+  ulp.value = value
+  selectedUlp(value)
+  data.value.ulp = value
 
-  console.log('data.value', data.value);
+  console.log('data.value', data.value)
+}
 
-};
 onMounted(() => {
   emit('update:filters', data.value)
   fetchUid()
@@ -48,33 +58,52 @@ onMounted(() => {
 
 <template>
   <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" />
   </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" :selected="up3" :placeholder="up3Placeholder" />
+    <Select
+      @update:selected="setUp3($event)"
+      :data="itemsUp3"
+      :selected="up3"
+      :placeholder="up3Placeholder"
+    />
   </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" :selected="ulp" :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">
     <label class="block mb-2 font-semibold text-gray-800 sm:mb-0">Periode Tanggal:</label>
-    <DatePicker @update:date-value="(value) => data.periode = value" />
+    <DatePicker @update:date-value="(value) => (data.periode = value)" />
   </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">Group By Kode Unit Distribusi:</label>
+    <label class="block mb-2 font-semibold text-gray-800 sm:mb-0"
+      >Group By Kode Unit Distribusi:</label
+    >
 
-    <InlineRadioGroup @update:group-value="(value) => {
-      data.group = value
-      console.log('data.group', value)
-    }" :radio-items="[{ id: 1, title: 'Tidak' }, { id: 2, title: 'Ya, Grupkan' }]" />
+    <InlineRadioGroup
+      @update:group-value="(value) => (data.groupBy = value.id === 2)"
+      :radio-items="[
+        { id: 1, title: 'Tidak' },
+        { id: 2, title: 'Ya, Grupkan' }
+      ]"
+    />
   </div>
 </template>
diff --git a/src/components/Form/FiltersType/Type6.vue b/src/components/Form/FiltersType/Type6.vue
index 800fc87..4bfdc21 100755
--- a/src/components/Form/FiltersType/Type6.vue
+++ b/src/components/Form/FiltersType/Type6.vue
@@ -16,7 +16,7 @@ import { onMounted, ref } from 'vue'
 const emit = defineEmits(['update:filters'])
 const uidPlaceholder = 'Semua Unit Induk Distribusi/Wilayah'
 const up3Placeholder = 'Semua Unit Pelaksanaan Pelayanan Pelanggan'
-const poskoPlaceholder = 'Semua Unit Layanan Pelanggan'
+const poskoPlaceholder = 'Semua Posko'
 const up3 = ref({ id: 0, name: up3Placeholder })
 const uid = ref({ id: 0, name: uidPlaceholder })
 const posko = ref({ id: 0, name: poskoPlaceholder })
diff --git a/src/components/Form/FiltersType/Type7.vue b/src/components/Form/FiltersType/Type7.vue
index d4f53e0..187548a 100755
--- a/src/components/Form/FiltersType/Type7.vue
+++ b/src/components/Form/FiltersType/Type7.vue
@@ -16,16 +16,16 @@ import { onMounted, ref, watch } from 'vue'
 const emit = defineEmits(['update:filters'])
 const uidPlaceholder = 'Semua Unit Induk Distribusi/Wilayah'
 const up3Placeholder = 'Semua Unit Pelaksanaan Pelayanan Pelanggan'
-const poskoPlaceholder = 'Semua Unit Layanan Pelanggan'
+const poskoPlaceholder = 'Semua Posko'
 const up3 = ref({ id: 0, name: up3Placeholder })
 const uid = ref({ id: 0, name: uidPlaceholder })
 const posko = ref({ id: 0, name: poskoPlaceholder })
-const totalMin = ref("1 Menit")
-const totalMax = ref("5 Menit")
+const totalMin = ref('1 Menit')
+const totalMax = ref('5 Menit')
 
-const setDataMin = (value: any) => totalMin.value = value
+const setDataMin = (value: any) => (totalMin.value = value)
 const getDataMin = () => totalMin.value
-const setDataMax = (value: any) => totalMax.value = value
+const setDataMax = (value: any) => (totalMax.value = value)
 const getDataMax = () => totalMax.value
 
 const data = ref({
@@ -37,8 +37,6 @@ const data = ref({
   maxTime: getDataMax().split(' ')[0]
 })
 
-
-
 const setUid = (value: any) => {
   uid.value = value
   selectedUid(value)
@@ -109,21 +107,35 @@ onMounted(() => {
 
 <template>
   <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" />
   </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" :selected="up3" :placeholder="up3Placeholder" />
+    <Select
+      @update:selected="setUp3($event)"
+      :data="itemsUp3"
+      :selected="up3"
+      :placeholder="up3Placeholder"
+    />
   </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">Posko:</label>
 
-    <Select @update:selected="setPosko($event)" :data="itemsPosko" :selected="posko" :placeholder="poskoPlaceholder" />
+    <Select
+      @update:selected="setPosko($event)"
+      :data="itemsPosko"
+      :selected="posko"
+      :placeholder="poskoPlaceholder"
+    />
   </div>
 
   <div class="sm:grid sm:grid-cols-2 lg:grid-cols-3 sm:items-center">
diff --git a/src/components/Pages/Cico/LaporanCICO.vue b/src/components/Pages/Cico/LaporanCICO.vue
index 7e7b99d..9909ad6 100755
--- a/src/components/Pages/Cico/LaporanCICO.vue
+++ b/src/components/Pages/Cico/LaporanCICO.vue
@@ -2,6 +2,7 @@
   <Filters @run-search="() => filterData(filters)" class="mb-4">
     <Type1 @update:filters="(value) => (filters = value)" />
   </Filters>
+
   <div id="data">
     <DxDataGrid
       class="max-h-[calc(100vh-140px)] mb-10"
diff --git a/src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue b/src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue
index ad665e3..2acc405 100755
--- a/src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue
+++ b/src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue
@@ -357,14 +357,7 @@ const filterData = (params: any) => {
   })
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
-      queryResult.data.rekapitulasiAllGangguan.forEach((item: any) => {
-        data.value = [
-          ...data.value,
-          {
-            ...item
-          }
-        ]
-      })
+      data.value = queryResult.data.rekapitulasiAllGangguan
     }
     console.log(queryResult.loading)
     console.log(queryResult.networkStatus)
diff --git a/src/components/Pages/Gangguan/Rekap/RGangguan_JenisGangguan.vue b/src/components/Pages/Gangguan/Rekap/RGangguan_JenisGangguan.vue
index b10066d..9d757ee 100755
--- a/src/components/Pages/Gangguan/Rekap/RGangguan_JenisGangguan.vue
+++ b/src/components/Pages/Gangguan/Rekap/RGangguan_JenisGangguan.vue
@@ -63,8 +63,8 @@
       <DxColumn
         :width="120"
         alignment="center"
-        data-field="kode"
-        caption="Kode"
+        data-field="sub_kelompok"
+        caption="Kelompok"
         css-class="custom-table-column"
         group-index="0"
       />
@@ -398,6 +398,7 @@ const GET_REKAP_JENIS_GANGGUAN = gql`
       idUid: $idUid
       idUp3: $idUp3
     ) {
+      sub_kelompok
       avg_durasi_recovery
       avg_durasi_response
       max_durasi_recovery
@@ -409,6 +410,8 @@ const GET_REKAP_JENIS_GANGGUAN = gql`
       tipe_permasalahan
       total
       kode
+      total_durasi_recovery
+      total_durasi_response
       total_diatas_sla_recovery
       total_diatas_sla_response
       total_dibawah_sla_recovery
@@ -478,12 +481,11 @@ const filterData = (params: any) => {
   })
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
-      let no = 0
-      queryResult.data.rekapitulasiPerJenisGangguan.forEach((item: any) => {
-        dataReal.value = [
-          ...dataReal.value,
-          {
-            no: ++no,
+      dataReal.value = queryResult.data.rekapitulasiPerJenisGangguan.map(
+        (item: any, index: number) => {
+          return {
+            no: ++index,
+            sub_kelompok: item.sub_kelompok,
             kode: item.kode,
             jenisGangguan: item.tipe_permasalahan,
             laporan: {
@@ -499,7 +501,7 @@ const filterData = (params: any) => {
             },
             responseTime: {
               menit: {
-                total: item.avg_durasi_response,
+                total: item.total_durasi_response,
                 rataRata: item.avg_durasi_response,
                 max: item.max_durasi_response,
                 min: item.min_durasi_response
@@ -511,7 +513,7 @@ const filterData = (params: any) => {
             },
             recoveryTime: {
               menit: {
-                total: item.avg_durasi_recovery,
+                total: item.total_durasi_recovery,
                 rataRata: item.avg_durasi_recovery,
                 max: item.max_durasi_recovery,
                 min: item.min_durasi_recovery
@@ -522,8 +524,8 @@ const filterData = (params: any) => {
               }
             }
           }
-        ]
-      })
+        }
+      )
     }
     console.log(queryResult.loading)
     console.log(queryResult.networkStatus)
diff --git a/src/components/Pages/Gangguan/Rekap/RGangguan_PerPosko.vue b/src/components/Pages/Gangguan/Rekap/RGangguan_PerPosko.vue
index b31477f..9ee78ee 100755
--- a/src/components/Pages/Gangguan/Rekap/RGangguan_PerPosko.vue
+++ b/src/components/Pages/Gangguan/Rekap/RGangguan_PerPosko.vue
@@ -510,6 +510,8 @@ const GET_REKAPITULASI_GANGGUAN_PER_POSKO = gql`
       persen_inproses
       persen_selesai
       total
+      total_durasi_recovery
+      total_durasi_response
       total_diatas_sla_recovery
       total_diatas_sla_response
       total_dibawah_sla_recovery
@@ -578,10 +580,9 @@ const filterData = (params: any) => {
   })
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
-      var i = 1
-      queryResult.data.rekapitulasiGangguanPerPosko.forEach((item: any) => {
-        const entry = {
-          no: Number(i++),
+      data.value = queryResult.data.rekapitulasiGangguanPerPosko.map((item: any, index: number) => {
+        return {
+          no: ++index,
           nama_posko: item.nama_posko,
           laporan: {
             total: item.total,
@@ -596,7 +597,7 @@ const filterData = (params: any) => {
           },
           responseTime: {
             menit: {
-              total: 0,
+              total: item.total_durasi_response,
               rataRata: item.avg_durasi_response,
               max: item.max_durasi_response,
               min: item.min_durasi_response
@@ -608,7 +609,7 @@ const filterData = (params: any) => {
           },
           recoveryTime: {
             menit: {
-              total: 0,
+              total: item.total_durasi_recovery,
               rataRata: item.avg_durasi_recovery,
               max: item.max_durasi_recovery,
               min: item.min_durasi_recovery
@@ -619,10 +620,7 @@ const filterData = (params: any) => {
             }
           }
         }
-        data.value = [...data.value, entry]
       })
-
-      data.value = [...data.value]
     }
     console.log(queryResult.data)
     console.log(queryResult.loading)
diff --git a/src/components/Pages/Gangguan/Rekap/RGangguan_PerRegu.vue b/src/components/Pages/Gangguan/Rekap/RGangguan_PerRegu.vue
index f886ed0..e7d8e5c 100755
--- a/src/components/Pages/Gangguan/Rekap/RGangguan_PerRegu.vue
+++ b/src/components/Pages/Gangguan/Rekap/RGangguan_PerRegu.vue
@@ -410,6 +410,8 @@ const GET_REKAPITULASI_GANGGUAN_PER_REGU = gql`
       persen_selesai
       nama_posko
       total
+      total_durasi_recovery
+      total_durasi_response
       total_diatas_sla_recovery
       total_diatas_sla_response
       total_dibawah_sla_recovery
@@ -478,11 +480,9 @@ const filterData = (params: any) => {
   })
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
-      var i = 1
-
-      queryResult.data.rekapitulasiGangguanPerRegu.forEach((item: any) => {
-        const entry = {
-          no: Number(i++),
+      data.value = queryResult.data.rekapitulasiGangguanPerRegu.map((item: any, index: number) => {
+        return {
+          no: ++index,
           kode_regu: item.kode_regu,
           nama_regu: item.nama_regu,
           laporan: {
@@ -498,7 +498,7 @@ const filterData = (params: any) => {
           },
           responseTime: {
             menit: {
-              total: 0,
+              total: item.total_durasi_response,
               rataRata: item.avg_durasi_response,
               max: item.max_durasi_response,
               min: item.min_durasi_response
@@ -510,7 +510,7 @@ const filterData = (params: any) => {
           },
           recoveryTime: {
             menit: {
-              total: 0,
+              total: item.total_durasi_recovery,
               rataRata: item.avg_durasi_recovery,
               max: item.max_durasi_recovery,
               min: item.min_durasi_recovery
@@ -521,10 +521,7 @@ const filterData = (params: any) => {
             }
           }
         }
-        data.value = [...data.value, entry]
       })
-
-      data.value = [...data.value]
     }
     console.log(queryResult.data)
     console.log(queryResult.loading)
diff --git a/src/components/Pages/Gangguan/Rekap/RGangguan_PerTanggal.vue b/src/components/Pages/Gangguan/Rekap/RGangguan_PerTanggal.vue
index 434b15d..eaee884 100755
--- a/src/components/Pages/Gangguan/Rekap/RGangguan_PerTanggal.vue
+++ b/src/components/Pages/Gangguan/Rekap/RGangguan_PerTanggal.vue
@@ -51,7 +51,7 @@
       <DxColumn
         :width="120"
         alignment="center"
-        data-field="id_uid"
+        data-field="nama_uid"
         caption="Nama UID"
         css-class="custom-table-column"
         group-index="0"
@@ -115,7 +115,7 @@
           <DxColumn
             :width="120"
             alignment="center"
-            data-field="total_response"
+            data-field="total_durasi_response"
             data-type="number"
             caption="Total"
             css-class="custom-table-column"
@@ -171,7 +171,7 @@
           <DxColumn
             :width="120"
             alignment="center"
-            data-field="total_recovery"
+            data-field="total_durasi_recovery"
             data-type="number"
             caption="Total"
             css-class="custom-table-column"
@@ -369,7 +369,5 @@ const filterData = (params: any) => {
   })
 }
 
-const filters = ref({
-  groupBy: false
-})
+const filters = ref({ groupBy: false })
 </script>
diff --git a/src/components/Pages/Keluhan/Daftar/DKeluhan_BerdasarMedia.vue b/src/components/Pages/Keluhan/Daftar/DKeluhan_BerdasarMedia.vue
index 25d8feb..0b33fa2 100755
--- a/src/components/Pages/Keluhan/Daftar/DKeluhan_BerdasarMedia.vue
+++ b/src/components/Pages/Keluhan/Daftar/DKeluhan_BerdasarMedia.vue
@@ -4,57 +4,182 @@
   </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" :column-width="100" @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"
+      :column-width="100"
+      @exporting="onExporting"
+      :allow-column-resizing="true"
+      column-resizing-mode="widget"
+      :word-wrap-enabled="true"
+    >
       <DxSelection mode="single" />
       <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" />
-      <DxLoadPanel :position="position" :show-indicator="showIndicator" :show-pane="showPane" :shading="shading"
-        v-if="loading" v-model:visible="loading" :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"
+      />
+      <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 css-class="custom-table-column" :width="50" alignment="center"
-        :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1" data-type="number" caption="No" />
-      <DxColumn :width="170" alignment="center" data-field="no_laporan" caption="No Laporan"
-        css-class="custom-table-column" cell-template="data" />
-      <DxColumn :width="170" alignment="center" data-field="nama_pelapor" caption="Nama Pelapor"
-        css-class="custom-table-column" cell-template="data" />
-      <DxColumn :width="170" alignment="center" data-field="alamat_pelapor" caption="Alamat Pelapor"
-        css-class="custom-table-column" cell-template="data" />
-      <DxColumn :width="170" alignment="center" data-field="no_telp_pelapor" caption="No Telp Pelapor"
-        css-class="custom-table-column" cell-template="data" />
-      <DxColumn :width="170" alignment="center" data-field="keterangan_pelapor" caption="Keterangan Pelapor"
-        css-class="custom-table-column" cell-template="data" />
-      <DxColumn :width="120" alignment="center" data-field="status_akhir" caption="Status" css-class="custom-table-column"
-        cell-template="data" />
+      <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
+        :width="170"
+        alignment="center"
+        data-field="no_laporan"
+        caption="No Laporan"
+        css-class="custom-table-column"
+        cell-template="data"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="nama_pelapor"
+        caption="Nama Pelapor"
+        css-class="custom-table-column"
+        cell-template="data"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="alamat_pelapor"
+        caption="Alamat Pelapor"
+        css-class="custom-table-column"
+        cell-template="data"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="no_telp_pelapor"
+        caption="No Telp Pelapor"
+        css-class="custom-table-column"
+        cell-template="data"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="keterangan_pelapor"
+        caption="Keterangan Pelapor"
+        css-class="custom-table-column"
+        cell-template="data"
+      />
+      <DxColumn
+        :width="120"
+        alignment="center"
+        data-field="status_akhir"
+        caption="Status"
+        css-class="custom-table-column"
+        cell-template="data"
+      />
 
-      <DxColumn :width="170" alignment="center" data-field="waktu_lapor" caption="Tgl Lapor"
-        css-class="custom-table-column" cell-template="data" />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="waktu_lapor"
+        caption="Tgl Lapor"
+        css-class="custom-table-column"
+        cell-template="data"
+      />
+
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="waktu_response"
+        caption="Tgl Response"
+        css-class="custom-table-column"
+        cell-template="data"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="waktu_recovery"
+        caption="Tgl Recovery"
+        css-class="custom-table-column"
+        cell-template="data"
+      />
+      <DxColumn
+        :width="150"
+        alignment="center"
+        data-field="durasi_response_time"
+        caption="Response Time"
+        css-class="custom-table-column"
+        cell-template="data-waktu"
+      />
+      <DxColumn
+        :width="150"
+        alignment="center"
+        data-field="durasi_recovery_time"
+        caption="Recovery Time"
+        css-class="custom-table-column"
+        cell-template="data-waktu"
+      />
+      <DxColumn
+        :width="150"
+        alignment="center"
+        data-field="media"
+        caption="Sumber Lapor"
+        css-class="custom-table-column"
+        cell-template="data"
+      />
+      <DxColumn
+        :width="150"
+        alignment="center"
+        data-field="waktu_media"
+        caption="Tgl Media"
+        css-class="custom-table-column"
+        cell-template="data"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="keterangan_media"
+        caption="Keterangan Media"
+        css-class="custom-table-column"
+        cell-template="data"
+      />
 
-      <DxColumn :width="170" alignment="center" data-field="waktu_response" caption="Tgl Response"
-        css-class="custom-table-column" cell-template="data" />
-      <DxColumn :width="170" alignment="center" data-field="waktu_recovery" caption="Tgl Recovery"
-        css-class="custom-table-column" cell-template="data" />
-      <DxColumn :width="150" alignment="center" data-field="waktu_response" caption="Response Time"
-        css-class="custom-table-column" cell-template="data" />
-      <DxColumn :width="150" alignment="center" data-field="durasi_recovery_time" caption="Recovery Time"
-        css-class="custom-table-column" cell-template="data" />
-      <DxColumn :width="150" alignment="center" data-field="media" caption="Sumber Lapor" css-class="custom-table-column"
-        cell-template="data" />
-      <DxColumn :width="150" alignment="center" data-field="waktu_media" caption="Tgl Media"
-        css-class="custom-table-column" cell-template="data" />
-      <DxColumn :width="170" alignment="center" data-field="keterangan_media" caption="Keterangan Media"
-        css-class="custom-table-column" cell-template="data" />
       <template #data="{ data }">
         <p class="cursor-pointer" @click="showData()">
           {{ data.text }}
         </p>
       </template>
+
+      <template #data-waktu="{ data }">
+        <p class="cursor-pointer" @click="showData()">
+          {{ parseInt(data.text) ? formatWaktu(data.text) : '-' }}
+        </p>
+      </template>
     </DxDataGrid>
   </div>
 
@@ -77,13 +202,22 @@
 
       <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">
         <h3 class="text-sm font-medium w-[170px] text-gray-800">Keterangan Pelapor:</h3>
-        <InputText :readonly="true" type="textarea" :value="dataDetail?.keterangan_pelapor"
-          class-name="flex-1 h-[56px]" />
+        <InputText
+          :readonly="true"
+          type="textarea"
+          :value="dataDetail?.keterangan_pelapor"
+          class-name="flex-1 h-[56px]"
+        />
       </div>
 
       <div class="flex flex-row items-center justify-between w-full">
@@ -108,12 +242,28 @@
 
       <div class="flex flex-row items-center justify-between w-full">
         <h3 class="text-sm font-medium w-[170px] text-gray-800">Response Time:</h3>
-        <InputText :readonly="true" :value="dataDetail?.durasi_response_time" class-name="flex-1" />
+        <InputText
+          :readonly="true"
+          :value="
+            parseInt(dataDetail?.durasi_response_time)
+              ? formatWaktu(dataDetail?.durasi_response_time)
+              : '-'
+          "
+          class-name="flex-1"
+        />
       </div>
 
       <div class="flex flex-row items-center justify-between w-full">
         <h3 class="text-sm font-medium w-[170px] text-gray-800">Recovery Time:</h3>
-        <InputText :readonly="true" :value="dataDetail?.durasi_recovery_time" class-name="flex-1" />
+        <InputText
+          :readonly="true"
+          :value="
+            parseInt(dataDetail?.durasi_recovery_time)
+              ? formatWaktu(dataDetail?.durasi_recovery_time)
+              : '-'
+          "
+          class-name="flex-1"
+        />
       </div>
 
       <div class="flex flex-row items-center justify-between w-full">
@@ -128,7 +278,12 @@
 
       <div class="flex flex-row items-center justify-between w-full">
         <h3 class="text-sm font-medium w-[170px] text-gray-800">Keterangan Media:</h3>
-        <InputText :readonly="true" type="textarea" :value="dataDetail?.keterangan_media" class-name="flex-1 h-[56px]" />
+        <InputText
+          :readonly="true"
+          type="textarea"
+          :value="dataDetail?.keterangan_media"
+          class-name="flex-1 h-[56px]"
+        />
       </div>
     </div>
   </DetailDialog>
@@ -139,6 +294,7 @@ import DetailDialog from '@/components/Dialogs/DetailDialog.vue'
 import InputText from '@/components/InputText.vue'
 import Filters from '@/components/Form/Filters.vue'
 import Type3 from '@/components/Form/FiltersType/Type3.vue'
+import { formatWaktu } from '@/components/Form/FiltersType/reference'
 import { ref } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
diff --git a/src/components/Pages/Keluhan/Daftar/DKeluhan_PLD1K.vue b/src/components/Pages/Keluhan/Daftar/DKeluhan_PLD1K.vue
index 69e1f91..cc118b6 100755
--- a/src/components/Pages/Keluhan/Daftar/DKeluhan_PLD1K.vue
+++ b/src/components/Pages/Keluhan/Daftar/DKeluhan_PLD1K.vue
@@ -440,7 +440,6 @@ const filterData = (params: any) => {
   onResult((queryResult) => {
     if (queryResult.data != undefined) {
       data.value = queryResult.data.daftarKeluhanMelaporLebihDariSatuKali
-      console.log(data.value[0])
     }
     console.log(queryResult.data)
     console.log(queryResult.loading)
diff --git a/src/components/Pages/Keluhan/Daftar/DKeluhan_RecoveryTime.vue b/src/components/Pages/Keluhan/Daftar/DKeluhan_RecoveryTime.vue
index 96d73b1..955b3bd 100755
--- a/src/components/Pages/Keluhan/Daftar/DKeluhan_RecoveryTime.vue
+++ b/src/components/Pages/Keluhan/Daftar/DKeluhan_RecoveryTime.vue
@@ -93,7 +93,7 @@
         data-field="durasi_response_time"
         caption="Durasi Response Time"
         css-class="custom-table-column"
-        cell-template="data"
+        cell-template="data-waktu"
       />
       <DxColumn
         :width="170"
@@ -101,7 +101,7 @@
         data-field="durasi_recovery_time"
         caption="Durasi Recovery Time"
         css-class="custom-table-column"
-        cell-template="data"
+        cell-template="data-waktu"
       />
       <DxColumn
         :width="120"
@@ -159,11 +159,18 @@
         css-class="custom-table-column"
         cell-template="data"
       />
+
       <template #data="{ data }">
         <p class="cursor-pointer" @click="showData()">
           {{ data.text }}
         </p>
       </template>
+
+      <template #data-waktu="{ data }">
+        <p class="cursor-pointer" @click="showData()">
+          {{ parseInt(data.text) ? formatWaktu(data.text) : '-' }}
+        </p>
+      </template>
     </DxDataGrid>
   </div>
 
@@ -191,12 +198,28 @@
 
       <div class="flex flex-row items-center justify-between w-full">
         <h3 class="text-sm font-medium w-[170px] text-gray-800">Response Time:</h3>
-        <InputText :readonly="true" :value="dataDetail?.durasi_response_time" class-name="flex-1" />
+        <InputText
+          :readonly="true"
+          :value="
+            parseInt(dataDetail?.durasi_response_time)
+              ? formatWaktu(dataDetail?.durasi_response_time)
+              : '-'
+          "
+          class-name="flex-1"
+        />
       </div>
 
       <div class="flex flex-row items-center justify-between w-full">
         <h3 class="text-sm font-medium w-[170px] text-gray-800">Recovery Time:</h3>
-        <InputText :readonly="true" :value="dataDetail?.durasi_recovery_time" class-name="flex-1" />
+        <InputText
+          :readonly="true"
+          :value="
+            parseInt(dataDetail?.durasi_recovery_time)
+              ? formatWaktu(dataDetail?.durasi_recovery_time)
+              : '-'
+          "
+          class-name="flex-1"
+        />
       </div>
 
       <div class="flex flex-row items-center justify-between w-full">
@@ -257,6 +280,7 @@ import DetailDialog from '@/components/Dialogs/DetailDialog.vue'
 import InputText from '@/components/InputText.vue'
 import Filters from '@/components/Form/Filters.vue'
 import Type11 from '@/components/Form/FiltersType/Type11.vue'
+import { formatWaktu } from '@/components/Form/FiltersType/reference'
 import { ref } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
diff --git a/src/components/Pages/Keluhan/Daftar/DKeluhan_ResponseTime.vue b/src/components/Pages/Keluhan/Daftar/DKeluhan_ResponseTime.vue
index c4f6de1..276f660 100755
--- a/src/components/Pages/Keluhan/Daftar/DKeluhan_ResponseTime.vue
+++ b/src/components/Pages/Keluhan/Daftar/DKeluhan_ResponseTime.vue
@@ -93,7 +93,7 @@
         data-field="durasi_response_time"
         caption="Durasi Response Time"
         css-class="custom-table-column"
-        cell-template="data"
+        cell-template="data-waktu"
       />
       <DxColumn
         :width="170"
@@ -101,7 +101,7 @@
         data-field="durasi_recovery_time"
         caption="Durasi Recovery Time"
         css-class="custom-table-column"
-        cell-template="data"
+        cell-template="data-waktu"
       />
       <DxColumn
         :width="120"
@@ -159,13 +159,21 @@
         css-class="custom-table-column"
         cell-template="data"
       />
+
       <template #data="{ data }">
         <p class="cursor-pointer" @click="showData()">
           {{ data.text }}
         </p>
       </template>
+
+      <template #data-waktu="{ data }">
+        <p class="cursor-pointer" @click="showData()">
+          {{ parseInt(data.text) ? formatWaktu(data.text) : '-' }}
+        </p>
+      </template>
     </DxDataGrid>
   </div>
+
   <DetailDialog :open="showDetail" title="Detail Keluhan" @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">
@@ -190,12 +198,28 @@
 
       <div class="flex flex-row items-center justify-between w-full">
         <h3 class="text-sm font-medium w-[170px] text-gray-800">Response Time:</h3>
-        <InputText :readonly="true" :value="dataDetail?.durasi_response_time" class-name="flex-1" />
+        <InputText
+          :readonly="true"
+          :value="
+            parseInt(dataDetail?.durasi_response_time)
+              ? formatWaktu(dataDetail?.durasi_response_time)
+              : '-'
+          "
+          class-name="flex-1"
+        />
       </div>
 
       <div class="flex flex-row items-center justify-between w-full">
         <h3 class="text-sm font-medium w-[170px] text-gray-800">Recovery Time:</h3>
-        <InputText :readonly="true" :value="dataDetail?.durasi_recovery_time" class-name="flex-1" />
+        <InputText
+          :readonly="true"
+          :value="
+            parseInt(dataDetail?.durasi_recovery_time)
+              ? formatWaktu(dataDetail?.durasi_recovery_time)
+              : '-'
+          "
+          class-name="flex-1"
+        />
       </div>
 
       <div class="flex flex-row items-center justify-between w-full">
@@ -256,6 +280,7 @@ import DetailDialog from '@/components/Dialogs/DetailDialog.vue'
 import InputText from '@/components/InputText.vue'
 import Filters from '@/components/Form/Filters.vue'
 import Type11 from '@/components/Form/FiltersType/Type11.vue'
+import { formatWaktu } from '@/components/Form/FiltersType/reference'
 import { ref } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
diff --git a/src/components/Pages/Keluhan/Daftar/DKeluhan_STIDP.vue b/src/components/Pages/Keluhan/Daftar/DKeluhan_STIDP.vue
index d87208f..3186b9f 100755
--- a/src/components/Pages/Keluhan/Daftar/DKeluhan_STIDP.vue
+++ b/src/components/Pages/Keluhan/Daftar/DKeluhan_STIDP.vue
@@ -4,55 +4,180 @@
   </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" :column-width="100" @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"
+      :column-width="100"
+      @exporting="onExporting"
+      :allow-column-resizing="true"
+      column-resizing-mode="widget"
+      :word-wrap-enabled="true"
+    >
       <DxSelection mode="single" />
       <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" />
-      <DxLoadPanel :position="position" :show-indicator="showIndicator" :show-pane="showPane" :shading="shading"
-        v-if="loading" v-model:visible="loading" :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"
+      />
+      <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 css-class="custom-table-column" :width="50" alignment="center"
-        :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1" data-type="number" caption="No" />
-      <DxColumn :width="170" alignment="center" data-field="no_laporan" caption="No Laporan"
-        css-class="custom-table-column" cell-template="data" />
-      <DxColumn :width="170" alignment="center" data-field="waktu_lapor" caption="Tgl Lapor"
-        css-class="custom-table-column" cell-template="data" />
-      <DxColumn :width="170" alignment="center" data-field="waktu_response" caption="Tgl Response"
-        css-class="custom-table-column" cell-template="data" />
-      <DxColumn :width="170" alignment="center" data-field="waktu_recovery" caption="Tgl Recovery"
-        css-class="custom-table-column" cell-template="data" />
-      <DxColumn :width="170" alignment="center" data-field="durasi_response_time" caption="Durasi Response Time"
-        css-class="custom-table-column" cell-template="data" />
-      <DxColumn :width="170" alignment="center" data-field="durasi_recovery_time" caption="Durasi Recovery Time"
-        css-class="custom-table-column" cell-template="data" />
-      <DxColumn :width="120" alignment="center" data-field="status_akhir" caption="Status" css-class="custom-table-column"
-        cell-template="data" />
-      <DxColumn :width="170" alignment="center" data-field="idpel_nometer" caption="IDPEL/NO METER"
-        css-class="custom-table-column" cell-template="data" />
-      <DxColumn :width="170" alignment="center" data-field="nama_pelapor" caption="Nama Pelapor"
-        css-class="custom-table-column" cell-template="data" />
-      <DxColumn :width="170" alignment="center" data-field="alamat_pelapor" caption="Alamat Pelapor"
-        css-class="custom-table-column" cell-template="data" />
-      <DxColumn :width="170" alignment="center" data-field="no_telp_pelapor" caption="No Telp Pelapor"
-        css-class="custom-table-column" cell-template="data" />
-      <DxColumn :width="170" alignment="center" data-field="keterangan_pelapor" caption="Keterangan Pelapor"
-        css-class="custom-table-column" cell-template="data" />
-      <DxColumn :width="150" alignment="center" data-field="media" caption="Sumber Lapor" css-class="custom-table-column"
-        cell-template="data" />
-      <DxColumn :width="150" alignment="center" data-field="nama_ulp" caption="Nama ULP" css-class="custom-table-column"
-        cell-template="data" />
+      <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
+        :width="170"
+        alignment="center"
+        data-field="no_laporan"
+        caption="No Laporan"
+        css-class="custom-table-column"
+        cell-template="data"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="waktu_lapor"
+        caption="Tgl Lapor"
+        css-class="custom-table-column"
+        cell-template="data"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="waktu_response"
+        caption="Tgl Response"
+        css-class="custom-table-column"
+        cell-template="data"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="waktu_recovery"
+        caption="Tgl Recovery"
+        css-class="custom-table-column"
+        cell-template="data"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="durasi_response_time"
+        caption="Durasi Response Time"
+        css-class="custom-table-column"
+        cell-template="data-waktu"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="durasi_recovery_time"
+        caption="Durasi Recovery Time"
+        css-class="custom-table-column"
+        cell-template="data-waktu"
+      />
+      <DxColumn
+        :width="120"
+        alignment="center"
+        data-field="status_akhir"
+        caption="Status"
+        css-class="custom-table-column"
+        cell-template="data"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="idpel_nometer"
+        caption="IDPEL/NO METER"
+        css-class="custom-table-column"
+        cell-template="data"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="nama_pelapor"
+        caption="Nama Pelapor"
+        css-class="custom-table-column"
+        cell-template="data"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="alamat_pelapor"
+        caption="Alamat Pelapor"
+        css-class="custom-table-column"
+        cell-template="data"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="no_telp_pelapor"
+        caption="No Telp Pelapor"
+        css-class="custom-table-column"
+        cell-template="data"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="keterangan_pelapor"
+        caption="Keterangan Pelapor"
+        css-class="custom-table-column"
+        cell-template="data"
+      />
+      <DxColumn
+        :width="150"
+        alignment="center"
+        data-field="media"
+        caption="Sumber Lapor"
+        css-class="custom-table-column"
+        cell-template="data"
+      />
+      <DxColumn
+        :width="150"
+        alignment="center"
+        data-field="nama_ulp"
+        caption="Nama ULP"
+        css-class="custom-table-column"
+        cell-template="data"
+      />
+
       <template #data="{ data }">
         <p class="cursor-pointer" @click="showData()">
           {{ data.text }}
         </p>
       </template>
+
+      <template #data-waktu="{ data }">
+        <p class="cursor-pointer" @click="showData()">
+          {{ parseInt(data.text) ? formatWaktu(data.text) : '-' }}
+        </p>
+      </template>
     </DxDataGrid>
   </div>
 
@@ -80,12 +205,28 @@
 
       <div class="flex flex-row items-center justify-between w-full">
         <h3 class="text-sm font-medium w-[170px] text-gray-800">Response Time:</h3>
-        <InputText :readonly="true" :value="dataDetail?.durasi_response_time" class-name="flex-1" />
+        <InputText
+          :readonly="true"
+          :value="
+            parseInt(dataDetail?.durasi_response_time)
+              ? formatWaktu(dataDetail?.durasi_response_time)
+              : '-'
+          "
+          class-name="flex-1"
+        />
       </div>
 
       <div class="flex flex-row items-center justify-between w-full">
         <h3 class="text-sm font-medium w-[170px] text-gray-800">Recovery Time:</h3>
-        <InputText :readonly="true" :value="dataDetail?.durasi_recovery_time" class-name="flex-1" />
+        <InputText
+          :readonly="true"
+          :value="
+            parseInt(dataDetail?.durasi_recovery_time)
+              ? formatWaktu(dataDetail?.durasi_recovery_time)
+              : '-'
+          "
+          class-name="flex-1"
+        />
       </div>
 
       <div class="flex flex-row items-center justify-between w-full">
@@ -105,7 +246,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">
@@ -115,8 +261,12 @@
 
       <div class="flex flex-row items-center justify-between w-full">
         <h3 class="text-sm font-medium w-[170px] text-gray-800">Keterangan Pelapor:</h3>
-        <InputText :readonly="true" type="textarea" :value="dataDetail?.keterangan_pelapor"
-          class-name="flex-1 h-[56px]" />
+        <InputText
+          :readonly="true"
+          type="textarea"
+          :value="dataDetail?.keterangan_pelapor"
+          class-name="flex-1 h-[56px]"
+        />
       </div>
 
       <div class="flex flex-row items-center justify-between w-full">
@@ -137,6 +287,7 @@ import DetailDialog from '@/components/Dialogs/DetailDialog.vue'
 import InputText from '@/components/InputText.vue'
 import Filters from '@/components/Form/Filters.vue'
 import Type3 from '@/components/Form/FiltersType/Type3.vue'
+import { formatWaktu } from '@/components/Form/FiltersType/reference'
 import { ref } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
diff --git a/src/components/Pages/Keluhan/Daftar/DKeluhan_SelesaiCC.vue b/src/components/Pages/Keluhan/Daftar/DKeluhan_SelesaiCC.vue
index ea00b83..8c2e0b3 100755
--- a/src/components/Pages/Keluhan/Daftar/DKeluhan_SelesaiCC.vue
+++ b/src/components/Pages/Keluhan/Daftar/DKeluhan_SelesaiCC.vue
@@ -4,55 +4,170 @@
   </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" :column-width="100" @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"
+      :column-width="100"
+      @exporting="onExporting"
+      :allow-column-resizing="true"
+      column-resizing-mode="widget"
+      :word-wrap-enabled="true"
+    >
       <DxSelection mode="single" />
       <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" />
-      <DxLoadPanel :position="position" :show-indicator="showIndicator" :show-pane="showPane" :shading="shading"
-        v-if="loading" v-model:visible="loading" :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"
+      />
+      <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 css-class="custom-table-column" :width="50" alignment="center"
-        :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1" data-type="number" caption="No" />
-      <DxColumn :width="170" alignment="center" data-field="no_laporan" caption="No Laporan"
-        css-class="custom-table-column" />
-      <DxColumn :width="170" alignment="center" data-field="nama_ulp" caption="Contact Center"
-        css-class="custom-table-column" />
-      <DxColumn :width="170" alignment="center" data-field="nama_uid" caption="UI Dist."
-        css-class="custom-table-column" />
-      <DxColumn :width="170" alignment="center" data-field="nama_ulp" caption="ULP" css-class="custom-table-column" />
-      <DxColumn :width="170" alignment="center" data-field="idpel_nometer" caption="IDPEL/NO METER"
-        css-class="custom-table-column" />
-      <DxColumn :width="170" alignment="center" data-field="nama_pelapor" caption="Nama Pelapor"
-        css-class="custom-table-column" />
+      <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
+        :width="170"
+        alignment="center"
+        data-field="no_laporan"
+        caption="No Laporan"
+        css-class="custom-table-column"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="nama_ulp"
+        caption="Contact Center"
+        css-class="custom-table-column"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="nama_uid"
+        caption="UI Dist."
+        css-class="custom-table-column"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="nama_ulp"
+        caption="ULP"
+        css-class="custom-table-column"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="idpel_nometer"
+        caption="IDPEL/NO METER"
+        css-class="custom-table-column"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="nama_pelapor"
+        caption="Nama Pelapor"
+        css-class="custom-table-column"
+      />
 
-      <DxColumn :width="170" alignment="center" data-field="alamat_pelapor" caption="Alamat Pelapor"
-        css-class="custom-table-column" />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="alamat_pelapor"
+        caption="Alamat Pelapor"
+        css-class="custom-table-column"
+      />
 
-      <DxColumn :width="170" alignment="center" data-field="no_telp_pelapor" caption="No Tlp Pelapor"
-        css-class="custom-table-column" />
-      <DxColumn :width="170" alignment="center" data-field="keterangan_pelapor" caption="Keterangan Pelapor"
-        css-class="custom-table-column" />
-      <DxColumn :width="150" alignment="center" data-field="status_akhir" caption="APKT Status"
-        css-class="custom-table-column" />
-      <DxColumn :width="150" alignment="center" data-field="nama_pelapor" caption="Created By"
-        css-class="custom-table-column" />
-      <DxColumn :width="170" alignment="center" data-field="waktu_recovery" caption="Tgl Penyelesaian"
-        css-class="custom-table-column" />
-      <DxColumn :width="170" alignment="center" data-field="jumlah_lapor" caption="Lapor Ulang"
-        css-class="custom-table-column" />
-      <DxColumn :width="170" alignment="center" data-field="media" caption="Sumber Lapor"
-        css-class="custom-table-column" />
-      <DxColumn :width="170" alignment="center" data-field="nama_issuetype" caption="Issue Type"
-        css-class="custom-table-column" />
-      <DxColumn :width="170" alignment="center" data-field="nama_subissuetype" caption="Sub Issue Type"
-        css-class="custom-table-column" />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="no_telp_pelapor"
+        caption="No Tlp Pelapor"
+        css-class="custom-table-column"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="keterangan_pelapor"
+        caption="Keterangan Pelapor"
+        css-class="custom-table-column"
+      />
+      <DxColumn
+        :width="150"
+        alignment="center"
+        data-field="status_akhir"
+        caption="APKT Status"
+        css-class="custom-table-column"
+      />
+      <DxColumn
+        :width="150"
+        alignment="center"
+        data-field="nama_pelapor"
+        caption="Created By"
+        css-class="custom-table-column"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="waktu_recovery"
+        caption="Tgl Penyelesaian"
+        css-class="custom-table-column"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="jumlah_lapor"
+        caption="Lapor Ulang"
+        css-class="custom-table-column"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="media"
+        caption="Sumber Lapor"
+        css-class="custom-table-column"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="nama_issuetype"
+        caption="Issue Type"
+        css-class="custom-table-column"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="nama_subissuetype"
+        caption="Sub Issue Type"
+        css-class="custom-table-column"
+      />
     </DxDataGrid>
   </div>
 </template>
diff --git a/src/components/Pages/Keluhan/Rekap/RKeluhan_ALL.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_ALL.vue
index 9e333e9..b1cc9d9 100755
--- a/src/components/Pages/Keluhan/Rekap/RKeluhan_ALL.vue
+++ b/src/components/Pages/Keluhan/Rekap/RKeluhan_ALL.vue
@@ -1,88 +1,224 @@
 <template>
-  <Filters @run-search="() => filterData(filters)" :report-button="true" class="mb-4">
-    <Type3 @update:filters="(value) => filters = value" />
+  <Filters
+    @reset-form="data = []"
+    @run-search="() => filterData(filters)"
+    :report-button="true"
+    class="mb-4"
+  >
+    <Type3 @update:filters="(value) => (filters = value)" />
   </Filters>
   <div>
-    <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="onDataSelectionChanged" :column-width="100" @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="onDataSelectionChanged"
+      :column-width="100"
+      @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" :width="170" data-field="nama_ulp" caption="Nama Unit" css-class="custom-table-column"
-        cell-template="unitName" header-cell-template="title-header" />
+      <DxColumn
+        alignment="center"
+        :width="170"
+        data-field="nama_ulp"
+        caption="Nama Unit"
+        css-class="custom-table-column"
+        cell-template="unitName"
+        header-cell-template="title-header"
+      />
       <template #unitName="{ data }">
         <p class="text-left cursor-pointer" @click="showDialog()">
           {{ data.text }}
         </p>
       </template>
       <DxColumn alignment="center" caption="Response Time" css-class="custom-table-column">
-        <DxColumn :width="150" alignment="center" data-field="total" data-type="number" caption="Total"
-          css-class="custom-table-column" cell-template="defaults" />
-        <DxColumn :width="150" alignment="center" data-field="total_selesai" data-type="number" caption="Selesai"
-          css-class="custom-table-column" cell-template="defaults" />
-        <DxColumn :width="150" alignment="center" data-field="persen_selesai" data-type="number" caption="%"
-          css-class="custom-table-column" cell-template="percent" />
-        <DxColumn :width="150" alignment="center" data-field="total_inproses" data-type="number" caption="InProgress"
-          css-class="custom-table-column" cell-template="defaults" />
-        <DxColumn :width="150" alignment="center" data-field="persen_inproses" data-type="number" caption="%"
-          css-class="custom-table-column" cell-template="percent" />
-        <DxColumn :width="150" alignment="center" data-field="avg_durasi_response" data-type="number" caption="Rata-Rata"
-          css-class="custom-table-column" cell-template="defaults" />
-        <DxColumn :width="150" alignment="center" data-field="max_durasi_response" data-type="number" caption="Max"
-          css-class="custom-table-column" cell-template="formatTime" />
-        <DxColumn :width="150" alignment="center" data-field="min_durasi_response" data-type="number" caption="Min"
-          css-class="custom-table-column" cell-template="formatTime" />
-        <DxColumn :width="150" alignment="center" data-field="total_diatas_sla_response" data-type="number"
-          caption="> SLA" css-class="custom-table-column" cell-template="defaults" />
-        <DxColumn :width="150" alignment="center" data-field="total_dibawah_sla_response" data-type="number"
-          caption="≤ SLA" css-class="custom-table-column" cell-template="defaults" />
+        <DxColumn
+          :width="150"
+          alignment="center"
+          data-field="total"
+          data-type="number"
+          caption="Total"
+          css-class="custom-table-column"
+          cell-template="defaults"
+        />
+        <DxColumn
+          :width="150"
+          alignment="center"
+          data-field="total_selesai"
+          data-type="number"
+          caption="Selesai"
+          css-class="custom-table-column"
+          cell-template="defaults"
+        />
+        <DxColumn
+          :width="150"
+          alignment="center"
+          data-field="persen_selesai"
+          data-type="number"
+          caption="%"
+          css-class="custom-table-column"
+          cell-template="percent"
+        />
+        <DxColumn
+          :width="150"
+          alignment="center"
+          data-field="total_inproses"
+          data-type="number"
+          caption="InProgress"
+          css-class="custom-table-column"
+          cell-template="defaults"
+        />
+        <DxColumn
+          :width="150"
+          alignment="center"
+          data-field="persen_inproses"
+          data-type="number"
+          caption="%"
+          css-class="custom-table-column"
+          cell-template="percent"
+        />
+        <DxColumn
+          :width="150"
+          alignment="center"
+          data-field="avg_durasi_response"
+          data-type="number"
+          caption="Rata-Rata"
+          css-class="custom-table-column"
+          cell-template="defaults"
+        />
+        <DxColumn
+          :width="150"
+          alignment="center"
+          data-field="max_durasi_response"
+          data-type="number"
+          caption="Max"
+          css-class="custom-table-column"
+          cell-template="formatTime"
+        />
+        <DxColumn
+          :width="150"
+          alignment="center"
+          data-field="min_durasi_response"
+          data-type="number"
+          caption="Min"
+          css-class="custom-table-column"
+          cell-template="formatTime"
+        />
+        <DxColumn
+          :width="150"
+          alignment="center"
+          data-field="total_diatas_sla_response"
+          data-type="number"
+          caption="> SLA"
+          css-class="custom-table-column"
+          cell-template="defaults"
+        />
+        <DxColumn
+          :width="150"
+          alignment="center"
+          data-field="total_dibawah_sla_response"
+          data-type="number"
+          caption="≤ SLA"
+          css-class="custom-table-column"
+          cell-template="defaults"
+        />
       </DxColumn>
       <DxColumn alignment="center" caption="Penyelesaian" css-class="custom-table-column">
-        <DxColumn :width="150" alignment="center" data-field="avg_durasi_recovery" data-type="number" caption="Rata-Rata"
-          css-class="custom-table-column" cell-template="defaults" />
-        <DxColumn :width="150" alignment="center" data-field="max_durasi_recovery" data-type="number" caption="Max"
-          css-class="custom-table-column" cell-template="formatTime" />
-        <DxColumn :width="150" alignment="center" data-field="min_durasi_recovery" data-type="number" caption="Min"
-          css-class="custom-table-column" cell-template="formatTime" />
-        <DxColumn :width="150" alignment="center" data-field="total_diatas_sla_recovery" data-type="number"
-          caption="> SLA" css-class="custom-table-column" cell-template="defaults" />
-        <DxColumn :width="150" alignment="center" data-field="total_dibawah_sla_recovery" data-type="number"
-          caption="≤ SLA" css-class="custom-table-column" cell-template="defaults" />
+        <DxColumn
+          :width="150"
+          alignment="center"
+          data-field="avg_durasi_recovery"
+          data-type="number"
+          caption="Rata-Rata"
+          css-class="custom-table-column"
+          cell-template="defaults"
+        />
+        <DxColumn
+          :width="150"
+          alignment="center"
+          data-field="max_durasi_recovery"
+          data-type="number"
+          caption="Max"
+          css-class="custom-table-column"
+          cell-template="formatTime"
+        />
+        <DxColumn
+          :width="150"
+          alignment="center"
+          data-field="min_durasi_recovery"
+          data-type="number"
+          caption="Min"
+          css-class="custom-table-column"
+          cell-template="formatTime"
+        />
+        <DxColumn
+          :width="150"
+          alignment="center"
+          data-field="total_diatas_sla_recovery"
+          data-type="number"
+          caption="> SLA"
+          css-class="custom-table-column"
+          cell-template="defaults"
+        />
+        <DxColumn
+          :width="150"
+          alignment="center"
+          data-field="total_dibawah_sla_recovery"
+          data-type="number"
+          caption="≤ SLA"
+          css-class="custom-table-column"
+          cell-template="defaults"
+        />
       </DxColumn>
 
       <template #formatTime="{ data }">
         <p class="cursor-pointer" @click="showDialog()">
-          {{ formatWaktu(data.text) }}
+          {{ parseInt(data.text) ? formatWaktu(data.text) : '-' }}
         </p>
       </template>
       <template #percent="{ data }">
-        <p class="cursor-pointer" @click="showDialog()">
-          {{ data.text }}%
-        </p>
+        <p class="cursor-pointer" @click="showDialog()">{{ data.text }}%</p>
       </template>
       <template #defaults="{ data }">
         <p class="cursor-pointer" @click="showDialog()">
           {{ data.text }}
         </p>
       </template>
-      <template #title-header="{ data }">
-        <p class="w-full text-center">
-          {{ data.column.caption }}
-        </p>
-      </template>
     </DxDataGrid>
   </div>
 
-  <DetailDialog :open="showDialogDetail" :full-width="true" title="Detail Rekapitulasi Keluhan All"
-    @on-close="closeDetailDialog">
+  <DetailDialog
+    :open="showDialogDetail"
+    :full-width="true"
+    title="Detail Rekapitulasi Keluhan All"
+    @on-close="closeDetailDialog"
+  >
     <div class="flex flex-col w-full space-y-2 lg:space-x-4 lg:flex-row lg:justify-between">
       <div class="flex flex-1 p-4 bg-white rounded-xl">
         <div class="w-full">
diff --git a/src/components/Pages/Keluhan/Rekap/RKeluhan_BerdasarMedia.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_BerdasarMedia.vue
index 27140ff..6af7c74 100755
--- a/src/components/Pages/Keluhan/Rekap/RKeluhan_BerdasarMedia.vue
+++ b/src/components/Pages/Keluhan/Rekap/RKeluhan_BerdasarMedia.vue
@@ -1,27 +1,68 @@
 <template>
-  <Filters @run-search="() => filterData(filters)" class="mb-4">
+  <Filters @reset-form="data = []" @run-search="() => filterData(filters)" class="mb-4">
     <Type3 @update:filters="(value) => (filters = value)" />
   </Filters>
+
   <div>
-    <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" :column-width="100" @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"
+      :column-width="100"
+      @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 :width="50" alignment="center" :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1"
-        caption="NO" css-class="custom-table-column" />
-      <DxColumn :width="170" alignment="center" data-field="media" caption="Nama Media" css-class="custom-table-column" />
+      <DxColumn
+        :width="50"
+        alignment="center"
+        :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1"
+        caption="NO"
+        css-class="custom-table-column"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="media"
+        caption="Nama Media"
+        css-class="custom-table-column"
+      />
       <DxColumn alignment="center" caption="Tanggal" css-class="custom-table-column">
-        <DxColumn v-for="i in 31" :width="150" alignment="center" :data-field="`tgl${i}`" data-type="number" :caption="i"
-          css-class="custom-table-column" />
+        <DxColumn
+          v-for="i in 31"
+          :width="150"
+          alignment="center"
+          :data-field="`tgl${i}`"
+          data-type="number"
+          :caption="i"
+          css-class="custom-table-column"
+        />
       </DxColumn>
     </DxDataGrid>
   </div>
diff --git a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerFungsiBidang.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerFungsiBidang.vue
index 2cd55fb..aac4d21 100755
--- a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerFungsiBidang.vue
+++ b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerFungsiBidang.vue
@@ -1,77 +1,361 @@
 <template>
-  <Filters @run-search="() => filterData(filters)" :report-button="true" class="mb-4">
+  <Filters
+    @reset-form="data = []"
+    @run-search="() => filterData(filters)"
+    :report-button="true"
+    class="mb-4"
+  >
     <Type13 @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" :column-width="100" @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"
+      :column-width="100"
+      @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 css-class="custom-table-column" :width="50" alignment="center"
-        :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1" data-type="number" caption="No" />
-      <DxColumn :width="170" alignment="center" data-field="fungsi_bidang" caption="Fungsi Bidang"
-        css-class="custom-table-column" />
+      <DxColumn
+        css-class="custom-table-column"
+        :width="100"
+        alignment="center"
+        :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1"
+        data-type="number"
+        data-field="no"
+        caption="No"
+      />
+      <!-- <DxColumn
+        :width="120"
+        alignment="center"
+        data-field="nama_uid"
+        caption="Nama UID"
+        css-class="custom-table-column"
+        :group-index="0"
+        name="NamaUID"
+        v-if="filters.groupBy"
+      /> -->
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="fungsi_bidang"
+        caption="Fungsi Bidang"
+        css-class="custom-table-column"
+        cell-template="cell-left"
+      />
       <DxColumn alignment="center" caption="Laporan" 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="total"
+          data-type="number"
+          caption="Total"
+          css-class="custom-table-column"
+        />
         <DxColumn alignment="center" caption="Sudah Selesai" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="total_selesai" data-type="number" caption="Jml"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="persen_selesai" data-type="number" caption="%"
-            css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_selesai"
+            data-type="number"
+            caption="Jml"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="persen_selesai"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+            cell-template="percent"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="Belum Selesai" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="total_inproses" data-type="number" caption="Jml"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="persen_inproses" data-type="number" caption="%"
-            css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_inproses"
+            data-type="number"
+            caption="Jml"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="persen_inproses"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+            cell-template="percent"
+          />
         </DxColumn>
       </DxColumn>
       <DxColumn alignment="center" caption="Response Time" css-class="custom-table-column">
         <DxColumn alignment="center" caption="Hari" 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="avg_durasi_response" data-type="number"
-            caption="Rata-Rata" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="min_durasi_response" data-type="number" caption="Max"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="max_durasi_response" data-type="number" caption="Min"
-            css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_durasi_response"
+            data-type="number"
+            caption="Total"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="avg_durasi_response"
+            data-type="number"
+            caption="Rata-Rata"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="min_durasi_response"
+            data-type="number"
+            caption="Max"
+            css-class="custom-table-column"
+            cell-template="data-waktu"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="max_durasi_response"
+            data-type="number"
+            caption="Min"
+            css-class="custom-table-column"
+            cell-template="data-waktu"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="Laporan" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="total_diatas_sla_response" data-type="number"
-            caption=">SLA" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="total_dibawah_sla_response" data-type="number"
-            caption="≤SLA" css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_diatas_sla_response"
+            data-type="number"
+            caption=">SLA"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_dibawah_sla_response"
+            data-type="number"
+            caption="≤SLA"
+            css-class="custom-table-column"
+          />
         </DxColumn>
       </DxColumn>
       <DxColumn alignment="center" caption="Penyelesaian" css-class="custom-table-column">
         <DxColumn alignment="center" caption="Hari" 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="avg_durasi_recovery" data-type="number"
-            caption="Rata-Rata" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="max_durasi_recovery" data-type="number" caption="Max"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="min_durasi_recovery" data-type="number" caption="Min"
-            css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_durasi_recovery"
+            data-type="number"
+            caption="Total"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="avg_durasi_recovery"
+            data-type="number"
+            caption="Rata-Rata"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="max_durasi_recovery"
+            data-type="number"
+            caption="Max"
+            css-class="custom-table-column"
+            cell-template="data-waktu"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="min_durasi_recovery"
+            data-type="number"
+            caption="Min"
+            css-class="custom-table-column"
+            cell-template="data-waktu"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="Laporan" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="total_diatas_sla_recovery" data-type="number"
-            caption=">SLA" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="total_dibawah_sla_recovery" data-type="number"
-            caption="≤SLA" css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_diatas_sla_recovery"
+            data-type="number"
+            caption=">SLA"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_dibawah_sla_recovery"
+            data-type="number"
+            caption="≤SLA"
+            css-class="custom-table-column"
+          />
         </DxColumn>
       </DxColumn>
+
+      <DxSummary>
+        <DxTotalItem
+          summary-type="sum"
+          display-format="Total"
+          show-in-column="no"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_selesai"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}%"
+          column="persen_selesai"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_inproses"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}%"
+          column="persen_inproses"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_durasi_response"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="avg_durasi_response"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="min_durasi_response"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="max_durasi_response"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_diatas_sla_response"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_dibawah_sla_response"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_durasi_recovery"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="avg_durasi_recovery"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="min_durasi_recovery"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="max_durasi_recovery"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_diatas_sla_recovery"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_dibawah_sla_recovery"
+          css-class="text-white"
+        />
+      </DxSummary>
+
+      <template #data-waktu="{ data }">
+        <p>
+          {{ parseInt(data.text) ? formatWaktu(data.text) : '-' }}
+        </p>
+      </template>
+      <template #percent="{ data }">
+        <p>{{ data.text }}%</p>
+      </template>
+      <template #cell-left="{ data }">
+        <p class="text-left">
+          {{ data.text }}
+        </p>
+      </template>
     </DxDataGrid>
   </div>
 </template>
@@ -79,8 +363,8 @@
 <script setup lang="ts">
 import Filters from '@/components/Form/Filters.vue'
 import Type13 from '@/components/Form/FiltersType/Type13.vue'
-import { onMounted, ref } from 'vue'
-import { useFiltersStore } from '@/stores/filters'
+import { formatWaktu } from '@/components/Form/FiltersType/reference'
+import { ref } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
   DxColumn,
@@ -90,7 +374,9 @@ import {
   DxPaging,
   DxScrolling,
   DxSearchPanel,
-  DxSelection
+  DxSelection,
+  DxSummary,
+  DxTotalItem
 } from 'devextreme-vue/data-grid'
 import { jsPDF } from 'jspdf'
 import { exportDataGrid as exportToPdf } from 'devextreme/pdf_exporter'
@@ -103,8 +389,7 @@ const position = { of: '#data' }
 const showIndicator = ref(true)
 const shading = ref(true)
 const showPane = ref(true)
-const dataDetail = ref<any>()
-const showDetail = ref(false)
+
 const onExporting = (e: any) => {
   if (e.format === 'pdf') {
     const doc = new jsPDF()
@@ -157,6 +442,8 @@ const GET_DATA = gql`
     ) {
       fungsi_bidang
       total
+      total_durasi_response
+      total_durasi_recovery
       total_selesai
       persen_selesai
       total_inproses
@@ -174,6 +461,44 @@ const GET_DATA = gql`
     }
   }
 `
+// const GET_DATA = gql`
+//   query rekapitulasiKeluhanPenyelesaianPerFungsiBidang(
+//     $dateFrom: Date!
+//     $dateTo: Date!
+//     $idUlp: Int!
+//     $idUid: Int!
+//     $idUp3: Int!
+//   ) {
+//     rekapitulasiKeluhanPenyelesaianPerFungsiBidang(
+//       dateFrom: $dateFrom
+//       dateTo: $dateTo
+//       idUlp: $idUlp
+//       idUid: $idUid
+//       idUp3: $idUp3
+//     ) {
+//       id_uid
+//       nama_uid
+//       fungsi_bidang
+//       total
+//       total_durasi_response
+//       total_durasi_recovery
+//       total_selesai
+//       persen_selesai
+//       total_inproses
+//       persen_inproses
+//       avg_durasi_response
+//       min_durasi_response
+//       max_durasi_response
+//       total_dibawah_sla_response
+//       total_diatas_sla_response
+//       avg_durasi_recovery
+//       min_durasi_recovery
+//       max_durasi_recovery
+//       total_dibawah_sla_recovery
+//       total_diatas_sla_recovery
+//     }
+//   }
+// `
 const { onResult, onError, loading, refetch } = useQuery(GET_DATA, {
   dateFrom: new Date('2023-10-01').toISOString().slice(0, 10),
   dateTo: new Date('2023-10-01').toISOString().slice(0, 10),
@@ -181,7 +506,7 @@ const { onResult, onError, loading, refetch } = useQuery(GET_DATA, {
   idUid: 0,
   idUp3: 0
 })
-const filters = ref()
+const filters = ref({ groupBy: false })
 
 const filterData = (params: any) => {
   const dateValue = params.periode.split(' s/d ')
diff --git a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerJenisKeluhan.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerJenisKeluhan.vue
index 7b8f3ba..c52ee8e 100755
--- a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerJenisKeluhan.vue
+++ b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerJenisKeluhan.vue
@@ -1,77 +1,481 @@
 <template>
-  <Filters @run-search="() => filterData(filters)" class="mb-4">
+  <Filters @reset-form="data = []" @run-search="() => filterData(filters)" class="mb-4">
     <Type3 @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" :column-width="100" @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"
+      :column-width="100"
+      @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 css-class="custom-table-column" :width="50" alignment="center"
-        :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1" data-type="number" caption="No" />
-      <DxColumn :width="170" alignment="center" data-field="tipe_keluhan" caption="Jenis Keluhan"
-        css-class="custom-table-column" />
+      <DxColumn
+        css-class="custom-table-column"
+        :width="100"
+        alignment="center"
+        :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1"
+        data-type="number"
+        data-field="no"
+        caption="No"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="tipe_keluhan"
+        caption="Jenis Keluhan"
+        css-class="custom-table-column"
+        cell-template="cell-left"
+      />
+      <!-- <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="tipe_keluhan"
+        caption="Jenis Keluhan"
+        name="tipeKeluhan"
+        css-class="custom-table-column"
+        :group-index="0"
+      /> -->
       <DxColumn alignment="center" caption="Laporan" 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="total"
+          data-type="number"
+          caption="Total"
+          css-class="custom-table-column"
+        />
         <DxColumn alignment="center" caption="Sudah Selesai" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="total_selesai" data-type="number" caption="Jml"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="persen_selesai" data-type="number" caption="%"
-            css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_selesai"
+            data-type="number"
+            caption="Jml"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="persen_selesai"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="Belum Selesai" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="total_inproses" data-type="number" caption="Jml"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="persen_inproses" data-type="number" caption="%"
-            css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_inproses"
+            data-type="number"
+            caption="Jml"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="persen_inproses"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+            cell-template="percent"
+          />
         </DxColumn>
       </DxColumn>
       <DxColumn alignment="center" caption="Response Time" css-class="custom-table-column">
         <DxColumn alignment="center" caption="Hari" 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="avg_durasi_response" data-type="number"
-            caption="Rata-Rata" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="max_durasi_response" data-type="number" caption="Max"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="min_durasi_response" data-type="number" caption="Min"
-            css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_durasi_response"
+            data-type="number"
+            caption="Total"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="avg_durasi_response"
+            data-type="number"
+            caption="Rata-Rata"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="max_durasi_response"
+            data-type="number"
+            caption="Max"
+            css-class="custom-table-column"
+            cell-template="data-waktu"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="min_durasi_response"
+            data-type="number"
+            caption="Min"
+            css-class="custom-table-column"
+            cell-template="data-waktu"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="Laporan" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="total_diatas_sla_response" data-type="number"
-            caption=">SLA" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="total_dibawah_sla_response" data-type="number"
-            caption="≤SLA" css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_diatas_sla_response"
+            data-type="number"
+            caption=">SLA"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_dibawah_sla_response"
+            data-type="number"
+            caption="≤SLA"
+            css-class="custom-table-column"
+          />
         </DxColumn>
       </DxColumn>
       <DxColumn alignment="center" caption="Penyelesaian" css-class="custom-table-column">
         <DxColumn alignment="center" caption="Hari" 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="avg_durasi_recovery" data-type="number"
-            caption="Rata-Rata" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="max_durasi_recovery" data-type="number" caption="Max"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="min_durasi_recovery" data-type="number" caption="Min"
-            css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_durasi_recovery"
+            data-type="number"
+            caption="Total"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="avg_durasi_recovery"
+            data-type="number"
+            caption="Rata-Rata"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="max_durasi_recovery"
+            data-type="number"
+            caption="Max"
+            css-class="custom-table-column"
+            cell-template="data-waktu"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="min_durasi_recovery"
+            data-type="number"
+            caption="Min"
+            css-class="custom-table-column"
+            cell-template="data-waktu"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="Laporan" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="total_diatas_sla_recovery" data-type="number"
-            caption=">SLA" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="total_dibawah_sla_recovery" data-type="number"
-            caption="≤SLA" css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_diatas_sla_recovery"
+            data-type="number"
+            caption=">SLA"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_dibawah_sla_recovery"
+            data-type="number"
+            caption="≤SLA"
+            css-class="custom-table-column"
+          />
         </DxColumn>
       </DxColumn>
+
+      <DxSummary>
+        <DxGroupItem
+          summary-type="sum"
+          display-format="Total"
+          show-in-column="no"
+          css-class="text-white"
+          :show-in-group-footer="true"
+        />
+        <DxGroupItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total"
+          css-class="text-white"
+          :show-in-group-footer="true"
+        />
+        <DxGroupItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_selesai"
+          css-class="text-white"
+          :show-in-group-footer="true"
+        />
+        <DxGroupItem
+          summary-type="sum"
+          display-format="{0}%"
+          column="persen_selesai"
+          css-class="text-white"
+          :show-in-group-footer="true"
+        />
+        <DxGroupItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_inproses"
+          css-class="text-white"
+          :show-in-group-footer="true"
+        />
+        <DxGroupItem
+          summary-type="sum"
+          display-format="{0}%"
+          column="persen_inproses"
+          css-class="text-white"
+          :show-in-group-footer="true"
+        />
+        <DxGroupItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_durasi_response"
+          css-class="text-white"
+          :show-in-group-footer="true"
+        />
+        <DxGroupItem
+          summary-type="sum"
+          display-format="{0}"
+          column="avg_durasi_response"
+          css-class="text-white"
+          :show-in-group-footer="true"
+        />
+        <DxGroupItem
+          summary-type="sum"
+          display-format="{0}"
+          column="min_durasi_response"
+          css-class="text-white"
+          :show-in-group-footer="true"
+        />
+        <DxGroupItem
+          summary-type="sum"
+          display-format="{0}"
+          column="max_durasi_response"
+          css-class="text-white"
+          :show-in-group-footer="true"
+        />
+        <DxGroupItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_diatas_sla_response"
+          css-class="text-white"
+          :show-in-group-footer="true"
+        />
+        <DxGroupItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_dibawah_sla_response"
+          css-class="text-white"
+          :show-in-group-footer="true"
+        />
+        <DxGroupItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_durasi_recovery"
+          css-class="text-white"
+          :show-in-group-footer="true"
+        />
+        <DxGroupItem
+          summary-type="sum"
+          display-format="{0}"
+          column="avg_durasi_recovery"
+          css-class="text-white"
+          :show-in-group-footer="true"
+        />
+        <DxGroupItem
+          summary-type="sum"
+          display-format="{0}"
+          column="min_durasi_recovery"
+          css-class="text-white"
+          :show-in-group-footer="true"
+        />
+        <DxGroupItem
+          summary-type="sum"
+          display-format="{0}"
+          column="max_durasi_recovery"
+          css-class="text-white"
+          :show-in-group-footer="true"
+        />
+        <DxGroupItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_diatas_sla_recovery"
+          css-class="text-white"
+          :show-in-group-footer="true"
+        />
+        <DxGroupItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_dibawah_sla_recovery"
+          css-class="text-white"
+          :show-in-group-footer="true"
+        />
+
+        <DxTotalItem
+          summary-type="sum"
+          display-format="Total"
+          show-in-column="no"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_selesai"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}%"
+          column="persen_selesai"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_inproses"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}%"
+          column="persen_inproses"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_durasi_response"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="avg_durasi_response"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="min_durasi_response"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="max_durasi_response"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_diatas_sla_response"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_dibawah_sla_response"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_durasi_recovery"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="avg_durasi_recovery"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="min_durasi_recovery"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="max_durasi_recovery"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_diatas_sla_recovery"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_dibawah_sla_recovery"
+          css-class="text-white"
+        />
+      </DxSummary>
+
+      <template #data-waktu="{ data }">
+        <p>
+          {{ parseInt(data.text) ? formatWaktu(data.text) : '-' }}
+        </p>
+      </template>
+      <template #percent="{ data }">
+        <p>{{ data.text }}%</p>
+      </template>
+      <template #cell-left="{ data }">
+        <p class="text-left">
+          {{ data.text }}
+        </p>
+      </template>
     </DxDataGrid>
   </div>
 </template>
@@ -80,7 +484,7 @@
 import Filters from '@/components/Form/Filters.vue'
 import Type3 from '@/components/Form/FiltersType/Type3.vue'
 import { ref } from 'vue'
-
+import { formatWaktu } from '@/components/Form/FiltersType/reference'
 import { DxDataGrid } from 'devextreme-vue'
 import {
   DxColumn,
@@ -90,7 +494,10 @@ import {
   DxPaging,
   DxScrolling,
   DxSearchPanel,
-  DxSelection
+  DxSelection,
+  DxSummary,
+  DxTotalItem,
+  DxGroupItem
 } from 'devextreme-vue/data-grid'
 import { jsPDF } from 'jspdf'
 import { exportDataGrid as exportToPdf } from 'devextreme/pdf_exporter'
@@ -162,6 +569,8 @@ const GET_DATA = gql`
       avg_durasi_response
       min_durasi_response
       max_durasi_response
+      total_durasi_response
+      total_durasi_recovery
       total_dibawah_sla_response
       total_diatas_sla_response
       avg_durasi_recovery
@@ -172,6 +581,7 @@ const GET_DATA = gql`
     }
   }
 `
+
 const { onResult, onError, loading, refetch } = useQuery(GET_DATA, {
   dateFrom: new Date('2023-10-01').toISOString().slice(0, 10),
   dateTo: new Date('2023-10-01').toISOString().slice(0, 10),
diff --git a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerKelompokKeluhan.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerKelompokKeluhan.vue
index 63ebdea..88d8518 100755
--- a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerKelompokKeluhan.vue
+++ b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerKelompokKeluhan.vue
@@ -1,77 +1,361 @@
 <template>
-  <Filters @run-search="() => filterData(filters)" :report-button="true" class="mb-4">
+  <Filters
+    @reset-form="data = []"
+    @run-search="() => filterData(filters)"
+    :report-button="true"
+    class="mb-4"
+  >
     <Type13 @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" :column-width="100" @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"
+      :column-width="100"
+      @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 css-class="custom-table-column" :width="50" alignment="center"
-        :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1" data-type="number" caption="No" />
-      <DxColumn :width="170" alignment="center" data-field="kelompok" caption="Kelompok Keluhan"
-        css-class="custom-table-column" />
+      <DxColumn
+        css-class="custom-table-column"
+        :width="100"
+        alignment="center"
+        :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1"
+        data-type="number"
+        data-field="no"
+        caption="No"
+      />
+      <!-- <DxColumn
+        :width="120"
+        alignment="center"
+        data-field="nama_uid"
+        caption="Nama UID"
+        css-class="custom-table-column"
+        :group-index="0"
+        name="NamaUID"
+        v-if="filters.groupBy"
+      /> -->
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="kelompok"
+        caption="Kelompok Keluhan"
+        css-class="custom-table-column"
+        cell-template="cell-left"
+      />
       <DxColumn alignment="center" caption="Laporan" 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="total"
+          data-type="number"
+          caption="Total"
+          css-class="custom-table-column"
+        />
         <DxColumn alignment="center" caption="Sudah Selesai" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="total_selesai" data-type="number" caption="Jml"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="persen_selesai" data-type="number" caption="%"
-            css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_selesai"
+            data-type="number"
+            caption="Jml"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="persen_selesai"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+            cell-template="percent"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="Belum Selesai" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="total_inproses" data-type="number" caption="Jml"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="persen_inproses" data-type="number" caption="%"
-            css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_inproses"
+            data-type="number"
+            caption="Jml"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="persen_inproses"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+            cell-template="percent"
+          />
         </DxColumn>
       </DxColumn>
       <DxColumn alignment="center" caption="Response Time" css-class="custom-table-column">
         <DxColumn alignment="center" caption="Hari" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="" data-type="number" caption="Total"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="avg_durasi_response" data-type="number"
-            caption="Rata-Rata" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="max_durasi_response" data-type="number" caption="Max"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="min_durasi_response" data-type="number" caption="Min"
-            css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_durasi_response"
+            data-type="number"
+            caption="Total"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="avg_durasi_response"
+            data-type="number"
+            caption="Rata-Rata"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="max_durasi_response"
+            data-type="number"
+            caption="Max"
+            css-class="custom-table-column"
+            cell-template="data-waktu"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="min_durasi_response"
+            data-type="number"
+            caption="Min"
+            css-class="custom-table-column"
+            cell-template="data-waktu"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="Laporan" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="total_diatas_sla_response" data-type="number"
-            caption=">SLA" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="total_dibawah_sla_response" data-type="number"
-            caption="≤SLA" css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_diatas_sla_response"
+            data-type="number"
+            caption=">SLA"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_dibawah_sla_response"
+            data-type="number"
+            caption="≤SLA"
+            css-class="custom-table-column"
+          />
         </DxColumn>
       </DxColumn>
       <DxColumn alignment="center" caption="Penyelesaian" css-class="custom-table-column">
         <DxColumn alignment="center" caption="Hari" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="" data-type="number" caption="Total"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="avg_durasi_recovery" data-type="number"
-            caption="Rata-Rata" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="max_durasi_recovery" data-type="number" caption="Max"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="min_durasi_recovery" data-type="number" caption="Min"
-            css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_durasi_recovery"
+            data-type="number"
+            caption="Total"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="avg_durasi_recovery"
+            data-type="number"
+            caption="Rata-Rata"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="max_durasi_recovery"
+            data-type="number"
+            caption="Max"
+            css-class="custom-table-column"
+            cell-template="data-waktu"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="min_durasi_recovery"
+            data-type="number"
+            caption="Min"
+            css-class="custom-table-column"
+            cell-template="data-waktu"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="Laporan" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="total_diatas_sla_recovery" data-type="number"
-            caption=">SLA" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="total_dibawah_sla_recovery" data-type="number"
-            caption="≤SLA" css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_diatas_sla_recovery"
+            data-type="number"
+            caption=">SLA"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_dibawah_sla_recovery"
+            data-type="number"
+            caption="≤SLA"
+            css-class="custom-table-column"
+          />
         </DxColumn>
       </DxColumn>
+
+      <DxSummary>
+        <DxTotalItem
+          summary-type="sum"
+          display-format="Total"
+          show-in-column="no"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_selesai"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}%"
+          column="persen_selesai"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_inproses"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}%"
+          column="persen_inproses"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_durasi_response"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="avg_durasi_response"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="min_durasi_response"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="max_durasi_response"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_diatas_sla_response"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_dibawah_sla_response"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_durasi_recovery"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="avg_durasi_recovery"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="min_durasi_recovery"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="max_durasi_recovery"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_diatas_sla_recovery"
+          css-class="text-white"
+        />
+        <DxTotalItem
+          summary-type="sum"
+          display-format="{0}"
+          column="total_dibawah_sla_recovery"
+          css-class="text-white"
+        />
+      </DxSummary>
+
+      <template #data-waktu="{ data }">
+        <p>
+          {{ parseInt(data.text) ? formatWaktu(data.text) : '-' }}
+        </p>
+      </template>
+      <template #percent="{ data }">
+        <p>{{ data.text }}%</p>
+      </template>
+      <template #cell-left="{ data }">
+        <p class="text-left">
+          {{ data.text }}
+        </p>
+      </template>
     </DxDataGrid>
   </div>
 </template>
@@ -79,6 +363,7 @@
 <script setup lang="ts">
 import Filters from '@/components/Form/Filters.vue'
 import Type13 from '@/components/Form/FiltersType/Type13.vue'
+import { formatWaktu } from '@/components/Form/FiltersType/reference'
 import { ref } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
@@ -89,7 +374,9 @@ import {
   DxPaging,
   DxScrolling,
   DxSearchPanel,
-  DxSelection
+  DxSelection,
+  DxSummary,
+  DxTotalItem
 } from 'devextreme-vue/data-grid'
 import { jsPDF } from 'jspdf'
 import { exportDataGrid as exportToPdf } from 'devextreme/pdf_exporter'
@@ -161,6 +448,8 @@ const GET_DATA = gql`
       avg_durasi_response
       min_durasi_response
       max_durasi_response
+      total_durasi_recovery
+      total_durasi_response
       total_dibawah_sla_response
       total_diatas_sla_response
       avg_durasi_recovery
@@ -171,6 +460,44 @@ const GET_DATA = gql`
     }
   }
 `
+// const GET_DATA = gql`
+//   query rekapitulasiKeluhanPerKelompokKeluhan(
+//     $dateFrom: Date!
+//     $dateTo: Date!
+//     $idUlp: Int!
+//     $idUid: Int!
+//     $idUp3: Int!
+//   ) {
+//     rekapitulasiKeluhanPerKelompokKeluhan(
+//       dateFrom: $dateFrom
+//       dateTo: $dateTo
+//       idUlp: $idUlp
+//       idUid: $idUid
+//       idUp3: $idUp3
+//     ) {
+//       kelompok
+//       id_uid
+//       nama_uid
+//       total
+//       total_selesai
+//       persen_selesai
+//       total_inproses
+//       persen_inproses
+//       avg_durasi_response
+//       min_durasi_response
+//       max_durasi_response
+//       total_durasi_recovery
+//       total_durasi_response
+//       total_dibawah_sla_response
+//       total_diatas_sla_response
+//       avg_durasi_recovery
+//       min_durasi_recovery
+//       max_durasi_recovery
+//       total_dibawah_sla_recovery
+//       total_diatas_sla_recovery
+//     }
+//   }
+// `
 const { onResult, onError, loading, refetch } = useQuery(GET_DATA, {
   dateFrom: new Date('2023-10-01').toISOString().slice(0, 10),
   dateTo: new Date('2023-10-01').toISOString().slice(0, 10),
@@ -178,7 +505,7 @@ const { onResult, onError, loading, refetch } = useQuery(GET_DATA, {
   idUid: 0,
   idUp3: 0
 })
-const filters = ref()
+const filters = ref({ groupBy: false })
 
 const filterData = (params: any) => {
   const dateValue = params.periode.split(' s/d ')
diff --git a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerTanggal.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerTanggal.vue
index 34b0a1e..2426e3d 100755
--- a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerTanggal.vue
+++ b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerTanggal.vue
@@ -1,77 +1,227 @@
 <template>
-  <Filters @run-search="() => filterData(filters)" :report-button="true" class="mb-4">
+  <Filters
+    @reset-form="data = []"
+    @run-search="() => filterData(filters)"
+    :report-button="true"
+    class="mb-4"
+  >
     <Type13 @update:filters="(value) => (filters = value)" />
   </Filters>
+
   <div>
-    <DxDataGrid class="max-h-[calc(100vh-140px)] mb-10" :show-column-lines="true" :show-row-lines="false"
-      :show-borders="true" :data-source="data" :row-alternation-enabled="true" :hover-state-enabled="true"
-      @selection-changed="onSelectionChanged" :column-width="100" @exporting="onExporting" :allow-column-resizing="true"
-      column-resizing-mode="widget" :word-wrap-enabled="true">
+    <DxDataGrid
+      class="max-h-[calc(100vh-140px)] mb-10"
+      :show-column-lines="true"
+      :show-row-lines="false"
+      :show-borders="true"
+      :data-source="data"
+      :row-alternation-enabled="true"
+      :hover-state-enabled="true"
+      @selection-changed="onSelectionChanged"
+      :column-width="100"
+      @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 :width="50" alignment="center" :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1"
-        caption="NO" css-class="custom-table-column" />
-      <DxColumn :width="170" alignment="center" data-field="tanggal" caption="Tanggal Lapor"
-        css-class="custom-table-column" />
+      <DxColumn
+        :width="50"
+        alignment="center"
+        :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1"
+        caption="NO"
+        css-class="custom-table-column"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="tanggal_lapor"
+        caption="Tanggal Lapor"
+        css-class="custom-table-column"
+      />
       <DxColumn alignment="center" caption="Laporan" 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="total"
+          data-type="number"
+          caption="Total"
+          css-class="custom-table-column"
+        />
         <DxColumn alignment="center" caption="Sudah Selesai" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="total_selesai" data-type="number" caption="Jml"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="persen_selesai" data-type="number" caption="%"
-            css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_selesai"
+            data-type="number"
+            caption="Jml"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="persen_selesai"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="Belum Selesai" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="total_inproses" data-type="number" caption="Jml"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="persen_inproses" data-type="number" caption="%"
-            css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_inproses"
+            data-type="number"
+            caption="Jml"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="persen_inproses"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+          />
         </DxColumn>
       </DxColumn>
       <DxColumn alignment="center" caption="Response Time" css-class="custom-table-column">
         <DxColumn alignment="center" caption="Hari" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="total_inproses" data-type="number" caption="Total"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="avg_durasi_response" data-type="number"
-            caption="Rata-Rata" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="max_durasi_response" data-type="number" caption="Max"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="min_durasi_response" data-type="number" caption="Min"
-            css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_durasi_response"
+            data-type="number"
+            caption="Total"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="avg_durasi_response"
+            data-type="number"
+            caption="Rata-Rata"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="max_durasi_response"
+            data-type="number"
+            caption="Max"
+            css-class="custom-table-column"
+            cell-template="data-waktu"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="min_durasi_response"
+            data-type="number"
+            caption="Min"
+            css-class="custom-table-column"
+            cell-template="data-waktu"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="Laporan" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="total_diatas_sla_response" data-type="number"
-            caption=">SLA" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="total_dibawah_sla_response" data-type="number"
-            caption="≤SLA" css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_diatas_sla_response"
+            data-type="number"
+            caption=">SLA"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_dibawah_sla_response"
+            data-type="number"
+            caption="≤SLA"
+            css-class="custom-table-column"
+          />
         </DxColumn>
       </DxColumn>
       <DxColumn alignment="center" caption="Penyelesaian" css-class="custom-table-column">
         <DxColumn alignment="center" caption="Hari" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="total_selesai" data-type="number" caption="Total"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="avg_durasi_recovery" data-type="number"
-            caption="Rata-Rata" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="max_durasi_recovery" data-type="number" caption="Max"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="min_durasi_recovery" data-type="number" caption="Min"
-            css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_durasi_recovery"
+            data-type="number"
+            caption="Total"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="avg_durasi_recovery"
+            data-type="number"
+            caption="Rata-Rata"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="max_durasi_recovery"
+            data-type="number"
+            caption="Max"
+            css-class="custom-table-column"
+            cell-template="data-waktu"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="min_durasi_recovery"
+            data-type="number"
+            caption="Min"
+            css-class="custom-table-column"
+            cell-template="data-waktu"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="Laporan" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="total_diatas_sla_recovery" data-type="number"
-            caption=">SLA" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="total_dibawah_sla_recovery" data-type="number"
-            caption="≤SLA" css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_diatas_sla_recovery"
+            data-type="number"
+            caption=">SLA"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_dibawah_sla_recovery"
+            data-type="number"
+            caption="≤SLA"
+            css-class="custom-table-column"
+          />
         </DxColumn>
       </DxColumn>
+
+      <template #data-waktu="{ data }">
+        <p>
+          {{ parseInt(data.text) ? formatWaktu(data.text) : '-' }}
+        </p>
+      </template>
     </DxDataGrid>
   </div>
 </template>
@@ -79,8 +229,8 @@
 <script setup lang="ts">
 import Filters from '@/components/Form/Filters.vue'
 import Type13 from '@/components/Form/FiltersType/Type13.vue'
-import { onMounted, ref } from 'vue'
-import { useFiltersStore } from '@/stores/filters'
+import { formatWaktu } from '@/components/Form/FiltersType/reference'
+import { ref } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
   DxColumn,
@@ -99,6 +249,7 @@ 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)
@@ -155,10 +306,10 @@ const GET_DATA = gql`
     ) {
       id_uid
       nama_uid
-      id_ulp
-      nama_ulp
-      tanggal
+      tanggal_lapor
       total
+      total_durasi_response
+      total_durasi_recovery
       total_selesai
       persen_selesai
       total_inproses
diff --git a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerUnit.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerUnit.vue
index 38b9d0f..b750aa3 100755
--- a/src/components/Pages/Keluhan/Rekap/RKeluhan_PerUnit.vue
+++ b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerUnit.vue
@@ -1,76 +1,227 @@
 <template>
-  <Filters @run-search="() => filterData(filters)" :report-button="true" class="mb-4">
+  <Filters
+    @reset-form="data = []"
+    @run-search="() => filterData(filters)"
+    :report-button="true"
+    class="mb-4"
+  >
     <Type8 @update:filters="(value) => (filters = value)" />
   </Filters>
+
   <div>
-    <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" :column-width="100" @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"
+      :column-width="100"
+      @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 :width="50" alignment="center" :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1"
-        caption="NO" css-class="custom-table-column" />
-      <DxColumn :width="170" alignment="center" data-field="nama_ulp" caption="Unit" css-class="custom-table-column" />
+      <DxColumn
+        :width="50"
+        alignment="center"
+        :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1"
+        caption="NO"
+        css-class="custom-table-column"
+      />
+      <DxColumn
+        :width="170"
+        alignment="center"
+        data-field="nama_ulp"
+        caption="Unit"
+        css-class="custom-table-column"
+      />
       <DxColumn alignment="center" caption="Laporan" 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="total"
+          data-type="number"
+          caption="Total"
+          css-class="custom-table-column"
+        />
         <DxColumn alignment="center" caption="Sudah Selesai" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="total_selesai" data-type="number" caption="Jml"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="persen_selesai" data-type="number" caption="%"
-            css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_selesai"
+            data-type="number"
+            caption="Jml"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="persen_selesai"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="Belum Selesai" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="total_inproses" data-type="number" caption="Jml"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="persen_inproses" data-type="number" caption="%"
-            css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_inproses"
+            data-type="number"
+            caption="Jml"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="persen_inproses"
+            data-type="number"
+            caption="%"
+            css-class="custom-table-column"
+          />
         </DxColumn>
       </DxColumn>
       <DxColumn alignment="center" caption="Response Time" css-class="custom-table-column">
         <DxColumn alignment="center" caption="Hari" 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="avg_durasi_response" data-type="number"
-            caption="Rata-Rata" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="max_durasi_response" data-type="number" caption="Max"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="min_durasi_response" data-type="number" caption="Min"
-            css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_durasi_response"
+            data-type="number"
+            caption="Total"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="avg_durasi_response"
+            data-type="number"
+            caption="Rata-Rata"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="max_durasi_response"
+            data-type="number"
+            caption="Max"
+            css-class="custom-table-column"
+            cell-templete="data-waktu"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="min_durasi_response"
+            data-type="number"
+            caption="Min"
+            css-class="custom-table-column"
+            cell-templete="data-waktu"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="Laporan" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="total_diatas_sla_response" data-type="number"
-            caption=">SLA" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="total_dibawah_sla_response" data-type="number"
-            caption="≤SLA" css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_diatas_sla_response"
+            data-type="number"
+            caption=">SLA"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_dibawah_sla_response"
+            data-type="number"
+            caption="≤SLA"
+            css-class="custom-table-column"
+          />
         </DxColumn>
       </DxColumn>
       <DxColumn alignment="center" caption="Penyelesaian" css-class="custom-table-column">
         <DxColumn alignment="center" caption="Hari" 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="avg_durasi_recovery" data-type="number"
-            caption="Rata-Rata" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="max_durasi_recovery" data-type="number" caption="Max"
-            css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="min_durasi_recovery" data-type="number" caption="Min"
-            css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_durasi_recovery"
+            data-type="number"
+            caption="Total"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="avg_durasi_recovery"
+            data-type="number"
+            caption="Rata-Rata"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="max_durasi_recovery"
+            data-type="number"
+            caption="Max"
+            css-class="custom-table-column"
+            cell-templete="data-waktu"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="min_durasi_recovery"
+            data-type="number"
+            caption="Min"
+            css-class="custom-table-column"
+            cell-templete="data-waktu"
+          />
         </DxColumn>
         <DxColumn alignment="center" caption="Laporan" css-class="custom-table-column">
-          <DxColumn :width="150" alignment="center" data-field="total_diatas_sla_recovery" data-type="number"
-            caption=">SLA" css-class="custom-table-column" />
-          <DxColumn :width="150" alignment="center" data-field="total_dibawah_sla_recovery" data-type="number"
-            caption="≤SLA" css-class="custom-table-column" />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_diatas_sla_recovery"
+            data-type="number"
+            caption=">SLA"
+            css-class="custom-table-column"
+          />
+          <DxColumn
+            :width="150"
+            alignment="center"
+            data-field="total_dibawah_sla_recovery"
+            data-type="number"
+            caption="≤SLA"
+            css-class="custom-table-column"
+          />
         </DxColumn>
       </DxColumn>
+
+      <template #data-waktu="{ data }">
+        <p>
+          {{ parseInt(data.text) ? formatWaktu(data.text) : '-' }}
+        </p>
+      </template>
     </DxDataGrid>
   </div>
 </template>
@@ -78,8 +229,8 @@
 <script setup lang="ts">
 import Filters from '@/components/Form/Filters.vue'
 import Type8 from '@/components/Form/FiltersType/Type8.vue'
-import { onMounted, ref } from 'vue'
-import { useFiltersStore } from '@/stores/filters'
+import { formatWaktu } from '@/components/Form/FiltersType/reference'
+import { ref } from 'vue'
 import { DxDataGrid } from 'devextreme-vue'
 import {
   DxColumn,
@@ -98,6 +249,7 @@ 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)
@@ -159,6 +311,8 @@ const GET_DATA = gql`
       persen_selesai
       total_inproses
       persen_inproses
+      total_durasi_response
+      total_durasi_recovery
       avg_durasi_response
       min_durasi_response
       max_durasi_response