diff --git a/src/assets/css/style.css b/src/assets/css/style.css
index 43b09f7..7e4268c 100755
--- a/src/assets/css/style.css
+++ b/src/assets/css/style.css
@@ -1373,10 +1373,6 @@ body {
   margin-top: 1.5rem;
 }
 
-.mb-5 {
-  margin-bottom: 1.25rem;
-}
-
 .mb-10 {
   margin-bottom: 2.5rem;
 }
diff --git a/src/components/Form/Filters.vue b/src/components/Form/Filters.vue
index 32e1405..8fb9d0a 100755
--- a/src/components/Form/Filters.vue
+++ b/src/components/Form/Filters.vue
@@ -14,28 +14,18 @@ const emit = defineEmits(['runSearch', 'resetForm', 'runReport'])
 
 <template>
   <div class="filters rounded-2xl">
-    <form class="filter-body bg-gray-50 mx-auto space-y-3 p-4 rounded-t-2xl">
+    <form class="p-4 mx-auto space-y-3 filter-body bg-gray-50 rounded-t-2xl">
       <slot></slot>
     </form>
 
-    <div class="filter-footer rounded-b-2xl px-4 py-3 bg-primary-50 flex justify-end">
-      <div class="filter-buttons flex gap-3 flex-wrap">
-        <Button
-          @on:click="() => emit('resetForm')"
-          label="Ulangi"
-          style-type="outline"
-          class-name="bg-white"
-        >
+    <div class="flex justify-end px-4 py-3 filter-footer rounded-b-2xl bg-primary-50">
+      <div class="flex flex-wrap gap-3 filter-buttons">
+        <Button @on:click="() => emit('resetForm')" label="Ulangi" style-type="outline" class-name="bg-white">
           <PhArrowsCounterClockwise size="18" class="ml-1" weight="regular" />
         </Button>
 
-        <Button
-          v-if="reportButton"
-          label="Lihat Laporan"
-          style-type="outline"
-          class-name="bg-white"
-          @on:click="() => emit('runReport')"
-        >
+        <Button v-if="reportButton" label="Lihat Laporan" style-type="outline" class-name="bg-white"
+          @on:click="() => emit('runReport')">
           <PhFileText size="18" class="ml-1" weight="regular" />
         </Button>
 
