From 5735777bb142da2761db2f1511ac6c4ac5ffa205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguyen=20Van=20Luan/=28Nguyen=20Van=20Luan=29/=ED=98=84?= =?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074472@skcc.com> Date: Mon, 4 Aug 2025 18:53:30 +0900 Subject: [PATCH] fixbug --- assets/scss/common/grid.scss | 20 ++++++++----- components/common/button/ActionButtons.vue | 29 +++++++++---------- components/common/button/BtnExcelDownload.vue | 2 +- .../common/modal/ChangeUserPswdPopPage.vue | 8 ++--- .../ems/DataSetInfo/DataSetTagRelTab.vue | 2 +- .../ems/ReadPlcInfo/ReadPlcTagRelTab.vue | 4 +-- pages/comm/auth/MenuRoleMngPage.vue | 16 +++++----- pages/comm/auth/UserRoleMngPage.vue | 11 +++---- pages/ems/base/EnrgCostCenterMngPage.vue | 25 ++++++++-------- pages/ems/effc/EnrgUsePlanPage.vue | 18 ++++++------ plugins/gridUtility.js | 4 +-- 11 files changed, 71 insertions(+), 68 deletions(-) diff --git a/assets/scss/common/grid.scss b/assets/scss/common/grid.scss index 7679f58..1bf19c1 100644 --- a/assets/scss/common/grid.scss +++ b/assets/scss/common/grid.scss @@ -98,6 +98,12 @@ @include theme($theme); .v-application.#{$theme}-mode { + .tui-grid-content-area{ + .tui-grid-header-area{ + height: auto !important; + } + } + .grid-title { font-weight: 600; font-size: 16px; @@ -308,13 +314,13 @@ #{$theme}, "tui-grid-cell-borderColor" ); - .tui-grid-cell-content { - border-right: 1px solid ; - border-right-color: map-deep-get($config, - #{$theme}, - "tui-grid-cell-borderColor" - ); - } + // .tui-grid-cell-content { + // border-right: 1px solid ; + // border-right-color: map-deep-get($config, + // #{$theme}, + // "tui-grid-cell-borderColor" + // ); + // } } } diff --git a/components/common/button/ActionButtons.vue b/components/common/button/ActionButtons.vue index 91a4550..9e75209 100644 --- a/components/common/button/ActionButtons.vue +++ b/components/common/button/ActionButtons.vue @@ -1,21 +1,8 @@ @@ -38,8 +25,18 @@ export default { type: Function, required: true, }, + directionBtn: { + type: String, + default: "horizontally" //horizontally, vertically. + } + }, + computed: { + icons() { + return this.directionBtn === "vertically" + ? { remove: "up", add: "down" } + : { remove: "left", add: "right" }; + }, }, - computed: {}, data() { return {}; }, diff --git a/components/common/button/BtnExcelDownload.vue b/components/common/button/BtnExcelDownload.vue index abdcc36..95506f5 100644 --- a/components/common/button/BtnExcelDownload.vue +++ b/components/common/button/BtnExcelDownload.vue @@ -45,7 +45,7 @@ export default { size: { type: String, require: false, - default: "default", // small, middle, large + default: "default", // small, default, large } }, data() { diff --git a/components/common/modal/ChangeUserPswdPopPage.vue b/components/common/modal/ChangeUserPswdPopPage.vue index 7671d38..fc188b7 100644 --- a/components/common/modal/ChangeUserPswdPopPage.vue +++ b/components/common/modal/ChangeUserPswdPopPage.vue @@ -44,8 +44,7 @@ 비밀번호 {{ isPassword }} - - + - - + -
+
삭제 확인 diff --git a/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue b/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue index d43aa51..94c86db 100644 --- a/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue +++ b/components/pages/ems/DataSetInfo/DataSetTagRelTab.vue @@ -38,7 +38,7 @@ import { mapState, mapMutations, mapActions } from 'vuex'; import Buttons from '~/components/common/button/Buttons'; import Grid from '~/components/common/Grid'; -import { CustumChecbox } from '~/plugins/gridUtility'; +import { CustomCheckbox } from '~/plugins/gridUtility'; import { CustomNumberEditor } from '~/plugins/gridUtility'; import Form from '~/components/common/form/Form'; import mixinGlobal from '@/mixin/global.js'; diff --git a/components/pages/ems/ReadPlcInfo/ReadPlcTagRelTab.vue b/components/pages/ems/ReadPlcInfo/ReadPlcTagRelTab.vue index 389f825..59177ea 100644 --- a/components/pages/ems/ReadPlcInfo/ReadPlcTagRelTab.vue +++ b/components/pages/ems/ReadPlcInfo/ReadPlcTagRelTab.vue @@ -30,7 +30,7 @@ import { mapState, mapMutations, mapActions } from 'vuex'; import Buttons from '~/components/common/button/Buttons'; import Grid from '~/components/common/Grid'; -import { CustumChecbox } from '~/plugins/gridUtility'; +import { CustomCheckbox } from '~/plugins/gridUtility'; import { CustomNumberEditor } from '~/plugins/gridUtility'; import Form from '~/components/common/form/Form'; import mixinGlobal from '@/mixin/global.js'; @@ -185,7 +185,7 @@ export default { align: 'center', width: 100, // renderer: { - // type: CustumChecbox, + // type: CustomCheckbox, // options: { // onlyone: true, // // disabled: true diff --git a/pages/comm/auth/MenuRoleMngPage.vue b/pages/comm/auth/MenuRoleMngPage.vue index 157cda8..d2c1085 100644 --- a/pages/comm/auth/MenuRoleMngPage.vue +++ b/pages/comm/auth/MenuRoleMngPage.vue @@ -342,7 +342,7 @@ export default { //---------------------gridOption 설정 끝---------------------------- //---------------------gridName3의 체크박스 설정 시작---------------------------- - class CustumChecbox { + class CustomCheckbox { constructor(props) { const el = document.createElement('input'); const { grid, rowKey, columnInfo } = props; @@ -433,7 +433,7 @@ export default { name: 'useFg', align: 'center', renderer: { - type: CustumChecbox, + type: CustomCheckbox, }, }, { @@ -441,7 +441,7 @@ export default { name: 'authCd1', align: 'center', renderer: { - type: CustumChecbox, + type: CustomCheckbox, }, }, { @@ -449,7 +449,7 @@ export default { name: 'authCd2', align: 'center', renderer: { - type: CustumChecbox, + type: CustomCheckbox, }, }, { @@ -457,7 +457,7 @@ export default { name: 'authCd3', align: 'center', renderer: { - type: CustumChecbox, + type: CustomCheckbox, }, }, { @@ -465,7 +465,7 @@ export default { name: 'authCd4', align: 'center', renderer: { - type: CustumChecbox, + type: CustomCheckbox, }, }, { @@ -473,7 +473,7 @@ export default { name: 'authCd5', align: 'center', renderer: { - type: CustumChecbox, + type: CustomCheckbox, }, }, { @@ -481,7 +481,7 @@ export default { name: 'authCd6', align: 'center', renderer: { - type: CustumChecbox, + type: CustomCheckbox, }, }, ]; diff --git a/pages/comm/auth/UserRoleMngPage.vue b/pages/comm/auth/UserRoleMngPage.vue index e5100d0..dd8bc6c 100644 --- a/pages/comm/auth/UserRoleMngPage.vue +++ b/pages/comm/auth/UserRoleMngPage.vue @@ -151,6 +151,7 @@ :leftGridName="gridName2" :rightGridName="gridName3" :btnActionsFnc="dualGridBtnActions" + directionBtn="vertically" /> @@ -981,7 +982,7 @@ const myDetail = blocCdList => { cols: 6, labelCols: 12, textCols: 12, - class: 'py-2 pr-4', + class: 'py-2 pl-4', iconShow: true, required: true, }, @@ -1005,7 +1006,7 @@ const myDetail = blocCdList => { cols: 6, labelCols: 12, textCols: 12, - class: 'py-2 pr-4', + class: 'py-2 pl-4', iconShow: true, required: true, }, @@ -1031,7 +1032,7 @@ const myDetail = blocCdList => { cols: 6, labelCols: 12, textCols: 12, - class: 'py-2 pr-4', + class: 'py-2 pl-4', iconShow: true, }, { @@ -1054,7 +1055,7 @@ const myDetail = blocCdList => { cols: 6, labelCols: 12, textCols: 12, - class: 'py-2 pr-4', + class: 'py-2 pl-4', iconShow: true, placeholder: '시스템 자동입력', }, @@ -1078,7 +1079,7 @@ const myDetail = blocCdList => { cols: 6, labelCols: 12, textCols: 12, - class: 'py-2 pr-4', + class: 'py-2 pl-4', iconShow: true, placeholder: '시스템 자동입력', }, diff --git a/pages/ems/base/EnrgCostCenterMngPage.vue b/pages/ems/base/EnrgCostCenterMngPage.vue index 764347f..b681254 100644 --- a/pages/ems/base/EnrgCostCenterMngPage.vue +++ b/pages/ems/base/EnrgCostCenterMngPage.vue @@ -4,7 +4,7 @@ - + - + - - + + + - + + + + + + + diff --git a/pages/ems/effc/EnrgUsePlanPage.vue b/pages/ems/effc/EnrgUsePlanPage.vue index 39709b6..73e1e38 100644 --- a/pages/ems/effc/EnrgUsePlanPage.vue +++ b/pages/ems/effc/EnrgUsePlanPage.vue @@ -10,15 +10,15 @@ + :label="'FAB'" @update:propsValue="selectValue01 = $event" :iconShow="true" customClass="select-large" /> + :label="'설비종류'" @update:propsValue="selectValue02 = $event" :iconShow="true" customClass="select-large"/> + :label="'설비그룹'" @update:propsValue="selectValue03 = $event" :iconShow="true" customClass="select-large" /> @@ -33,7 +33,7 @@ -
+
설비별 에너지 계획 리스트
@@ -291,7 +291,7 @@ export default { }, }; - class CustumButton { + class CustomButton { constructor(props) { const { grid, rowKey, columnInfo } = props; @@ -304,7 +304,7 @@ export default { $(elDiv).addClass('tui-grid-cell-content d-flex justify-space-between'); const el2 = document.createElement('button'); $(el2).addClass('edit-btn blue--text'); - el2.innerText = 'Edit'; + el2.innerText = '편집하다'; elDiv.appendChild(el2); this.el = elDiv; @@ -352,7 +352,7 @@ export default { header: 'NO', name: 'rowNum', width: 40, - align: 'center', + align: 'right', // hidden: true, }, { @@ -389,7 +389,7 @@ export default { // `; // } renderer: { - type: CustumButton, + type: CustomButton, options: { value: '계획수정', }, @@ -402,7 +402,7 @@ export default { align: 'center', hidden: true, renderer: { - type: CustumButton, + type: CustomButton, options: { value: '계획수정', }, diff --git a/plugins/gridUtility.js b/plugins/gridUtility.js index 1593079..e39230e 100644 --- a/plugins/gridUtility.js +++ b/plugins/gridUtility.js @@ -115,7 +115,7 @@ export class CustomCalcNumberEditor { } } -export class CustumChecbox { +export class CustomCheckbox { constructor(props) { const el = document.createElement('input'); const { grid, rowKey, columnInfo } = props; @@ -169,7 +169,7 @@ export class CustumChecbox { } } -export class CustumButton { +export class CustomButton { constructor(props) { const el = document.createElement('button'); const { grid, rowKey, columnInfo } = props;