diff --git a/src/images/screen1/tip.png b/src/images/screen1/tip.png deleted file mode 100644 index 0db0dd6..0000000 Binary files a/src/images/screen1/tip.png and /dev/null differ diff --git a/src/pages/Setup.vue b/src/pages/Setup.vue index 8f703fd..e44db13 100644 --- a/src/pages/Setup.vue +++ b/src/pages/Setup.vue @@ -68,7 +68,7 @@ export default { return { loginname: '', password: '', - options: [{value: '1', label: '大屏'}, {value: '2', label: '压制生产看板'}, {value: '3', label: '分拣作业监控'}, {value: '4', label: '干燥作业监控'}], + options: [{value: '1', label: '大屏'}, {value: '2', label: '压制生产看板'}, {value: '3', label: '分拣作业监控'}, {value: '4', label: '干燥作业监控'}, {value: '5', label: '料仓监控'}], value: this.$store.getters.equipId, baseUrl: this.$store.getters.baseUrl, setTime: this.$store.getters.setTime / 1000, @@ -103,6 +103,8 @@ export default { this.$router.push('/boardindex/sortwork') } else if (this.value === '4') { this.$router.push('/boardindex/drytask') + } else if (this.value === '5') { + this.$router.push('/boardindex/stockbin') } let element = document.documentElement if (this.fullscreen) { diff --git a/src/pages/modules/board/DryTask_back.vue b/src/pages/modules/board/DryTask_back.vue new file mode 100644 index 0000000..23b8355 --- /dev/null +++ b/src/pages/modules/board/DryTask_back.vue @@ -0,0 +1,229 @@ + + + + + \ No newline at end of file diff --git a/src/pages/modules/board/StockBin.vue b/src/pages/modules/board/StockBin.vue new file mode 100644 index 0000000..9301925 --- /dev/null +++ b/src/pages/modules/board/StockBin.vue @@ -0,0 +1,174 @@ + + + + diff --git a/src/pages/modules/home/index.vue b/src/pages/modules/home/index.vue index cd56188..fd3a54c 100644 --- a/src/pages/modules/home/index.vue +++ b/src/pages/modules/home/index.vue @@ -155,7 +155,7 @@ export default { }, data () { return { - options: [{value: 1, label: '压制生产看板'}, {value: 2, label: '分拣作业监控'}, {value: 3, label: '干燥作业监控'}], + options: [{value: 1, label: '压制生产看板'}, {value: 2, label: '分拣作业监控'}, {value: 3, label: '干燥作业监控'}, {value: 4, label: '料仓监控'}], value: '', interTime: this.$store.getters.setTime, timer: null, @@ -223,6 +223,8 @@ export default { this.$router.push('/boardindex/sortwork') } else if (this.value === 3) { this.$router.push('/boardindex/drytask') + } else if (this.value === 4) { + this.$router.push('/boardindex/stockbin') } }, refresh () { diff --git a/src/router/index.js b/src/router/index.js index a896ce5..3c359d4 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,6 +7,7 @@ const boardIndex = r => require.ensure([], () => r(require('@page/modules/board/ const PressProd = r => require.ensure([], () => r(require('@page/modules/board/PressProd')), 'PressProd') const SortWorkMonitor = r => require.ensure([], () => r(require('@page/modules/board/SortWorkMonitor')), 'SortWorkMonitor') const DryTask = r => require.ensure([], () => r(require('@page/modules/board/DryTask')), 'DryTask') +const StockBin = r => require.ensure([], () => r(require('@page/modules/board/StockBin')), 'StockBin') Vue.use(Router) @@ -40,6 +41,10 @@ export default new Router({ path: 'drytask', component: DryTask, meta: {title: '干燥作业监控'} + }, { + path: 'stockbin', + component: StockBin, + meta: {title: '料仓监控'} }] } ]