diff --git a/src/assets/scss/main-shuju.scss b/src/assets/scss/main-shuju.scss index bb1f2171..5b90e6d0 100644 --- a/src/assets/scss/main-shuju.scss +++ b/src/assets/scss/main-shuju.scss @@ -10,8 +10,9 @@ body { .m-iframe { position: relative; - width: 100vw; - height: calc(100vh - 55px); + box-sizing: content-box; + width: calc(100% + 20px); + // height: calc(100vh - 55px); margin: -10px; z-index: 100; } diff --git a/src/views/main-shuju/main-content.vue b/src/views/main-shuju/main-content.vue index 4d6a73a3..6f3b1c52 100644 --- a/src/views/main-shuju/main-content.vue +++ b/src/views/main-shuju/main-content.vue @@ -18,6 +18,7 @@ height="100%" frameborder="0" scrolling="yes" + :style="{ height: $store.state.fixed1920.height - 100 + 'px' }" />