+
diff --git a/pages/ems/base/EquipmentMasterMngPage.vue b/pages/ems/base/EquipmentMasterMngPage.vue
index 9d74c43..ae78103 100644
--- a/pages/ems/base/EquipmentMasterMngPage.vue
+++ b/pages/ems/base/EquipmentMasterMngPage.vue
@@ -479,6 +479,7 @@ export default {
});
},
async getRowData(data) {
+ console.log('-------------DEBUG-----getRowData-----------', data);
this.setEqpmAddInfo(data);
this.setEqpmIao(data);
this.setEqpmConstIao(data);
@@ -969,7 +970,7 @@ const myDetail = [
labelCols: 12,
textCols: 12,
iconShow: true,
- class: 'py-3 pr-4',
+ class: 'py-3 pr-4 pb-2',
},
{
type: 'CheckBox',
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 2/4] 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 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 3/4] 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 4/4] 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: '물리량 값',