From 60fcc3b878f0d6d4bb47a6966db108c69f95e57a Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Mon, 11 Dec 2023 10:50:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.json | 21 --- pages/modules/callmanage.vue | 235 ------------------------------ pages/modules/taskmanage.vue | 126 ---------------- pages/modules/unloading-mater.vue | 115 ++++++++++++++- pages/modules/zlmanage.vue | 142 ------------------ utils/getData2.js | 145 ++++++++---------- 6 files changed, 168 insertions(+), 616 deletions(-) delete mode 100644 pages/modules/callmanage.vue delete mode 100644 pages/modules/taskmanage.vue delete mode 100644 pages/modules/zlmanage.vue diff --git a/pages.json b/pages.json index 3d255a4..787e077 100644 --- a/pages.json +++ b/pages.json @@ -23,27 +23,6 @@ "style": { "navigationStyle": "custom" } - }, - { - "path": "pages/modules/callmanage", - "style" : - { - "navigationStyle": "custom" - } - }, - { - "path": "pages/modules/taskmanage", - "style" : - { - "navigationStyle": "custom" - } - }, - { - "path": "pages/modules/zlmanage", - "style" : - { - "navigationStyle": "custom" - } } ,{ "path" : "pages/modules/unloading-mater", diff --git a/pages/modules/callmanage.vue b/pages/modules/callmanage.vue deleted file mode 100644 index 034a2dc..0000000 --- a/pages/modules/callmanage.vue +++ /dev/null @@ -1,235 +0,0 @@ - - - - - diff --git a/pages/modules/taskmanage.vue b/pages/modules/taskmanage.vue deleted file mode 100644 index 76df826..0000000 --- a/pages/modules/taskmanage.vue +++ /dev/null @@ -1,126 +0,0 @@ - - - - - diff --git a/pages/modules/unloading-mater.vue b/pages/modules/unloading-mater.vue index 239d03a..943833a 100644 --- a/pages/modules/unloading-mater.vue +++ b/pages/modules/unloading-mater.vue @@ -1,19 +1,124 @@ - diff --git a/pages/modules/zlmanage.vue b/pages/modules/zlmanage.vue deleted file mode 100644 index 4b9047a..0000000 --- a/pages/modules/zlmanage.vue +++ /dev/null @@ -1,142 +0,0 @@ - - - - - diff --git a/utils/getData2.js b/utils/getData2.js index 5002748..75660fd 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -14,9 +14,9 @@ export const pdaUpdate = () => request({ // 登录 export const handLogin = (user, password) => request({ - url:'api/hand/login', + url:'api/pda/handlogin', data: { - username: user, + user: user, password: password } }) @@ -37,101 +37,72 @@ export const authority = () => { * 站点管理 */ // 1.1查询所有区域信息 -export const queryArea = () => request({ - url:'api/hand/queryArea', - data: {} -}) -// export const queryArea = () => { -// let res = { -// result: [{region_code: '1', region_name: 'A1'}, {region_code: '2', region_name: 'A2'}, {region_code: '3', region_name: 'A2'}, {region_code: '4', region_name: 'A10'}] -// } -// return res -// } +// export const queryRegion = () => request({ +// url:'api/pda/region', +// data: {} +// }) +export const queryRegion = () => { + let res = { + result: [{region_code: '1', region_name: 'A1'}, {region_code: '2', region_name: 'A2'}, {region_code: '3', region_name: 'A2'}, {region_code: '4', region_name: 'A10'}] + } + return res +} // 1.2根据区域查询设备编号及状态 -export const queryPointByArea = (code) => request({ - url:'api/hand/queryPointByArea', - data: { - areaCode: code - } -}) -// export const queryPointByArea = () => { -// let res = { -// result: [{ -// device_code: '1', -// device_name: 'JLDFJLLJ' -// }, { -// device_code: '12', -// device_name: 'JLDFJLLJ' -// }, { -// device_code: '13', -// device_name: 'JLDFJLLJ' -// }, { -// device_code: '14', -// device_name: 'JLDFJLLJ' -// }, { -// device_code: '15', -// device_name: 'JLDFJLLJ' -// }, { -// device_code: '16', -// device_name: 'JLDFJLLJ' -// }, { -// device_code: '17', -// device_name: 'JLDFJLLJ' -// }] -// } -// return res -// } +// export const queryPoint = (code) => request({ +// url:'api/pda/point', +// data: { +// region_code: code +// } +// }) +export const queryPoint = () => { + let res = { + result: [{ + device_code: '1', + device_name: 'JLDFJLLJ' + }, { + device_code: '12', + device_name: 'JLDFJLLJ' + }, { + device_code: '13', + device_name: 'JLDFJLLJ' + }, { + device_code: '14', + device_name: 'JLDFJLLJ' + }, { + device_code: '15', + device_name: 'JLDFJLLJ' + }, { + device_code: '16', + device_name: 'JLDFJLLJ' + }, { + device_code: '17', + device_name: 'JLDFJLLJ' + }] + } + return res +} /** - * 呼叫管理 + * 涂线板下料 */ -// 1.1创建任务(确定起点) -export const callTask = (scodes, code) => request({ - url:'api/hand/callTask', +// 1.1出库确认 +export const outStructOutSave = (code, vcode, type) => request({ + url:'api/pda/outStruct/outSave', data: { - start_device_codes: scodes, - next_device_code: code + point_code: code, + vehicle_code: vcode, + material_type: type } }) /** - * 指令管理 + * 包片机上料 */ -// 1.1查询未完成指令 -export const queryInstraction = (keyword, scode, ncode) => request({ - url:'api/hand/insts', +// 1.1出库确认 +export const callingMaterialTask = (code, type) => request({ + url:'api/pda/callingMaterialTask', data: { - keyword: keyword, - start_devicecode: scode, - next_devicecode: ncode - } -}) -//1.2 指令操作 -export const instOperation = (uuid, type) => request({ - url:'api/hand/inst', - data: { - inst_uuid: uuid, - type: type - } -}) - -/** - * 任务管理 - */ -// 1.1 查询未完成指令 -export const queryTask = (keyword, scode, ncode) => request({ - url:'api/hand/tasks', - data: { - keyword: keyword, - start_devicecode: scode, - next_devicecode: ncode - } -}) -// 1.2 指令操作 -export const taskOperation = (uuid, type) => request({ - url:'api/hand/taskoperation', - data: { - inst_uuid: uuid, - type: type + point_code: code, + material_type: type } })