From aa6b6371dd191079175319a031062ab098daed7c Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Mon, 12 Dec 2022 16:35:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/getData1.js | 61 +-------- src/config/getData2.js | 185 +++++++++++++-------------- src/pages/login/Home.vue | 16 ++- src/pages/login/Login.vue | 2 +- src/pages/login/Setup.vue | 18 +-- src/pages/proj/PaintTask.vue | 236 +++++++++++++++++++++++++++++++++++ src/router/index.js | 31 +---- src/style/common.styl | 15 ++- src/vuex/modules/com.js | 2 +- 9 files changed, 361 insertions(+), 205 deletions(-) create mode 100644 src/pages/proj/PaintTask.vue diff --git a/src/config/getData1.js b/src/config/getData1.js index 6a41fe8..01fcc93 100644 --- a/src/config/getData1.js +++ b/src/config/getData1.js @@ -1,79 +1,28 @@ -import {post, post2} from '@config/http.js' +import {post2} from '@config/http.js' // import store from '../vuex/store' // 指令管理 // 1.1 查询未完成指令 -export const queryInstraction = (keyword, scode, ncode) => post2('api/hand/insts', { +export const queryInstraction = (keyword, scode, ncode) => post2('api/axg/hand/insts', { keyword: keyword, start_devicecode: scode, next_devicecode: ncode }) // 1.2 指令操作 -export const instOperation = (uuid, type) => post2('api/hand/inst', { +export const instOperation = (uuid, type) => post2('api/axg/hand/inst', { inst_uuid: uuid, type: type }) // 任务管理 // 1.1 查询未完成指令 -export const queryTask = (keyword, scode, ncode) => post2('api/hand/tasks', { +export const queryTask = (keyword, scode, ncode) => post2('api/axg/hand/tasks', { keyword: keyword, start_devicecode: scode, next_devicecode: ncode }) // 1.2 指令操作 -export const taskOperation = (uuid, type) => post2('api/hand/taskoperation', { +export const taskOperation = (uuid, type) => post2('api/axg/hand/taskoperation', { inst_uuid: uuid, type: type }) - -// 送料 -// 1.1查询区域点位 -export const sendMaterialqueryPoint = () => post('api/pda/sendMaterial/queryPoint', {}) -// 1.2送料确定 -export const sendMaterialconfirm = (rid, pid, pcode, qty) => post('api/pda/sendMaterial/confirm', { - region_id: rid, - point_id: pid, - point_code: pcode, - qty: qty -}) - -// 叫料 -// 1.1查询区域点位 -export const callMaterialqueryPoint = () => post('api/pda/callMaterial/queryPoint', {}) -// 1.2叫料确定 -export const callMaterialconfirm = (rid, pid, pcode) => post('api/pda/callMaterial/confirm', { - region_id: rid, - point_id: pid, - point_code: pcode -}) - -// 送空托盘 -// 1.1查询区域点位 -export const sendEmptyqueryPoint = () => post('api/pda/sendEmpty/queryPoint', {}) -// 1.2送托盘确认 -export const sendEmptyconfirm = (rid, pid, pcode, vcode, qty) => post('api/pda/sendEmpty/confirm', { - region_id: rid, - point_id: pid, - point_code: pcode, - vehicle_code: vcode, - qty: qty -}) - -// 呼叫空托盘 -// 1.1查询区域点位 -export const callEmptyqueryPoint = () => post('api/pda/callEmpty/queryPoint', {}) -// 1.2送料确定 -export const callEmptyconfirm = (rid, pid, pcode, qty) => post('api/pda/callEmpty/confirm', { - region_id: rid, - point_id: pid, - point_code: pcode, - qty: qty -}) - -// 组盘-托盘数量绑定 -// 1.1托盘数量绑定确认 -export const emptyAndQtyconfirm = (vcode, qty) => post('api/pda/emptyAndQty/confirm', { - vehicle_code: vcode, - qty: qty -}) diff --git a/src/config/getData2.js b/src/config/getData2.js index e60520d..149dea7 100644 --- a/src/config/getData2.js +++ b/src/config/getData2.js @@ -1,4 +1,4 @@ -import {post, post2} from '@config/http.js' +import {post} from '@config/http.js' // 测试接口返回结果 export const test = () => post('test/1', {}) @@ -18,105 +18,90 @@ export const updatePass = (Rfold, Rfnew) => post('api/pda/updatePass', { RfnewPass: Rfnew }) -/** 呼叫空托盘 */ -// 1.1查询区域 -export const queryArea = () => post('api/pda/callEmpty/queryArea', {}) +/** 任务生成 */ +// 1.1查询设备 +// export const queryDevice = () => post('api/pda/queryDevice', {}) +export const queryDevice = () => { + let res = { + result: [ + { + region_id: '1', + region_code: '1', + region_name: '1111', + deviceArr: [ + { + device_id: '1', + device_code: '1', + device_name: 'aaaa', + seq_num: '11111' + }, + { + device_id: '1', + device_code: '1', + device_name: 'aaaa', + seq_num: '11111' + }, + { + device_id: '1', + device_code: '1', + device_name: 'aaaa', + seq_num: '11111' + }, + { + device_id: '1', + device_code: '1', + device_name: 'aaaa', + seq_num: '11111' + }, { + device_id: '1', + device_code: '1', + device_name: 'aaaa', + seq_num: '11111' + } + ] + }, + { + region_id: '2', + region_code: '1', + region_name: '1111', + deviceArr: [ + { + device_id: '1', + device_code: '1', + device_name: 'aaaa', + seq_num: '11111' + }, + { + device_id: '1', + device_code: '1', + device_name: 'aaaa', + seq_num: '11111' + }, + { + device_id: '1', + device_code: '1', + device_name: 'aaaa', + seq_num: '11111' + }, + { + device_id: '1', + device_code: '1', + device_name: 'aaaa', + seq_num: '11111' + }, { + device_id: '1', + device_code: '1', + device_name: 'aaaa', + seq_num: '11111' + } + ] + } + ] + } + return res +} // 1.2根据区域查询点位 -export const queryPointByArea = (code) => post('api/pda/callEmpty/queryPointByArea', { - area_code: code -}) -// 1.3 呼叫空托盘确定 -export const callEmptyConfirm = (id, code, pname, acode) => post('api/pda/callEmpty/confirm', { - point_id: id, - point_code: code, - point_name: pname, - area_code: acode -}) - -/** 托盘点位绑定 */ -// 1.1查询区域 -export const queryArea1 = () => post('api/pda/sendEmpty/queryArea', {}) -// 1.2根据区域查询点位 -export const queryPointByArea1 = (code) => post('api/pda/sendEmpty/queryPointByArea', { - area_code: code -}) -// 1.2托盘点位绑定确认 -export const bindingConfirm = (code, vcode, status, is) => post('api/pda/binding/confirm', { - point_code: code, - vehicle_code: vcode, - point_status: status, - is_lock: is -}) - -/** 盘点管理 */ -// 1.1查询物料 -export const queryMaterial = (page, size) => post('api/pda/check/queryMaterial', { - page: page, - size: size -}) -// 1.2查询盘点单据 -export const queryIvt = (suuid, tuuid, page, size) => post('api/pda/check/queryIvt', { - sect_uuid: suuid, - struct_uuid: tuuid, - page: page, - size: size -}) -// 1.3盘点确定 -export const checkConfirm = (arr) => post('api/pda/check/confirm', { - JSONarray: arr -}) -// 1.4查询库区 -export const querySectCode = () => post('api/pda/check/querySectCode', {}) -// 1.5查询仓位 -export const queryStructCode = (uuid) => post('api/pda/check/queryStructCode', { - sect_uuid: uuid -}) - -/** 入窑输送线规则 */ -// 1.1根据规则模式查询信息 -export const queryInfo = (mode) => post('api/pda/ruleSetting/queryInfo', { - mode: mode -}) -export const ruleSettingConfirm = (mode, is, JSONArray) => post('api/pda/ruleSetting/confirm', { - mode: mode, - is_used: is, - JSONArray: JSONArray -}) - -/** 托盘物料绑定 */ -// 1.1根据托盘查询信息 -export const queryInfoByVehicle = (code) => post('api/pda/bindingMaterial/queryInfoByVehicle', { - vehicle_code: code -}) -// 1.2确定 -export const bindingMaterialConfirm = (id, code, mname, pcsn, qty, vcode) => post('api/pda/bindingMaterial/confirm', { - material_id: id, - material_code: code, - material_name: mname, - pcsn: pcsn, - qty: qty, - vehicle_code: vcode -}) - -/** 定点任务 */ -// 1.1查询设备起点和终点 -export const queryDevice = () => post2('api/hand/queryDevice', { -}) -// 1.2任务生成 -export const handTask = (type, num, scode, fy, fz, ncode, ty, tz) => post2('api/hand/task', { - task_type: type, - emptypallet_num: num, +export const pdaTask = (scode, ncode) => post('api/pda/task', { start_devicecode: scode, - form_y: fy, - form_z: fz, - next_devicecode: ncode, - to_y: ty, - to_z: tz -}) -// 1.3查询任务类型 -export const taskType = () => post2('api/hand/task_type', { -}) -// 1.4查询货架点位的列、层 -export const storageCode = (code) => post2('api/hand/queryStorageExtra', { - storage_code: code + next_devicecode: ncode }) diff --git a/src/pages/login/Home.vue b/src/pages/login/Home.vue index e2c1d01..0b5fad5 100644 --- a/src/pages/login/Home.vue +++ b/src/pages/login/Home.vue @@ -5,7 +5,7 @@

