diff --git a/src/components/Pages/Gangguan/Table_1.vue b/src/components/Pages/Gangguan/Table_1.vue
index 5b27b35..eb3ee76 100755
--- a/src/components/Pages/Gangguan/Table_1.vue
+++ b/src/components/Pages/Gangguan/Table_1.vue
@@ -56,9 +56,9 @@
       <DxColumn css-class="custom-table-column" :width="170" alignment="center" data-field="posko" caption="Posko"
         cell-template="data" />
       <template #data="{ data }">
-        <span class="cursor-pointer" @click="showData()">
+        <p class="cursor-pointer" @click="showData()">
           {{ data.text }}
-        </span>
+          </span>
       </template>
     </DxDataGrid>
   </div>
diff --git a/src/components/Pages/Gangguan/Table_2.vue b/src/components/Pages/Gangguan/Table_2.vue
index e29179b..b47e9bc 100755
--- a/src/components/Pages/Gangguan/Table_2.vue
+++ b/src/components/Pages/Gangguan/Table_2.vue
@@ -4,186 +4,60 @@
   </Filters>
 
   <div id="data">
-    <DxDataGrid
-      class="max-h-[calc(100vh-140px)]"
-      :data-source="data"
-      :show-column-lines="true"
-      :show-row-lines="false"
-      :show-borders="true"
-      :row-alternation-enabled="true"
-      :hover-state-enabled="true"
-      @selection-changed="onSelectionChanged"
-      :column-width="100"
-      @exporting=""
-      :allow-column-resizing="true"
-      column-resizing-mode="widget"
-    >
+    <DxDataGrid class="max-h-[calc(100vh-140px)]" :data-source="data" :show-column-lines="true" :show-row-lines="false"
+      :show-borders="true" :row-alternation-enabled="true" :hover-state-enabled="true"
+      @selection-changed="onSelectionChanged" :column-width="100" @exporting="" :allow-column-resizing="true"
+      column-resizing-mode="widget">
       <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.sync="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.sync="loading" :enabled="true" />
       <DxSearchPanel :visible="true" :highlight-case-sensitive="true" />
-      <DxExport
-        :enabled="true"
-        :formats="['pdf', 'xlsx', 'document']"
-        :allow-export-selected-data="false"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="50"
-        alignment="center"
-        :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1"
-        data-type="number"
-        caption="No"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="150"
-        alignment="center"
-        data-field="no_laporan"
-        caption="No Laporan"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="150"
-        alignment="center"
-        data-field="waktu_lapor"
-        caption="Tgl Lapor"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="150"
-        alignment="center"
-        data-field="waktu_response"
-        caption="Tgl Response"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="150"
-        alignment="center"
-        data-field="waktu_recovery"
-        caption="Tgl Recovery"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        alignment="center"
-        data-field="jumlah_lapor"
-        caption="Jml Lapor"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="170"
-        alignment="center"
-        data-field="durasi_response_time"
-        caption="Durasi Response Time"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="170"
-        alignment="center"
-        data-field="durasi_recovery_time"
-        caption="Durasi Recovery Time"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="150"
-        alignment="center"
-        data-field="status_akhir"
-        caption="Status"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="150"
-        alignment="center"
-        data-field="idpel_nometer"
-        caption="IDPEL/NO METER"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="150"
-        alignment="center"
-        data-field="nama_pelapor"
-        caption="Nama Pelapor"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="170"
-        alignment="center"
-        data-field="alamat_pelapor"
-        caption="Alamat Pelapor"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="150"
-        alignment="center"
-        data-field="no_telp_pelapor"
-        caption="No Telp Pelapor"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="150"
-        alignment="center"
-        data-field="keterangan_pelapor"
-        caption="Keterangan Pelapor"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="150"
-        alignment="center"
-        data-field="media"
-        caption="Sumber Lapor"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="170"
-        alignment="center"
-        data-field="nama_posko"
-        caption="Posko"
-        cell-template="data"
-      />
+      <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
+      <DxColumn css-class="custom-table-column" :width="50" alignment="center"
+        :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1" data-type="number" caption="No" />
+      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="no_laporan"
+        caption="No Laporan" cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="waktu_lapor"
+        caption="Tgl Lapor" cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="waktu_response"
+        caption="Tgl Response" cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="waktu_recovery"
+        caption="Tgl Recovery" cell-template="data" />
+      <DxColumn css-class="custom-table-column" alignment="center" data-field="jumlah_lapor" caption="Jml Lapor"
+        cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="170" alignment="center" data-field="durasi_response_time"
+        caption="Durasi Response Time" cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="170" alignment="center" data-field="durasi_recovery_time"
+        caption="Durasi Recovery Time" cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="status_akhir" caption="Status"
+        cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="idpel_nometer"
+        caption="IDPEL/NO METER" cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="nama_pelapor"
+        caption="Nama Pelapor" cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="170" alignment="center" data-field="alamat_pelapor"
+        caption="Alamat Pelapor" cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="no_telp_pelapor"
+        caption="No Telp Pelapor" cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="keterangan_pelapor"
+        caption="Keterangan Pelapor" cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="media" caption="Sumber Lapor"
+        cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="170" alignment="center" data-field="nama_posko" caption="Posko"
+        cell-template="data" />
 
       <template #data="{ data }">
