From 090712f45dfe99ac08839e1b2fc45beca10b0ae0 Mon Sep 17 00:00:00 2001 From: kur0nek-o Date: Sun, 5 Nov 2023 08:51:15 +0700 Subject: [PATCH 1/2] implemented filters to modul gangguan --- src/assets/css/style.css | 4 ---- src/components/Pages/Gangguan/Table_10.vue | 10 ++++++++++ src/components/Pages/Gangguan/Table_11.vue | 10 ++++++++++ src/components/Pages/Gangguan/Table_12.vue | 9 +++++++++ src/components/Pages/Gangguan/Table_13.vue | 9 +++++++++ src/components/Pages/Gangguan/Table_14.vue | 10 ++++++++++ src/components/Pages/Gangguan/Table_15.vue | 10 ++++++++++ src/components/Pages/Gangguan/Table_16.vue | 10 ++++++++++ src/components/Pages/Gangguan/Table_17.vue | 8 ++++++++ src/components/Pages/Gangguan/Table_18.vue | 9 +++++++++ src/components/Pages/Gangguan/Table_19.vue | 9 +++++++++ src/components/Pages/Gangguan/Table_2.vue | 9 +++++++++ src/components/Pages/Gangguan/Table_20.vue | 9 +++++++++ src/components/Pages/Gangguan/Table_3.vue | 9 +++++++++ src/components/Pages/Gangguan/Table_4.vue | 9 +++++++++ src/components/Pages/Gangguan/Table_5.vue | 9 +++++++++ src/components/Pages/Gangguan/Table_6.vue | 9 +++++++++ src/components/Pages/Gangguan/Table_7.vue | 9 +++++++++ src/components/Pages/Gangguan/Table_8.vue | 9 ++++++++- src/components/Pages/Gangguan/Table_9.vue | 10 ++++++++++ src/stores/filters.ts | 22 +++++++++++++++++----- 21 files changed, 192 insertions(+), 10 deletions(-) diff --git a/src/assets/css/style.css b/src/assets/css/style.css index c96e4db..30b0ad8 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -962,10 +962,6 @@ select { z-index: 50; } -.z-\[9999\] { - z-index: 9999; -} - .order-last { order: 9999; } diff --git a/src/components/Pages/Gangguan/Table_10.vue b/src/components/Pages/Gangguan/Table_10.vue index b8b9b26..50f03d4 100644 --- a/src/components/Pages/Gangguan/Table_10.vue +++ b/src/components/Pages/Gangguan/Table_10.vue @@ -73,6 +73,8 @@ \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Table_11.vue b/src/components/Pages/Gangguan/Table_11.vue index 26c1db6..7851893 100644 --- a/src/components/Pages/Gangguan/Table_11.vue +++ b/src/components/Pages/Gangguan/Table_11.vue @@ -71,6 +71,8 @@ \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Table_12.vue b/src/components/Pages/Gangguan/Table_12.vue index 9d76b67..8c74234 100644 --- a/src/components/Pages/Gangguan/Table_12.vue +++ b/src/components/Pages/Gangguan/Table_12.vue @@ -72,6 +72,8 @@ \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Table_13.vue b/src/components/Pages/Gangguan/Table_13.vue index c0214c7..b250090 100644 --- a/src/components/Pages/Gangguan/Table_13.vue +++ b/src/components/Pages/Gangguan/Table_13.vue @@ -72,6 +72,8 @@ \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Table_14.vue b/src/components/Pages/Gangguan/Table_14.vue index 276851d..cc0df4c 100644 --- a/src/components/Pages/Gangguan/Table_14.vue +++ b/src/components/Pages/Gangguan/Table_14.vue @@ -32,6 +32,8 @@ \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Table_15.vue b/src/components/Pages/Gangguan/Table_15.vue index 1e3c0f8..2401a66 100644 --- a/src/components/Pages/Gangguan/Table_15.vue +++ b/src/components/Pages/Gangguan/Table_15.vue @@ -22,6 +22,8 @@ \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Table_16.vue b/src/components/Pages/Gangguan/Table_16.vue index c459a9c..754c03b 100644 --- a/src/components/Pages/Gangguan/Table_16.vue +++ b/src/components/Pages/Gangguan/Table_16.vue @@ -138,6 +138,8 @@ \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Table_17.vue b/src/components/Pages/Gangguan/Table_17.vue index 5df03f6..9ef5ff6 100644 --- a/src/components/Pages/Gangguan/Table_17.vue +++ b/src/components/Pages/Gangguan/Table_17.vue @@ -62,6 +62,7 @@ \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Table_18.vue b/src/components/Pages/Gangguan/Table_18.vue index 2ffde97..eef6b31 100644 --- a/src/components/Pages/Gangguan/Table_18.vue +++ b/src/components/Pages/Gangguan/Table_18.vue @@ -62,6 +62,8 @@ \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Table_19.vue b/src/components/Pages/Gangguan/Table_19.vue index 14ad8a9..0c02ace 100644 --- a/src/components/Pages/Gangguan/Table_19.vue +++ b/src/components/Pages/Gangguan/Table_19.vue @@ -43,6 +43,8 @@ \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Table_2.vue b/src/components/Pages/Gangguan/Table_2.vue index 71b17ad..0748076 100644 --- a/src/components/Pages/Gangguan/Table_2.vue +++ b/src/components/Pages/Gangguan/Table_2.vue @@ -44,7 +44,16 @@ \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Table_20.vue b/src/components/Pages/Gangguan/Table_20.vue index 14ad8a9..0c02ace 100644 --- a/src/components/Pages/Gangguan/Table_20.vue +++ b/src/components/Pages/Gangguan/Table_20.vue @@ -43,6 +43,8 @@ \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Table_3.vue b/src/components/Pages/Gangguan/Table_3.vue index c7490e7..5ce9164 100644 --- a/src/components/Pages/Gangguan/Table_3.vue +++ b/src/components/Pages/Gangguan/Table_3.vue @@ -43,7 +43,16 @@ \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Table_4.vue b/src/components/Pages/Gangguan/Table_4.vue index fe9adb7..7d9dd02 100644 --- a/src/components/Pages/Gangguan/Table_4.vue +++ b/src/components/Pages/Gangguan/Table_4.vue @@ -45,7 +45,16 @@ \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Table_5.vue b/src/components/Pages/Gangguan/Table_5.vue index 9811a6c..558d2d8 100644 --- a/src/components/Pages/Gangguan/Table_5.vue +++ b/src/components/Pages/Gangguan/Table_5.vue @@ -43,7 +43,16 @@ \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Table_6.vue b/src/components/Pages/Gangguan/Table_6.vue index 00ce94a..228a69e 100644 --- a/src/components/Pages/Gangguan/Table_6.vue +++ b/src/components/Pages/Gangguan/Table_6.vue @@ -41,7 +41,16 @@ \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Table_7.vue b/src/components/Pages/Gangguan/Table_7.vue index 9811a6c..558d2d8 100644 --- a/src/components/Pages/Gangguan/Table_7.vue +++ b/src/components/Pages/Gangguan/Table_7.vue @@ -43,7 +43,16 @@ \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Table_8.vue b/src/components/Pages/Gangguan/Table_8.vue index b39a574..f3651d2 100644 --- a/src/components/Pages/Gangguan/Table_8.vue +++ b/src/components/Pages/Gangguan/Table_8.vue @@ -64,6 +64,7 @@ \ No newline at end of file diff --git a/src/components/Pages/Gangguan/Table_9.vue b/src/components/Pages/Gangguan/Table_9.vue index 3e34671..d271c94 100644 --- a/src/components/Pages/Gangguan/Table_9.vue +++ b/src/components/Pages/Gangguan/Table_9.vue @@ -77,6 +77,8 @@ \ No newline at end of file diff --git a/src/stores/filters.ts b/src/stores/filters.ts index e8d044a..f801266 100644 --- a/src/stores/filters.ts +++ b/src/stores/filters.ts @@ -1,8 +1,5 @@ -import { ref, computed, VueElement } from 'vue' +import { ref, VueElement } from 'vue' import { defineStore } from 'pinia' -import { dispatchNotification } from '@/components/Notification' -import { readData, removeData, writeData } from '@/utils/storage' -import router from '@/router' import { Type1, @@ -26,7 +23,22 @@ import { const test1: { [key: string]: any } = { 'type-1': Type1, - 'type-2': Type2 + 'type-2': Type2, + 'type-3': Type3, + 'type-4': Type4, + 'type-5': Type5, + 'type-6': Type6, + 'type-7': Type7, + 'type-8': Type8, + 'type-9': Type9, + 'type-10': Type10, + 'type-11': Type11, + 'type-12': Type12, + 'type-13': Type13, + 'type-14': Type14, + 'type-15': Type15, + 'type-16': Type16, + 'type-17': Type17 } const getFilters = (type: string): VueElement => { From 4a33b382e5fe13649fcb930cc2e396ed0c4e3b92 Mon Sep 17 00:00:00 2001 From: Dede Fuji Abdul Date: Wed, 8 Nov 2023 08:34:24 +0700 Subject: [PATCH 2/2] update --- src/assets/css/style.css | 7 ++ src/assets/css/tailwind.css | 7 ++ src/components/Pages/Gangguan/Table_9.vue | 95 ++++++++++++----------- 3 files changed, 65 insertions(+), 44 deletions(-) diff --git a/src/assets/css/style.css b/src/assets/css/style.css index 30b0ad8..5829961 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -705,6 +705,8 @@ select { --tw-backdrop-sepia: ; } +/* DevExpress */ + /* NavBar */ .menu-item { @@ -1682,6 +1684,11 @@ select { border-color: transparent; } +.\!bg-primary-500 { + --tw-bg-opacity: 1 !important; + background-color: rgb(3 91 113 / var(--tw-bg-opacity)) !important; +} + .bg-black { --tw-bg-opacity: 1; background-color: rgb(0 0 0 / var(--tw-bg-opacity)); diff --git a/src/assets/css/tailwind.css b/src/assets/css/tailwind.css index cb1564b..70189b1 100644 --- a/src/assets/css/tailwind.css +++ b/src/assets/css/tailwind.css @@ -3,6 +3,13 @@ @tailwind utilities; @layer components { + /* DevExpress */ + .dx-datagrid-rowsview .dx-row.dx-group-row { + @apply !bg-['#F7F7F7']; + } + .dx-datagrid-group-footer{ + @apply !bg-primary-500; + } /* NavBar */ .menu-item { @apply w-full text-left block px-4 py-3 text-base text-gray-800; diff --git a/src/components/Pages/Gangguan/Table_9.vue b/src/components/Pages/Gangguan/Table_9.vue index 3e34671..9a1dcc2 100644 --- a/src/components/Pages/Gangguan/Table_9.vue +++ b/src/components/Pages/Gangguan/Table_9.vue @@ -1,8 +1,9 @@