Commit 3a7c3e01 by 曾经

Merge branch 'feature/停复机' into dev

* feature/停复机:
  调试
parents 29d5d261 014d6b32
<template>
<div>
<notice></notice>
<div class="notice-placeholder"></div>
<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>
......@@ -20,7 +21,7 @@
</template>
<script>
import Notice from '@/components/notice/notice.vue';
import Notice from '../notice/notice.vue';
import { getRequest } from '@/api/api.js';
import errorMsg from '@/common/js/error.js';
import MainMenu from './main-menu.vue';
......
<template>
<div>
<div class="notice-box">
<el-alert v-if="showNotice" class="notice-box" type="warning" show-icon @close="onClose">
<div class="notice-content" slot="title">
<div
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment