From 2dde396442bf8c28c77703c7c575e81c8e3839ea Mon Sep 17 00:00:00 2001 From: Michael <20074391@skcc.com> Date: Mon, 25 Aug 2025 11:59:01 +0900 Subject: [PATCH 1/2] Update default pagination --- components/common/Pagination.vue | 2 +- pages/comm/base/BatchLogMngPage.vue | 2 +- pages/comm/base/NoticeMngPage.vue | 2 +- pages/comm/base/PrgmMngPage_Pagination.vue | 2 +- pages/ems/base/PastRsltDataReadPage.vue | 2 +- pages/ems/base/ReadResultCloseMngPage.vue | 2 +- pages/ems/base/TagMngPage_Pagination.vue | 2 +- pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue | 2 +- pages/ems/effc/EnrgUsePlanPage.vue | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components/common/Pagination.vue b/components/common/Pagination.vue index afd628a..032ca7d 100644 --- a/components/common/Pagination.vue +++ b/components/common/Pagination.vue @@ -34,7 +34,7 @@ export default { }, itemsPerPageArray: { type: Array, - default: () => [20, 50, 100], + default: () => [10, 20, 50], }, }, data() { diff --git a/pages/comm/base/BatchLogMngPage.vue b/pages/comm/base/BatchLogMngPage.vue index 337d667..f85f16f 100644 --- a/pages/comm/base/BatchLogMngPage.vue +++ b/pages/comm/base/BatchLogMngPage.vue @@ -117,7 +117,7 @@ export default { // rowGridOrigin: [], detailList: myDetail, itemsPerPage: 20, - itemsPerPageArray: [10, 20, 30], + itemsPerPageArray: [10, 20, 50], limit: 20, page: 1, totalCount: 0, diff --git a/pages/comm/base/NoticeMngPage.vue b/pages/comm/base/NoticeMngPage.vue index 69af853..b1d3964 100644 --- a/pages/comm/base/NoticeMngPage.vue +++ b/pages/comm/base/NoticeMngPage.vue @@ -295,7 +295,7 @@ export default { selectedRowKey: null, selectedRowData: null, itemsPerPage: 10, - itemsPerPageArray: [10, 20, 30], + itemsPerPageArray: [10, 20, 50], limit: 20, page: 1, totalCount: 0, diff --git a/pages/comm/base/PrgmMngPage_Pagination.vue b/pages/comm/base/PrgmMngPage_Pagination.vue index 2c56bb0..4ae43ed 100644 --- a/pages/comm/base/PrgmMngPage_Pagination.vue +++ b/pages/comm/base/PrgmMngPage_Pagination.vue @@ -134,7 +134,7 @@ export default { // rowGridOrigin: [], detailList: myDetail, itemsPerPage: 10, - itemsPerPageArray: [10, 20, 30], + itemsPerPageArray: [10, 20, 50], limit: 20, page: 1, totalCount: 0, diff --git a/pages/ems/base/PastRsltDataReadPage.vue b/pages/ems/base/PastRsltDataReadPage.vue index 27769b4..95b1679 100644 --- a/pages/ems/base/PastRsltDataReadPage.vue +++ b/pages/ems/base/PastRsltDataReadPage.vue @@ -117,7 +117,7 @@ export default { formFg: false, }, itemsPerPage: 10, - itemsPerPageArray: [10, 20, 30], + itemsPerPageArray: [10, 20, 50], limit: 20, page: 1, totalCount: 0, diff --git a/pages/ems/base/ReadResultCloseMngPage.vue b/pages/ems/base/ReadResultCloseMngPage.vue index 42d693c..26b0386 100644 --- a/pages/ems/base/ReadResultCloseMngPage.vue +++ b/pages/ems/base/ReadResultCloseMngPage.vue @@ -167,7 +167,7 @@ export default { gridName: "rowGrid", loadGrid: false, itemsPerPage: 10, - itemsPerPageArray: [10, 20, 30], + itemsPerPageArray: [10, 20, 50], limit: 20, page: 1, totalCount: 0, diff --git a/pages/ems/base/TagMngPage_Pagination.vue b/pages/ems/base/TagMngPage_Pagination.vue index 4b3e83b..6052980 100644 --- a/pages/ems/base/TagMngPage_Pagination.vue +++ b/pages/ems/base/TagMngPage_Pagination.vue @@ -153,7 +153,7 @@ export default { detailList: myDetail, alrmFg: null, itemsPerPage: 10, - itemsPerPageArray: [10, 20, 30], + itemsPerPageArray: [10, 20, 50], limit: 20, page: 1, totalCount: 0, diff --git a/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue b/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue index 4a85f1e..eb12523 100644 --- a/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue +++ b/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue @@ -159,7 +159,7 @@ export default { eqpmGdIdxFlag: false, fabFlag: false, itemsPerPage: 10, - itemsPerPageArray: [10, 20, 30], + itemsPerPageArray: [10, 20, 50], limit: 20, page: 1, routeData: {}, diff --git a/pages/ems/effc/EnrgUsePlanPage.vue b/pages/ems/effc/EnrgUsePlanPage.vue index 5ae6127..a81f84e 100644 --- a/pages/ems/effc/EnrgUsePlanPage.vue +++ b/pages/ems/effc/EnrgUsePlanPage.vue @@ -110,7 +110,7 @@ export default { rowKey: null, edtingFinishFlag: 'Y', itemsPerPage: 10, - itemsPerPageArray: [10, 20, 30], + itemsPerPageArray: [10, 20, 50], limit: 20, page: 1, totalCount: 0, From 08d2918a6dac81d247c7db2e442cd0e8444a4911 Mon Sep 17 00:00:00 2001 From: Michael <20074391@skcc.com> Date: Mon, 25 Aug 2025 12:22:31 +0900 Subject: [PATCH 2/2] Update color of pagination ellipsis --- assets/scss/common/pagination.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/scss/common/pagination.scss b/assets/scss/common/pagination.scss index 423503a..00e9e6e 100644 --- a/assets/scss/common/pagination.scss +++ b/assets/scss/common/pagination.scss @@ -22,6 +22,10 @@ background-color: transparent !important; } + .ant-pagination-item-ellipsis { + color: map-deep-get($config, #{$theme}, "paging-text") !important; + } + .ant-pagination-item, .ant-pagination-prev, .ant-pagination-next {