From 4c4c6475fde41dbee74c6a071a187a47a1c4a243 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期二, 22 八月 2023 09:24:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/layout/components/AppMain.vue | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 4c2c635..f0ae826 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -1,52 +1,52 @@
<template>
<section class="app-main">
<transition name="fade-transform" mode="out-in">
- <router-view
- ref="child"
- @triggerMainBtnPlan="triggerMainBtnPlan"
- :key="key"
- />
+ <router-view ref="child" @triggerMainBtnPlan="triggerMainBtnPlan" :key="key" />
</transition>
</section>
</template>
<script>
export default {
- name: "AppMain",
+ name: 'AppMain',
computed: {
key() {
- return this.$route.path;
- },
+ return this.$route.path
+ }
},
methods: {
- childMethod() {
- this.$refs.child.combackLookPlan();
+ childMethod(){
+ this.$refs.child.combackLookPlan()
},
- triggerMainBtnPlan() {
- this.$parent.triggerCombackBtn();
+ triggerMainBtnPlan(){
+ this.$parent.triggerCombackBtn()
},
- },
-};
+ mainAdd(){
+ this.$refs.child.measureAdd()
+ },
+ mainShowAdd(){
+ this.$parent.showIndexAdd()
+ }
+ }
+}
</script>
<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);
+ >div{
height: 100%;
width: 100%;
}
- ::v-deep .content-main {
- //杩欐槸鎵�鏈夐〉闈㈢殑鍐呰竟璺�
+ ::v-deep .content-main{//杩欐槸鎵�鏈夐〉闈㈢殑鍐呰竟璺�
padding: 24px !important;
}
}
-.fixed-header + .app-main {
+.fixed-header+.app-main {
padding-top: 50px;
}
</style>
@@ -58,7 +58,7 @@
padding-right: 15px;
}
}
-.el-menu--popup {
+.el-menu--popup{
width: 120px;
}
</style>
--
Gitblit v1.9.3