diff --git a/src/assets/css/reset.css b/src/assets/css/reset.css index a2975fa..551e160 100644 --- a/src/assets/css/reset.css +++ b/src/assets/css/reset.css @@ -79,7 +79,7 @@ li { -webkit-border-radius: 6px; } -/* 顺安大屏尺寸1920*1200 */ +/* 马钢大屏尺寸1920*1200 */ html, body { /* width: 100%; height: 100%; diff --git a/src/pages/Setup.vue b/src/pages/Setup.vue index f2afbcf..ad6ab6d 100644 --- a/src/pages/Setup.vue +++ b/src/pages/Setup.vue @@ -98,14 +98,7 @@ export default { // equipId: this.active } this.$store.dispatch('setConfig', obj) - this.$router.push('/LogisticsProcess') - // this.$router.push('/MonitoringScreen') - // this.$router.push('/HomeScreen') - // if (this.active === '0') { - // this.$router.push('/MonitoringScreen') - // } else { - // this.$router.push('/devicescreen') - // } + this.$router.push('/prodcount') let element = document.documentElement if (this.fullscreen) { if (document.exitFullscreen) { diff --git a/src/pages/proj/ProdCount.vue b/src/pages/proj/ProdCount.vue new file mode 100644 index 0000000..a89d8a3 --- /dev/null +++ b/src/pages/proj/ProdCount.vue @@ -0,0 +1,685 @@ + + + + + diff --git a/src/pages/shunhe/LogisticsProcess.vue b/src/pages/shunhe/LogisticsProcess.vue deleted file mode 100644 index 3c5b138..0000000 --- a/src/pages/shunhe/LogisticsProcess.vue +++ /dev/null @@ -1,864 +0,0 @@ - - - - - diff --git a/src/pages/shunhe/ProdCount.vue b/src/pages/shunhe/ProdCount.vue deleted file mode 100644 index 86b86bc..0000000 --- a/src/pages/shunhe/ProdCount.vue +++ /dev/null @@ -1,761 +0,0 @@ - - - - - diff --git a/src/pages/shunhe/StorageMonitor.vue b/src/pages/shunhe/StorageMonitor.vue deleted file mode 100644 index a2887bb..0000000 --- a/src/pages/shunhe/StorageMonitor.vue +++ /dev/null @@ -1,1197 +0,0 @@ - - - - - diff --git a/src/pages/shunhe/StorageMonitor0.vue b/src/pages/shunhe/StorageMonitor0.vue deleted file mode 100644 index 056206b..0000000 --- a/src/pages/shunhe/StorageMonitor0.vue +++ /dev/null @@ -1,687 +0,0 @@ - - - - - diff --git a/src/pages/shunhe/StorageMonitor822.vue b/src/pages/shunhe/StorageMonitor822.vue deleted file mode 100644 index f489aba..0000000 --- a/src/pages/shunhe/StorageMonitor822.vue +++ /dev/null @@ -1,852 +0,0 @@ - - - - - diff --git a/src/pages/shunhe/StorageMonitorOld.vue b/src/pages/shunhe/StorageMonitorOld.vue deleted file mode 100644 index 5e5fbad..0000000 --- a/src/pages/shunhe/StorageMonitorOld.vue +++ /dev/null @@ -1,796 +0,0 @@ - - - - - diff --git a/src/pages/shunhe/Testkb.vue b/src/pages/shunhe/Testkb.vue deleted file mode 100644 index 1ba1ae5..0000000 --- a/src/pages/shunhe/Testkb.vue +++ /dev/null @@ -1,215 +0,0 @@ - - - - - diff --git a/src/router/index.js b/src/router/index.js index de39d9e..13e6b18 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,9 +7,7 @@ const DeviceScreen = r => require.ensure([], () => r(require('@page/DeviceScreen const WorkshopScreen = r => require.ensure([], () => r(require('@page/WorkshopScreen')), 'WorkshopScreen') const HomeScreen = r => require.ensure([], () => r(require('@page/HomeScreen')), 'HomeScreen') -const ProdCount = r => require.ensure([], () => r(require('@page/shunhe/ProdCount')), 'ProdCount') -const StorageMonitor = r => require.ensure([], () => r(require('@page/shunhe/StorageMonitor')), 'StorageMonitor') -const LogisticsProcess = r => require.ensure([], () => r(require('@page/shunhe/LogisticsProcess')), 'LogisticsProcess') +const ProdCount = r => require.ensure([], () => r(require('@page/proj/ProdCount')), 'ProdCount') Vue.use(Router) @@ -43,14 +41,6 @@ export default new Router({ { path: '/ProdCount', component: ProdCount - }, - { - path: '/StorageMonitor', - component: StorageMonitor - }, - { - path: '/LogisticsProcess', - component: LogisticsProcess } ] })