From 0ba75db34c554959c6bc566a38a22db34913c797 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 06 九月 2023 17:38:49 +0800
Subject: [PATCH] modified: src/views/CNAS/nonConformanceManage/index.vue modified: src/views/CNAS/reviewAnnualPlan/index.vue modified: src/views/CNAS/satisfactionSurveys/index.vue modified: src/views/basicData/index.vue modified: src/views/chart/work/index.vue modified: src/views/experiment/checkTheReport/index.vue modified: src/views/experiment/inspectionApplication/index.vue modified: src/views/experiment/nonConformingFeedback/index.vue modified: src/views/experiment/passRateStatistics/index.vue modified: src/views/experiment/planAssignments/plan.vue modified: src/views/experiment/reportAuditing/index.vue modified: src/views/inspectionManagement/commissionInspection/index.vue modified: src/views/inspectionManagement/reportForInspection/index.vue modified: src/views/laboratory/gather/index.vue modified: src/views/laboratory/ledger/index.vue modified: src/views/laboratory/measure/index.vue modified: src/views/laboratory/personnel/index.vue modified: src/views/laboratory/role/index.vue modified: src/views/message/toDo/index.vue modified: src/views/standardLibrary/index.vue
---
src/layout/components/AppMain.vue | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index b5caf55..f0ae826 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -1,7 +1,7 @@
<template>
<section class="app-main">
<transition name="fade-transform" mode="out-in">
- <router-view :key="key" />
+ <router-view ref="child" @triggerMainBtnPlan="triggerMainBtnPlan" :key="key" />
</transition>
</section>
</template>
@@ -13,6 +13,20 @@
key() {
return this.$route.path
}
+ },
+ methods: {
+ childMethod(){
+ this.$refs.child.combackLookPlan()
+ },
+ triggerMainBtnPlan(){
+ this.$parent.triggerCombackBtn()
+ },
+ mainAdd(){
+ this.$refs.child.measureAdd()
+ },
+ mainShowAdd(){
+ this.$parent.showIndexAdd()
+ }
}
}
</script>
@@ -20,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