diff --git a/manifest.json b/manifest.json index c9f3aab..7a4f978 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "诺力电源", - "appid" : "__UNI__C550D5E", + "appid" : "__UNI__B3904F7", "description" : "诺力电源手持系统", "versionName" : "1.0.0", "versionCode" : 100, diff --git a/pages.json b/pages.json index 63fc9fa..9429ccf 100644 --- a/pages.json +++ b/pages.json @@ -94,14 +94,21 @@ "navigationStyle": "custom" } } - ,{ - "path" : "pages/modules/pallet-add-record", + ,{ + "path" : "pages/modules/pallet-add-record", "style" : { "navigationStyle": "custom" } - - } + + } + ,{ + "path" : "pages/modules/agv-task", + "style" : + { + "navigationStyle": "custom" + } + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/home/home.vue b/pages/home/home.vue index 035b0ae..47f56c1 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -30,59 +30,23 @@ export default { data() { return { - roles: this.$store.getters.saveRoles, + // roles: this.$store.getters.saveRoles, userName: '', menuList: [] }; }, created () { this.menuList = [ - // {id: '1', name: '人工排产', icon: 'RF01', path: '/pages/modules/man-paichan'}, - // {id: '2', name: '涂线板', icon: 'RF02', path: '/pages/modules/wire-board'}, - // {id: '3', name: '物料库存', icon: 'RF03', path: '/pages/modules/mater-inventory'} - {id: '1', name: '原材料入库', icon: 'RF04', path: '/pages/modules/rawmater-instore'}, - {id: '2', name: '原材料出库', icon: 'RF06', path: '/pages/modules/rawmater-outstore'}, - {id: '3', name: '搬运任务', icon: 'RF07', path: '/pages/modules/carry-task'}, - {id: '4', name: '组盘解绑', icon: 'RF08', path: '/pages/modules/zupan-unbind'}, - {id: '5', name: '指令管理', icon: 'RF01', path: '/pages/modules/zlmanage'}, - {id: '6', name: '任务管理', icon: 'RF09', path: '/pages/modules/taskmanage'}, - {id: '7', name: '异常出库', icon: 'RF10', path: '/pages/modules/error-outstore'}, - {id: '8', name: '托盘号补录', icon: 'RF05', path: '/pages/modules/pallet-add-record'} + {id: '3', name: '搬运任务', icon: 'RF07', path: '/pages/modules/agv-task'}, + // {id: '1', name: '原材料入库', icon: 'RF04', path: '/pages/modules/rawmater-instore'}, + // {id: '2', name: '原材料出库', icon: 'RF06', path: '/pages/modules/rawmater-outstore'}, + // {id: '3', name: '搬运任务', icon: 'RF07', path: '/pages/modules/carry-task'}, + // {id: '4', name: '组盘解绑', icon: 'RF08', path: '/pages/modules/zupan-unbind'}, + // {id: '5', name: '指令管理', icon: 'RF01', path: '/pages/modules/zlmanage'}, + // {id: '6', name: '任务管理', icon: 'RF09', path: '/pages/modules/taskmanage'}, + // {id: '7', name: '异常出库', icon: 'RF10', path: '/pages/modules/error-outstore'}, + // {id: '8', name: '托盘号补录', icon: 'RF05', path: '/pages/modules/pallet-add-record'} ] - if (this.roles === 'A1,A2,') { - this.menuList = [ - // {id: '1', name: '人工排产', icon: 'RF01', path: '/pages/modules/man-paichan'}, - // {id: '2', name: '涂线板', icon: 'RF02', path: '/pages/modules/wire-board'}, - // {id: '3', name: '物料库存', icon: 'RF03', path: '/pages/modules/mater-inventory'} - {id: '1', name: '原材料入库', icon: 'RF03', path: '/pages/modules/rawmater-instore'}, - {id: '2', name: '原材料出库', icon: 'RF07', path: '/pages/modules/rawmater-outstore'}, - {id: '3', name: '搬运任务', icon: 'RF01', path: '/pages/modules/carry-task'}, - {id: '4', name: '组盘解绑', icon: 'RF04', path: '/pages/modules/zupan-unbind'}, - {id: '5', name: '指令管理', icon: 'RF02', path: '/pages/modules/zlmanage'}, - {id: '6', name: '任务管理', icon: 'RF09', path: '/pages/modules/taskmanage'}, - {id: '7', name: '异常出库', icon: 'RF10', path: '/pages/modules/error-outstore'}, - {id: '8', name: '托盘号补录', icon: 'RF05', path: '/pages/modules/pallet-add-record'} - ] - } - if (this.roles === 'A1,') { - this.menuList = [ - {id: '1', name: '原材料入库', icon: 'RF03', path: '/pages/modules/rawmater-instore'}, - {id: '2', name: '原材料出库', icon: 'RF07', path: '/pages/modules/rawmater-outstore'}, - {id: '5', name: '指令管理', icon: 'RF02', path: '/pages/modules/zlmanage'}, - {id: '6', name: '任务管理', icon: 'RF09', path: '/pages/modules/taskmanage'}, - {id: '7', name: '异常出库', icon: 'RF10', path: '/pages/modules/error-outstore'}, - {id: '8', name: '托盘号补录', icon: 'RF05', path: '/pages/modules/pallet-add-record'} - ] - } - if (this.roles === 'A2,') { - this.menuList = [ - {id: '3', name: '搬运任务', icon: 'RF01', path: '/pages/modules/carry-task'}, - {id: '4', name: '组盘解绑', icon: 'RF04', path: '/pages/modules/zupan-unbind'}, - {id: '5', name: '指令管理', icon: 'RF02', path: '/pages/modules/zlmanage'}, - {id: '6', name: '任务管理', icon: 'RF09', path: '/pages/modules/taskmanage'}, - {id: '7', name: '异常出库', icon: 'RF10', path: '/pages/modules/error-outstore'} - ] - } this.$store.dispatch('setPublicObj', '') if (this.$store.getters.userInfo) { this.userName = JSON.parse(this.$store.getters.userInfo).username diff --git a/pages/modules/agv-task.vue b/pages/modules/agv-task.vue new file mode 100644 index 0000000..04a0641 --- /dev/null +++ b/pages/modules/agv-task.vue @@ -0,0 +1,139 @@ + + + + +