From f934de5bf5fae15b9d79061e9fe3441aeb13d394 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 21 八月 2023 18:03:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-before

---
 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 5932228..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()
     }
   }
 }
@@ -27,13 +33,12 @@
 
 <style lang="scss" scoped>
 .app-main {
-  /*88 = navbar+baredcrumb  */
-  min-height: calc(100vh - 88px);
+  /* 88 = navbar+baredcrumb  */
+  height: calc(100vh - 88px);
   width: 100%;
   position: relative;
   overflow: hidden;
   >div{
-    min-height: calc(100vh - 88px);
     height: 100%;
     width: 100%;
   }

--
Gitblit v1.9.3