diff --git a/src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue b/src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue index a8687bb..a656289 100755 --- a/src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue +++ b/src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue @@ -173,7 +173,7 @@ caption="Rata-Rata" :allow-resizing="false" css-class="custom-table-column" - cell-template="formatNumber" + cell-template="formatDPT" /> - - - - - - + + + + + + + + + + + + @@ -572,7 +617,7 @@ css-class="custom-table-column" :width="50" alignment="center" - :calculateCellValue="(item: any) => dataSub.findIndex((i) => i == item) + 1" + :calculateCellValue="(item: any) => dataSub.findIndex((i: any) => i == item) + 1" data-type="number" caption="No" cell-template="formatNumber" diff --git a/src/report/Gangguan/Rekap/RGangguan_ALL.ts b/src/report/Gangguan/Rekap/RGangguan_ALL.ts index 922f73c..7c0aa49 100644 --- a/src/report/Gangguan/Rekap/RGangguan_ALL.ts +++ b/src/report/Gangguan/Rekap/RGangguan_ALL.ts @@ -170,8 +170,8 @@ const formatData = (rawData: any) => { summary.total_selesai != summary.total ? formatPercentage((summary.total_selesai / summary.total) * 100) : '100%', - summary.total_inproses, - '0%', + formatNumber(summary.total_inproses), + formatPercentage((summary.total_inproses / summary.total) * 100), formatNumber(avgDurasiDispatch), formatWaktu(summary.max_durasi_dispatch), formatWaktu(summary.min_durasi_dispatch), @@ -220,8 +220,8 @@ const formatData = (rawData: any) => { formatNumber(total.total), formatNumber(total.total_selesai), formatPercentage((total.total_selesai / total.total) * 100), - total.total_inproses, - '0%', + formatNumber(total.total_inproses), + formatPercentage((total.total_inproses / total.total) * 100), formatNumber( total.avg_durasi_dispatch.length ? total.avg_durasi_dispatch.reduce((a: any, b: any) => a + b) /