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 @@