{{$store.getters.userInfo !== '' ? JSON.parse($store.getters.userInfo).nickName : ''}}

-

欢迎进入永裕手持系统！

+

欢迎进入马钢手持系统！

@@ -16,15 +16,10 @@
    -
  • 任务管理
    • +
  • 任务生成
  • 指令管理
    • -
  • 修改密码
    • -
  • 送料
    • -
  • 叫料
    • -
  • 送空托盘
    • -
  • 呼叫空托盘
    • -
  • 组盘
    • -
  • 定点任务
    • +
  • 任务管理
    • +
@@ -45,6 +40,9 @@ export default { document.getElementsByTagName('body')[0].className = 'bgwhite' this.$store.dispatch('receiveMaterObj', {}) }, + beforeDestroy () { + document.body.removeAttribute('class', 'bgwhite') + }, created () { // this._authority() }, diff --git a/src/pages/login/Login.vue b/src/pages/login/Login.vue index 5f6f0bb..fb9148b 100644 --- a/src/pages/login/Login.vue +++ b/src/pages/login/Login.vue @@ -2,7 +2,7 @@

欢迎来到

-

永裕手持系统！

+

马钢手持系统！

diff --git a/src/pages/login/Setup.vue b/src/pages/login/Setup.vue index b4bc0d5..e2b8982 100644 --- a/src/pages/login/Setup.vue +++ b/src/pages/login/Setup.vue @@ -26,11 +26,11 @@
  • 单据打印地址: -
    • + -->
  • 刷新时间(s): - -
    • --> + +
    @@ -49,7 +49,7 @@ export default { imgip: this.$store.getters.imgip, printip: this.$store.getters.printUrl || 'http://10.5.29.104:8000', billPrintip: this.$store.getters.billPrintUrl || 'http://10.5.29.191:8000', - setTime: this.$store.getters.setTime, + setTime: this.$store.getters.setTime / 1000, factid: '1', storeid: '1' } @@ -80,10 +80,10 @@ export default { // this.toast('请填写单据打印地址') // return // } - // if (this.setTime === '') { - // this.toast('请填写刷新时间') - // return - // } + if (this.setTime === '') { + this.toast('请填写刷新时间') + return + } // 删除id为printid的DOM节点 // var printid = document.getElementById('printid') // if (printid) { @@ -113,7 +113,7 @@ export default { this.$store.dispatch('setImgIp', this.imgip) this.$store.dispatch('setPrintUrl', this.printip) this.$store.dispatch('setBillPrintUrl', this.billPrintip) - this.$store.dispatch('setRefreshTime', this.setTime) + this.$store.dispatch('setRefreshTime', this.setTime * 1000) this.$router.push('/login') } } diff --git a/src/pages/proj/PaintTask.vue b/src/pages/proj/PaintTask.vue new file mode 100644 index 0000000..7962461 --- /dev/null +++ b/src/pages/proj/PaintTask.vue @@ -0,0 +1,236 @@ + + + + + diff --git a/src/router/index.js b/src/router/index.js index bbbce5b..e648ffc 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -10,12 +10,7 @@ const Setup = r => require.ensure([], () => r(require('../pages/login/Setup')), const Password = r => require.ensure([], () => r(require('../pages/proj/Password')), 'Password') const TaskManage = r => require.ensure([], () => r(require('../pages/proj/TaskManage')), 'TaskManage') const ZlManage = r => require.ensure([], () => r(require('../pages/proj/ZlManage')), 'ZlManage') -const SendMater = r => require.ensure([], () => r(require('../pages/proj/SendMater')), 'SendMater') -const EquipCallMater = r => require.ensure([], () => r(require('../pages/proj/EquipCallMater')), 'EquipCallMater') -const SendEmptyPallet = r => require.ensure([], () => r(require('../pages/proj/SendEmptyPallet')), 'SendEmptyPallet') -const CallEmptyPallet = r => require.ensure([], () => r(require('../pages/proj/CallEmptyPallet')), 'CallEmptyPallet') -const GroupPallet = r => require.ensure([], () => r(require('../pages/proj/GroupPallet')), 'GroupPallet') -const FixedPointTask = r => require.ensure([], () => r(require('../pages/proj/FixedPointTask')), 'FixedPointTask') +const PaintTask = r => require.ensure([], () => r(require('../pages/proj/PaintTask')), 'PaintTask') Vue.use(Router) @@ -61,28 +56,8 @@ export default new Router({ component: ZlManage }, { - path: '/SendMater', // 送料 - component: SendMater - }, - { - path: '/EquipCallMater', // 叫料 - component: EquipCallMater - }, - { - path: '/SendEmptyPallet', // 送空托盘 - component: SendEmptyPallet - }, - { - path: '/CallEmptyPallet', // 呼叫空托盘 - component: CallEmptyPallet - }, - { - path: '/GroupPallet', // 组盘 - component: GroupPallet - }, - { - path: '/FixedPointTask', // 定点任务 - component: FixedPointTask + path: '/PaintTask', // 任务生成 + component: PaintTask } ], scrollBehavior (to, from, savedPosition) { diff --git a/src/style/common.styl b/src/style/common.styl index 15a7218..2514125 100644 --- a/src/style/common.styl +++ b/src/style/common.styl @@ -548,4 +548,17 @@ header .el-radio__input.is-checked+.el-radio__label color#323232 .el-radio__inner:hover - border-color: $red \ No newline at end of file + border-color: $red + +// 状态 +.icons + height .8rem +.item_icon + _fj() + margin-right .2rem +.color_icon + _wh(.3rem, .3rem) + border-radius 50% + margin-right .1rem +.font_icon + _font(.28rem, .8rem, #000) \ No newline at end of file diff --git a/src/vuex/modules/com.js b/src/vuex/modules/com.js index e88ae2f..bbfbec3 100644 --- a/src/vuex/modules/com.js +++ b/src/vuex/modules/com.js @@ -7,7 +7,7 @@ const acsUrl = 'http://192.168.81.153:8010' const imgip = 'http://192.168.81.155:8080' const printUrl = '' const billPrintUrl = '' -const setTime = '15' +const setTime = '5000' /** * App通用配置 */