Merge branch 'dev-defuj' of github.com:defuj/eis into dev-bagus

This commit is contained in:
kur0nek-o 2024-03-29 14:00:05 +07:00
commit d65a80c18d
3 changed files with 26 additions and 12 deletions

View File

@ -2,7 +2,7 @@ VITE_BASE_URL=http://localhost:5173
VITE_BASE_DIRECTORY=/ VITE_BASE_DIRECTORY=/
VITE_APP_VERSION=0.0.1 VITE_APP_VERSION=0.0.1
VITE_APP_NAME='Executive Information System' VITE_APP_NAME='Executive Information System'
# VITE_APP_GRAPHQL_ENDPOINT=http://127.0.0.1:32169/graphql # VITE_APP_GRAPHQL_ENDPOINT=http://10.8.0.13:32169/graphql
# VITE_APP_REST_ENDPOINT=http://192.168.191.163:32180 # VITE_APP_REST_ENDPOINT=http://192.168.191.163:32180
VITE_APP_GRAPHQL_ENDPOINT=http://10.1.50.173:32180/graphql VITE_APP_GRAPHQL_ENDPOINT=http://10.1.50.173:32180/graphql

View File

@ -1118,7 +1118,7 @@ const reportMeta = ref({
}) })
const onCellClicked = (e: any) => { const onCellClicked = (e: any) => {
// console.log('cell clicked', e) console.log('cell clicked', e)
// console.log('group cell clicked', e.column.caption) // console.log('group cell clicked', e.column.caption)
// console.log('value', e.values[e.row.groupIndex]) // console.log('value', e.values[e.row.groupIndex])
if (e.rowType == 'group') { if (e.rowType == 'group') {
@ -1128,17 +1128,29 @@ const onCellClicked = (e: any) => {
if (e.row.groupIndex == 0) { if (e.row.groupIndex == 0) {
// //
} else if (e.row.groupIndex == 1) { } 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] const data = e.data.collapsedItems[0].items[0].items[0]
groupData.value = data groupData.value = data
console.table(data) }
} else if (e.row.groupIndex == 2) { } 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] const data = e.data.collapsedItems[0].items[0]
groupData.value = data groupData.value = data
console.table(data) }
} else if (e.row.groupIndex == 3) { } 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] const data = e.data.collapsedItems[0]
groupData.value = data groupData.value = data
console.table(data) }
} }
showDetail() showDetail()
} else { } else {

View File

@ -915,7 +915,9 @@ const getDetail = async () => {
idRegu: ref?.id_regu ? ref?.id_regu : 0, idRegu: ref?.id_regu ? ref?.id_regu : 0,
idUlp: ref?.id_ulp ? ref?.id_ulp : 0, idUlp: ref?.id_ulp ? ref?.id_ulp : 0,
namaRegional: ref?.nama_regional ? ref?.nama_regional : '', namaRegional: ref?.nama_regional ? ref?.nama_regional : '',
media: ref?.media ? ref?.media : '' media: ref?.media ? ref?.media : '',
isSelesai: 0,
tanggal: ''
} }
loadingSubData.value = true loadingSubData.value = true