-        <span class="cursor-pointer" @click="showData()">
+        <p class="cursor-pointer" @click="showData()">
           {{ data.text }}
-        </span>
+          </span>
       </template>
     </DxDataGrid>
   </div>
 
-  <DetailDialog
-    :open="showDetail"
-    title="Daftar Gangguan Melapor Lebih Dari 1 Kali"
-    @on-close="closeDetail"
-  >
+  <DetailDialog :open="showDetail" title="Daftar Gangguan Melapor Lebih Dari 1 Kali" @on-close="closeDetail">
     <div class="w-full p-4 space-y-2 bg-white rounded-xl">
       <div class="flex flex-row items-center justify-between w-full">
         <h3 class="text-sm font-medium w-[170px] text-gray-800">No Laporan:</h3>
@@ -257,12 +131,7 @@
 
       <div class="flex flex-row items-center justify-between w-full">
         <h3 class="text-sm font-medium w-[170px] text-gray-800">Unit Layanan Pelanggan:</h3>
-        <InputText
-          :readonly="true"
-          type="textarea"
-          :value="dataDetail?.nama_posko"
-          class-name="flex-1 h-[56px]"
-        />
+        <InputText :readonly="true" type="textarea" :value="dataDetail?.nama_posko" class-name="flex-1 h-[56px]" />
       </div>
     </div>
   </DetailDialog>
diff --git a/src/components/Pages/Gangguan/Table_3.vue b/src/components/Pages/Gangguan/Table_3.vue
index c71967e..5838ae6 100755
--- a/src/components/Pages/Gangguan/Table_3.vue
+++ b/src/components/Pages/Gangguan/Table_3.vue
@@ -4,172 +4,55 @@
   </Filters>
 
   <div id="data">
-    <DxDataGrid
-      class="max-h-[calc(100vh-140px)]"
-      :data-source="data"
-      :show-column-lines="true"
-      :show-row-lines="false"
-      :show-borders="true"
-      :row-alternation-enabled="true"
-      :hover-state-enabled="true"
-      @selection-changed="onSelectionChanged"
-      :column-width="100"
-      @exporting=""
-      :allow-column-resizing="true"
-      column-resizing-mode="widget"
-    >
+    <DxDataGrid class="max-h-[calc(100vh-140px)]" :data-source="data" :show-column-lines="true" :show-row-lines="false"
+      :show-borders="true" :row-alternation-enabled="true" :hover-state-enabled="true"
+      @selection-changed="onSelectionChanged" :column-width="100" @exporting="" :allow-column-resizing="true"
+      column-resizing-mode="widget">
       <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"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="50"
-        alignment="center"
-        :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1"
-        data-type="number"
-        caption="No"
-        cell-template="data"
-      />
+      <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
+      <DxColumn css-class="custom-table-column" :width="50" alignment="center"
+        :calculateCellValue="(item: any) => data.findIndex((i) => i == item) + 1" data-type="number" caption="No"
+        cell-template="data" />
 
