From 1250b3d3afd0cfcbc67cdef37f7af8fd79aa8e9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pham=20Hoang=20Manh/=28Pham=20Hoang=20Manh=29/=ED=98=84?= =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074606@skcc.com> Date: Fri, 15 Aug 2025 15:52:52 +0900 Subject: [PATCH 1/3] fix desgin screen 38 --- assets/scss/common/grid.scss | 2 +- .../ems/DataSetInfo/DataSetTagRelTab.vue | 26 +----- pages/comm/base/BatchLogMngPage.vue | 86 ++++++------------- 3 files changed, 31 insertions(+), 83 deletions(-) diff --git a/assets/scss/common/grid.scss b/assets/scss/common/grid.scss index bb34e53..f1110c4 100644 --- a/assets/scss/common/grid.scss +++ b/assets/scss/common/grid.scss @@ -204,7 +204,7 @@ overflow: auto; &::-webkit-scrollbar { - // width: $scrollbar-width !important; + width: $scrollbar-width !important; height: $scrollbar-width !important; -webkit-appearance: initial; background-color: rgba(0, 0, 0, 0) !important; diff --git a/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue b/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue index d66d241..c32ba03 100644 --- a/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue +++ b/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue @@ -39,8 +39,6 @@ import { mapState, mapMutations, mapActions } from 'vuex'; import Buttons from '~/components/common/button/Buttons'; import Grid from '~/components/common/Grid'; -import { CustomCheckbox } from '~/plugins/gridUtility'; -import { CustomNumberEditor } from '~/plugins/gridUtility'; import Form from '~/components/common/form/Form'; import mixinGlobal from '@/mixin/global.js'; import Utility from '~/plugins/utility'; @@ -324,7 +322,7 @@ const myDataSetTagDetail = [ valueNm: 'tagNm', disabled: false, cols: 6, - class: 'py-2 mt-2', + class: 'py-2 mt-1', required: true, labelCols: 12, textCols: 12, @@ -350,12 +348,11 @@ const myDataSetTagDetail = [ valueNm: 'useFg', disabled: false, cols: 5, - class: 'py-2 mt-2', + class: 'py-2 mt-1', value: { '1': true, '0': false }, required: true, textCols: 12, iconShow: true, - // class: "d-flex align-end" }, { type: 'TextArea', @@ -369,23 +366,4 @@ const myDataSetTagDetail = [ required: false, }, ]; - - -const dataPathDataExample = [ - { - id: 'INCHEON.HVAC.EQP_HT_CH001.UT_CH101.CHI_AMP_1A_PV', - name: 'INCHEON 고온 냉동기 101호기 - 호로1', - type: '합계' - }, - { - id: 'INCHEON.HVAC.EQP_HT_CH001.UT_CH101.CHI_AMP_1A_PV', - name: 'INCHEON 고온 냉동기 101호기 - 호로1', - type: '합계' - }, - { - id: 'INCHEON.HVAC.EQP_HT_CH001.UT_CH101.CHI_AMP_1A_PV', - name: 'INCHEON 고온 냉동기 101호기 - 호로1', - type: '합계' - }, -]; diff --git a/pages/comm/base/BatchLogMngPage.vue b/pages/comm/base/BatchLogMngPage.vue index 9633561..e2e7ec4 100644 --- a/pages/comm/base/BatchLogMngPage.vue +++ b/pages/comm/base/BatchLogMngPage.vue @@ -7,41 +7,21 @@ - + - + - + - +
@@ -54,41 +34,30 @@ - - + + 배치 리스트 -
+
- + +
+
+
-
- -
- - + +
배치 상세
-
-
- -
+
+
@@ -147,7 +116,7 @@ export default { gridName: 'rowGrid', // rowGridOrigin: [], detailList: myDetail, - itemsPerPage: 10, + itemsPerPage: 20, itemsPerPageArray: [10, 20, 30], limit: 20, page: 1, @@ -215,12 +184,12 @@ export default { this.gridInit(); }, layoutInit() { - this.$refs.contents.style.height = 'auto'; + const searchFilterHeight = this.$refs.searchFilter.offsetHeight; + this.$refs.contents.style.height = `calc(100% - 30px - ${searchFilterHeight}px)`; }, gridInit() { this.loadGrid = false; - const gridHeight = this.$refs.gridParent.offsetHeight; - + const gridHeight = this.$refs.gridParent.offsetHeight - 30; const myOptions = { scrollX: false, }; @@ -469,6 +438,7 @@ const myDetail = [ readonly: true, cols: 12, class: 'py-2', + rows: 3 }, ]; \ No newline at end of file From 50698ac661283fd949efd7351f2d62d6c9d35ff4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tran=20Van=20Dung/=28Tran=20Van=20Dung=29/=ED=98=84?= =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074470@skcc.com> Date: Mon, 18 Aug 2025 09:25:41 +0700 Subject: [PATCH 2/3] hotfix bug screen 10 --- .../pages/ems/DataSetInfo/DataSetTagRelTab.vue | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue b/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue index c32ba03..35135a1 100644 --- a/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue +++ b/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue @@ -68,18 +68,6 @@ export default { loadGrid: false, gridName: 'rowDataSetTagRelGrid', detailDataSetTagList: myDataSetTagDetail, - dataPathMock: { - "rowDataSetTagRelGrid": { - column: [ - { header: 'TAG ID', name: 'id', headerAlign: 'left' }, - { header: 'TAG 명', name: 'name', headerAlign: 'left' }, - { header: '모델 Data 구분', name: 'type', headerAlign: 'left' } - ], - data: dataPathDataExample, - defaultRow: dataPathDataExample, - option: {} - } - }, }; }, computed: { From c6eb2b57b22b89ceb7f36c4770821b0832da7670 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pham=20Hoang=20Manh/=28Pham=20Hoang=20Manh=29/=ED=98=84?= =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074606@skcc.com> Date: Mon, 18 Aug 2025 16:31:29 +0900 Subject: [PATCH 3/3] fix bug grid no scroll y margin right --- assets/scss/common/grid.scss | 9 +++++++++ components/common/Grid.vue | 4 ++++ 2 files changed, 13 insertions(+) diff --git a/assets/scss/common/grid.scss b/assets/scss/common/grid.scss index f1110c4..a10b784 100644 --- a/assets/scss/common/grid.scss +++ b/assets/scss/common/grid.scss @@ -21,6 +21,15 @@ display: none; } + &-no-scroll-y { + .tui-grid-rside-area { + .tui-grid-header-area, + .tui-grid-summary-area { + margin-right: 0 !important; + } + } + } + &-rside-area { .tui-grid-header-area, diff --git a/components/common/Grid.vue b/components/common/Grid.vue index e77da25..f36a390 100644 --- a/components/common/Grid.vue +++ b/components/common/Grid.vue @@ -174,6 +174,10 @@ export default { this.gridScrollTop = e.target.scrollTop; this.gridScrollLeft = e.target.scrollLeft; }); + + if (!(this.scrollBody.scrollHeight > this.scrollBody.clientHeight)) { + this.gridInstance.$el.getElementsByClassName('tui-grid-content-area')[0].classList.add('tui-grid-no-scroll-y'); + } } }, methods: {