From e132d7d87ff834eb231bd39c82c3be22bae2d80b Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 28 八月 2023 09:10:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/layout/components/AppMain.vue | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index e9e0b9f..f0ae826 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -16,10 +16,16 @@
},
methods: {
childMethod(){
- this.$refs.child.combackLookPlan()
+ this.$refs.child.combackLookPlan()
},
triggerMainBtnPlan(){
this.$parent.triggerCombackBtn()
+ },
+ mainAdd(){
+ this.$refs.child.measureAdd()
+ },
+ mainShowAdd(){
+ this.$parent.showIndexAdd()
}
}
}
@@ -28,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