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/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/ems/base/ReadObjectMngPage.vue b/pages/ems/base/ReadObjectMngPage.vue index 0d35b99..ec5e948 100644 --- a/pages/ems/base/ReadObjectMngPage.vue +++ b/pages/ems/base/ReadObjectMngPage.vue @@ -59,18 +59,16 @@ :btnActionsFnc="btnActions" /> -