-      <DxColumn
-        css-class="custom-table-column"
-        :width="150"
-        alignment="center"
-        data-field="no_laporan"
-        caption="No Laporan"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="150"
-        alignment="center"
-        data-field="waktu_lapor"
-        caption="Tgl Lapor"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="150"
-        alignment="center"
-        data-field="waktu_response"
-        caption="Tgl Response"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="150"
-        alignment="center"
-        data-field="waktu_recovery"
-        caption="Tgl Recovery"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="170"
-        alignment="center"
-        data-field="durasi_response_time"
-        caption="Durasi Response Time"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="170"
-        alignment="center"
-        data-field="durasi_recovery_time"
-        caption="Durasi Recovery Time"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="150"
-        alignment="center"
-        data-field="status_akhir"
-        caption="Status"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="150"
-        alignment="center"
-        data-field="referensi_marking"
-        caption="Referensi Marking"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="150"
-        alignment="center"
-        data-field="idpel_nometer"
-        caption="IDPEL/NO METER"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="150"
-        alignment="center"
-        data-field="nama_pelapor"
-        caption="Nama Pelapor"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="170"
-        alignment="center"
-        data-field="alamat_pelapor"
-        caption="Alamat Pelapor"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="150"
-        alignment="center"
-        data-field="no_telp_pelapor"
-        caption="No Telp Pelapor"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="150"
-        alignment="center"
-        data-field="keterangan_pelapor"
-        caption="Keterangan Pelapor"
-        cell-template="data"
-      />
-      <DxColumn
-        css-class="custom-table-column"
-        :width="170"
-        alignment="center"
-        data-field="nama_posko"
-        caption="Posko"
-        cell-template="data"
-      />
+      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="no_laporan"
+        caption="No Laporan" cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="waktu_lapor"
+        caption="Tgl Lapor" cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="waktu_response"
+        caption="Tgl Response" cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="waktu_recovery"
+        caption="Tgl Recovery" cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="170" alignment="center" data-field="durasi_response_time"
+        caption="Durasi Response Time" cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="170" alignment="center" data-field="durasi_recovery_time"
+        caption="Durasi Recovery Time" cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="status_akhir" caption="Status"
+        cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="referensi_marking"
+        caption="Referensi Marking" cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="idpel_nometer"
+        caption="IDPEL/NO METER" cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="nama_pelapor"
+        caption="Nama Pelapor" cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="170" alignment="center" data-field="alamat_pelapor"
+        caption="Alamat Pelapor" cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="no_telp_pelapor"
+        caption="No Telp Pelapor" cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="150" alignment="center" data-field="keterangan_pelapor"
+        caption="Keterangan Pelapor" cell-template="data" />
+      <DxColumn css-class="custom-table-column" :width="170" alignment="center" data-field="nama_posko" caption="Posko"
+        cell-template="data" />
 
       <template #data="{ data }">
-        <span class="cursor-pointer" @click="showData()">
+        <p class="cursor-pointer" @click="showData()">
           {{ data.text }}
-        </span>
+          </span>
       </template>
     </DxDataGrid>
   </div>
@@ -243,32 +126,17 @@
 
       <div class="flex flex-row items-center justify-between w-full">
         <h3 class="text-sm font-medium w-[170px] text-gray-800">Unit Layanan Pelanggan:</h3>
-        <InputText
-          :readonly="true"
-          type="textarea"
-          :value="dataDetail?.nama_posko"
-          class-name="flex-1 h-[56px]"
-        />
+        <InputText :readonly="true" type="textarea" :value="dataDetail?.nama_posko" 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">Penyebab:</h3>
-        <InputText
-          :readonly="true"
-          type="textarea"
-          :value="dataDetail?.penyebab"
-          class-name="flex-1 h-[56px]"
-        />
+        <InputText :readonly="true" type="textarea" :value="dataDetail?.penyebab" 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">Tindakan:</h3>
-        <InputText
-          :readonly="true"
-          type="textarea"
-          :value="dataDetail?.tindakan"
-          class-name="flex-1 h-[56px]"
-        />
+        <InputText :readonly="true" type="textarea" :value="dataDetail?.tindakan" class-name="flex-1 h-[56px]" />
       </div>
     </div>
   </DetailDialog>
diff --git a/src/components/Pages/Keluhan/Table_22.vue b/src/components/Pages/Keluhan/Table_22.vue
index aca60a2..f6794b9 100755
--- a/src/components/Pages/Keluhan/Table_22.vue
+++ b/src/components/Pages/Keluhan/Table_22.vue
@@ -4,181 +4,57 @@
   </Filters>
 
   <div id="data">
