diff --git a/src/pages/Setup.vue b/src/pages/Setup.vue index 9d7e596..17bf297 100644 --- a/src/pages/Setup.vue +++ b/src/pages/Setup.vue @@ -62,7 +62,7 @@ export default { loginname: '', password: '', // option: [{index: '1', label: '生产统计'}, {index: '2', label: '仓储监控'}, {index: '3', label: '设备监控'}], - option: [{index: '1', label: '工序生产-左'}, {index: '2', label: '工序生产-右'}], + option: [{index: '1', label: '首页-左'}, {index: '2', label: '首页-右'}, {index: '3', label: '工序生产-左'}, {index: '4', label: '工序生产-右'}], index: this.$store.getters.equipId, baseUrl: this.$store.getters.baseUrl, setTime: this.$store.getters.setTime / 1000, @@ -90,6 +90,10 @@ export default { this.$router.push('/homepageone') } else if (this.index === '2') { this.$router.push('/homepagetwo') + } else if (this.index === '3') { + this.$router.push('/pdone') + } else if (this.index === '4') { + this.$router.push('/pdtwo') } // if (this.index === '1') { // this.$router.push('/prodcount') diff --git a/src/pages/modules/homepage/one.vue b/src/pages/modules/processproduction/one.vue similarity index 100% rename from src/pages/modules/homepage/one.vue rename to src/pages/modules/processproduction/one.vue diff --git a/src/pages/modules/homepage/one2.vue b/src/pages/modules/processproduction/one2.vue similarity index 100% rename from src/pages/modules/homepage/one2.vue rename to src/pages/modules/processproduction/one2.vue diff --git a/src/pages/modules/homepage/three.vue b/src/pages/modules/processproduction/three.vue similarity index 100% rename from src/pages/modules/homepage/three.vue rename to src/pages/modules/processproduction/three.vue diff --git a/src/pages/modules/homepage/two.1.vue b/src/pages/modules/processproduction/two.1.vue similarity index 100% rename from src/pages/modules/homepage/two.1.vue rename to src/pages/modules/processproduction/two.1.vue diff --git a/src/pages/modules/homepage/two.vue b/src/pages/modules/processproduction/two.vue similarity index 100% rename from src/pages/modules/homepage/two.vue rename to src/pages/modules/processproduction/two.vue diff --git a/src/pages/modules/homepage/two2.vue b/src/pages/modules/processproduction/two2.vue similarity index 100% rename from src/pages/modules/homepage/two2.vue rename to src/pages/modules/processproduction/two2.vue diff --git a/src/router/index.js b/src/router/index.js index e9707d8..e4503db 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -10,9 +10,9 @@ const LogisticsTech = r => require.ensure([], () => r(require('@page/LogisticsTe const ProdCount = r => require.ensure([], () => r(require('@page/ProdCount2')), 'ProdCount') Vue.use(Router) -const HomePageOne = r => require.ensure([], () => r(require('@page/modules/homepage/one')), 'HomePageOne') -const HomePageTwo = r => require.ensure([], () => r(require('@page/modules/homepage/two')), 'HomePageOne') -const HomePageThree = r => require.ensure([], () => r(require('@page/modules/homepage/three')), 'HomePageThree') +const ProcessProductionOne = r => require.ensure([], () => r(require('@page/modules/processproduction/one')), 'modules') +const ProcessProductionTwo = r => require.ensure([], () => r(require('@page/modules/processproduction/two')), 'modules') +const ProcessProductionThree = r => require.ensure([], () => r(require('@page/modules/processproduction/three')), 'modules') export default new Router({ linkActiveClass: 'tab-active', @@ -26,16 +26,16 @@ export default new Router({ component: Setup }, { - path: '/homepageone', - component: HomePageOne + path: '/pdone', + component: ProcessProductionOne }, { - path: '/homepagetwo', - component: HomePageTwo + path: '/pdtwo', + component: ProcessProductionTwo }, { - path: '/homepagethree', - component: HomePageThree + path: '/pdthree', + component: ProcessProductionThree }, { path: '/homepage',