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

* feature/停复机1:
  消息通知组件

# Conflicts:
#	src/components/layout/index.vue

src/components/layout/index.vue

 <template>
+  <div>
+    <notice />
     <div class="hb-layout" 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>
@@ -13,6 +15,7 @@
       </div>
       <expire-dialog :visible.sync="showExpireDialog" :expireData="expireData"></expire-dialog>
     </div>
+  </div>
 </template>
 
 <script>