diff --git a/src/components/Pages/Keluhan/Table_26.vue b/src/components/Pages/Keluhan/Daftar/DKeluhan_BerdasarMedia.vue
similarity index 100%
rename from src/components/Pages/Keluhan/Table_26.vue
rename to src/components/Pages/Keluhan/Daftar/DKeluhan_BerdasarMedia.vue
diff --git a/src/components/Pages/Keluhan/Table_21.vue b/src/components/Pages/Keluhan/Daftar/DKeluhan_DKUL.vue
similarity index 100%
rename from src/components/Pages/Keluhan/Table_21.vue
rename to src/components/Pages/Keluhan/Daftar/DKeluhan_DKUL.vue
diff --git a/src/components/Pages/Keluhan/Table_22.vue b/src/components/Pages/Keluhan/Daftar/DKeluhan_PLD1K.vue
similarity index 100%
rename from src/components/Pages/Keluhan/Table_22.vue
rename to src/components/Pages/Keluhan/Daftar/DKeluhan_PLD1K.vue
diff --git a/src/components/Pages/Keluhan/Table_24.vue b/src/components/Pages/Keluhan/Daftar/DKeluhan_RecoveryTime.vue
similarity index 100%
rename from src/components/Pages/Keluhan/Table_24.vue
rename to src/components/Pages/Keluhan/Daftar/DKeluhan_RecoveryTime.vue
diff --git a/src/components/Pages/Keluhan/Table_23.vue b/src/components/Pages/Keluhan/Daftar/DKeluhan_ResponseTime.vue
similarity index 100%
rename from src/components/Pages/Keluhan/Table_23.vue
rename to src/components/Pages/Keluhan/Daftar/DKeluhan_ResponseTime.vue
diff --git a/src/components/Pages/Keluhan/Table_25.vue b/src/components/Pages/Keluhan/Daftar/DKeluhan_STIDP.vue
similarity index 100%
rename from src/components/Pages/Keluhan/Table_25.vue
rename to src/components/Pages/Keluhan/Daftar/DKeluhan_STIDP.vue
diff --git a/src/components/Pages/Keluhan/Table_27.vue b/src/components/Pages/Keluhan/Daftar/DKeluhan_SelesaiCC.vue
similarity index 100%
rename from src/components/Pages/Keluhan/Table_27.vue
rename to src/components/Pages/Keluhan/Daftar/DKeluhan_SelesaiCC.vue
diff --git a/src/components/Pages/Keluhan/Table_28.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_ALL.vue
similarity index 100%
rename from src/components/Pages/Keluhan/Table_28.vue
rename to src/components/Pages/Keluhan/Rekap/RKeluhan_ALL.vue
diff --git a/src/components/Pages/Keluhan/Table_34.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_BerdasarMedia.vue
similarity index 100%
rename from src/components/Pages/Keluhan/Table_34.vue
rename to src/components/Pages/Keluhan/Rekap/RKeluhan_BerdasarMedia.vue
diff --git a/src/components/Pages/Keluhan/Table_29.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerFungsiBidang.vue
similarity index 100%
rename from src/components/Pages/Keluhan/Table_29.vue
rename to src/components/Pages/Keluhan/Rekap/RKeluhan_PerFungsiBidang.vue
diff --git a/src/components/Pages/Keluhan/Table_30.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerJenisKeluhan.vue
similarity index 100%
rename from src/components/Pages/Keluhan/Table_30.vue
rename to src/components/Pages/Keluhan/Rekap/RKeluhan_PerJenisKeluhan.vue
diff --git a/src/components/Pages/Keluhan/Table_31.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerKelompokKeluhan.vue
similarity index 100%
rename from src/components/Pages/Keluhan/Table_31.vue
rename to src/components/Pages/Keluhan/Rekap/RKeluhan_PerKelompokKeluhan.vue
diff --git a/src/components/Pages/Keluhan/Table_32.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerTanggal.vue
similarity index 100%
rename from src/components/Pages/Keluhan/Table_32.vue
rename to src/components/Pages/Keluhan/Rekap/RKeluhan_PerTanggal.vue
diff --git a/src/components/Pages/Keluhan/Table_33.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_PerUnit.vue
similarity index 100%
rename from src/components/Pages/Keluhan/Table_33.vue
rename to src/components/Pages/Keluhan/Rekap/RKeluhan_PerUnit.vue
diff --git a/src/components/Pages/Keluhan/Rekap/RKeluhan_RatingPerUnit.vue b/src/components/Pages/Keluhan/Rekap/RKeluhan_RatingPerUnit.vue
new file mode 100755
index 0000000..a3967e2
--- /dev/null
+++ b/src/components/Pages/Keluhan/Rekap/RKeluhan_RatingPerUnit.vue
@@ -0,0 +1,203 @@
+<template>
+  <Filters @run-search="() => filterData(filters)" :report-button="true" class="mb-4">
+    <Type8 @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">
+      <DxSelection mode="single" />
+      <DxPaging :enabled="false" />
+      <DxScrolling column-rendering-mode="virtual" mode="virtual" />
+      <DxLoadPanel :position="position" :show-indicator="showIndicator" :show-pane="showPane" :shading="shading"
+        v-if="loading" v-model:visible="loading" :enabled="true" />
+      <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
+      <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
+      <DxColumnFixing :enabled="true" />
+
+      <DxColumn 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="150" alignment="center" data-field="regu" caption="Kode Unit" css-class="custom-table-column" />
+      <DxColumn :width="170" alignment="center" data-field="nama_idUlp" caption="Nama 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 alignment="center" caption="Belum Selesai" css-class="custom-table-column">
+          <DxColumn :width="150" alignment="center" data-field="in_process" data-type="number" caption="Jml"
+            css-class="custom-table-column" />
+          <DxColumn :width="150" alignment="center" data-field="persen_in_process" data-type="number" caption="%"
+            css-class="custom-table-column" />
+        </DxColumn>
+        <DxColumn alignment="center" caption="Sudah Selesai" css-class="custom-table-column">
+          <DxColumn :width="150" alignment="center" data-field="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>
+      <DxColumn alignment="center" caption="Rating" css-class="custom-table-column">
+        <DxColumn alignment="center" caption="Bintang" css-class="custom-table-column">
+          <DxColumn :width="150" alignment="center" data-field="jumlah_rating" data-type="number" caption="Jml"
+            css-class="custom-table-column" />
+          <DxColumn :width="150" alignment="center" data-field="persen_rating" data-type="number" caption="%"
+            css-class="custom-table-column" />
+          <DxColumn :width="150" alignment="center" data-field="rating_1" data-type="number" caption="1"
+            css-class="custom-table-column" />
+          <DxColumn :width="150" alignment="center" data-field="rating_2" data-type="number" caption="2"
+            css-class="custom-table-column" />
+          <DxColumn :width="150" alignment="center" data-field="rating_3" data-type="number" caption="3"
+            css-class="custom-table-column" />
+          <DxColumn :width="150" alignment="center" data-field="rating_4" data-type="number" caption="4"
+            css-class="custom-table-column" />
+          <DxColumn :width="150" alignment="center" data-field="rating_5" data-type="number" caption="5"
+            css-class="custom-table-column" />
+          <DxColumn :width="150" alignment="center" data-field="indeks_rating" data-type="number" caption="Indeks"
+            css-class="custom-table-column" />
+        </DxColumn>
+      </DxColumn>
+      <DxColumn alignment="center" caption="Non Rating" css-class="custom-table-column">
+        <DxColumn :width="150" alignment="center" data-field="jumlah_non_rating" data-type="number" caption="Jml"
+          css-class="custom-table-column" />
+        <DxColumn :width="150" alignment="center" data-field="persen_non_rating" data-type="number" caption="%"
+          css-class="custom-table-column" />
+      </DxColumn>
+    </DxDataGrid>
+  </div>
+</template>
+
+<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 { DxDataGrid } from 'devextreme-vue'
+import {
+  DxColumn,
+  DxColumnFixing,
+  DxExport,
+  DxLoadPanel,
+  DxPaging,
+  DxScrolling,
+  DxSearchPanel,
+  DxSelection
+} from 'devextreme-vue/data-grid'
+import { jsPDF } from 'jspdf'
+import { exportDataGrid as exportToPdf } from 'devextreme/pdf_exporter'
+import { exportDataGrid as exportToExcel } from 'devextreme/excel_exporter'
+import { saveAs } from 'file-saver'
+import { Workbook } from 'exceljs'
+import { useQuery } from '@vue/apollo-composable'
+import gql from 'graphql-tag'
+const position = { of: '#data' }
+const showIndicator = ref(true)
+const shading = ref(true)
+const showPane = ref(true)
+const onExporting = (e: any) => {
+  if (e.format === 'pdf') {
+    const doc = new jsPDF()
+
+    exportToPdf({
+      jsPDFDocument: doc,
+      component: e.component,
+      indent: 5
+    }).then(() => {
+      doc.save(`.pdf`)
+    })
+  } else {
+    const workbook = new Workbook()
+    const worksheet = workbook.addWorksheet('Employees')
+
+    exportToExcel({
+      component: e.component,
+      worksheet,
+      autoFilterEnabled: true
+    }).then(() => {
+      workbook.xlsx.writeBuffer().then((buffer: any) => {
+        saveAs(new Blob([buffer], { type: 'application/octet-stream' }), 'DataGrid.xlsx')
+      })
+    })
+
+    e.cancel = true
+  }
+}
+
+const onSelectionChanged = ({ selectedRowsData }: any) => {
+  const data = selectedRowsData[0]
+  console.log(data)
+}
+
+const data = ref<any[]>([])
+const GET_DATA = gql`
+  query rekapitulasiKeluhanRatingPerUnit(
+    $dateFrom: Date!
+    $dateTo: Date!
+    $idUlp: Int!
+    $idUid: Int!
+    $idUp3: Int!
+  ) {
+    rekapitulasiKeluhanRatingPerUnit(
+      dateFrom: $dateFrom
+      dateTo: $dateTo
+      idUlp: $idUlp
+      idUid: $idUid
+      idUp3: $idUp3
+    ) {
+      in_process
+      indeks_rating
+      jumlah_non_rating
+      jumlah_rating
+      nama_idUlp
+      persen_in_process
+      persen_non_rating
+      persen_rating
+      persen_selesai
+      rating_1
+      rating_2
+      rating_3
+      rating_4
+      rating_5
+      regu
+      selesai
+      total
+    }
+  }
+`
+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),
+  idUlp: 0,
+  idUid: 0,
+  idUp3: 0
+})
+const filters = ref()
+
+const filterData = (params: any) => {
+  const dateValue = params.periode.split(' s/d ')
+  const { idUlp, uid, up3 } = params
+  refetch({
+    dateFrom: dateValue[0]
+      ? dateValue[0].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    dateTo: dateValue[1]
+      ? dateValue[1].split('-').reverse().join('-')
+      : new Date().toISOString().slice(0, 10),
+    idUlp: idUlp ? idUlp.id : 0,
+    idUid: uid ? uid.id : 0,
+    idUp3: up3 ? up3.id : 0
+  })
+
+  onResult((queryResult) => {
+    if (queryResult.data != undefined) {
+      data.value = queryResult.data.rekapitulasiKeluhanRatingPerUnit
+    }
+    console.log(queryResult.data)
+    console.log(queryResult.loading)
+    console.log(queryResult.networkStatus)
+  })
+  onError((error) => {
+    console.log(error)
+  })
+}
+</script>
diff --git a/src/components/Pages/Keluhan/Table_35.vue b/src/components/Pages/Keluhan/Table_35.vue
deleted file mode 100755
index ce1449b..0000000
--- a/src/components/Pages/Keluhan/Table_35.vue
+++ /dev/null
@@ -1,332 +0,0 @@
-<template>
-  <Filters @run-search="() => filterData(filters)" :report-button="true" class="mb-4">
-    <Type8 @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"
-    >
-      <DxSelection mode="single" />
-      <DxPaging :enabled="false" />
-      <DxScrolling column-rendering-mode="virtual" mode="virtual" />
-      <DxLoadPanel
-        :position="position"
-        :show-indicator="showIndicator"
-        :show-pane="showPane"
-        :shading="shading"
-        v-if="loading"
-        v-model:visible="loading"
-        :enabled="true"
-      />
-      <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
-      <DxExport
-        :enabled="true"
-        :formats="['pdf', 'xlsx', 'document']"
-        :allow-export-selected-data="false"
-      />
-      <DxColumnFixing :enabled="true" />
-
-      <DxColumn
-        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="150"
-        alignment="center"
-        data-field="regu"
-        caption="Kode Unit"
-        css-class="custom-table-column"
-      />
-      <DxColumn
-        :width="170"
-        alignment="center"
-        data-field="nama_idUlp"
-        caption="Nama 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 alignment="center" caption="Belum Selesai" css-class="custom-table-column">
-          <DxColumn
-            :width="150"
-            alignment="center"
-            data-field="in_process"
-            data-type="number"
-            caption="Jml"
-            css-class="custom-table-column"
-          />
-          <DxColumn
-            :width="150"
-            alignment="center"
-            data-field="persen_in_process"
-            data-type="number"
-            caption="%"
-            css-class="custom-table-column"
-          />
-        </DxColumn>
-        <DxColumn alignment="center" caption="Sudah Selesai" css-class="custom-table-column">
-          <DxColumn
-            :width="150"
-            alignment="center"
-            data-field="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>
-      <DxColumn alignment="center" caption="Rating" css-class="custom-table-column">
-        <DxColumn alignment="center" caption="Bintang" css-class="custom-table-column">
-          <DxColumn
-            :width="150"
-            alignment="center"
-            data-field="jumlah_rating"
-            data-type="number"
-            caption="Jml"
-            css-class="custom-table-column"
-          />
-          <DxColumn
-            :width="150"
-            alignment="center"
-            data-field="persen_rating"
-            data-type="number"
-            caption="%"
-            css-class="custom-table-column"
-          />
-          <DxColumn
-            :width="150"
-            alignment="center"
-            data-field="rating_1"
-            data-type="number"
-            caption="1"
-            css-class="custom-table-column"
-          />
-          <DxColumn
-            :width="150"
-            alignment="center"
-            data-field="rating_2"
-            data-type="number"
-            caption="2"
-            css-class="custom-table-column"
-          />
-          <DxColumn
-            :width="150"
-            alignment="center"
-            data-field="rating_3"
-            data-type="number"
-            caption="3"
-            css-class="custom-table-column"
-          />
-          <DxColumn
-            :width="150"
-            alignment="center"
-            data-field="rating_4"
-            data-type="number"
-            caption="4"
-            css-class="custom-table-column"
-          />
-          <DxColumn
-            :width="150"
-            alignment="center"
-            data-field="rating_5"
-            data-type="number"
-            caption="5"
-            css-class="custom-table-column"
-          />
-          <DxColumn
-            :width="150"
-            alignment="center"
-            data-field="indeks_rating"
-            data-type="number"
-            caption="Indeks"
-            css-class="custom-table-column"
-          />
-        </DxColumn>
-      </DxColumn>
-      <DxColumn alignment="center" caption="Non Rating" css-class="custom-table-column">
-        <DxColumn
-          :width="150"
-          alignment="center"
-          data-field="jumlah_non_rating"
-          data-type="number"
-          caption="Jml"
-          css-class="custom-table-column"
-        />
-        <DxColumn
-          :width="150"
-          alignment="center"
-          data-field="persen_non_rating"
-          data-type="number"
-          caption="%"
-          css-class="custom-table-column"
-        />
-      </DxColumn>
-    </DxDataGrid>
-  </div>
-</template>
-
-<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 { DxDataGrid } from 'devextreme-vue'
-import {
-  DxColumn,
-  DxColumnFixing,
-  DxExport,
-  DxLoadPanel,
-  DxPaging,
-  DxScrolling,
-  DxSearchPanel,
-  DxSelection
-} from 'devextreme-vue/data-grid'
-import { jsPDF } from 'jspdf'
-import { exportDataGrid as exportToPdf } from 'devextreme/pdf_exporter'
-import { exportDataGrid as exportToExcel } from 'devextreme/excel_exporter'
-import { saveAs } from 'file-saver'
-import { Workbook } from 'exceljs'
-import { useQuery } from '@vue/apollo-composable'
-import gql from 'graphql-tag'
-const position = { of: '#data' }
-const showIndicator = ref(true)
-const shading = ref(true)
-const showPane = ref(true)
-const onExporting = (e: any) => {
-  if (e.format === 'pdf') {
-    const doc = new jsPDF()
-
-    exportToPdf({
-      jsPDFDocument: doc,
-      component: e.component,
-      indent: 5
-    }).then(() => {
-      doc.save(`.pdf`)
-    })
-  } else {
-    const workbook = new Workbook()
-    const worksheet = workbook.addWorksheet('Employees')
-
-    exportToExcel({
-      component: e.component,
-      worksheet,
-      autoFilterEnabled: true
-    }).then(() => {
-      workbook.xlsx.writeBuffer().then((buffer: any) => {
-        saveAs(new Blob([buffer], { type: 'application/octet-stream' }), 'DataGrid.xlsx')
-      })
-    })
-
-    e.cancel = true
-  }
-}
-
-const onSelectionChanged = ({ selectedRowsData }: any) => {
-  const data = selectedRowsData[0]
-  console.log(data)
-}
-
-const data = ref<any[]>([])
-const GET_DATA = gql`
-  query rekapitulasiKeluhanRatingPerUnit(
-    $dateFrom: Date!
-    $dateTo: Date!
-    $idUlp: Int!
-    $idUid: Int!
-    $idUp3: Int!
-  ) {
-    rekapitulasiKeluhanRatingPerUnit(
-      dateFrom: $dateFrom
-      dateTo: $dateTo
-      idUlp: $idUlp
-      idUid: $idUid
-      idUp3: $idUp3
-    ) {
-      in_process
-      indeks_rating
-      jumlah_non_rating
-      jumlah_rating
-      nama_idUlp
-      persen_in_process
-      persen_non_rating
-      persen_rating
-      persen_selesai
-      rating_1
-      rating_2
-      rating_3
-      rating_4
-      rating_5
-      regu
-      selesai
-      total
-    }
-  }
-`
-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),
-  idUlp: 0,
-  idUid: 0,
-  idUp3: 0
-})
-const filters = ref()
-
-const filterData = (params: any) => {
-  const dateValue = params.periode.split(' s/d ')
-  const { idUlp, uid, up3 } = params
-  refetch({
-    dateFrom: dateValue[0]
-      ? dateValue[0].split('-').reverse().join('-')
-      : new Date().toISOString().slice(0, 10),
-    dateTo: dateValue[1]
-      ? dateValue[1].split('-').reverse().join('-')
-      : new Date().toISOString().slice(0, 10),
-    idUlp: idUlp ? idUlp.id : 0,
-    idUid: uid ? uid.id : 0,
-    idUp3: up3 ? up3.id : 0
-  })
-
-  onResult((queryResult) => {
-    if (queryResult.data != undefined) {
-      data.value = queryResult.data.rekapitulasiKeluhanRatingPerUnit
-    }
-    console.log(queryResult.data)
-    console.log(queryResult.loading)
-    console.log(queryResult.networkStatus)
-  })
-  onError((error) => {
-    console.log(error)
-  })
-}
-</script>
diff --git a/src/components/Pages/Keluhan/index.ts b/src/components/Pages/Keluhan/index.ts
index fe6387d..aa4e3c2 100755
--- a/src/components/Pages/Keluhan/index.ts
+++ b/src/components/Pages/Keluhan/index.ts
@@ -1,15 +1,15 @@
-export { default as KeluhanTable1 } from '@/components/Pages/Keluhan/Table_21.vue'
-export { default as KeluhanTable2 } from '@/components/Pages/Keluhan/Table_22.vue'
-export { default as KeluhanTable3 } from '@/components/Pages/Keluhan/Table_23.vue'
-export { default as KeluhanTable4 } from '@/components/Pages/Keluhan/Table_24.vue'
-export { default as KeluhanTable5 } from '@/components/Pages/Keluhan/Table_25.vue'
-export { default as KeluhanTable6 } from '@/components/Pages/Keluhan/Table_26.vue'
-export { default as KeluhanTable7 } from '@/components/Pages/Keluhan/Table_27.vue'
-export { default as KeluhanTable8 } from '@/components/Pages/Keluhan/Table_28.vue'
-export { default as KeluhanTable9 } from '@/components/Pages/Keluhan/Table_29.vue'
-export { default as KeluhanTable10 } from '@/components/Pages/Keluhan/Table_30.vue'
-export { default as KeluhanTable11 } from '@/components/Pages/Keluhan/Table_31.vue'
-export { default as KeluhanTable12 } from '@/components/Pages/Keluhan/Table_32.vue'
-export { default as KeluhanTable13 } from '@/components/Pages/Keluhan/Table_33.vue'
-export { default as KeluhanTable14 } from '@/components/Pages/Keluhan/Table_34.vue'
-export { default as KeluhanTable15 } from '@/components/Pages/Keluhan/Table_35.vue'
\ No newline at end of file
+export { default as DaftarKeluhanDKUL } from '@/components/Pages/Keluhan/Daftar/DKeluhan_DKUL.vue'
+export { default as DaftarKeluhanPLD1K } from '@/components/Pages/Keluhan/Daftar/DKeluhan_PLD1K.vue'
+export { default as DaftarKeluhanResponseTime } from '@/components/Pages/Keluhan/Daftar/DKeluhan_ResponseTime.vue'
+export { default as DaftarKeluhanRecoveryTime } from '@/components/Pages/Keluhan/Daftar/DKeluhan_RecoveryTime.vue'
+export { default as DaftarKeluhanSTIDP } from '@/components/Pages/Keluhan/Daftar/DKeluhan_STIDP.vue'
+export { default as DaftarKeluhanBerdasarMedia } from '@/components/Pages/Keluhan/Daftar/DKeluhan_BerdasarMedia.vue'
+export { default as DaftarKeluhanSelesaiCC } from '@/components/Pages/Keluhan/Daftar/DKeluhan_SelesaiCC.vue'
+export { default as RekapKeluhanALL } from '@/components/Pages/Keluhan/Rekap/RKeluhan_ALL.vue'
+export { default as RekapKeluhanPerFungsiBidang } from '@/components/Pages/Keluhan/Rekap/RKeluhan_PerFungsiBidang.vue'
+export { default as RekapKeluhanPerJenisKeluhan } from '@/components/Pages/Keluhan/Rekap/RKeluhan_PerJenisKeluhan.vue'
+export { default as RekapKeluhanPerKelompokKeluhan } from '@/components/Pages/Keluhan/Rekap/RKeluhan_PerKelompokKeluhan.vue'
+export { default as RekapKeluhanPerTanggal } from '@/components/Pages/Keluhan/Rekap/RKeluhan_PerTanggal.vue'
+export { default as RekapKeluhanPerUnit } from '@/components/Pages/Keluhan/Rekap/RKeluhan_PerUnit.vue'
+export { default as RekapKeluhanBerdasarMedia } from '@/components/Pages/Keluhan/Rekap/RKeluhan_BerdasarMedia.vue'
+export { default as RekapKeluhanRatingPerUnit } from '@/components/Pages/Keluhan/Rekap/RKeluhan_RatingPerUnit.vue'
\ No newline at end of file
diff --git a/src/router/index.ts b/src/router/index.ts
index afbc332..28decb4 100755
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -29,21 +29,21 @@ import {
   RekapGangguanCTTM
 } from '@/components/Pages/Gangguan'
 import {
-  KeluhanTable1,
-  KeluhanTable2,
-  KeluhanTable3,
-  KeluhanTable4,
-  KeluhanTable5,
-  KeluhanTable6,
-  KeluhanTable7,
-  KeluhanTable8,
-  KeluhanTable9,
-  KeluhanTable10,
-  KeluhanTable11,
-  KeluhanTable12,
-  KeluhanTable13,
-  KeluhanTable14,
-  KeluhanTable15
+  DaftarKeluhanDKUL,
+  DaftarKeluhanPLD1K,
+  DaftarKeluhanResponseTime,
+  DaftarKeluhanRecoveryTime,
+  DaftarKeluhanSTIDP,
+  DaftarKeluhanBerdasarMedia,
+  DaftarKeluhanSelesaiCC,
+  RekapKeluhanALL,
+  RekapKeluhanPerFungsiBidang,
+  RekapKeluhanPerJenisKeluhan,
+  RekapKeluhanPerKelompokKeluhan,
+  RekapKeluhanPerTanggal,
+  RekapKeluhanPerUnit,
+  RekapKeluhanBerdasarMedia,
+  RekapKeluhanRatingPerUnit
 } from '@/components/Pages/Keluhan'
 import {
   MonalisaTable1,
@@ -230,37 +230,37 @@ export const routes: RouteRecordRaw[] = [
               {
                 path: '1',
                 name: 'Daftar Keluhan Dialihkan Ke Unit Lain',
-                component: KeluhanTable1
+                component: DaftarKeluhanDKUL
               },
               {
                 path: '2',
                 name: 'Daftar Keluhan Pelanggan Lebih Dari 1 Kali',
-                component: KeluhanTable2
+                component: DaftarKeluhanPLD1K
               },
               {
                 path: '3',
                 name: 'Daftar Keluhan Response Time',
-                component: KeluhanTable3
+                component: DaftarKeluhanResponseTime
               },
               {
                 path: '4',
                 name: 'Daftar Keluhan Recovery Time',
-                component: KeluhanTable4
+                component: DaftarKeluhanRecoveryTime
               },
               {
                 path: '5',
                 name: 'Daftar Keluhan Selesai Tanpa ID Pelanggan',
-                component: KeluhanTable5
+                component: DaftarKeluhanSTIDP
               },
               {
                 path: '6',
                 name: 'Daftar Keluhan Berdasarkan Media',
-                component: KeluhanTable6
+                component: DaftarKeluhanBerdasarMedia
               },
               {
                 path: '7',
-                name: 'Daftar Keluhan Selesai di CC123',
-                component: KeluhanTable7
+                name: 'Daftar Keluhan Selesai di Contact Center',
+                component: DaftarKeluhanSelesaiCC
               },
               {
                 path: ':pathMatch(.*)*',
@@ -275,42 +275,42 @@ export const routes: RouteRecordRaw[] = [
               {
                 path: '1',
                 name: 'Rekapitulasi Keluhan All',
-                component: KeluhanTable8
+                component: RekapKeluhanALL
               },
               {
                 path: '2',
                 name: 'Rekapitulasi Keluhan Per Fungsi Bidang',
-                component: KeluhanTable9
+                component: RekapKeluhanPerFungsiBidang
               },
               {
                 path: '3',
                 name: 'Rekapitulasi Keluhan Per Jenis Keluhan',
-                component: KeluhanTable10
+                component: RekapKeluhanPerJenisKeluhan
               },
               {
                 path: '4',
                 name: 'Rekapitulasi Keluhan Per Kelompok Keluhan',
-                component: KeluhanTable11
+                component: RekapKeluhanPerKelompokKeluhan
               },
               {
                 path: '5',
                 name: 'Rekapitulasi Keluhan Per Tanggal',
-                component: KeluhanTable12
+                component: RekapKeluhanPerTanggal
               },
               {
                 path: '6',
                 name: 'Rekapitulasi Keluhan Per Unit',
-                component: KeluhanTable13
+                component: RekapKeluhanPerUnit
               },
               {
                 path: '7',
                 name: 'Rekapitulasi Keluhan Berdasarkan Media',
-                component: KeluhanTable14
+                component: RekapKeluhanBerdasarMedia
               },
               {
                 path: '8',
                 name: 'Rekapitulasi Rating Per Unit',
-                component: KeluhanTable15
+                component: RekapKeluhanRatingPerUnit
               },
               {
                 path: ':pathMatch(.*)*',