diff --git a/pages.json b/pages.json index 9d89d0e..b8226ce 100644 --- a/pages.json +++ b/pages.json @@ -202,6 +202,20 @@ } } + ,{ + "path" : "pages/wb/taskcarry", + "style" : + { + "navigationStyle": "custom" + } + } + ,{ + "path" : "pages/wb/taskmanage", + "style" : + { + "navigationStyle": "custom" + } + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/home/home.1.vue b/pages/home/home.1.vue new file mode 100644 index 0000000..df00373 --- /dev/null +++ b/pages/home/home.1.vue @@ -0,0 +1,248 @@ + + + + + diff --git a/pages/home/home.vue b/pages/home/home.vue index 8984641..83c7ed4 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -15,24 +15,14 @@ - - + + {{e.title}} - - - {{title}} - - - {{e.title}} - - - - @@ -42,55 +32,27 @@ return { userName: '', menuList: [ - {title: '通用功能', path: 'RF06', sonTree: [ - {title: '入库组箱', path: '/pages/General/warehouse-box'}, - {title: '配送组箱', path: '/pages/General/distribution-box'}, - {title: '点对点转运', path: '/pages/General/line-transfer'}, - {title: '确认取放货', path: '/pages/General/pick-place-goods'}, - {title: '作业管理', path: '/pages/General/ops-mgmt'}, - {title: '点位更新', path: '/pages/General/pt-update'} - ]}, - {title: '小料箱功能', path: 'RF03', sonTree: [ - {title: '空载具出库', path: '/pages/Material/kzj-out-store'}, - {title: '空载具入库', path: '/pages/Material/kzj-in-store'}, - {title: '小料箱入库', path: '/pages/Material/xlx-in-store'} - ]}, - {title: '大料箱功能', path: 'RF04', sonTree: [ - {title: '空载具出入库', path: '/pages/Material/kzj-inout-store'}, - {title: '料箱入库', path: '/pages/Material/lx-in-store'}, - {title: '物料入库', path: '/pages/Material/mater-in-store'}, - {title: '大料箱出库', path: '/pages/Material/dlx-out-store'}, - {title: '退库确认', path: '/pages/Material/tuiku-confirm'}, - {title: '大料箱移库', path: '/pages/Material/dlx-move-store'}, - {title: '大料箱盘库', path: '/pages/Material/dlx-pan-store'} - ]} + {title: '任务下发', icon: 'RF03', path: '/pages/wb/taskcarry'}, + {title: '任务管理', icon: 'RF02', path: '/pages/wb/taskmanage'} ], show: false, - secM: [], - icon: '', - title: '' + secM: [] }; }, created () { + this.$store.dispatch('setPublicObj', '') if (this.$store.getters.userInfo) { this.userName = JSON.parse(this.$store.getters.userInfo).username } }, methods: { - toPage1 (e) { - if (e.sonTree.length > 0) { - this.show = true - this.secM = e.sonTree - - this.icon = e.path - this.title = e.title - } + async _authority () { + let res = await authority() + this.menuList = [...res.sonTree] + }, - toPage2 (e) { + toPage (e) { let url = e.path + '?title=' + e.title - if (e.active === false) { - return - } uni.redirectTo({ url: url }) @@ -100,11 +62,6 @@ uni.redirectTo({ url: '/pages/login/login' }) - }, - toTest () { - uni.redirectTo({ - url: '/pages/test' - }) } } } @@ -190,57 +147,4 @@ .menu-name _font(28rpx, 38rpx, #444,,center) padding 0 20rpx -.sec_menu_wraper - position fixed - bottom 0 - left 0 - width 100% - background-color #f4f5f5 - box-shadow 0 -8px 16px 0 rgba(28,31,33,.1) - border-top-left-radius 20rpx - border-top-right-radius 20rpx - z-index 2017 - transition all .3s -.modal - position fixed - bottom 0 - left 0 - _wh(100%, 100%) - background-color rgba(0,0,0,0.8) - z-index 2010 -.sec_menu_w - width calc(100% - 76rpx) - margin 30rpx auto 60rpx auto - _fj(flex-start) - flex-wrap wrap -.sec_menu-item - _wh(30%, 120rpx) - margin-bottom 20rpx - border-radius 10rpx - background-size 40% auto - background-position right 90% - background-repeat no-repeat - &:nth-child(3n+2) - margin-left 5% - margin-right 5% - &:nth-child(5n+1) .menu-name_inner - background linear-gradient(to right, rgba(73,102,255,0.8) 0%, rgba(117,142,255,0.8) 100%) - &:nth-child(5n+2) .menu-name_inner - background linear-gradient(to right, rgba(254, 168, 20,0.8) 0%, rgba(255, 177, 1,0.8) 100%) - &:nth-child(5n+3) .menu-name_inner - background linear-gradient(to right, rgba(0, 228, 153,0.8) 0%, rgba(0, 241, 197,0.8) 100%) - &:nth-child(5n+4) .menu-name_inner - background linear-gradient(to right, rgba(196, 5, 219,0.8) 0%, rgba(183,120,190,0.8) 100%) - &:nth-child(5n+5) .menu-name_inner - background linear-gradient(to right, rgba(146, 94, 52,0.8) 0%, rgba(162, 116, 79,0.8) 100%) -.menu-name_inner - _wh(100%, 100%) - _fj(center) - _font(28rpx, 30rpx, #fff, 700, center) - border-radius 10rpx - padding 10rpx - overflow hidden -.pop-title - margin 60rpx 38rpx 0 38rpx - _font(30rpx, 60rpx, #000,700,center) diff --git a/pages/login/setup.vue b/pages/login/setup.vue index 6a0773d..bc95059 100644 --- a/pages/login/setup.vue +++ b/pages/login/setup.vue @@ -7,10 +7,10 @@ 服务器地址 - + + + + + + + 起始区域 + + + + + + + + 目标区域 + + + + + + + + 起点点位 + + + + + + + + 目标点位 + + + + + + + + + + + + + + + + + diff --git a/pages/wb/taskmanage.vue b/pages/wb/taskmanage.vue new file mode 100644 index 0000000..4bd2204 --- /dev/null +++ b/pages/wb/taskmanage.vue @@ -0,0 +1,111 @@ + + + + + \ No newline at end of file diff --git a/utils/getData3.js b/utils/getData3.js new file mode 100644 index 0000000..c97b4f9 --- /dev/null +++ b/utils/getData3.js @@ -0,0 +1,65 @@ +import request from './request.js' + +// 版本更新测试 +export const pdaUpdate = () => request({ + url:'api/pda/update' +}) +// export const pdaUpdate = () => { +// let res = { +// versionName: '1.0.1', +// url: 'https://mp-e979e0eb-882b-42b3-a4a1-923ad08ea194.cdn.bspapp.com/cloudstorage/f72ec59f-7b25-487d-a034-fead1b6654c6.apk' +// } +// return res +// } + +// 登录 +export const handLogin = (user, password) => request({ + url:'mobile/auth/login', + data: { + username: user, + password: password + } +}) + +/** + * 任务下发 + */ +// 一、生成任务 +export const callTask = (scode, ncode, type) => request({ + url:'api/hand/callTask', + data: { + start_device_code: scode, + next_device_code: ncode, + task_type: type + } +}) +// 二、查询区域 +export const queryArea = () => request({ + url:'api/hand/queryArea', + data: {} +}) +// 三、查询区域站点 +export const queryPointByArea = (rcode) => request({ + url:'api/hand/queryPointByArea', + data: { + region_code: rcode + } +}) + + +/** + * 任务管理 + */ +// 四、查询未完成任务 +export const querytasks = () => request({ + url:'api/hand/tasks', + data: {} +}) +// 五、任务操作 +export const taskoperation = (id, type) => request({ + url:'api/hand/taskoperation', + data: { + task_uuid: id, + type: type + } +})