diff --git a/src/assets/css/style.css b/src/assets/css/style.css index 1dd8ec9..deb3898 100755 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -3715,6 +3715,16 @@ body { color: rgb(102 102 0 / var(--tw-text-opacity)); } +.text-slate-300 { + --tw-text-opacity: 1; + color: rgb(203 213 225 / var(--tw-text-opacity)); +} + +.text-slate-500 { + --tw-text-opacity: 1; + color: rgb(100 116 139 / var(--tw-text-opacity)); +} + .text-opacity-40 { --tw-text-opacity: 0.4; } @@ -3723,6 +3733,10 @@ body { text-decoration-line: underline; } +.no-underline { + text-decoration-line: none; +} + .placeholder-gray-500::-moz-placeholder { --tw-placeholder-opacity: 1; color: rgb(107 114 128 / var(--tw-placeholder-opacity)); @@ -5252,6 +5266,11 @@ body { color: rgb(51 51 0 / 0.9); } +:is(.dark .dark\:text-slate-500) { + --tw-text-opacity: 1; + color: rgb(100 116 139 / var(--tw-text-opacity)); +} + :is(.dark .dark\:text-opacity-70) { --tw-text-opacity: 0.7; } diff --git a/src/components/Form/FiltersType/Type13.vue b/src/components/Form/FiltersType/Type13.vue index 50c0401..00e0b98 100755 --- a/src/components/Form/FiltersType/Type13.vue +++ b/src/components/Form/FiltersType/Type13.vue @@ -67,12 +67,22 @@ onMounted(() => {
-
-
@@ -80,14 +90,25 @@ onMounted(() => {
-
- +
+ - +
- diff --git a/src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue b/src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue index e2ec9a3..fb1c429 100755 --- a/src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue +++ b/src/components/Pages/Gangguan/Rekap/RGangguan_ALL.vue @@ -11,7 +11,7 @@
- - - - - ([ + { + data: '', + caption: 'Semua Unit' + }, + { + data: 'nama_regional', + caption: 'Regional' + }, + { + data: 'nama_uid', + caption: 'UID' + }, + { + data: 'nama_up3', + caption: 'UP3' + } +]) const onCellClicked = (e: any) => { if (e.rowType == 'group') { @@ -1448,6 +1428,50 @@ const filterData = async (params: any) => { const { posko, uid, up3 } = params const dateValue = params.periode.split(' s/d ') + var groupList: any[] = [ + { + data: '', + caption: 'Semua Unit' + }, + { + data: 'nama_regional', + caption: 'Regional' + }, + { + data: 'nama_uid', + caption: 'UID' + }, + { + data: 'nama_up3', + caption: 'UP3' + } + ] + + if (uid?.id != 0) { + groupList.forEach((item, index) => { + if (item.caption == 'Semua Unit' || item.caption == 'Regional') { + groupList.splice(index, 1) + } + }) + + if (up3?.id != 0) { + groupList.forEach((item, index) => { + if (item.caption == 'UID') { + groupList.splice(index, 1) + } + }) + + if (posko?.id != 0) { + groupList.forEach((item, index) => { + if (item.caption == 'UP3') { + groupList.splice(index, 1) + } + }) + } + } + } + grouping.value = groupList + const query = { dateFrom: dateValue[0] ? dateValue[0].split('-').reverse().join('-') diff --git a/src/components/Pages/Gangguan/Rekap/RGangguan_AlihPosko.vue b/src/components/Pages/Gangguan/Rekap/RGangguan_AlihPosko.vue index 22ebe90..119bbcf 100755 --- a/src/components/Pages/Gangguan/Rekap/RGangguan_AlihPosko.vue +++ b/src/components/Pages/Gangguan/Rekap/RGangguan_AlihPosko.vue @@ -1,14 +1,31 @@