From 0e030c7fb4d7c1f62654bcd2bacc60f66b12f02f Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Wed, 4 Sep 2024 10:54:41 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=94=B6=E5=8D=B7=E8=BE=8A=E5=BA=93\?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=8F=96=E6=A0=B7\=E5=BA=9F=E7=AE=94?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- pages.json | 44 ++-- pages/home/home.vue | 212 ++++++++++++------ pages/login/login.vue | 2 +- pages/login/upgrade.vue | 2 +- ...erial-racks-back.vue => call-sampling.vue} | 33 ++- pages/manage/empty-tray-back.vue | 87 ------- pages/manage/roll-manage.vue | 116 ++++++++++ .../{area-lock.vue => waste-foil-move.vue} | 59 ++--- utils/getData2.js | 74 +++--- utils/mork2.js | 33 +-- 11 files changed, 385 insertions(+), 279 deletions(-) rename pages/manage/{empty-material-racks-back.vue => call-sampling.vue} (52%) delete mode 100644 pages/manage/empty-tray-back.vue create mode 100644 pages/manage/roll-manage.vue rename pages/manage/{area-lock.vue => waste-foil-move.vue} (51%) diff --git a/README.md b/README.md index 12e3f99..23a0a70 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # 注意事项 + 原生APP云打包使用自有证书 + 证书别名：testalias -+ 接口线上地址：https://apifox.com/apidoc/shared-3b67df3b-411c-4dd4-9752-f9b71898ee7d/api-150208183 \ No newline at end of file ++ 接口线上地址：https://apifox.com/apidoc/shared-36902b16-4b6e-4ea6-af9d-43db3974ba93 \ No newline at end of file diff --git a/pages.json b/pages.json index a23ec36..c321877 100644 --- a/pages.json +++ b/pages.json @@ -6,20 +6,36 @@ "navigationStyle": "custom" } } + ,{ + "path" : "pages/login/setup", + "style": { + "navigationStyle": "custom" + } + } ,{ "path" : "pages/home/home", "style": { "navigationStyle": "custom" } } - ,{ - "path" : "pages/login/setup", - "style": { - "navigationStyle": "custom" - } + ,{ + "path" : "pages/manage/roll-manage", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/manage/call-sampling", + "style" : + { + "navigationStyle": "custom" + } + } ,{ - "path" : "pages/manage/empty-tray-back", + "path" : "pages/manage/waste-foil-move", "style" : { "navigationStyle": "custom" @@ -33,14 +49,6 @@ "navigationStyle": "custom" } - } - ,{ - "path" : "pages/manage/area-lock", - "style" : - { - "navigationStyle": "custom" - } - } ,{ "path" : "pages/manage/fill-tray", @@ -49,14 +57,6 @@ "navigationStyle": "custom" } - } - ,{ - "path" : "pages/manage/empty-material-racks-back", - "style" : - { - "navigationStyle": "custom" - } - } ,{ "path" : "pages/manage/material-transfer", diff --git a/pages/home/home.vue b/pages/home/home.vue index fc3c6fd..abdd4f6 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -1,62 +1,82 @@ - diff --git a/pages/login/login.vue b/pages/login/login.vue index ad0aa59..6985c95 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -1,7 +1,7 @@ @@ -24,43 +27,50 @@ diff --git a/utils/getData2.js b/utils/getData2.js index b38758e..168ad75 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -20,56 +20,36 @@ export const handLogin = (user, password) => request({ password: password } }) -// 区域 -export const regionList = () => request({ - url:'api/fab/regionList', - method: 'GET' -}) -// 区域锁定 -export const handheldLock = (code, status) => request({ - url:'api/handheld/lock', - data: {region_code: code, status: status} -}) -// 外协区空料架送回 -export const handheldRack = (code, vcode) => request({ - url:'api/handheld/rack', - data: {device_code: code, vehicle_code: vcode} -}) -// 外协区空笼框送回 -export const handheldCageFrame = (code, list) => request({ - url:'api/handheld/cageFrame', - data: {device_code: code, vehicle_list: list} -}) -// 物料转运 -export const handheldTranshipment = (code, vcode) => request({ - url:'api/handheld/transhipment', - data: {device_code: code, vehicle_code: vcode} -}) -// 载具类型列表 -export const vehicleType = () => request({ - url:'api/fab/vehicleType', +// 菜单 +export const authority = () => request({ + url:'mobile/auth/authority', data: {} }) -// 补空框 -export const handheldStorehouse = (code, type) => request({ - url:'api/handheld/storehouse', - data: {device_code: code, vehicle_type: type} +// 入辊 +export const onlySendRollTruss = (code, vcode, type) => request({ + url:'api/pda/other/onlySendRollTruss', + data: {point_code: code, vehicle_code: vcode, vehicle_type: type} }) -// 工序下料 -// export const handheldGetRegionCode = (code) => request({ -// url:'api/handheld/getRegionCode', -// data: {orderCode: code} -// }) -export const handheldBlanking = (code, rcode, vcode, material) => request({ - url:'api/handheld/blanking', - data: {device_code: code, region_code: rcode, vehicle_code: vcode, material: material} +// +export const onlyCallRollTruss = (code, vcode, type) => request({ + url:'api/pda/other/onlyCallRollTruss', + data: {point_code: code, vehicle_type: type} }) -// 修改订单工序 -export const fabOrders = (code) => request({ - url:'api/fab/orders', - data: {vehicle_code: code} +// 呼叫取样 +export const callAgvToSampling = (code1, code2) => request({ + url:'api/pda/other/callAgvToSampling', + data: {point_code1: code1, point_code1: code2} }) -export const updateOrder = (data) => request({ - url:'api/handheld/updateOrder', - data: data +export const callAgvToSamplingVerify = (flag, scode, ecode) => request({ + url:'api/pda/other/callAgvToSamplingVerify', + data: {flag: flag, startPoint: scode, endPoint: ecode} +}) +// 废箔搬运 +export const startMoveWasteFoilv2 = (code) => request({ + url:'api/pda/other/startMoveWasteFoil/v2', + data: {point_code: code} +}) +export const resumeMoveWasteFoilv2 = (flag, code) => request({ + url:'api/pda/other/resumeMoveWasteFoil/v2', + data: {flag: flag, point_code: code} }) \ No newline at end of file diff --git a/utils/mork2.js b/utils/mork2.js index fb56c7f..aaab77f 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -1,24 +1,15 @@ -export const handLogin = (user, password) => { +export const authority = () => { let res = { - user: { - user: {username: 'admin'}, - }, - token: 'abcd' - } - return res -} -export const regionList = () => { - let res = { - content: [{value: '1', label: 'aa'}, {value: '2', label: 'bb'}] - } - return res -} - -export const fabOrders = (data) => { - let res = { - content: [ - {order_code: '111', region_code: '3', due_date: '2020-10-10 11:30:30'} - ] - } + code: '1', + result: { + rf_menu0: { + sonTree: + [ + {path: 'RF01', title: '收卷辊库', sonTree: [{title: '收卷辊管理', path: '/pages/manage/roll-manage'}]}, + {path: 'RF01', title: '检测取样', sonTree: [{title: '呼叫取样', path: '/pages/manage/call-sampling'}]}, + {path: 'RF01', title: '废箔处理', sonTree: [{title: '废箔搬运', path: '/pages/manage/waste-foil-move'}]} + ] + } + }} return res } \ No newline at end of file