-    <DxDataGrid
-      class="max-h-[calc(100vh-140px)]"
-      :data-source="data"
-      :show-column-lines="true"
-      :show-row-lines="false"
-      :show-borders="true"
-      :row-alternation-enabled="true"
-      :hover-state-enabled="true"
-      @selection-changed="onSelectionChanged"
-      :column-width="100"
-      @exporting="onExporting"
-      :allow-column-resizing="true"
-      column-resizing-mode="widget"
-      :word-wrap-enabled="true"
-    >
+    <DxDataGrid class="max-h-[calc(100vh-140px)]" :data-source="data" :show-column-lines="true" :show-row-lines="false"
+      :show-borders="true" :row-alternation-enabled="true" :hover-state-enabled="true"
+      @selection-changed="onSelectionChanged" :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="120"
-        alignment="center"
-        data-field="jumlah_lapor"
-        caption="Jml Lapor"
-        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="120" alignment="center" data-field="jumlah_lapor" caption="Jml Lapor"
+        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" />
 
       <template #data="{ data }">
-        <span class="cursor-pointer" @click="showData()">
+        <p class="cursor-pointer" @click="showData()">
           {{ data.text }}
-        </span>
+        </p>
       </template>
     </DxDataGrid>
   </div>
@@ -237,12 +113,7 @@
 
       <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">
@@ -252,12 +123,8 @@
 
       <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">
diff --git a/src/components/Pages/Keluhan/Table_23.vue b/src/components/Pages/Keluhan/Table_23.vue
index 9cd1c78..7cdc319 100755
--- a/src/components/Pages/Keluhan/Table_23.vue
+++ b/src/components/Pages/Keluhan/Table_23.vue
@@ -4,165 +4,53 @@
   </Filters>
 
   <div id="data">
-    <DxDataGrid
-      class="max-h-[calc(100vh-140px)]"
-      :data-source="data"
-      :show-column-lines="true"
-      :show-row-lines="false"
-      :show-borders="true"
-      :row-alternation-enabled="true"
-      :hover-state-enabled="true"
-      @selection-changed="onSelectionChanged"
-      :column-width="100"
-      @exporting="onExporting"
-      :allow-column-resizing="true"
-      column-resizing-mode="widget"
-      :word-wrap-enabled="true"
-    >
+    <DxDataGrid class="max-h-[calc(100vh-140px)]" :data-source="data" :show-column-lines="true" :show-row-lines="false"
+      :show-borders="true" :row-alternation-enabled="true" :hover-state-enabled="true"
+      @selection-changed="onSelectionChanged" :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 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="nama_ulp"
-        caption="Nama ULP"
-        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="nama_ulp" caption="Nama ULP" css-class="custom-table-column"
+        cell-template="data" />
       <template #data="{ data }">
-        <span class="cursor-pointer" @click="showData()">
+        <p class="cursor-pointer" @click="showData()">
           {{ data.text }}
-        </span>
+        </p>
       </template>
     </DxDataGrid>
   </div>
@@ -215,12 +103,7 @@
 
       <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">
@@ -230,12 +113,8 @@
 
       <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">
diff --git a/src/components/Pages/Keluhan/Table_24.vue b/src/components/Pages/Keluhan/Table_24.vue
index ad9a789..df5c1ea 100755
--- a/src/components/Pages/Keluhan/Table_24.vue
+++ b/src/components/Pages/Keluhan/Table_24.vue
@@ -4,165 +4,53 @@
   </Filters>
 
   <div id="data">
-    <DxDataGrid
-      class="max-h-[calc(100vh-140px)]"
-      :data-source="data"
-      :show-column-lines="true"
-      :show-row-lines="false"
-      :show-borders="true"
-      :row-alternation-enabled="true"
-      :hover-state-enabled="true"
-      @selection-changed="onSelectionChanged"
-      :column-width="100"
-      @exporting="onExporting"
-      :allow-column-resizing="true"
-      column-resizing-mode="widget"
-      :word-wrap-enabled="true"
-    >
+    <DxDataGrid class="max-h-[calc(100vh-140px)]" :data-source="data" :show-column-lines="true" :show-row-lines="false"
+      :show-borders="true" :row-alternation-enabled="true" :hover-state-enabled="true"
+      @selection-changed="onSelectionChanged" :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 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="nama_ulp"
-        caption="Nama ULP"
-        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="nama_ulp" caption="Nama ULP" css-class="custom-table-column"
+        cell-template="data" />
       <template #data="{ data }">
-        <span class="cursor-pointer" @click="showData()">
+        <p class="cursor-pointer" @click="showData()">
           {{ data.text }}
-        </span>
+        </p>
       </template>
     </DxDataGrid>
   </div>
@@ -216,12 +104,7 @@
 
       <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">
