diff --git a/src/components/Form/FiltersType/Type2.vue b/src/components/Form/FiltersType/Type2.vue index 01a37cf..f66188c 100755 --- a/src/components/Form/FiltersType/Type2.vue +++ b/src/components/Form/FiltersType/Type2.vue @@ -9,8 +9,7 @@ import { itemsUp3, itemsUlp, itemsRegional, - months, - years + months } from './reference' import { onMounted, ref, watch } from 'vue' import { getMonthName } from '@/utils/texts' @@ -37,7 +36,16 @@ if (bulanIndex !== -1) { months.splice(bulanIndex, 1) } // Find index of current year -const tahunIndex = years.value.findIndex((year) => year.id === tahun.value.id) +const year = new Date().getFullYear() +const years = ref([]) +for (let i = 0; i < 5; i++) { + if (i == 0) { + years.value.push({ id: year, name: year }) + } + years.value.push({ id: year - i, name: year - i }) +} + +const tahunIndex = years.value.findIndex((year: any) => year.id === tahun.value.id) if (tahunIndex !== -1) { years.value.splice(tahunIndex, 1) } @@ -210,7 +218,7 @@ onMounted(() => { :data="months" :placeholder="bulanPlaceholder" /> - diff --git a/src/components/Form/FiltersType/reference.ts b/src/components/Form/FiltersType/reference.ts index 19e73aa..56e0168 100755 --- a/src/components/Form/FiltersType/reference.ts +++ b/src/components/Form/FiltersType/reference.ts @@ -24,6 +24,9 @@ const months = [ const year = new Date().getFullYear() const years = ref([]) for (let i = 0; i < 5; i++) { + if (i == 0) { + years.value.push({ id: year, name: year }) + } years.value.push({ id: year - i, name: year - i }) } const itemsUid = ref([]) diff --git a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahKaliGangguan.vue b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahKaliGangguan.vue index 720d994..f7f18d5 100755 --- a/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahKaliGangguan.vue +++ b/src/components/Pages/Monalisa/Gangguan/Rekap/MonalisaGR_JumlahKaliGangguan.vue @@ -268,7 +268,7 @@