- Data Set TAG 연결 정보
+ Data Set TAG 연결 정보
diff --git a/components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue b/components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue
index 2987f82..c96013a 100644
--- a/components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue
+++ b/components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue
@@ -55,9 +55,9 @@ export default {
dataPathMock: {
'rowDetailGrid' : {
column: [
- { header: '추가 정보', name: 'id', headerAlign: 'left' },
- { header: 'Data 구분', name: 'lable', headerAlign: 'left' },
- { header: '추가 정보 값', name: 'type', headerAlign: 'left' },
+ { header: '추가 정보', name: 'id', headerAlign: 'left', align: 'left', },
+ { header: 'Data 구분', name: 'lable', headerAlign: 'left', align: 'left' },
+ { header: '추가 정보 값', name: 'type', headerAlign: 'left', align: 'right' },
// { header: '비고', name: 'note', headerAlign: 'left' }
],
data: dataPathDataExample,
diff --git a/pages/ems/effc/DataSetMngPage.vue b/pages/ems/effc/DataSetMngPage.vue
index cf3e12c..b80f853 100644
--- a/pages/ems/effc/DataSetMngPage.vue
+++ b/pages/ems/effc/DataSetMngPage.vue
@@ -27,7 +27,7 @@
Jamovi
+ depressed size="large">JAMOVI
@@ -283,7 +283,7 @@ export default {
{
header: '모델링 DataSet ID',
name: 'dataSetId',
- align: 'center',
+ align: 'left',
width: 180,
},
{
diff --git a/pages/ems/effc/EnrgReptMngPage.vue b/pages/ems/effc/EnrgReptMngPage.vue
index a22005e..35a7a1a 100644
--- a/pages/ems/effc/EnrgReptMngPage.vue
+++ b/pages/ems/effc/EnrgReptMngPage.vue
@@ -21,22 +21,21 @@
:itemList="selectValueList03" :label="'FAB'" :multiple="fabMultiple"
@update:propsValue="selectValue03 = $event" :labelCols="12" :textCols="12" customClass="select-large" />
-
-
-
+
+
-
+
- 엑셀
+ 엑셀
@@ -62,15 +61,23 @@
설비별 효율지표 Trend
-
-
+
조회
-
@@ -316,6 +323,7 @@ export default {
legend: {
icon: 'circle',
top: 'top',
+ size: '8'
},
grid: {
top: '10%',
From a4007d56975cb32965e57c2fa89422ff293c1813 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: Wed, 6 Aug 2025 10:12:34 +0700
Subject: [PATCH 4/6] resolve comment
---
assets/scss/common/grid.scss | 5 -----
components/common/Grid.vue | 1 -
components/common/select/SelectBoxMulti.vue | 4 +---
pages/comm/base/PrgmMngPage.vue | 6 +++---
4 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/assets/scss/common/grid.scss b/assets/scss/common/grid.scss
index d7a0349..e1268ab 100644
--- a/assets/scss/common/grid.scss
+++ b/assets/scss/common/grid.scss
@@ -169,14 +169,9 @@
// color: #000000E0;
& ::-webkit-scrollbar {
- width: $scrollbar-width !important;
width: 0 !important;
height: $scrollbar-width !important;
-webkit-appearance: initial;
- // background-color: map-deep-get($config,
- // #{$theme},
- // "tui-grid-cell-borderColor"
- // ) !important;
background-color: rgba(0, 0, 0, 0) !important;
border-radius: 3px !important;
}
diff --git a/components/common/Grid.vue b/components/common/Grid.vue
index b61f1ef..cdaad76 100644
--- a/components/common/Grid.vue
+++ b/components/common/Grid.vue
@@ -621,7 +621,6 @@ export default {
this.gridInstance.invoke('refreshLayout');
},
refreshGrid(){
- console.log("---------DEBUG---refreshGrid: ");
// console.log("refreshLayout",this.$refs['tuigrid' + this.gridName])
var store = this.$refs['tuigrid' + this.gridName].gridInstance.store;
var containerEl = this.$refs['tuigrid' + this.gridName].$el;
diff --git a/components/common/select/SelectBoxMulti.vue b/components/common/select/SelectBoxMulti.vue
index 2086baa..96ca8b9 100644
--- a/components/common/select/SelectBoxMulti.vue
+++ b/components/common/select/SelectBoxMulti.vue
@@ -140,6 +140,4 @@ export default {
};
-
+
diff --git a/pages/comm/base/PrgmMngPage.vue b/pages/comm/base/PrgmMngPage.vue
index 1a0a984..d8a180b 100644
--- a/pages/comm/base/PrgmMngPage.vue
+++ b/pages/comm/base/PrgmMngPage.vue
@@ -26,15 +26,15 @@
-
-
+
+
-
+
Date: Wed, 6 Aug 2025 16:31:44 +0700
Subject: [PATCH 5/6] fix bugs
---
assets/scss/common/grid.scss | 96 +++++++++----------
assets/scss/datepicker.scss | 5 +-
components/common/modal/EqpmSelectPop.vue | 8 +-
.../pages/ems/EqpmInfo/EqpmAddInfoTab.vue | 4 +-
components/pages/ems/EqpmInfo/EqpmIaoTab.vue | 15 ++-
pages/comm/auth/MenuRoleMngPage.vue | 2 +-
pages/ems/base/EquipmentMasterMngPage.vue | 2 +-
7 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/assets/scss/common/grid.scss b/assets/scss/common/grid.scss
index e1268ab..baa07d9 100644
--- a/assets/scss/common/grid.scss
+++ b/assets/scss/common/grid.scss
@@ -17,18 +17,6 @@
border: 0 !important;
}
- // &-body-container {
- // width: 100% !important;
- // }
-
- // &-table {
- // width: 100% !important;
- // }
-
- // &-lside-area .tui-grid-body-area {
- // margin-right: -11px;
- // }
-
&-lside-area .tui-grid-scrollbar-left-bottom {
display: none;
}
@@ -150,50 +138,28 @@
&-body-container{
border-right: 0;
- // border-right-color: map-deep-get($config,
- // #{$theme},
- // "tui-grid-cell-borderColor"
- // );
+ // position: relative;
width: auto !important;
+
.tui-grid-table-container{
- width: 100% !important;
+ // width: 100% !important;
.tui-grid-table {
- width: 100% !important;
+ // width: 100% !important;
+ // table-layout: fixed;
+ // th, td {
+ // &:last-child{
+ // width: auto !important;
+ // }
+ // }
}
}
}
- &-container,
- &-summary-area {
+ &-summary-area,
+ &-container {
font-family: Inter;
- // color: #000000E0;
- & ::-webkit-scrollbar {
- width: 0 !important;
- height: $scrollbar-width !important;
- -webkit-appearance: initial;
- background-color: rgba(0, 0, 0, 0) !important;
- border-radius: 3px !important;
- }
-
- & ::-webkit-scrollbar-track {
- // background-color: map-deep-get($config,
- // #{$theme},
- // "tui-grid-cell-borderColor"
- // ) !important;
- background-color: rgba(0, 0, 0, 0) !important;
- }
-
- & ::-webkit-scrollbar-thumb {
- // width: 50px !important;
- height: 50px !important;
- background-color: map-deep-get($config, #{$theme}, "scrollbar-thumb");
- // background-color: rgba(0, 0, 0, 0);
- border-radius: 3px;
- }
-
.tui-grid-cell {
-
&.tui-grid-cell-summary {
color: map-deep-get($config,
#{$theme},
@@ -203,6 +169,32 @@
}
}
+ &-body-area {
+ overflow: auto;
+
+ &::-webkit-scrollbar {
+ width: $scrollbar-width !important;
+ height: $scrollbar-width !important;
+ -webkit-appearance: initial;
+ background-color: rgba(0, 0, 0, 0) !important;
+ border-radius: 3px !important;
+ // border-right: 1px solid;
+ // border-right-color: map-deep-get($config, #{$theme}, "tui-grid-cell-borderColor");
+ }
+
+ &::-webkit-scrollbar-track {
+ background-color: rgba(0, 0, 0, 0) !important;
+ }
+
+ &::-webkit-scrollbar-thumb {
+ height: 50px !important;
+ background-color: map-deep-get($config, #{$theme}, "scrollbar-thumb");
+ border-radius: 3px;
+ // width: 50px !important;
+ // background-color: rgba(0, 0, 0, 0);
+ }
+ }
+
&-rside-area {
background-color: map-deep-get($config, #{$theme}, "scrollbar-track");
}
@@ -241,13 +233,13 @@
&-scrollbar-right-bottom {
width: $scrollbar-width !important;
height: $scrollbar-width !important;
- // display: none !important;
border-color: map-deep-get($config, #{$theme}, "cardBackground");
background-color: map-deep-get($config, #{$theme}, "cardBackground");
+ box-sizing: border-box;
+ // display: none !important;
// border: none !important;
// bottom: -1px;
// right: -2px;
- box-sizing: border-box;
// display: none;
}
@@ -358,10 +350,10 @@
#{$theme},
"tui-grid-cell-backgroundColor"
);
- width: 100% !important;
- .tui-grid-table {
- width: 100% !important;
- }
+ // width: 100% !important;
+ // .tui-grid-table {
+ // width: 100% !important;
+ // }
}
&-row-odd,
diff --git a/assets/scss/datepicker.scss b/assets/scss/datepicker.scss
index ffc8c88..0bfa128 100644
--- a/assets/scss/datepicker.scss
+++ b/assets/scss/datepicker.scss
@@ -15,8 +15,9 @@
border-radius: 6px;
border: solid 1px;
height: 32px;
- // border-color: #424242;
- border-color: map-deep-get($config, #{$theme}, "tui-datepicker-border-color");
+ color: map-deep-get($config, #{$theme}, "v-input-fieldset-color") !important;
+ border-color: currentColor;
+ // border-color: map-deep-get($config, #{$theme}, "tui-datepicker-border-color");
&.datepicker-large {
height: 40px;
diff --git a/components/common/modal/EqpmSelectPop.vue b/components/common/modal/EqpmSelectPop.vue
index 4d28f74..1d5f863 100644
--- a/components/common/modal/EqpmSelectPop.vue
+++ b/components/common/modal/EqpmSelectPop.vue
@@ -36,21 +36,21 @@
-
+
-
+
-
+
- 조회
+ 조회
-
+
diff --git a/pages/ems/base/EquipmentMasterMngPage.vue b/pages/ems/base/EquipmentMasterMngPage.vue
index 938faf2..966038d 100644
--- a/pages/ems/base/EquipmentMasterMngPage.vue
+++ b/pages/ems/base/EquipmentMasterMngPage.vue
@@ -382,7 +382,7 @@ export default {
header: '사용 여부',
name: 'useFg',
width: 100,
- align: 'center',
+ align: 'left',
formatter({ value }) {
const newValue = _this.pageData.useFgList.filter(
item => item.commCd == value,
From 38585f7b4f4e23525bf94efe1f4a859a0f414379 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: Wed, 6 Aug 2025 16:43:12 +0700
Subject: [PATCH 6/6] hotfix layout
---
components/pages/ems/EqpmInfo/EqpmIaoTab.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/pages/ems/EqpmInfo/EqpmIaoTab.vue b/components/pages/ems/EqpmInfo/EqpmIaoTab.vue
index a113226..e600490 100644
--- a/components/pages/ems/EqpmInfo/EqpmIaoTab.vue
+++ b/components/pages/ems/EqpmInfo/EqpmIaoTab.vue
@@ -114,7 +114,7 @@ export default {
this.detailList[2].class = 'py-3 d-none';
this.detailList[3].class = 'py-3 pl-4 pt-1 d-none';
- this.detailList[4].class = 'py-3';
+ this.detailList[4].class = 'py-3 pl-4';
this.detailList[5].class = 'py-3 pl-4';
this.detailList[6].class = 'py-3 pl-4 pt-0';
} else {