sheng/mes-ui-d2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source 
Former-commit-id: b5687ea01f2dcebfff6b8406754ac98e26ec93e0 [formerly b5687ea01f2dcebfff6b8406754ac98e26ec93e0 [formerly b5687ea01f2dcebfff6b8406754ac98e26ec93e0 [formerly b5687ea01f2dcebfff6b8406754ac98e26ec93e0 [formerly 5d2850b106dc1b50203c5ccd07aeaaf5e64abefb [formerly c47bfaf61c987bdcbd67d5ff33cee57ceb85520e]]]]]
Former-commit-id: 88ba97f79d648bb483a7c17f2b5acc9f52094937
Former-commit-id: 0abca3842a16aec2ddac7b1f4c87ee075e14cf82
Former-commit-id: 577aa39857ded4d6c2ebabb1908ec4774522fb9b [formerly 3e1b8940baf7bef31499565c7b3176816622652d]
Former-commit-id: aaced5d0b59d752cd9ae2509f4ac0c9ca53801d4
Former-commit-id: 1d26b050bb8a3d4c0b0ec52ff1b293ac916c9196
Former-commit-id: 5cff9c3ba978c84e295085e17ac0bfaa0094679c
Former-commit-id: d6b793809fb85991daf546fb57ce4618b0136edc
Former-commit-id: b38f8d0b0f421d1b2ab672ec9e02c701bbb1b79c
This commit is contained in:
liyang
2018-12-13 13:24:28 +08:00
parent 15c4cffc65 b2d52bb33c
commit aac8020433
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/layout/header-aside/layout.vue
View File

@@ -81,6 +81,15 @@
</template>
<script>
import d2MenuSide from './components/menu-side'
import d2MenuHeader from './components/menu-header'
import d2Tabs from './components/tabs'
import d2HeaderFullscreen from './components/header-fullscreen'
import d2HeaderSearch from './components/header-search'
import d2HeaderSize from './components/header-size'
import d2HeaderTheme from './components/header-theme'
import d2HeaderUser from './components/header-user'
import d2HeaderErrorLog from './components/header-error-log'
import { mapState, mapGetters, mapActions } from 'vuex'
import mixinSearch from './mixins/search'
export default {
@@ -89,15 +98,15 @@ export default {
mixinSearch
],
components: {
'd2-menu-side': () => import('./components/menu-side'),
'd2-menu-header': () => import('./components/menu-header'),
'd2-tabs': () => import('./components/tabs'),
'd2-header-fullscreen': () => import('./components/header-fullscreen'),
'd2-header-search': () => import('./components/header-search'),
'd2-header-size': () => import('./components/header-size'),
'd2-header-theme': () => import('./components/header-theme'),
'd2-header-user': () => import('./components/header-user'),
'd2-header-error-log': () => import('./components/header-error-log')
d2MenuSide,
d2MenuHeader,
d2Tabs,
d2HeaderFullscreen,
d2HeaderSearch,
d2HeaderSize,
d2HeaderTheme,
d2HeaderUser,
d2HeaderErrorLog
},
data () {
return {