+
@@ -196,15 +191,13 @@ export default {
gridName: 'rowGrid',
loadGrid: false,
tab: null,
- selectedRowKey: null,
- // rowSelectionStatus: {},
- dataPathMock : { },
items: [
{ name: '공정 정보', id: 'eccBaseInfoTab', disabledFlag: false },
{ name: '공정 추가 정보', id: 'eccAddInfoTab', disabledFlag: false },
{ name: '공정 연결 정보', id: 'eccIaoTab', disabledFlag: false },
],
detailList: myDetail,
+ loadGrid: false,
};
},
computed: {
@@ -320,23 +313,11 @@ export default {
},
mounted() {
this.init();
- this.$nextTick(() => {
- // const checkbox = document.getElementById('headerCheckbox');
- // if (checkbox) {
- // checkbox.addEventListener('change', this.handleHeaderCheckboxChange);
- // }
- });
},
beforeDestroy() {
this.chkOpenTabList({ key: 'destroy', prgmId: myPrgmId });
},
methods: {
- handleHeaderCheckboxChange(event) {
- const checked = event.target.checked;
- this.dataPathMock.rowGrid.data.forEach(row => {
- row.selected = checked;
- });},
-
...mapMutations({
setPageData: 'setPageData',
}),
@@ -351,41 +332,7 @@ export default {
blocId: this.userInfo.blocId,
});
},
- gridInitTest() {
- const rowGrid = {
- column: [
- {
- header: '',
- name: '',
- align: 'center',
- width: 50,
- formatter: (props) => {
- return `
`;
- }
- },
- { header: '공정 정보', name: 'eccNm', align: 'left' },
- { header: '현재 상태', name: 'status', align: 'center' },
- { header: '공정 유형', name: 'eccKind', align: 'left' },
- { header: '사용 여부', name: 'useFg', align: 'center' },
- ],
- data: dataMockExample,
- defaultRow: dataMockExample,
- option: {
- ...gridOptions,
- },
- }
- this.dataPathMock = {rowGrid};
- this.$nextTick(() => {
- this.loadGrid = true;
- });
- },
gridInit() {
- // Test
- this.gridInitTest(); return;
- // End test
-
const gridHeight = this.$refs.gridParent.offsetHeight - 30;
const gridWidth = this.$refs.gridParent.offsetWidth;
@@ -404,6 +351,17 @@ export default {
const _this = this;
const myColumns = [
+ {
+ header: '',
+ name: '',
+ align: 'center',
+ width: 50,
+ formatter: (props) => {
+ return `
`;
+ }
+ },
{ header: '회사 ID', name: 'comId', hidden: true },
{
header: '공정 명',
@@ -598,16 +556,6 @@ export default {
});
},
async getRowData(data) {
-
- //Progess and fake radio
- // const rowKey = data.rowKey;
- // this.selectedRowKey = rowKey;
- // Object.keys(this.rowSelectionStatus).forEach(key => {
- // this.$set(this.rowSelectionStatus, key, false);
- // });
- // this.$set(this.rowSelectionStatus, rowKey, true);
-
-
this.setEccAddInfo(data);
this.setEccIao(data);
this.setGridSelectData({
@@ -623,9 +571,6 @@ export default {
rowGridSelectKey: data.rowKey,
rowGridSelectData: Object.assign({}, data),
});
- //fake radio need recheck
- // this.$refs[this.gridName]?.repaint?.();
-
},
async setEccAddInfo(data) {
this.setPageData({
@@ -1070,142 +1015,7 @@ const myDetail = [
value: { '1': true, '0': false },
},
];
-
-const dataMockExample = [
- {
- eccId: 'ECC000001',
- eccNm: 'EGP_HVAC_LT_CH001',
- status: '운영중',
- eccKind: '공정',
- useFg: '1',
- _children: [
- {
- eccId: 'ECC000002',
- eccNm: 'B01',
- status: '대기',
- eccKind: '공정',
- useFg: '1',
- _children: [
- {
- eccId: 'ECC000005',
- eccNm: 'B01-1',
- status: '운영중',
- eccKind: '공정',
- useFg: '1',
- _children: [
- {
- eccId: 'ECC000009',
- eccNm: 'B01-1-1',
- status: '운영중',
- eccKind: '공정',
- useFg: '1'
- },
- {
- eccId: 'ECC0000010',
- eccNm: 'B01-1-2',
- status: '운영중',
- eccKind: '공정',
- useFg: '1'
- },
- {
- eccId: 'ECC0000011',
- eccNm: 'B01-1-3',
- status: '운영중',
- eccKind: '공정',
- useFg: '1'
- },
- ]
- },
- {
- eccId: 'ECC000006',
- eccNm: 'B01-2',
- status: '점검중',
- eccKind: '공정',
- useFg: '0',
- _children: [
- {
- eccId: 'ECC0000013',
- eccNm: 'B01-2-1',
- status: '운영중',
- eccKind: '공정',
- useFg: '1'
- },
- {
- eccId: 'ECC0000014',
- eccNm: 'B01-1-2',
- status: '운영중',
- eccKind: '공정',
- useFg: '1'
- },
- {
- eccId: 'ECC0000015',
- eccNm: 'B01-1-3',
- status: '운영중',
- eccKind: '공정',
- useFg: '1'
- },
- ]
- },
- {
- eccId: 'ECC000007',
- eccNm: 'B01-3',
- status: '운영중',
- eccKind: '공정',
- useFg: '1',
- _children: [
- {
- eccId: 'ECC000009',
- eccNm: 'B01-3-1',
- status: '운영중',
- eccKind: '공정',
- useFg: '1'
- },
- {
- eccId: 'ECC0000010',
- eccNm: 'B01-3-2',
- status: '운영중',
- eccKind: '공정',
- useFg: '1'
- },
- {
- eccId: 'ECC0000011',
- eccNm: 'B01-3-3',
- status: '운영중',
- eccKind: '공정',
- useFg: '1'
- },
- ]
- },
- ],
- },
- {
- eccId: 'ECC000003',
- eccNm: 'B02',
- status: '운영중',
- eccKind: '공정',
- useFg: '1',
- },
- {
- eccId: 'ECC000004',
- eccNm: 'B03',
- status: '점검중',
- eccKind: '공정',
- useFg: '0',
- },
- ],
- },
-];
-
-const gridOptions = {
- treeColumnOptions: {
- name: 'eccNm', // Showing tree table
- useIcon: false, // Not using icon
- indentWidth: 10,// spacing when showing children
- },
- header: {
- height: 40,
- },
- rowHeight: 35,
- showCheckbox: false,
-};
+
From 238fdb5fc56872feaf1708447518ca15ec79bf99 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: Thu, 31 Jul 2025 14:18:29 +0700
Subject: [PATCH 03/15] remove console
---
components/common/Grid.vue | 8 --------
components/pages/ems/EqpmInfo/EqpmIaoTab.vue | 3 +--
pages/comm/auth/MenuRoleMngPage.vue | 2 --
pages/comm/base/PrgmMngPage.vue | 1 -
pages/ems/base/EquipmentMasterMngPage.vue | 1 -
pages/ems/base/ReadResultCloseMngPage.vue | 1 -
pages/ems/effc/EnrgMapPage.vue | 1 -
pages/ems/effc/EnrgReptMngPage.vue | 5 +----
8 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/components/common/Grid.vue b/components/common/Grid.vue
index e2b607d..1641bd4 100644
--- a/components/common/Grid.vue
+++ b/components/common/Grid.vue
@@ -251,11 +251,9 @@ export default {
this.gridInstance.invoke('check', rowData.rowKey, instance);
},
setSelectionRange(rowKey) {
- // console.log("------------------DEBUG-------setSelectionRange:", rowKey);
const rowDatas = this.gridInstance.invoke('getData');
rowDatas.forEach(item => {
if (item.rowKey == rowKey) {
- // console.log("------------------DEBUG-------setSelectionRange---item:", item);
this.gridInstance.invoke(
'addRowClassName',
item.rowKey,
@@ -271,17 +269,14 @@ export default {
});
},
onMousedown(evt) {
- console.log("------------------DEBUG-------onMousedown:", evt);
this.handleSelectedRow(evt);
},
focusChangeEvt(e) {
- console.log("------------------DEBUG-------focusChangeEvt:", e);
if(e.rowKey === 0) {
this.handleSelectedRow(e);
}
},
handleSelectedRow(e) {
- console.log("------------------DEBUG-------handleSelectedRow:", e);
// console.log('focusChangeEvt1...')
if (this.preventFocusChangeEvent(e)) {
// console.log('prevent focusChangeEvt')
@@ -302,7 +297,6 @@ export default {
this.sendSelectedRowData(e.rowKey);
},
startEditing(e) {
- // console.log("------------------DEBUG-------startEditing:", e);
// console.log('startEditing1...')
if (this.preventFocusChangeEvent(e)) {
// console.log('prevent startEditing')
@@ -329,7 +323,6 @@ export default {
}
},
async editingFinish(e) {
- // console.log('------------------DEBUG-------editingFinish:', e);
// console.log("Editing END E::", e);
// editor 간 이동시 수정되는 문제 수정
// e.rowEditingFg: grid의 한 row를 한번에 수정할 시 각각의 cell 마다 click 이벤트가 발생하지 않아 this.editorStartKey값이 제대로 입력 되지 않는 경우를 대비하여 만든 Fg
@@ -691,7 +684,6 @@ export default {
? this.gridInstance.invoke('getFocusedCell').rowKey
: eventRowKey;
var rowData = this.gridInstance.invoke('getRow', rowKey);
- // console.log('------------------DEBUG-------sendSelectedRowData:', {eventRowKey, rowKey});
this.$emit('sendSelectedRowStatInfo', rowData);
}
},
diff --git a/components/pages/ems/EqpmInfo/EqpmIaoTab.vue b/components/pages/ems/EqpmInfo/EqpmIaoTab.vue
index 5be2e9b..3945a72 100644
--- a/components/pages/ems/EqpmInfo/EqpmIaoTab.vue
+++ b/components/pages/ems/EqpmInfo/EqpmIaoTab.vue
@@ -115,7 +115,7 @@ export default {
this.detailList[3].class = 'py-3 pl-4 pt-1 d-none';
this.detailList[4].class = 'py-3';
- this.detailList[5].class = 'py-3';
+ this.detailList[5].class = 'py-3 pl-4';
this.detailList[6].class = 'py-3 pl-4 pt-0';
} else {
// }else if(val==="READ_PLC"){
@@ -286,7 +286,6 @@ export default {
this.loadGrid = true;
},
async getRowData(data, gridName) {
- console.log("--------------------DEBUG-----getRowData---------------", {data, gridName});
if (data.rowStat === 'I') {
this.detailList[0].disabled = false;
this.detailList[1].disabled = false;
diff --git a/pages/comm/auth/MenuRoleMngPage.vue b/pages/comm/auth/MenuRoleMngPage.vue
index c3b9d50..157cda8 100644
--- a/pages/comm/auth/MenuRoleMngPage.vue
+++ b/pages/comm/auth/MenuRoleMngPage.vue
@@ -668,8 +668,6 @@ export default {
},
getUnAsgnRowData(data) {
- console.log("------------------DEBUG-------getUnAsgnRowData:", data);
-
const getRowData = data;
this.leftSelectRowData = Object.assign({}, getRowData);
},
diff --git a/pages/comm/base/PrgmMngPage.vue b/pages/comm/base/PrgmMngPage.vue
index 9532ceb..7aa0ce8 100644
--- a/pages/comm/base/PrgmMngPage.vue
+++ b/pages/comm/base/PrgmMngPage.vue
@@ -315,7 +315,6 @@ export default {
});
},
async getRowData(data, gridName) {
- // console.log("-----------------------DEBUG--getRowData--------------", {
// gridKey: gridName,
// gridSelect: true,
// rowGridSelectKey: data.rowKey,
diff --git a/pages/ems/base/EquipmentMasterMngPage.vue b/pages/ems/base/EquipmentMasterMngPage.vue
index ae78103..acc09f1 100644
--- a/pages/ems/base/EquipmentMasterMngPage.vue
+++ b/pages/ems/base/EquipmentMasterMngPage.vue
@@ -479,7 +479,6 @@ export default {
});
},
async getRowData(data) {
- console.log('-------------DEBUG-----getRowData-----------', data);
this.setEqpmAddInfo(data);
this.setEqpmIao(data);
this.setEqpmConstIao(data);
diff --git a/pages/ems/base/ReadResultCloseMngPage.vue b/pages/ems/base/ReadResultCloseMngPage.vue
index d696a06..8a64eea 100644
--- a/pages/ems/base/ReadResultCloseMngPage.vue
+++ b/pages/ems/base/ReadResultCloseMngPage.vue
@@ -282,7 +282,6 @@ export default {
mgnf: item.mgnf || 0,
})),
});
- // console.log('--------------DEBUG-----res-------', res);
}
this.setPageData({ isFind: false });
this.$nextTick(() => {
diff --git a/pages/ems/effc/EnrgMapPage.vue b/pages/ems/effc/EnrgMapPage.vue
index b8f6922..b3c2e51 100644
--- a/pages/ems/effc/EnrgMapPage.vue
+++ b/pages/ems/effc/EnrgMapPage.vue
@@ -245,7 +245,6 @@ export default {
this.setChartOption({ chartKey: this.chartName, value: chartOption });
- // console.log("----DEBUG chart-options-------", { chartOption });
this.$nextTick(() => {
this.loadChart = true;
});
diff --git a/pages/ems/effc/EnrgReptMngPage.vue b/pages/ems/effc/EnrgReptMngPage.vue
index b88ff91..9db9f28 100644
--- a/pages/ems/effc/EnrgReptMngPage.vue
+++ b/pages/ems/effc/EnrgReptMngPage.vue
@@ -264,9 +264,6 @@ export default {
},
created() { },
async mounted() {
- // console.log('----DEBUG---');
- // await this.initTest();
- // End Debug Test---
await this.init();
this.initedFlag = true;
},
@@ -287,7 +284,7 @@ export default {
}),
async initTest() {
// debug test
- console.log('----DEBUG init pages----');
+ // console.log('----DEBUG init pages----');
const seriesName1 = ['B01. 냉동기전력량', ' B01.COP'];
const seriesName2 = [
'UT_HT_CH101:냉동기전혁당', 'UT_HT_CH102:냉동기전력량', 'UT_HT_CH201:냉동기전력당',
From 34d5a1eeb787577bd705fb690d180bca4fa9cd14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vu=20Trung=20Kien/=28Vu=20Trung=20Kien=29/=ED=98=84?=
=?UTF-8?q?=EC=9E=A5=EB=8C=80=EB=A6=AC=EC=9D=B8/SK?= <20074468@skcc.com>
Date: Thu, 31 Jul 2025 16:18:33 +0900
Subject: [PATCH 04/15] fixbug ui 20 21
---
components/common/PastRsltDatePicker.vue | 6 +-
.../pages/ems/TagInfo/TagAddInfoTab.vue | 5 +-
pages/ems/base/EqpmKindPage.vue | 4 +-
pages/ems/base/EquipmentGroupMngPage.vue | 4 +-
pages/ems/base/PastRsltDataReadPage.vue | 4 +-
pages/ems/base/TagMngPage.vue | 224 +++++++++---------
pages/ems/base/TagMngPage_Pagination.vue | 2 +-
plugins/gridUtility.js | 17 +-
8 files changed, 142 insertions(+), 124 deletions(-)
diff --git a/components/common/PastRsltDatePicker.vue b/components/common/PastRsltDatePicker.vue
index 67933f9..13dddae 100644
--- a/components/common/PastRsltDatePicker.vue
+++ b/components/common/PastRsltDatePicker.vue
@@ -9,7 +9,7 @@
-
+
-
+
+
-
+
-
+
-
-
-
-
+
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
@@ -66,63 +48,33 @@
TAG 정보
-
+
-
-
+
+
-
+
TAG 상세
-
+
{{ item.name }}
-
+
-
-
+
+
@@ -134,6 +86,7 @@
+
\ No newline at end of file
diff --git a/pages/ems/base/TagMngPage_Pagination.vue b/pages/ems/base/TagMngPage_Pagination.vue
index e8408b5..4b3e83b 100644
--- a/pages/ems/base/TagMngPage_Pagination.vue
+++ b/pages/ems/base/TagMngPage_Pagination.vue
@@ -69,7 +69,7 @@
-
+
TAG 상세
diff --git a/plugins/gridUtility.js b/plugins/gridUtility.js
index d371c44..1593079 100644
--- a/plugins/gridUtility.js
+++ b/plugins/gridUtility.js
@@ -253,8 +253,9 @@ export class NewCustomRenderer {
} else {
el.type = 'text';
- $(el).addClass('tui-grid-cell-content');
+ $(el).addClass('tui-grid-cell-content w100');
$(el).css('text-align', 'center');
+ $(el).css('border', '0');
}
this.render(props);
if(!this.disabled){
@@ -314,6 +315,8 @@ export class NewCustomEditor {
this.rowKey = rowKey;
this.columnInfo = columnInfo;
this.grid = grid;
+ const divEl = document.createElement('div');
+ $(divEl).css('text-align', 'center');
const el = document.createElement('input');
if (
props.grid.store.data.rawData[props.rowKey].addInfoDataKind == 'FG'
@@ -363,16 +366,20 @@ export class NewCustomEditor {
}
$(el).addClass('tui-grid-content-text');
}
+
+ divEl.append(el);
// console.log('props: %o', props);
// console.log('el: %o', el);
this.el = el;
+ this.divEl = divEl;
this.render(props);
+
}
getElement() {
- return this.el;
+ return this.divEl;
}
getValue() {
@@ -389,9 +396,9 @@ export class NewCustomEditor {
}
mounted() {
- if (this.el.type == 'checkbox') {
- $(this.el.parentElement).css('text-align', 'center');
- }
+ // if (this.el.type == 'checkbox') {
+ // $(this.el.parentElement).css('text-align', 'center');
+ // }
this.el.select();
}
}
\ No newline at end of file
From 40addfe63911456a682946cab94e6cf85426f5a5 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: Thu, 31 Jul 2025 15:05:33 +0700
Subject: [PATCH 05/15] fixbug active menu item
---
assets/scss/common.scss | 149 ++++++++++------------------------------
1 file changed, 38 insertions(+), 111 deletions(-)
diff --git a/assets/scss/common.scss b/assets/scss/common.scss
index 0fac17b..705e75a 100644
--- a/assets/scss/common.scss
+++ b/assets/scss/common.scss
@@ -691,6 +691,43 @@ a {
}
&>.v-treeview-node {
+
+ .v-treeview-node--active {
+ background-color: map-deep-get($config,
+ #{$theme},
+ "v-treeview-node-label-active-bg"
+ );
+ border: 1px solid map-deep-get($config,
+ #{$theme},
+ "v-treeview-node-label-active-border"
+ );
+ border-radius: 8px;
+
+ &:before {
+ background-color: map-deep-get($config,
+ #{$theme},
+ "v-treeview-node-subroot-backgroundColor"
+ );
+ }
+
+ &>.v-treeview-node__content {
+ .v-treeview-node__label {
+ color: map-deep-get($config,
+ #{$theme},
+ "v-treeview-node-label-active-color"
+ );
+ }
+
+ .v-icon {
+ color: map-deep-get($config,
+ #{$theme},
+ "v-treeview-icon-active-color"
+ );
+ }
+ }
+
+ }
+
&>.v-treeview-node__root {
&:before {
background-color: map-deep-get($config,
@@ -736,6 +773,7 @@ a {
&>.v-treeview-node__children {
&>.v-treeview-node {
+
&>.v-treeview-node__root {
&:before {
background-color: map-deep-get($config,
@@ -793,117 +831,6 @@ a {
);
}
- &>.v-treeview-node--active {
- &:before {
- background-color: map-deep-get($config,
- #{$theme},
- "v-treeview-node-subroot-backgroundColor"
- );
- }
-
- &>.v-treeview-node__content {
- .v-treeview-node__label {
- color: map-deep-get($config,
- #{$theme},
- "v-treeview-node-label-active-color"
- );
- }
-
- .v-icon {
- color: map-deep-get($config,
- #{$theme},
- "v-treeview-icon-active-color"
- );
- }
- }
- }
-
- &>.v-treeview-node__children {
- & .v-treeview-node {
- &>.v-treeview-node__root {
- &:before {
- background-color: map-deep-get($config,
- #{$theme},
- "v-treeview-node-subroot-backgroundColor"
- );
- }
-
- &>.v-treeview-node__content {
- .v-treeview-node__label {
- color: map-deep-get($config,
- #{$theme},
- "v-treeview-node-label-color"
- );
- }
-
- .v-icon {
- color: map-deep-get($config,
- #{$theme},
- "v-treeview-icon-color"
- );
- }
- }
-
- &:not(.v-treeview-node--active):hover {
- &:before {
- background-color: map-deep-get($config,
- #{$theme},
- "v-treeview-leaf-active-backgroundColor"
- );
- }
-
- &>.v-treeview-node__content {
- .v-treeview-node__label {
- color: map-deep-get($config,
- #{$theme},
- "v-treeview-leaf-active-color"
- );
- }
-
- .v-icon {
- color: map-deep-get($config,
- #{$theme},
- "v-treeview-leaf-active-color"
- );
- }
- }
- }
- }
-
- &>.v-treeview-node--active {
- background-color: map-deep-get($config,
- #{$theme},
- "v-treeview-node-label-active-bg"
- );
- border: 1px solid map-deep-get($config,
- #{$theme},
- "v-treeview-node-label-active-border"
- );
- border-radius: 8px;
-
- &:before {
- opacity: 0 !important;
- }
-
- &>.v-treeview-node__content {
- .v-treeview-node__label {
- color: map-deep-get($config,
- #{$theme},
- "v-treeview-node-label-active-color"
- );
- }
-
- .v-icon {
- color: map-deep-get($config,
- #{$theme},
- "v-treeview-node-label-active-color"
- );
- }
- }
- }
- }
- }
-
&[aria-expanded="true"] {
& .v-treeview-node__root>.v-treeview-node__content {
.v-treeview-node__label {
From dcdcf772ce8db3ced572a99b5b2c3ee3358c63c4 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: Thu, 31 Jul 2025 16:18:44 +0700
Subject: [PATCH 06/15] fixbug screen 20.4
---
.../pages/ems/EqpmInfo/EqpmConstTab.vue | 22 ++++++++++---------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/components/pages/ems/EqpmInfo/EqpmConstTab.vue b/components/pages/ems/EqpmInfo/EqpmConstTab.vue
index 69f1615..b68a035 100644
--- a/components/pages/ems/EqpmInfo/EqpmConstTab.vue
+++ b/components/pages/ems/EqpmInfo/EqpmConstTab.vue
@@ -96,20 +96,20 @@ export default {
watch: {
selectedEqpmKindId(val) {
if (val) {
- this.detailList[2].eqpmKindId = val;
+ this.detailList[1].eqpmKindId = val;
}
},
selectedEqpmGrpId(val) {
// if(!val){
- // this.detailList[2].eqpmGrpId = '';
+ // this.detailList[1].eqpmGrpId = '';
// }else{
- // this.detailList[2].eqpmGrpId = val;
+ // this.detailList[1].eqpmGrpId = val;
// }
// if(val){
- // this.detailList[2].eqpmGrpId = val;
+ // this.detailList[1].eqpmGrpId = val;
// }
// else if(val == null || val == ''){
- // this.detailList[2].eqpmGrpId = '';
+ // this.detailList[1].eqpmGrpId = '';
// }
},
},
@@ -238,10 +238,10 @@ export default {
},
async getRowData(data, gridName) {
if (data.rowStat === 'I') {
- this.detailList[2].disabled = false;
+ this.detailList[1].disabled = false;
this.detailList[3].disabled = false;
} else {
- this.detailList[2].disabled = true;
+ this.detailList[1].disabled = true;
this.detailList[3].disabled = true;
}
@@ -257,12 +257,12 @@ export default {
switch (action) {
case 'add':
this.$refs[this.gridName].addRow();
- this.detailList[2].disabled = false;
+ this.detailList[1].disabled = false;
this.detailList[3].disabled = false;
break;
case 'remove':
- this.detailList[2].disabled = true;
+ this.detailList[1].disabled = true;
this.detailList[3].disabled = true;
this.$refs[this.gridName].removeRow();
break;
@@ -370,6 +370,7 @@ const myEqpmConstDetail = [
textCols: 12,
iconShow: true,
},
+ // ==================
{
type: 'EgrpPysclQtyPop',
labelContent: '물리량',
@@ -381,7 +382,7 @@ const myEqpmConstDetail = [
pysclQtyNm: 'pysclQtyNm',
},
valueNm: 'objId',
- disabled: false,
+ disabled: true,
required: true,
openMode: 'CONST',
cols: 6,
@@ -412,6 +413,7 @@ const myEqpmConstDetail = [
textCols: 12,
iconShow: true,
},
+ // ------------
{
type: 'InputText',
label: '물리량 값',
From 3ae3ff8167388cee5de4641f08ea70c60489d86c 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: Thu, 31 Jul 2025 18:47:42 +0900
Subject: [PATCH 07/15] refactor code
---
pages/comm/base/BatchLogMngPage.vue | 1 -
pages/ems/base/EnrgCostCenterMngPage.vue | 5 +----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/pages/comm/base/BatchLogMngPage.vue b/pages/comm/base/BatchLogMngPage.vue
index 2ea07c1..df852d8 100644
--- a/pages/comm/base/BatchLogMngPage.vue
+++ b/pages/comm/base/BatchLogMngPage.vue
@@ -5,7 +5,6 @@
-
-
+
\ No newline at end of file
From 1284d5b14fef44634e7ad614530a0c5e65c3298d Mon Sep 17 00:00:00 2001
From: Michael <20074391@skcc.com>
Date: Fri, 1 Aug 2025 11:41:32 +0900
Subject: [PATCH 08/15] Update s1 s29 - Remove mock data s5 s11
---
components/common/modal/ElecPowChrgPop.vue | 49 +-
pages/ems/base/ReadResultCloseMngPage.vue | 1 +
pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue | 2 +-
pages/ems/effc/EnrgEffcTotSummPage.vue | 8 +-
pages/ems/effc/EnrgReptMngPage.vue | 2 +-
pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue | 30 +-
pages/ems/effc/EnrgUseTotSummPage.vue | 4 +-
pages/ems/effc/EqpmIndMntrPage.vue | 1 +
pages/ems/effc/TagTrndPage.vue | 1642 +++++++++----------
9 files changed, 865 insertions(+), 874 deletions(-)
diff --git a/components/common/modal/ElecPowChrgPop.vue b/components/common/modal/ElecPowChrgPop.vue
index c2e7770..a6872aa 100644
--- a/components/common/modal/ElecPowChrgPop.vue
+++ b/components/common/modal/ElecPowChrgPop.vue
@@ -58,7 +58,7 @@
-
+
-
+
-
+
-
+
+
-
+
+
+ 초기화
+
@@ -310,7 +335,11 @@ export default {
},
// 공정/설비 트리 그리드 세팅
gridInit() {
- const myOptions = {};
+ const myOptions = {
+ header: {
+ height: 38,
+ },
+ };
this.setModalGridOption({
modalKey: this.myModalKey,
gridKey: this.gridName,
@@ -606,11 +635,11 @@ const myColumns = [
{ header: '전력계약 ID', name: 'eleclContId', hidden: true},
{ header: '전력계약 명', name: 'eleclContNm', hidden: true},
{ header: '전력계약구분CD', name: 'elecContKind', hidden: true},
- { header: '전력계약구분', name: 'elecContKindNm', align: 'center'},
+ { header: '전력계약구분', name: 'elecContKindNm', align: 'left'},
{ header: '전압구분CD', name: 'voltKind', hidden: true },
- { header: '전압구분', name: 'voltKindNm', align: 'center' },
+ { header: '전압구분', name: 'voltKindNm', align: 'left' },
{ header: '옵션CD', name: 'optKind', hidden: true },
- { header: '옵션', name: 'optKindNm', align: 'center' },
+ { header: '옵션', name: 'optKindNm', align: 'left' },
{
header: '기본요금(원/kW)',
name: 'baseChrg',
@@ -620,7 +649,7 @@ const myColumns = [
},
},
{ header: '시간대CD', name: 'peakKind', hidden: true },
- { header: '시간대', name: 'peakKindNm', align: 'center' },
+ { header: '시간대', name: 'peakKindNm', align: 'left' },
{
header: '여름철(6~8월)',
name: 'unitPrcSum',
diff --git a/pages/ems/base/ReadResultCloseMngPage.vue b/pages/ems/base/ReadResultCloseMngPage.vue
index 8a64eea..0720a38 100644
--- a/pages/ems/base/ReadResultCloseMngPage.vue
+++ b/pages/ems/base/ReadResultCloseMngPage.vue
@@ -43,6 +43,7 @@
:is="'Datepicker'"
:parentPrgmId="myPrgmId"
:label="'조회기간'"
+ customClass="datepicker-large"
/>
diff --git a/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue b/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue
index 351da39..0a98351 100644
--- a/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue
+++ b/pages/ems/effc/EnrgEffcEqpmDetlMntrPage.vue
@@ -49,7 +49,7 @@
+ :textCols="12" :customClass="'datepicker-large'" />
diff --git a/pages/ems/effc/EnrgEffcTotSummPage.vue b/pages/ems/effc/EnrgEffcTotSummPage.vue
index a6e53e3..a443021 100644
--- a/pages/ems/effc/EnrgEffcTotSummPage.vue
+++ b/pages/ems/effc/EnrgEffcTotSummPage.vue
@@ -25,7 +25,7 @@
@@ -99,7 +99,6 @@ export default {
async asyncData(context) {
const myState = context.store.state;
myPrgmId = context.route.query.prgmId;
- console.log("active menu:", myState.menuData);
await context.store.commit("setActiveMenuInfo", myState.menuData[myPrgmId]);
myTitle = await myState.activeMenuInfo.menuNm;
},
@@ -319,8 +318,7 @@ export default {
},
};
- console.log("data : ", data);
- data.map((item) => {
+ data.map((item) => {
xAxisData.push(item.fabNm);
});
@@ -374,8 +372,6 @@ export default {
];
}
- // console.log("xAxisData : ", xAxisData);
- console.log("seriesData : ", seriesData);
var chartOption = {
legend: {
top: xAxisData.length > 7 ? "top" : "bottom",
diff --git a/pages/ems/effc/EnrgReptMngPage.vue b/pages/ems/effc/EnrgReptMngPage.vue
index 9db9f28..e0ea938 100644
--- a/pages/ems/effc/EnrgReptMngPage.vue
+++ b/pages/ems/effc/EnrgReptMngPage.vue
@@ -32,7 +32,7 @@
-
+
diff --git a/pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue b/pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue
index 5416a1d..cb0f8a5 100644
--- a/pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue
+++ b/pages/ems/effc/EnrgUseEqpmDetlMntrPage.vue
@@ -97,7 +97,7 @@
-
+
-
+
{{
value["gdIdxNm"]
}}
-
-
-
-
+
+
+
-
+
@@ -746,10 +732,12 @@ export default {
{
type: "line",
data: seriesData,
- symbol: "none",
itemStyle: {
color: "#D32029",
},
+ // symbol: "circle",
+ showSymbol: true,
+ connectNulls: true,
},
// {
// type: "line",
diff --git a/pages/ems/effc/EnrgUseTotSummPage.vue b/pages/ems/effc/EnrgUseTotSummPage.vue
index a8b0860..405cc53 100644
--- a/pages/ems/effc/EnrgUseTotSummPage.vue
+++ b/pages/ems/effc/EnrgUseTotSummPage.vue
@@ -24,6 +24,7 @@
:is="'DatePicker'"
:label="'대상연월'"
:parentPrgmId="myPrgmId"
+ :customClass="'datepicker-large'"
/>
@@ -429,9 +430,6 @@ export default {
var chartKey = null;
var chartOption = null;
- console.log("data key:", dataKeyList);
- console.log("data test:", data);
-
for (var i = 0; i < dataKeyList.length; i++) {
for (var j = 0; j < data[dataKeyList[i]].chartData.length; j++) {
currentChartData = data[dataKeyList[i]].chartData[j];
diff --git a/pages/ems/effc/EqpmIndMntrPage.vue b/pages/ems/effc/EqpmIndMntrPage.vue
index 1b18b7e..067f144 100644
--- a/pages/ems/effc/EqpmIndMntrPage.vue
+++ b/pages/ems/effc/EqpmIndMntrPage.vue
@@ -71,6 +71,7 @@
:label="'대상년월'"
:parentPrgmId="myPrgmId"
:isRangeOption="false"
+ :customClass="'datepicker-large'"
/>
diff --git a/pages/ems/effc/TagTrndPage.vue b/pages/ems/effc/TagTrndPage.vue
index c0cd56a..ed7e0a6 100644
--- a/pages/ems/effc/TagTrndPage.vue
+++ b/pages/ems/effc/TagTrndPage.vue
@@ -1,37 +1,37 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+ :selectFromDtUntilTodayFg="true"
+ :selectToDtUntilTodayFg="true"
+ :selectBoxTimeItemList="selectBoxTimeItemList"
+ />
+
-
-
+ />
+
@@ -64,21 +64,21 @@
@click="search"
>조회
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
+
+
+
TAG 리스트
-
-
+
+
@@ -87,55 +87,55 @@
>
TAG 삭제
-
-
-
+ >
+
+
+
-
-
-
-
-
+
+
+
+
+
{{
item
}}
-
-
-
-
+
+
+
+
-
-
-
+
+
-
-
+
+
{{
"ICHEON.HVAC.EQP_HT_CH004.UT_HT_CH201.CHI_AMP_1A_PV"
}}
-
+
-
-
-
-
-
-
-
-
+ class="w100 h100"
+ :is="'Chart'"
+ :parentPrgmId="myPrgmId"
+ :chartName="chartNameList[0]"
+ :ref="chartNameList[0]"
+ />
+
+
+
+
+
+
+
From 06308055ef224459b171e54313fc2a9563060775 Mon Sep 17 00:00:00 2001
From: Michael <20074391@skcc.com>
Date: Fri, 1 Aug 2025 12:08:43 +0900
Subject: [PATCH 09/15] Remove mock data popup s11
---
components/common/modal/TagTrndTagPop.vue | 74 +++++++++++------------
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/components/common/modal/TagTrndTagPop.vue b/components/common/modal/TagTrndTagPop.vue
index fa0b2d4..1eccc1d 100644
--- a/components/common/modal/TagTrndTagPop.vue
+++ b/components/common/modal/TagTrndTagPop.vue
@@ -273,9 +273,9 @@ export default {
});
},
async created() {
- // await this.setSelectValueList01();
- // await this.setSelectValueList02();
- // await this.setSelectValueList03();
+ await this.setSelectValueList01();
+ await this.setSelectValueList02();
+ await this.setSelectValueList03();
this.init();
// if(this.searchParam.isMulti == true){
// this.setPageData({
@@ -487,40 +487,40 @@ export default {
eqpmId: this.selectValue03,
searchWord: this.searchWord,
};
- let res = [
- {
- eqpmGrpNm: "냉각 시스템",
- eqpmGrpId: "GRP001",
- eqpmId: "EQ001",
- eqpmNm: "냉각기 A",
- tagId: "TAG001-001",
- tagNm: "냉각 온도 센서",
- rowStat: "I",
- },
- {
- eqpmGrpNm: "전력 시스템",
- eqpmGrpId: "GRP002",
- eqpmId: "EQ002",
- eqpmNm: "변압기 B",
- tagId: "TAG002-002",
- tagNm: "전류 센서",
- rowStat: "U",
- },
- {
- eqpmGrpNm: "공기압 시스템",
- eqpmGrpId: "GRP003",
- eqpmId: "EQ003",
- eqpmNm: "압축기 C",
- tagId: "TAG003-003",
- tagNm: "압력 센서",
- rowStat: "D",
- },
- ];
- // res = await this.postApiReturn({
- // apiKey: "selectTagAndEqpmList",
- // resKey: "tagTrndDatas",
- // sendParam: searchParam,
- // });
+ // let res = [
+ // {
+ // eqpmGrpNm: "냉각 시스템",
+ // eqpmGrpId: "GRP001",
+ // eqpmId: "EQ001",
+ // eqpmNm: "냉각기 A",
+ // tagId: "TAG001-001",
+ // tagNm: "냉각 온도 센서",
+ // rowStat: "I",
+ // },
+ // {
+ // eqpmGrpNm: "전력 시스템",
+ // eqpmGrpId: "GRP002",
+ // eqpmId: "EQ002",
+ // eqpmNm: "변압기 B",
+ // tagId: "TAG002-002",
+ // tagNm: "전류 센서",
+ // rowStat: "U",
+ // },
+ // {
+ // eqpmGrpNm: "공기압 시스템",
+ // eqpmGrpId: "GRP003",
+ // eqpmId: "EQ003",
+ // eqpmNm: "압축기 C",
+ // tagId: "TAG003-003",
+ // tagNm: "압력 센서",
+ // rowStat: "D",
+ // },
+ // ];
+ let res = await this.postApiReturn({
+ apiKey: "selectTagAndEqpmList",
+ resKey: "tagTrndDatas",
+ sendParam: searchParam,
+ });
let newRes = [];
if (this.searchParam["tagList"].length > 0) {
newRes = res.filter((item) => {
From df678daedf7dbf5354152c39118fd4c1c1b81332 Mon Sep 17 00:00:00 2001
From: Michael <20074391@skcc.com>
Date: Fri, 1 Aug 2025 16:03:54 +0900
Subject: [PATCH 10/15] Fix duplicate id not reload page date
---
layouts/default.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/layouts/default.vue b/layouts/default.vue
index 87ee665..68f6454 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -62,10 +62,10 @@
-