From dd559629ab7f893d7ee1eaa76be1bd83a2e91ac7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Le=20Quang=20Cuong/=28Le=20Quang=20Cuong=29/=ED=98=84?=
=?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074469@skcc.com>
Date: Fri, 25 Jul 2025 18:11:31 +0900
Subject: [PATCH] dev-manhph1-screen18-19-21-28
---
components/common/PageTitle.vue | 11 +-
components/common/modal/EvtObjPop.vue | 81 +----
.../pages/ems/TagInfo/TagAddInfoTab.vue | 48 +--
pages/ems/base/EqpmKindPage.vue | 84 ++---
pages/ems/base/EquipmentGroupMngPage.vue | 125 ++-----
pages/ems/base/PastRsltDataReadPage.vue | 62 +---
pages/ems/base/TagMngPage_Pagination.vue | 332 ++++--------------
7 files changed, 143 insertions(+), 600 deletions(-)
diff --git a/components/common/PageTitle.vue b/components/common/PageTitle.vue
index d27b7f8..bd5f006 100644
--- a/components/common/PageTitle.vue
+++ b/components/common/PageTitle.vue
@@ -1,19 +1,26 @@
- {{ text }}
+ {{ text ? text : menuNm}}
diff --git a/components/common/modal/EvtObjPop.vue b/components/common/modal/EvtObjPop.vue
index e0be9aa..30919b6 100644
--- a/components/common/modal/EvtObjPop.vue
+++ b/components/common/modal/EvtObjPop.vue
@@ -124,7 +124,7 @@ export default {
return {
dialog: false,
- loadGrid: true,
+ loadGrid: false,
grid_01: 'grid_01',
myModalKey: 'evtObjPop',
modalDataKey: 'modalData2',
@@ -165,35 +165,6 @@ export default {
computed: {
...mapState({
searchParam(state) {
- const myOptions = {
- columnOptions: {
- resizable: true,
- },
- treeColumnOptions: {
- name: 'readPlcNm', // Showing tree table
- useIcon: false, // Not using icon
- indentWidth: 10,
- },
- };
- const dataPathMock = {
- 'grid_01': {
- column: [
- { header: '검침개소명', name: 'readPlcNm', align: 'left', minWidth: 400, },
- { header: '검침개소', name: 'plcKind', minWidth: 100, align: 'center', },
- // {
- // header: '사용 여부', name: 'useFg', minWidth: 100, align: 'center',
- // },
- ],
- data: sampleData,
- option: myOptions
- }
- };
- return {
- modalData2: {
- evtObjPop: dataPathMock
- }
- }
- // end test
return state.pageData[this.parentPrgmId];
},
myBindingData(state) {
@@ -277,6 +248,9 @@ export default {
columnOptions: {
resizable: true,
},
+ header: {
+ height: 38,
+ },
};
this.setModalGridOption({
modalKey: this.myModalKey,
@@ -300,7 +274,7 @@ export default {
});
},
async getGridData() {
- // this.loadGrid = false;
+ this.loadGrid = false;
const res = await this.postApiReturn({
apiKey: 'selectTagBaseInfo',
@@ -376,7 +350,6 @@ export default {
// this.dialog = false;
// return;
// }
- console.log("this.dialog: ", this.dialog);
this.dialog = !val;
},
},
@@ -389,50 +362,6 @@ var evtObjPop = {
option: {},
},
};
-
-const sampleData = [
- {
- readPlcNm: '서울 본사',
- plcKind: '본사',
- useFg: '사용',
- _children: [
- {
- readPlcNm: '서울 본사 - 1층',
- plcKind: '층',
- useFg: '사용',
- },
- {
- readPlcNm: '서울 본사 - 2층',
- plcKind: '층',
- useFg: '미사용',
- },
- ],
- },
- {
- readPlcNm: '부산 지사',
- plcKind: '지사',
- useFg: '사용',
- _children: [
- {
- readPlcNm: '부산 지사 - A동',
- plcKind: '건물',
- useFg: '사용',
- _children: [
- {
- readPlcNm: '부산 지사 - A동 1층',
- plcKind: '층',
- useFg: '사용',
- },
- ],
- },
- ],
- },
- {
- readPlcNm: '대전 창고',
- plcKind: '창고',
- useFg: '미사용',
- },
-];