From 3b3513a1b653af76231ed053cb0d22a362d36876 Mon Sep 17 00:00:00 2001
From: yuyu <1981343953@qq.com>
Date: 星期五, 25 八月 2023 17:33:51 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.110.209:9001/r/lims-before
---
src/layout/components/AppMain.vue | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 5932228..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()
}
}
}
@@ -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