From 88b59f5f3315d74d7dafd5a18f011f311f688e77 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: Wed, 30 Jul 2025 16:19:54 +0900 Subject: [PATCH 1/5] update code merge --- pages/ems/effc/EnrgUsePlanPage.vue | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pages/ems/effc/EnrgUsePlanPage.vue b/pages/ems/effc/EnrgUsePlanPage.vue index 45a3471..3a2c44f 100644 --- a/pages/ems/effc/EnrgUsePlanPage.vue +++ b/pages/ems/effc/EnrgUsePlanPage.vue @@ -8,9 +8,15 @@ - - + + Date: Wed, 30 Jul 2025 16:21:52 +0900 Subject: [PATCH 2/5] update code --- .../pages/ems/EccInfo/EccAddInfoTab.vue | 33 +- components/pages/ems/EccInfo/EccIaoTab.vue | 24 +- pages/comm/auth/UserRoleMngPage.vue | 104 +------ pages/comm/base/BatchLogMngPage.vue | 24 +- pages/ems/base/AddInfoMngPage.vue | 59 +--- pages/ems/effc/EnrgUsePlanPage.vue | 292 ++++-------------- 6 files changed, 78 insertions(+), 458 deletions(-) diff --git a/components/pages/ems/EccInfo/EccAddInfoTab.vue b/components/pages/ems/EccInfo/EccAddInfoTab.vue index 88823b2..312c78c 100644 --- a/components/pages/ems/EccInfo/EccAddInfoTab.vue +++ b/components/pages/ems/EccInfo/EccAddInfoTab.vue @@ -20,7 +20,6 @@ :editorGrid="true" :innerTabGridInfo="innerTabGridInfo" @getRowsData="getRowData" - :dataPath="dataPathMock" /> @@ -54,22 +53,10 @@ export default { }, data() { return { - loadGrid: true, + loadGrid: false, gridName: 'rowDetailGrid', rowKey: null, edtingFinishFlag: 'Y', - dataPathMock: { - "rowDetailGrid": { - column: [ - { header: '추가 정보', name: 'readObjId', align: 'left' }, - { header: 'Data 구분', name: 'readObjNm', align: 'left' }, - { header: '추가 정보 값', name: 'readObjKind', align: 'left' }, - ], - data: dataPathDataExample, - defaultRow: dataPathDataExample, - option: {} - } - }, }; }, computed: { @@ -444,22 +431,4 @@ export default { }, }, }; - -const dataPathDataExample = [ - { - readObjId: 'OBJ001', - readObjNm: '서울 본사', - readObjKind: 'TYPE01', - }, - { - readObjId: 'OBJ002', - readObjNm: '부산 지사', - readObjKind: 'TYPE02', - }, - { - readObjId: 'OBJ003', - readObjNm: '대전 공장', - readObjKind: 'TYPE03', - } -] diff --git a/components/pages/ems/EccInfo/EccIaoTab.vue b/components/pages/ems/EccInfo/EccIaoTab.vue index 4e03d6f..9153f96 100644 --- a/components/pages/ems/EccInfo/EccIaoTab.vue +++ b/components/pages/ems/EccInfo/EccIaoTab.vue @@ -19,7 +19,6 @@ :parentPrgmId="parentPrgmId" @getRowsData="getRowData" :innerTabGridInfo="innerTabGridInfo" - :dataPath="dataPathMock" />
@@ -60,24 +59,11 @@ export default { }, data() { return { - loadGrid: true, + loadGrid: false, gridName: 'rowEccIaoGrid', inputList_emMapDiv: [], inputList_cmInOut: [], detailList: myDetail, - dataPathMock: { - "rowEccIaoGrid": { - column: [ - { header: '검침 대상 ID', name: 'readObjId', align: 'left' }, - { header: '검침 대상 명', name: 'readObjNm', align: 'left' }, - { header: '검침 대상 유형', name: 'readObjKind', align: 'left' }, - { header: '그룹', name: 'grpCd', align: 'left' }, - ], - data: dataPathDataExample, - defaultRow: dataPathDataExample, - option: {} - } - }, }; }, computed: { @@ -516,12 +502,4 @@ const myDetail = [ iconShow: true, }, ]; -const dataPathDataExample = [ - { - readObjId: 'OBJ001', - readObjNm: '서울 본사', - readObjKind: 'TYPE01', - grpCd: 'GRP01', - }, -] diff --git a/pages/comm/auth/UserRoleMngPage.vue b/pages/comm/auth/UserRoleMngPage.vue index 8a4599d..cabbed3 100644 --- a/pages/comm/auth/UserRoleMngPage.vue +++ b/pages/comm/auth/UserRoleMngPage.vue @@ -12,6 +12,8 @@ :parentPrgmId="myPrgmId" :sendParam="{ comId }" customClass="select-large" + labelCols="12" + textCols="12" />