Merge branch 'feature/停复机1' into dev

* feature/停复机1:
  提示 占用 高度计算

src/components/layout/aside-menu.vue

@@ -49,7 +49,7 @@ export default {
   margin-right: 16px;
   padding: 8px 10px;
   width: 190px;
-  height: calc(100vh - 60px);
+  height: calc(100% - 60px);
   box-sizing: border-box;
   overflow-y: auto;
   .aside-menu-list {

src/components/layout/index.vue

 <template>
   <div>
-    <div class="hb-layout" v-loading="fullLoading.visible">
+    <notice @showNotice="_ => (isShowNotice = _)" />
+    <div class="hb-layout" :style="{ height: isShowNotice ? 'calc(100vh - 42px)' : '100vh' }" v-loading="fullLoading.visible">
       <main-menu ref="mainMenu" :menu-list="menuList" :actived-code="activedMenu.length > 0 ? activedMenu[0].menuCode : ''" @showLoading="onShowLoading"></main-menu>
       <aside-menu v-show="showAside" :menu-list="activedMenu.length > 0 ? activedMenu[0].childList : []" :actived-code="activedMenu.length > 2 ? activedMenu[2].menuCode : ''"></aside-menu>
       <div class="hb-layout-content" :style="{ width: showAside ? 'calc(100% - 206px)' : '100%' }">
         <bread-menu v-if="activedMenu.length > 3" :menu-list="activedMenu.slice(2)"></bread-menu>
         <div class="hb-layout-pager" id="hb-layout-pager-one" :style="{ height: activedMenu.length > 3 ? `calc(100% - 30px)` : '100%', 'padding-bottom': pagePaddingBottom }">
-          <notice @showNotice="_ => (isShowNotice = _)" />
           <!-- 页面内容 -->
           <keep-alive :include="keepAlive">
             <router-view :key="$route.path" :brand-id="enterpriseId"></router-view>
@@ -219,7 +219,7 @@ export default {
   overflow-x: auto;
   .hb-layout-content {
     padding-top: 20px;
-    height: calc(100vh - 60px);
+    height: calc(100% - 60px);
     box-sizing: border-box;
     .hb-layout-pager {
       height: 100%;