@@ -231,12 +114,8 @@
 
       <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">
diff --git a/src/components/Pages/Keluhan/Table_25.vue b/src/components/Pages/Keluhan/Table_25.vue
index f1c7b8d..f839374 100755
--- a/src/components/Pages/Keluhan/Table_25.vue
+++ b/src/components/Pages/Keluhan/Table_25.vue
@@ -4,172 +4,54 @@
   </Filters>
 
   <div id="data">
-    <DxDataGrid
-      class="max-h-[calc(100vh-140px)]"
-      :data-source="data"
-      :show-column-lines="true"
-      :show-row-lines="false"
-      :show-borders="true"
-      :row-alternation-enabled="true"
-      :hover-state-enabled="true"
-      @selection-changed="onSelectionChanged"
-      :column-width="100"
-      @exporting="onExporting"
-      :allow-column-resizing="true"
-      column-resizing-mode="widget"
-      :word-wrap-enabled="true"
-    >
+    <DxDataGrid class="max-h-[calc(100vh-140px)]" :data-source="data" :show-column-lines="true" :show-row-lines="false"
+      :show-borders="true" :row-alternation-enabled="true" :hover-state-enabled="true"
+      @selection-changed="onSelectionChanged" :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" />
+      <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" />
       <template #data="{ data }">
-        <span class="cursor-pointer" @click="showData()">
+        <p class="cursor-pointer" @click="showData()">
           {{ data.text }}
-        </span>
+        </p>
       </template>
     </DxDataGrid>
   </div>
@@ -223,12 +105,7 @@
 
       <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">
@@ -238,12 +115,8 @@
 
       <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">
diff --git a/src/components/Pages/Keluhan/Table_26.vue b/src/components/Pages/Keluhan/Table_26.vue
index b884aa2..928e424 100755
--- a/src/components/Pages/Keluhan/Table_26.vue
+++ b/src/components/Pages/Keluhan/Table_26.vue
@@ -4,174 +4,56 @@
   </Filters>
 
   <div id="data">
-    <DxDataGrid
-      class="max-h-[calc(100vh-140px)]"
-      :data-source="data"
-      :show-column-lines="true"
-      :show-row-lines="false"
-      :show-borders="true"
-      :row-alternation-enabled="true"
-      :hover-state-enabled="true"
-      @selection-changed="onSelectionChanged"
-      :column-width="100"
-      @exporting="onExporting"
-      :allow-column-resizing="true"
-      column-resizing-mode="widget"
-      :word-wrap-enabled="true"
-    >
+    <DxDataGrid class="max-h-[calc(100vh-140px)]" :data-source="data" :show-column-lines="true" :show-row-lines="false"
+      :show-borders="true" :row-alternation-enabled="true" :hover-state-enabled="true"
+      @selection-changed="onSelectionChanged" :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="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"
-      />
+      <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 }">
-        <span class="cursor-pointer" @click="showData()">
+        <p class="cursor-pointer" @click="showData()">
           {{ data.text }}
-        </span>
+        </p>
       </template>
     </DxDataGrid>
   </div>
@@ -195,22 +77,13 @@
 
       <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">
@@ -255,12 +128,7 @@
 
       <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>
diff --git a/src/components/Pages/Keluhan/Table_28.vue b/src/components/Pages/Keluhan/Table_28.vue
index 2cf9d36..d4ac089 100755
--- a/src/components/Pages/Keluhan/Table_28.vue
+++ b/src/components/Pages/Keluhan/Table_28.vue
@@ -16,8 +16,8 @@
       <DxExport :enabled="true" :formats="['pdf', 'xlsx', 'document']" :allow-export-selected-data="false" />
       <DxColumnFixing :enabled="true" />
 
-      <DxColumn :width="170" alignment="center" data-field="nama_ulp" caption="Nama Unit" css-class="custom-table-column"
-        cell-template="data" />
+      <DxColumn :width="170" data-field="nama_ulp" caption="Nama Unit" css-class="custom-table-column"
+        cell-template="data" header-cell-template="title-header" />
       <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="data" />
@@ -53,9 +53,9 @@
           css-class="custom-table-column" cell-template="data" />
       </DxColumn>
       <template #data="{ data }">
-        <span class="cursor-pointer" @click="showDialog()">
+        <p class="cursor-pointer" @click="showDialog()">
           {{ data.text }}
-        </span>
+        </p>
       </template>
     </DxDataGrid>
   </div>