From e29601d320865c7cf3b6d0d35640659f6f51a0a6 Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期三, 30 八月 2023 15:36:49 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/layout/components/AppMain.vue | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index 3226fb4..f0ae826 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -16,7 +16,7 @@ }, methods: { childMethod(){ - this.$refs.child.combackLookPlan() + this.$refs.child.combackLookPlan() }, triggerMainBtnPlan(){ this.$parent.triggerCombackBtn() @@ -34,12 +34,11 @@ <style lang="scss" scoped> .app-main { /* 88 = navbar+baredcrumb */ - min-height: calc(100vh - 88px); + height: calc(100vh - 88px); width: 100%; position: relative; overflow: hidden; >div{ - min-height: calc(100vh - 88px); height: 100%; width: 100%; } -- Gitblit v1.9.3