From f666110a1adf1ec564c99f52d5d74a8a274be97f Mon Sep 17 00:00:00 2001 From: Michael <20074391@skcc.com> Date: Mon, 11 Aug 2025 11:55:32 +0900 Subject: [PATCH] Add pagination + fix bugs tooltip + fix bugs line chart --- assets/scss/common.scss | 1 + assets/scss/common/pagination.scss | 43 +++++++ assets/scss/var.scss | 4 + components/common/Pagination.vue | 93 ++++++++++++++ components/common/chartoptions/LineChart.js | 1 + pages/ems/effc/EnrgUseTotSummPage.vue | 6 +- pages/ems/effc/EqpmIndMntrPage.vue | 135 +++++++++++++------- plugins/ant-design-vue.js | 3 +- store/modules/list.js | 5 + 9 files changed, 245 insertions(+), 46 deletions(-) create mode 100644 assets/scss/common/pagination.scss create mode 100644 components/common/Pagination.vue diff --git a/assets/scss/common.scss b/assets/scss/common.scss index faa3804..aad3c9b 100644 --- a/assets/scss/common.scss +++ b/assets/scss/common.scss @@ -9,6 +9,7 @@ @import "./common/card.scss"; @import "./common/tabs.scss"; @import "./common/numericInput.scss"; +@import "./common/pagination.scss"; @import "./common/editor.scss"; diff --git a/assets/scss/common/pagination.scss b/assets/scss/common/pagination.scss new file mode 100644 index 0000000..503ccc4 --- /dev/null +++ b/assets/scss/common/pagination.scss @@ -0,0 +1,43 @@ +@each $theme in dark, light { + + // @include theme($theme); + .v-application.#{$theme}-mode { + + .ant-pagination-item, + .ant-pagination-prev, + .ant-pagination-next { + // border: none !important; + // box-shadow: none !important; + background-color: map-deep-get($config, #{$theme}, "paging-background") !important; + color: map-deep-get($config, #{$theme}, "paging-text") !important; + border: 0.5px solid #424242; + + .ant-pagination-item-link { + border: none; + background-color: map-deep-get($config, #{$theme}, "paging-background") !important; + } + } + + .ant-pagination-item-active { + border-color: #1890ff !important; + color: #1890ff !important + } + + .ant-pagination-options-size-changer { + .ant-select-selection { + border: 0.5px solid #424242; + background: map-deep-get($config, #{$theme}, "paging-background") !important; + color: map-deep-get($config, #{$theme}, "paging-text") !important; + } + + .ant-select-arrow { + color: map-deep-get($config, #{$theme}, "paging-text") !important; + } + + .ant-select-selection__rendered { + margin-right: 30px; + } + } + + } +} \ No newline at end of file diff --git a/assets/scss/var.scss b/assets/scss/var.scss index 3d2a922..15484d7 100644 --- a/assets/scss/var.scss +++ b/assets/scss/var.scss @@ -182,6 +182,8 @@ $config: ( ant-btn-popup-bg: #212224, ant-btn-popup-color: #FFFFFFD9, ant-btn-popup-border: #424242, + paging-background: #212224, + paging-text: #FFFFFFD9 ), light: (w-g5: $--color-gray_555, g5-w: $--color-white, @@ -327,5 +329,7 @@ $config: ( ant-btn-popup-bg: #FFFFFF, ant-btn-popup-color: #000000E0, ant-btn-popup-border: #D9D9D9, + paging-background: #FFFFFF, + paging-text: #000000E0 ), ); \ No newline at end of file diff --git a/components/common/Pagination.vue b/components/common/Pagination.vue new file mode 100644 index 0000000..afd628a --- /dev/null +++ b/components/common/Pagination.vue @@ -0,0 +1,93 @@ + + + + diff --git a/components/common/chartoptions/LineChart.js b/components/common/chartoptions/LineChart.js index fd53fa9..66c517f 100644 --- a/components/common/chartoptions/LineChart.js +++ b/components/common/chartoptions/LineChart.js @@ -70,6 +70,7 @@ export default function getLineChartOption({ }, splitLine: { lineStyle: { + type: 'dashed', // Options: 'solid', 'dashed', 'dotted' color: isDarkMode ? '#444444' : '#EEEEEE', }, }, diff --git a/pages/ems/effc/EnrgUseTotSummPage.vue b/pages/ems/effc/EnrgUseTotSummPage.vue index 405cc53..14b0043 100644 --- a/pages/ems/effc/EnrgUseTotSummPage.vue +++ b/pages/ems/effc/EnrgUseTotSummPage.vue @@ -52,6 +52,8 @@ + +
- {{ + {{ item.fabNm }}
@@ -123,6 +125,8 @@
+ +
diff --git a/pages/ems/effc/EqpmIndMntrPage.vue b/pages/ems/effc/EqpmIndMntrPage.vue index f49c1f8..187fdcb 100644 --- a/pages/ems/effc/EqpmIndMntrPage.vue +++ b/pages/ems/effc/EqpmIndMntrPage.vue @@ -97,14 +97,25 @@ 설비별 현황 리스트 -
-
+
+
+ +
+ +