Refactor RKeluhan_ALL.vue and RGangguan_CTTM.vue to improve code readability and remove unused variables

This commit is contained in:
Dede Fuji Abdul
2024-04-17 00:18:12 +07:00
parent 018032afda
commit 604d735f18
5 changed files with 205 additions and 135 deletions

View File

@@ -11,7 +11,7 @@
<div id="data">
<DxDataGrid
@cell-click=""
@cell-click="onCellClicked"
ref="dataGridRef"
:allow-column-reordering="true"
class="max-h-[calc(100vh-140px)] mb-10"
@@ -74,8 +74,7 @@
:allow-resizing="false"
css-class="custom-table-column"
cell-template="formatNumber"
>
</DxColumn>
/>
<DxColumn
:width="150"
alignment="center"
@@ -1227,38 +1226,8 @@ const onCellClicked = (e: any) => {
groupIndex.value = e.row.groupIndex
setAgreementDialog(e.column.caption)
const data = getDataRowGroup(e.data)
console.table(data)
groupData.value = data
groupData.value = getDataRowGroup(e.data)
showDetail()
// if (e.row.groupIndex == 0) {
// //
// } else if (e.row.groupIndex == 1) {
// if (e.row.isExpanded) {
// const data = e.data.items[0].collapsedItems[0].items[0]
// groupData.value = data
// } else {
// const data = e.data.collapsedItems[0].items[0].items[0]
// groupData.value = data
// }
// } else if (e.row.groupIndex == 2) {
// if (e.row.isExpanded) {
// const data = e.data.items[0].collapsedItems[0]
// groupData.value = data
// } else {
// const data = e.data.collapsedItems[0].items[0]
// groupData.value = data
// }
// } else if (e.row.groupIndex == 3) {
// if (e.row.isExpanded) {
// const data = e.data.items[0]
// groupData.value = data
// } else {
// const data = e.data.collapsedItems[0]
// groupData.value = data
// }
// }
// showDetail()
} else {
groupDialog.value = false
}
@@ -1360,7 +1329,11 @@ const calculateCustomSummary = (options: any) => {
count_durasi_dispatch = 0
total_durasi_dispatch = 0
} else if (options.summaryProcess === 'finalize') {
options.totalValue = total_durasi_dispatch / count_durasi_dispatch
options.totalValue = !isFinite(total_durasi_dispatch / count_durasi_dispatch)
? 0
: total_durasi_dispatch == 0
? 0
: total_durasi_dispatch / count_durasi_dispatch
}
}
@@ -1539,39 +1512,19 @@ const getDetail = async () => {
tanggal: ''
}
if (groupDialog.value) {
// if (groupColumnCaption.value != 'Semua Unit') {
// if (groupColumnCaption.value == 'Regional') {
// query = {
// ...query,
// namaRegional: groupData.value?.nama_regional ? groupData.value?.nama_regional : ''
// }
// } else if (groupColumnCaption.value == 'UID') {
// query = {
// ...query,
// idUid: groupData.value?.id_uid ? groupData.value?.id_uid : 0,
// namaRegional: groupData.value?.nama_regional ? groupData.value?.nama_regional : ''
// }
// } else if (groupColumnCaption.value == 'UP3') {
// query = {
// ...query,
// idUid: groupData.value?.id_uid ? groupData.value?.id_uid : 0,
// idUp3: groupData.value?.id_up3 ? groupData.value?.id_up3 : 0,
// namaRegional: groupData.value?.nama_regional ? groupData.value?.nama_regional : ''
// }
// }
// }
if (groupIndex.value == 1) {
console.log('groupData', grouping.value[groupIndex.value].data)
if (grouping.value[groupIndex.value].data == 'nama_regional') {
query = {
...query,
namaRegional: groupData.value?.nama_regional ? groupData.value?.nama_regional : ''
}
} else if (groupIndex.value == 2) {
} else if (grouping.value[groupIndex.value].data == 'nama_uid') {
query = {
...query,
idUid: groupData.value?.id_uid ? groupData.value?.id_uid : 0,
namaRegional: groupData.value?.nama_regional ? groupData.value?.nama_regional : ''
}
} else if (groupIndex.value == 3) {
} else if (grouping.value[groupIndex.value].data == 'nama_up3') {
query = {
...query,
idUid: groupData.value?.id_uid ? groupData.value?.id_uid : 0,