diff --git a/assets/scss/common.scss b/assets/scss/common.scss
index b0d4fa3..cf990d2 100644
--- a/assets/scss/common.scss
+++ b/assets/scss/common.scss
@@ -144,7 +144,7 @@ a {
& .router-tab__container {
overflow-y: auto;
- min-height: calc(100vh - 105px);
+ height: calc(100vh - 105px);
max-height: calc(100vh - 105px);
padding: 20px;
}
diff --git a/assets/scss/common/text.scss b/assets/scss/common/text.scss
index a849c86..535a3be 100644
--- a/assets/scss/common/text.scss
+++ b/assets/scss/common/text.scss
@@ -63,6 +63,12 @@
line-height: 1.25 !important;
}
+.custom-title-7 {
+ font-size: 0.875rem !important;
+ font-weight: 400 !important;
+ line-height: 22px !important;
+}
+
.custom-title-8 {
font-size: 0.75rem !important;
font-weight: 700 !important;
@@ -76,15 +82,15 @@
.custom-text-2 {
opacity: 0.6;
- font-family: SpoqaHanSansNeo;
font-size: 14px;
- font-weight: normal;
- font-stretch: normal;
- font-style: normal;
line-height: 2.17;
- letter-spacing: normal;
- text-align: right;
- color: #fff;
+ // font-weight: normal;
+ // font-stretch: normal;
+ // font-style: normal;
+ // letter-spacing: normal;
+ // text-align: right;
+ // color: #fff;
+ // font-family: SpoqaHanSansNeo;
}
.text-color--white-0 {
diff --git a/components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue b/components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue
index 88294ec..edd14e0 100644
--- a/components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue
+++ b/components/pages/ems/EqpmInfo/EqpmAddInfoTab.vue
@@ -20,7 +20,6 @@
:editorGrid="true"
:innerTabGridInfo="innerTabGridInfo"
@getRowsData="getRowData"
- :dataPath="dataPathMock"
/>
@@ -52,7 +51,7 @@ export default {
},
data() {
return {
- loadGrid: true,
+ loadGrid: false,
gridName: 'rowDetailGrid',
rowKey: null,
edtingFinishFlag: 'Y',
@@ -343,7 +342,9 @@ export default {
value: myColumns,
});
- this.loadGrid = true;
+ this.$nextTick(() => {
+ this.loadGrid = true;
+ });
},
async btnActions(action) {
let dataArr = [];
diff --git a/components/pages/ems/EqpmInfo/EqpmConstTab.vue b/components/pages/ems/EqpmInfo/EqpmConstTab.vue
index acce195..06d78f0 100644
--- a/components/pages/ems/EqpmInfo/EqpmConstTab.vue
+++ b/components/pages/ems/EqpmInfo/EqpmConstTab.vue
@@ -6,7 +6,7 @@
+ @getRowsData="getRowData" :innerTabGridInfo="innerTabGridInfo" />
{
+ this.loadGrid = true;
+ });
},
async getRowData(data, gridName) {
if (data.rowStat === 'I') {
diff --git a/components/pages/ems/EqpmInfo/EqpmIaoTab.vue b/components/pages/ems/EqpmInfo/EqpmIaoTab.vue
index de40290..0073f3b 100644
--- a/components/pages/ems/EqpmInfo/EqpmIaoTab.vue
+++ b/components/pages/ems/EqpmInfo/EqpmIaoTab.vue
@@ -19,7 +19,6 @@
:parentPrgmId="parentPrgmId"
@getRowsData="getRowData"
:innerTabGridInfo="innerTabGridInfo"
- :dataPath="dataPathMock"
/>
@@ -60,7 +59,7 @@ export default {
},
data() {
return {
- loadGrid: true,
+ loadGrid: false,
gridName: 'rowEqpmIaoGrid',
detailList: myEqpmIaoDetail,
@@ -297,7 +296,9 @@ export default {
value: myColumns,
});
- this.loadGrid = true;
+ this.$nextTick(() => {
+ this.loadGrid = true;
+ });
},
async getRowData(data, gridName) {
if (data.rowStat === 'I') {
diff --git a/mixin/global.js b/mixin/global.js
index 7631640..08c1d9c 100644
--- a/mixin/global.js
+++ b/mixin/global.js
@@ -58,7 +58,7 @@ export default {
layoutInit() {
if (this.$refs.searchFilter) {
const searchFilterHeight = this.$refs.searchFilter.offsetHeight;
- this.$refs.contents.style.minHeight = `calc(100% - ${searchFilterHeight + 20}px)`;
+ this.$refs.contents.style.height = `calc(100% - ${searchFilterHeight + 20}px)`;
}
},
//init() {}
diff --git a/pages/comm/base/NoticeMngPage.vue b/pages/comm/base/NoticeMngPage.vue
index e0956bd..e7ecfbb 100644
--- a/pages/comm/base/NoticeMngPage.vue
+++ b/pages/comm/base/NoticeMngPage.vue
@@ -1,6 +1,6 @@
-
+
@@ -16,11 +16,9 @@
-
-
+
+ @getRowsData="getRowData" />
@@ -29,7 +27,7 @@
-
+
-
- 제목
-
-
+
+ {{ viewActionData.title }}
-
+
+ :class="[isDarkMode ? 'theme--white' : 'theme--black', 'custom-view pa-3']" />
-
- 파일목록
+
+
+ 파일목록
+
-
+
공지사항
-
- 제목
+
+ 제목
-
+
-
-
- 파일첨부
-
-
-
+
+ 파일첨부
-
+
공지사항
-
- 제목
-
+ 제목
+
-
-
- 파일첨부
-
+
+ 파일첨부
-
+
@@ -186,16 +178,16 @@
공지사항
- 제목
-
+ 제목
+
-
- 파일첨부
+
+ 파일첨부
{
- const newObj = {
- ...item,
- rowStat: null,
- dataSetId: item.dataSetId,
- dataSetNm: item.dataSetNm,
- useFg: item.useFg === '1' ? true : false, // 화면 개발 편의를 위해 boolean 타입으로 교체, 저장시 "1", "0" 으로 바꿔 보내야 함
- };
- return newObj;
- });
-
+
this.setGridData({
gridKey: this.gridName,
- value: newRes,
+ value: res,
+ });
+ this.$nextTick(() => {
+ this.loadGrid = true;
});
-
this.setPageData({ isFind: false });
- this.loadGrid = true;
},
getRowData(data) {
this.selectedRowKey = data.rowKey;
@@ -1073,4 +1046,19 @@ const dataPathDataExample = getPathDataExample({
color: #1677FF;
}
}
+::v-deep {
+ .v-input__slot {
+ padding-left: 8px;
+ padding-right: 8px;
+ }
+ .custom-view {
+ border: 1px solid;
+ border-radius: 6px;
+ height: 100%;
+ @each $theme in dark, light {
+ @include theme($theme);
+ border-color: map-deep-get($config, #{$theme}, "v-input-textarea-border");;
+ }
+ }
+}
diff --git a/pages/ems/base/EffcIdxMngPage.vue b/pages/ems/base/EffcIdxMngPage.vue
index 1b570eb..6eb712f 100644
--- a/pages/ems/base/EffcIdxMngPage.vue
+++ b/pages/ems/base/EffcIdxMngPage.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/pages/ems/base/EnrgReadPlaceMngPage.vue b/pages/ems/base/EnrgReadPlaceMngPage.vue
index b641ace..ede9560 100644
--- a/pages/ems/base/EnrgReadPlaceMngPage.vue
+++ b/pages/ems/base/EnrgReadPlaceMngPage.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/pages/ems/base/EqpmGrpPysclQtyMngPage.vue b/pages/ems/base/EqpmGrpPysclQtyMngPage.vue
index c581bfb..b26eb74 100644
--- a/pages/ems/base/EqpmGrpPysclQtyMngPage.vue
+++ b/pages/ems/base/EqpmGrpPysclQtyMngPage.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/pages/ems/base/EquipmentMasterMngPage.vue b/pages/ems/base/EquipmentMasterMngPage.vue
index 65194f3..9d74c43 100644
--- a/pages/ems/base/EquipmentMasterMngPage.vue
+++ b/pages/ems/base/EquipmentMasterMngPage.vue
@@ -1,5 +1,6 @@
+
@@ -34,23 +35,23 @@
-
+
설비 정보
-
-
-
-
+
+
+
-
+
설비 상세
@@ -287,7 +288,7 @@ export default {
blocId: this.userInfo.blocId,
},
});
- console.log('res : ', res);
+ // console.log('res : ', res);
res.map(item => {
const it = { text: item.ercNm, value: item.ercId };
ercList.push(it);
diff --git a/pages/ems/base/GdIdxMngPage.vue b/pages/ems/base/GdIdxMngPage.vue
index f635b6b..85f177d 100644
--- a/pages/ems/base/GdIdxMngPage.vue
+++ b/pages/ems/base/GdIdxMngPage.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/pages/ems/base/GdStndMngPage.vue b/pages/ems/base/GdStndMngPage.vue
index 9ff1f50..fba788e 100644
--- a/pages/ems/base/GdStndMngPage.vue
+++ b/pages/ems/base/GdStndMngPage.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/pages/ems/base/ReadObjectMngPage.vue b/pages/ems/base/ReadObjectMngPage.vue
index 66d586e..3d3af2b 100644
--- a/pages/ems/base/ReadObjectMngPage.vue
+++ b/pages/ems/base/ReadObjectMngPage.vue
@@ -59,19 +59,17 @@
:btnActionsFnc="btnActions"
/>
-
-
-
-
+
+
+
diff --git a/pages/ems/base/ReadResultCloseMngPage.vue b/pages/ems/base/ReadResultCloseMngPage.vue
index 478328a..03514d9 100644
--- a/pages/ems/base/ReadResultCloseMngPage.vue
+++ b/pages/ems/base/ReadResultCloseMngPage.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/pages/ems/effc/EnrgMapPage.vue b/pages/ems/effc/EnrgMapPage.vue
index a764adb..b8f6922 100644
--- a/pages/ems/effc/EnrgMapPage.vue
+++ b/pages/ems/effc/EnrgMapPage.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/pages/ems/effc/EnrgUsePlanPage.vue b/pages/ems/effc/EnrgUsePlanPage.vue
index a017f33..45a3471 100644
--- a/pages/ems/effc/EnrgUsePlanPage.vue
+++ b/pages/ems/effc/EnrgUsePlanPage.vue
@@ -1,6 +1,6 @@
-
+