diff --git a/src/components/Form/FiltersType/Type2.vue b/src/components/Form/FiltersType/Type2.vue index 23a28de..ee81445 100755 --- a/src/components/Form/FiltersType/Type2.vue +++ b/src/components/Form/FiltersType/Type2.vue @@ -26,7 +26,7 @@ const bulanSelected = new Date().getMonth() const tahunSelected = new Date().getFullYear() const uppp = ref({ id: 0, name: up3Placholder }) const uid = ref({ id: 0, name: uidPlaceholder }) -const ulp = ref({ id: '', name: ulpPlaceholder }) +const ulp = ref({ id: 0, name: ulpPlaceholder }) const bulan = ref({ id: bulanSelected, name: bulanPlaceholder }) const tahun = ref({ id: tahunSelected, name: tahunPlaceholder }) const regional = ref({ id: 0, name: regionalPlaceholder }) @@ -73,7 +73,7 @@ const setUid = (value: any) => { const setUp3 = (value: any) => { uppp.value = value selectedUp3Ulp(value) - ulp.value = { id: '', name: ulpPlaceholder } + ulp.value = { id: 0, name: ulpPlaceholder } data.value.up3 = value } @@ -104,48 +104,25 @@ onMounted(() => {
-
- + -
- + -
-
diff --git a/src/components/Form/FiltersType/reference.ts b/src/components/Form/FiltersType/reference.ts index ef79699..3f0f354 100755 --- a/src/components/Form/FiltersType/reference.ts +++ b/src/components/Form/FiltersType/reference.ts @@ -1,7 +1,5 @@ import { usePostsStore } from '@/stores/posts' -import { useRegionStore } from '@/stores/region' import { useUlpStore } from '@/stores/ulp' -import { useUp3Store } from '@/stores/up3' import { getUid, getUp3, getPosko, getUlp, getRegional, getUidRegional } from '@/utils/network' import { ref } from 'vue' interface Item { @@ -132,7 +130,7 @@ const fetchRegional = async () => { const res = await getRegional() itemsRegional.value = res.data.map((item: any) => ({ id: item.id, - name: item.nama.toUpperCase() + name: String(item.nama).toUpperCase() })) } catch (error) { console.error('Error fetching data:', error) diff --git a/src/components/Pages/Monalisa/Table_37.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_DispatchingTimeGangguan.vue similarity index 95% rename from src/components/Pages/Monalisa/Table_37.vue rename to src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_DispatchingTimeGangguan.vue index 270f519..0f07149 100755 --- a/src/components/Pages/Monalisa/Table_37.vue +++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_DispatchingTimeGangguan.vue @@ -18,7 +18,7 @@ + css-class="custom-table-column" :group-index="0" name="namaUlp" /> @@ -169,23 +169,21 @@ const { onResult, onError, loading, refetch } = useQuery(monalisaDispatchingTime }) const filterData = (params: any) => { - const { regional, idUlp, idUid, idUp3, bulan, tahun } = params + const { regional, ulp, uid, up3, bulan, tahun } = params bulanSekarang.value = bulan.id tahunSekarang.value = tahun.id tahunLalu.value = tahun.id - 1 refetch({ // regional: regional, - idUid: idUid ? idUid.id : 0, - idUp3: idUp3 ? idUp3.id : 0, + idUid: uid ? uid.id : 0, + idUp3: up3 ? up3.id : 0, idUlp: ulp ? ulp.id : 0, bulan: bulan ? bulan.id : bulanSekarang.value, tahun: bulan ? tahun.id : tahunSekarang.value }) onResult((queryResult) => { if (queryResult.data != undefined) { - queryResult.data.monalisaDispatchingTimeGangguan.forEach((item: any) => { - data.value = [...data.value, { ...item }] - }) + data.value = queryResult.data.monalisaDispatchingTimeGangguan } console.log(queryResult.data) console.log(queryResult.loading) diff --git a/src/components/Pages/Monalisa/Table_43.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ENSGangguan.vue similarity index 58% rename from src/components/Pages/Monalisa/Table_43.vue rename to src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ENSGangguan.vue index 8f4c199..297d283 100755 --- a/src/components/Pages/Monalisa/Table_43.vue +++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_ENSGangguan.vue @@ -3,98 +3,36 @@
- + - + - + - + - - - + + + - - - + + + @@ -137,28 +75,34 @@ const dataDetail = ref() const showDetail = ref(false) const monalisaRekapitulasiEnsGangguan = gql` query DaftarmonalisaRekapitulasiEnsGangguan( - $regional: String - $posko: Int + #$regional: String + $idUlp: Int $idUid: Int $idUp3: Int $bulan: Int $tahun: Int ) { monalisaRekapitulasiEnsGangguan( - regional: $regional - posko: $posko + #regional: $regional + idUlp: $idUlp idUid: $idUid idUp3: $idUp3 bulan: $bulan tahun: $tahun ) { - jumlah_bulan - jumlah_bulan_n_1 - jumlah_tahun - jumlah_tahun_n_1 - nama_posko - persen_bulan - persen_tahun + nama_regional + id_uid + nama_uid + id_up3 + nama_up3 + id_ulp + nama_ulp + mom_bulan_ini + mom_bulan_kemarin + persen_mom + yoy_tahun_ini + yoy_tahun_kemarin + persen_yoy } } ` @@ -166,18 +110,18 @@ const { onResult, onError, loading, refetch } = useQuery(monalisaRekapitulasiEns bulan: 10, tahun: 2023, regional: '', - posko: '', + idUlp: 0, idUid: 0, idUp3: 0 }) const filterData = (params: any) => { - const { regional, posko, idUid, idUp3, bulan, tahun } = params + const { regional, ulp, idUid, idUp3, bulan, tahun } = params bulanSekarang.value = bulan.id tahunSekarang.value = tahun.id tahunLalu.value = tahun.id - 1 refetch({ regional: regional, - posko: posko ? posko.id : 0, + idUlp: ulp ? ulp.id : 0, idUid: idUid ? idUid.id : 0, idUp3: idUp3 ? idUp3.id : 0, bulan: bulan ? bulan.id : 10, @@ -185,14 +129,7 @@ const filterData = (params: any) => { }) onResult((queryResult) => { if (queryResult.data != undefined) { - queryResult.data.monalisaRekapitulasiEnsGangguan.forEach((item: any) => { - data.value = [ - ...data.value, - { - ...item - } - ] - }) + data.value = queryResult.data.monalisaRekapitulasiEnsGangguan } console.log(queryResult.data) console.log(queryResult.loading) diff --git a/src/components/Pages/Monalisa/Table_44.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanBelumSelesai.vue similarity index 62% rename from src/components/Pages/Monalisa/Table_44.vue rename to src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanBelumSelesai.vue index 7c669ee..94bdff5 100755 --- a/src/components/Pages/Monalisa/Table_44.vue +++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanBelumSelesai.vue @@ -3,71 +3,27 @@
- + - + - + - + - - - + + +
@@ -108,59 +64,58 @@ const dataDetail = ref() const showDetail = ref(false) const monalisaGangguanBelumSelesai = gql` query DaftarmonalisaGangguanBelumSelesai( - $regional: String - $posko: Int + #$regional: String + $idUlp: Int $idUid: Int $idUp3: Int $bulan: Int $tahun: Int ) { monalisaGangguanBelumSelesai( - regional: $regional - posko: $posko + #regional: $regional + idUlp: $idUlp idUid: $idUid idUp3: $idUp3 bulan: $bulan tahun: $tahun ) { - gangguan - informasi - nama_posko + nama_regional + id_uid + nama_uid + id_up3 + nama_up3 + id_ulp + nama_ulp + jumlah_gangguan + jumlah_informasi total } } ` const { onResult, onError, loading, refetch } = useQuery(monalisaGangguanBelumSelesai, { regional: '', - posko: '', + idUlp: 0, idUid: 0, idUp3: 0, bulan: 10, tahun: 2023 }) const filterData = (params: any) => { - const { regional, posko, idUid, idUp3, bulan, tahun } = params + const { regional, ulp, uid, up3, bulan, tahun } = params bulanSekarang.value = bulan.id tahunSekarang.value = tahun.id tahunLalu.value = tahun.id - 1 refetch({ regional: regional, - posko: posko ? posko.id : 0, - idUid: idUid ? idUid.id : 0, - idUp3: idUp3 ? idUp3.id : 0, + idUlp: ulp ? ulp.id : 0, + idUid: uid ? uid.id : 0, + idUp3: up3 ? up3.id : 0, bulan: bulan ? bulan.id : 10, tahun: bulan ? tahun.id : 2023 }) onResult((queryResult) => { if (queryResult.data != undefined) { - queryResult.data.monalisaGangguanBelumSelesai.forEach((item: any) => { - data.value = [ - ...data.value, - { - ...item - } - ] - }) + data.value = queryResult.data.monalisaGangguanBelumSelesai } console.log(queryResult.data) console.log(queryResult.loading) diff --git a/src/components/Pages/Monalisa/Table_41.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanPerJenisGangguan.vue similarity index 59% rename from src/components/Pages/Monalisa/Table_41.vue rename to src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanPerJenisGangguan.vue index cdbc1df..5bed7bd 100755 --- a/src/components/Pages/Monalisa/Table_41.vue +++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_GangguanPerJenisGangguan.vue @@ -3,73 +3,31 @@
- + - + - + - - - - - + + + + + + +
@@ -108,25 +66,25 @@ const dataDetail = ref() const showDetail = ref(false) const monalisaGangguanPerJenisGangguan = gql` query DaftarmonalisaGangguanPerJenisGangguan( - $regional: String - $posko: Int + #$nama_regional: String $idUid: Int $idUp3: Int + $idUlp: Int $bulan: Int $tahun: Int ) { monalisaGangguanPerJenisGangguan( - regional: $regional - posko: $posko + #nama_regional: $regional idUid: $idUid idUp3: $idUp3 + idUlp: $idUlp bulan: $bulan tahun: $tahun ) { - id_gangguan + id_jenis_gangguan + nama_jenis_gangguan jumlah - persen_gangguan - tipe_permasalahan + persen } } ` @@ -134,31 +92,24 @@ const { onResult, onError, loading, refetch } = useQuery(monalisaGangguanPerJeni bulan: 10, tahun: 2023, regional: '', - posko: '', idUid: 0, - idUp3: 0 + idUp3: 0, + idUlp: 0 }) const filterData = (params: any) => { - const { regional, posko, idUid, idUp3, bulan, tahun } = params + const { regional, ulp, uid, up3, bulan, tahun } = params refetch({ regional: regional, - posko: posko ? posko.id : 0, - idUid: idUid ? idUid.id : 0, - idUp3: idUp3 ? idUp3.id : 0, + idUlp: ulp ? ulp.id : 0, + idUid: uid ? uid.id : 0, + idUp3: up3 ? up3.id : 0, bulan: bulan ? bulan.id : 10, tahun: bulan ? tahun.id : 2023 }) onResult((queryResult) => { if (queryResult.data != undefined) { - queryResult.data.monalisaGangguanPerJenisGangguan.forEach((item: any) => { - data.value = [ - ...data.value, - { - ...item - } - ] - }) + data.value = queryResult.data.monalisaGangguanPerJenisGangguan } console.log(queryResult.data) console.log(queryResult.loading) diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahDDRPTRCTGangguan.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahDDRPTRCTGangguan.vue new file mode 100755 index 0000000..57508e6 --- /dev/null +++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahDDRPTRCTGangguan.vue @@ -0,0 +1,239 @@ + + + diff --git a/src/components/Pages/Monalisa/Table_36.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahKaliGangguan.vue similarity index 96% rename from src/components/Pages/Monalisa/Table_36.vue rename to src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahKaliGangguan.vue index e8c42ca..2bacb96 100755 --- a/src/components/Pages/Monalisa/Table_36.vue +++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahKaliGangguan.vue @@ -1,6 +1,6 @@