diff --git a/src/pages/Setup.vue b/src/pages/Setup.vue index 9629e7b..daa43f0 100644 --- a/src/pages/Setup.vue +++ b/src/pages/Setup.vue @@ -98,9 +98,9 @@ export default { if (this.value === '1') { this.$router.push('/home') } else if (this.value === '2') { - this.$router.push('/pressprod') + this.$router.push('/boardindex/pressprod') } else if (this.value === '3') { - this.$router.push('/SortWorkMonitor') + this.$router.push('/boardindex/sortwork') } let element = document.documentElement if (this.fullscreen) { diff --git a/src/pages/modules/board/DryTask.vue b/src/pages/modules/board/DryTask.vue new file mode 100644 index 0000000..4fb6a0a --- /dev/null +++ b/src/pages/modules/board/DryTask.vue @@ -0,0 +1,6 @@ + diff --git a/src/pages/modules/PressProd.vue b/src/pages/modules/board/PressProd.vue similarity index 80% rename from src/pages/modules/PressProd.vue rename to src/pages/modules/board/PressProd.vue index e628a7d..54a9df1 100644 --- a/src/pages/modules/PressProd.vue +++ b/src/pages/modules/board/PressProd.vue @@ -1,112 +1,103 @@ + + diff --git a/src/router/index.js b/src/router/index.js index 2c5898a..c5a37d3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3,8 +3,9 @@ import Router from 'vue-router' const Setup = r => require.ensure([], () => r(require('@page/Setup')), 'Setup') const home = r => require.ensure([], () => r(require('@page/modules/home/index')), 'home') -const PressProd = r => require.ensure([], () => r(require('@page/modules/PressProd')), 'PressProd') -const SortWorkMonitor = r => require.ensure([], () => r(require('@page/modules/SortWorkMonitor')), 'SortWorkMonitor') +const boardIndex = r => require.ensure([], () => r(require('@page/modules/board/index')), 'boardIndex') +const PressProd = r => require.ensure([], () => r(require('@page/modules/board/PressProd')), 'PressProd') +const SortWorkMonitor = r => require.ensure([], () => r(require('@page/modules/board/SortWorkMonitor')), 'SortWorkMonitor') Vue.use(Router) @@ -24,12 +25,17 @@ export default new Router({ component: home }, { - path: '/pressprod', - component: PressProd - }, - { - path: '/SortWorkMonitor', - component: SortWorkMonitor + path: '/boardindex', + component: boardIndex, + children: [{ + path: 'pressprod', + component: PressProd, + meta: {title: '压制生产看板'} + }, { + path: 'sortwork', + component: SortWorkMonitor, + meta: {title: '分拣作业监控'} + }] } ] })