diff --git a/README.md b/README.md index 4103af4..c548adb 100644 --- a/README.md +++ b/README.md @@ -19,3 +19,7 @@ npm run build --report ``` For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader). + +# 注意事项 ++ 晟华中控大屏由18块小屏拼接而成，呈 3x6 分布，外配投屏电脑一台，连接 两个显示器 ++ 分辨率都为 1920 * 1080 \ No newline at end of file diff --git a/index.html b/index.html index 3997652..2841419 100644 --- a/index.html +++ b/index.html @@ -1,3 +1,4 @@ + diff --git a/src/assets/css/reset.css b/src/assets/css/reset.css index 20a2b0e..1428518 100644 --- a/src/assets/css/reset.css +++ b/src/assets/css/reset.css @@ -81,10 +81,7 @@ li { html, body { width: 100%; height: 100%; - /* min-width: 1440px; - min-height: 789px; */ width: 1920px; - /* width: 3840px; */ height: 1080px; } diff --git a/src/pages/DeviceMonitor.vue b/src/pages/DeviceMonitor.vue deleted file mode 100644 index 93332c4..0000000 --- a/src/pages/DeviceMonitor.vue +++ /dev/null @@ -1,754 +0,0 @@ - - - - - diff --git a/src/pages/HomePage.vue b/src/pages/HomePage.vue deleted file mode 100644 index 35cd191..0000000 --- a/src/pages/HomePage.vue +++ /dev/null @@ -1,1416 +0,0 @@ - - - - - diff --git a/src/pages/LogisticsTech.vue b/src/pages/LogisticsTech.vue deleted file mode 100644 index 1f32ce3..0000000 --- a/src/pages/LogisticsTech.vue +++ /dev/null @@ -1,877 +0,0 @@ - - - - - diff --git a/src/pages/ProdCount.vue b/src/pages/ProdCount.vue deleted file mode 100644 index 038b9c8..0000000 --- a/src/pages/ProdCount.vue +++ /dev/null @@ -1,536 +0,0 @@ - - - - - diff --git a/src/pages/ProdCount2.vue b/src/pages/ProdCount2.vue deleted file mode 100644 index dd8acf7..0000000 --- a/src/pages/ProdCount2.vue +++ /dev/null @@ -1,743 +0,0 @@ - - - - - diff --git a/src/pages/Setup.vue b/src/pages/Setup.vue index aa2b1ff..094ce4d 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: '首页-右'}, {index: '3', label: '混碾困料-左'}, {index: '4', label: '混碾困料-右'}, {index: '5', label: '成型-左'}, {index: '6', label: '成型-右'}, {index: '7', label: '烧制干燥-左'}, {index: '8', label: '烧制干燥-右'}, {index: '9', label: '分拣包装-左'}, {index: '10', label: '分拣包装-右'}, {index: '11', label: '工序生产-左'}, {index: '12', label: '工序生产-右'}], + option: [{index: '13', label: '新-左'}, {index: '14', label: '新-右'}, {index: '1', label: '首页-左'}, {index: '2', label: '首页-右'}, {index: '3', label: '混碾困料-左'}, {index: '4', label: '混碾困料-右'}, {index: '5', label: '成型-左'}, {index: '6', label: '成型-右'}, {index: '7', label: '烧制干燥-左'}, {index: '8', label: '烧制干燥-右'}, {index: '9', label: '分拣包装-左'}, {index: '10', label: '分拣包装-右'}, {index: '11', label: '工序生产-左'}, {index: '12', label: '工序生产-右'}], index: this.$store.getters.equipId, baseUrl: this.$store.getters.baseUrl, setTime: this.$store.getters.setTime / 1000, @@ -90,7 +90,11 @@ export default { equipId: this.index } this.$store.dispatch('setConfig', obj) - if (this.index === '1') { + if (this.index === '13') { + this.$router.push('/lindex') + } else if (this.index === '14') { + this.$router.push('/rindex') + } else if (this.index === '1') { this.$router.push('/homepageone') } else if (this.index === '2') { this.$router.push('/homepagetwo') diff --git a/src/pages/StorageMonitor.1.vue b/src/pages/StorageMonitor.1.vue deleted file mode 100644 index ed64051..0000000 --- a/src/pages/StorageMonitor.1.vue +++ /dev/null @@ -1,647 +0,0 @@ - - - - - diff --git a/src/pages/StorageMonitor.vue b/src/pages/StorageMonitor.vue deleted file mode 100644 index 1008ac2..0000000 --- a/src/pages/StorageMonitor.vue +++ /dev/null @@ -1,850 +0,0 @@ - - - - - diff --git a/src/pages/StorageMonitor2.vue b/src/pages/StorageMonitor2.vue deleted file mode 100644 index bfdb0b5..0000000 --- a/src/pages/StorageMonitor2.vue +++ /dev/null @@ -1,754 +0,0 @@ - - - - - diff --git a/src/pages/StorageMonitor2bf.vue b/src/pages/StorageMonitor2bf.vue deleted file mode 100644 index fc6cd07..0000000 --- a/src/pages/StorageMonitor2bf.vue +++ /dev/null @@ -1,684 +0,0 @@ - - - - - diff --git a/src/pages/Test.vue b/src/pages/Test.vue deleted file mode 100644 index 22931da..0000000 --- a/src/pages/Test.vue +++ /dev/null @@ -1,527 +0,0 @@ - - - - - diff --git a/src/pages/Test2.vue b/src/pages/Test2.vue deleted file mode 100644 index 2dd04fc..0000000 --- a/src/pages/Test2.vue +++ /dev/null @@ -1,345 +0,0 @@ - - - - - diff --git a/src/pages/Testscreen.vue b/src/pages/Testscreen.vue deleted file mode 100644 index b2597d8..0000000 --- a/src/pages/Testscreen.vue +++ /dev/null @@ -1,49 +0,0 @@ - - - - - diff --git a/src/pages/modules/new/left/index.vue b/src/pages/modules/new/left/index.vue new file mode 100644 index 0000000..b751003 --- /dev/null +++ b/src/pages/modules/new/left/index.vue @@ -0,0 +1,69 @@ + + + + + diff --git a/src/pages/modules/new/left/left.vue b/src/pages/modules/new/left/left.vue new file mode 100644 index 0000000..47f5aef --- /dev/null +++ b/src/pages/modules/new/left/left.vue @@ -0,0 +1,9 @@ + + + diff --git a/src/pages/modules/new/left/right.vue b/src/pages/modules/new/left/right.vue new file mode 100644 index 0000000..6a26961 --- /dev/null +++ b/src/pages/modules/new/left/right.vue @@ -0,0 +1,9 @@ + + + diff --git a/src/pages/modules/new/right/index.vue b/src/pages/modules/new/right/index.vue new file mode 100644 index 0000000..57b3d89 --- /dev/null +++ b/src/pages/modules/new/right/index.vue @@ -0,0 +1,69 @@ + + + + + diff --git a/src/pages/modules/new/right/left.vue b/src/pages/modules/new/right/left.vue new file mode 100644 index 0000000..47f5aef --- /dev/null +++ b/src/pages/modules/new/right/left.vue @@ -0,0 +1,9 @@ + + + diff --git a/src/pages/modules/new/right/right.vue b/src/pages/modules/new/right/right.vue new file mode 100644 index 0000000..6a26961 --- /dev/null +++ b/src/pages/modules/new/right/right.vue @@ -0,0 +1,9 @@ + + + diff --git a/src/router/index.js b/src/router/index.js index 07361c1..e81911a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,13 +1,10 @@ import Vue from 'vue' import Router from 'vue-router' -const Test = r => require.ensure([], () => r(require('@page/Testscreen')), 'Testscreen') const Setup = r => require.ensure([], () => r(require('@page/Setup')), 'Setup') -const HomePage = r => require.ensure([], () => r(require('@page/HomePage')), 'HomePage') -const StorageMonitor = r => require.ensure([], () => r(require('@page/StorageMonitor2')), 'StorageMonitor') -const DeviceMonitor = r => require.ensure([], () => r(require('@page/DeviceMonitor')), 'DeviceMonitor') -const LogisticsTech = r => require.ensure([], () => r(require('@page/LogisticsTech')), 'LogisticsTech') -const ProdCount = r => require.ensure([], () => r(require('@page/ProdCount2')), 'ProdCount') +const lIndex = r => require.ensure([], () => r(require('@page/modules/new/left/index')), 'newscreen') +const rIndex = r => require.ensure([], () => r(require('@page/modules/new/right/index')), 'newscreen') + Vue.use(Router) const HomePageOne = r => require.ensure([], () => r(require('@page/modules/homepage/one')), 'HomePageOne') @@ -39,6 +36,14 @@ export default new Router({ path: '/setup', component: Setup }, + { + path: '/lindex', + component: lIndex + }, + { + path: '/rindex', + component: rIndex + }, { path: '/homepageone', component: HomePageOne @@ -91,30 +96,6 @@ export default new Router({ path: '/sortpacktwo', component: SortPackTwo }, - { - path: '/homepage', - component: HomePage - }, - { - path: '/storagemonitor', - component: StorageMonitor - }, - { - path: '/devicemonitor', - component: DeviceMonitor - }, - { - path: '/logisticstech', - component: LogisticsTech - }, - { - path: '/prodcount', - component: ProdCount - }, - { - path: '/test', - component: Test - }, { path: '/shunheDemo', component: shunheDemo