From 6dd2ed2eb744d085130554abed50ca1a98c8c508 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期一, 21 八月 2023 09:16:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/layout/components/AppMain.vue | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index e9e0b9f..48fea47 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -20,6 +20,12 @@
},
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