From 8f6cc7dff6683b8ca4b58fc64eae34ff9b37bdbc Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Thu, 25 Apr 2024 15:59:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=8C=E6=9C=9F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 3 +- pages.json | 131 +------ pages/SecondPhase/DeliveryUnbind.vue | 125 ------- pages/SecondPhase/DeliveryUnbindConfirm.vue | 175 --------- pages/SecondPhase/EmptyBoxInStore.vue | 84 ----- pages/SecondPhase/EmptyVehicleInStore.vue | 86 ----- pages/SecondPhase/point/ErrorOutUnlock.vue | 80 ----- pages/SecondPhase/point/PointManage.vue | 95 ----- pages/SecondPhase/production/BakeProcess.vue | 158 --------- pages/SecondPhase/production/ManmadeBake.vue | 155 -------- pages/SecondPhase/production/SboProcess.vue | 281 --------------- .../production/SboProdProgress.vue | 159 --------- .../SecondPhase/production/SurfaceProcess.vue | 89 ----- .../SecondPhase/slitting/SlittingFeeding.vue | 331 ----------------- pages/SecondPhase/slitting/ZjCasing.vue | 289 --------------- pages/SecondPhase/slitting/ZjDelivery.vue | 333 ----------------- pages/SecondPhase/slitting/ZjInStore.vue | 178 ---------- pages/SecondPhase/slitting/ZjOutStore.vue | 334 ------------------ pages/home/home.vue | 264 ++++---------- pages/home/home_back.vue | 178 ---------- utils/getData3.js | 93 ----- utils/mork2.js | 36 +- 22 files changed, 76 insertions(+), 3581 deletions(-) delete mode 100644 pages/SecondPhase/DeliveryUnbind.vue delete mode 100644 pages/SecondPhase/DeliveryUnbindConfirm.vue delete mode 100644 pages/SecondPhase/EmptyBoxInStore.vue delete mode 100644 pages/SecondPhase/EmptyVehicleInStore.vue delete mode 100644 pages/SecondPhase/point/ErrorOutUnlock.vue delete mode 100644 pages/SecondPhase/point/PointManage.vue delete mode 100644 pages/SecondPhase/production/BakeProcess.vue delete mode 100644 pages/SecondPhase/production/ManmadeBake.vue delete mode 100644 pages/SecondPhase/production/SboProcess.vue delete mode 100644 pages/SecondPhase/production/SboProdProgress.vue delete mode 100644 pages/SecondPhase/production/SurfaceProcess.vue delete mode 100644 pages/SecondPhase/slitting/SlittingFeeding.vue delete mode 100644 pages/SecondPhase/slitting/ZjCasing.vue delete mode 100644 pages/SecondPhase/slitting/ZjDelivery.vue delete mode 100644 pages/SecondPhase/slitting/ZjInStore.vue delete mode 100644 pages/SecondPhase/slitting/ZjOutStore.vue delete mode 100644 pages/home/home_back.vue delete mode 100644 utils/getData3.js diff --git a/README.md b/README.md index 7f1820a..72d2b9f 100644 --- a/README.md +++ b/README.md @@ -2,5 +2,4 @@ + 原生APP云打包使用自有证书 + 证书别名:testalias + 当前应用版本名称1.0.5 -+ 当前应用版本号105 -+ 线上菜单接口地址:(https://apifox.com/apidoc/shared-cb4996b0-0426-44a6-82a5-0cefe2540fb9/api-152616802) \ No newline at end of file ++ 当前应用版本号105 \ No newline at end of file diff --git a/pages.json b/pages.json index 57d8b01..640c45c 100644 --- a/pages.json +++ b/pages.json @@ -253,136 +253,7 @@ { "navigationStyle": "custom" } - } - ,{ - "path" : "pages/SecondPhase/EmptyVehicleInStore", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/EmptyBoxInStore", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/DeliveryUnbind", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/DeliveryUnbindConfirm", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/production/SboProdProgress", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/production/SboProcess", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/production/BakeProcess", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/production/ManmadeBake", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/production/SurfaceProcess", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/slitting/SlittingFeeding", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/slitting/ZjCasing", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/slitting/ZjDelivery", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/slitting/ZjInStore", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/slitting/ZjOutStore", - "style" : - { - "navigationStyle": "custom" - } - - } - - ,{ - "path" : "pages/SecondPhase/point/PointManage", - "style" : - { - "navigationStyle": "custom" - } - - } - ,{ - "path" : "pages/SecondPhase/point/ErrorOutUnlock", - "style" : - { - "navigationStyle": "custom" - } - - } + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/SecondPhase/DeliveryUnbind.vue b/pages/SecondPhase/DeliveryUnbind.vue deleted file mode 100644 index dcec560..0000000 --- a/pages/SecondPhase/DeliveryUnbind.vue +++ /dev/null @@ -1,125 +0,0 @@ - - - - - diff --git a/pages/SecondPhase/DeliveryUnbindConfirm.vue b/pages/SecondPhase/DeliveryUnbindConfirm.vue deleted file mode 100644 index 58a3bb4..0000000 --- a/pages/SecondPhase/DeliveryUnbindConfirm.vue +++ /dev/null @@ -1,175 +0,0 @@ - - - - - diff --git a/pages/SecondPhase/EmptyBoxInStore.vue b/pages/SecondPhase/EmptyBoxInStore.vue deleted file mode 100644 index 56ed99f..0000000 --- a/pages/SecondPhase/EmptyBoxInStore.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - - diff --git a/pages/SecondPhase/EmptyVehicleInStore.vue b/pages/SecondPhase/EmptyVehicleInStore.vue deleted file mode 100644 index f45bf49..0000000 --- a/pages/SecondPhase/EmptyVehicleInStore.vue +++ /dev/null @@ -1,86 +0,0 @@ - - - - - diff --git a/pages/SecondPhase/point/ErrorOutUnlock.vue b/pages/SecondPhase/point/ErrorOutUnlock.vue deleted file mode 100644 index b287214..0000000 --- a/pages/SecondPhase/point/ErrorOutUnlock.vue +++ /dev/null @@ -1,80 +0,0 @@ - - - - - diff --git a/pages/SecondPhase/point/PointManage.vue b/pages/SecondPhase/point/PointManage.vue deleted file mode 100644 index dc5b6e2..0000000 --- a/pages/SecondPhase/point/PointManage.vue +++ /dev/null @@ -1,95 +0,0 @@ - - - - - diff --git a/pages/SecondPhase/production/BakeProcess.vue b/pages/SecondPhase/production/BakeProcess.vue deleted file mode 100644 index df6282f..0000000 --- a/pages/SecondPhase/production/BakeProcess.vue +++ /dev/null @@ -1,158 +0,0 @@ - - - - - diff --git a/pages/SecondPhase/production/ManmadeBake.vue b/pages/SecondPhase/production/ManmadeBake.vue deleted file mode 100644 index fa0bb4d..0000000 --- a/pages/SecondPhase/production/ManmadeBake.vue +++ /dev/null @@ -1,155 +0,0 @@ - - - - - diff --git a/pages/SecondPhase/production/SboProcess.vue b/pages/SecondPhase/production/SboProcess.vue deleted file mode 100644 index 9a6e222..0000000 --- a/pages/SecondPhase/production/SboProcess.vue +++ /dev/null @@ -1,281 +0,0 @@ - - - - - diff --git a/pages/SecondPhase/production/SboProdProgress.vue b/pages/SecondPhase/production/SboProdProgress.vue deleted file mode 100644 index 4a7f3c7..0000000 --- a/pages/SecondPhase/production/SboProdProgress.vue +++ /dev/null @@ -1,159 +0,0 @@ - - - - - diff --git a/pages/SecondPhase/production/SurfaceProcess.vue b/pages/SecondPhase/production/SurfaceProcess.vue deleted file mode 100644 index 3ffa5a3..0000000 --- a/pages/SecondPhase/production/SurfaceProcess.vue +++ /dev/null @@ -1,89 +0,0 @@ - - - - - diff --git a/pages/SecondPhase/slitting/SlittingFeeding.vue b/pages/SecondPhase/slitting/SlittingFeeding.vue deleted file mode 100644 index 7bccfe3..0000000 --- a/pages/SecondPhase/slitting/SlittingFeeding.vue +++ /dev/null @@ -1,331 +0,0 @@ - - - - - diff --git a/pages/SecondPhase/slitting/ZjCasing.vue b/pages/SecondPhase/slitting/ZjCasing.vue deleted file mode 100644 index 995812f..0000000 --- a/pages/SecondPhase/slitting/ZjCasing.vue +++ /dev/null @@ -1,289 +0,0 @@ - - - - - diff --git a/pages/SecondPhase/slitting/ZjDelivery.vue b/pages/SecondPhase/slitting/ZjDelivery.vue deleted file mode 100644 index 36f9fe4..0000000 --- a/pages/SecondPhase/slitting/ZjDelivery.vue +++ /dev/null @@ -1,333 +0,0 @@ - - - - - diff --git a/pages/SecondPhase/slitting/ZjInStore.vue b/pages/SecondPhase/slitting/ZjInStore.vue deleted file mode 100644 index ab6ab73..0000000 --- a/pages/SecondPhase/slitting/ZjInStore.vue +++ /dev/null @@ -1,178 +0,0 @@ - - - - - diff --git a/pages/SecondPhase/slitting/ZjOutStore.vue b/pages/SecondPhase/slitting/ZjOutStore.vue deleted file mode 100644 index 03e6812..0000000 --- a/pages/SecondPhase/slitting/ZjOutStore.vue +++ /dev/null @@ -1,334 +0,0 @@ - - - - - diff --git a/pages/home/home.vue b/pages/home/home.vue index 3750278..0fa14d3 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -1,81 +1,58 @@ - - diff --git a/utils/getData3.js b/utils/getData3.js deleted file mode 100644 index f51474c..0000000 --- a/utils/getData3.js +++ /dev/null @@ -1,93 +0,0 @@ -/** - * author:cll - * day:2024-04-18 - * content: 二期接口 - */ -import request from './request.js' -/** - * 二期空载具入库 - */ -// 1.1空载具入库-【入库按钮】 -export const twoPdaVehicleIn = (code, type, pcode) => request({ - url:'api/twoPda/vehicle/vehicleIn', - data: { - vehicle_code: code, - vehicle_type: type, - point_code: pcode - } -}) -/** - * 二期空木箱入库 - */ -// 1.1空木箱入库-【入库按钮】 -export const twoPdaBoxIn = (code, no, pcode) => request({ - url:'api/twoPda/vehicle/boxIn', - data: { - vehicle_code: code, - box_no: no, - point_code: pcode - } -}) -/** - * 二期发货区解绑 - */ -// 1.1单据初始化查询 -export const twoPdaIvtQuery = (no, code) => request({ - url:'api/twoPda/st/ivtQuery', - data: { - box_no: no, - bill_code: code - } -}) -// 1.2【确认】按钮(二级页面) -export const twoPdaIvtDtlQuery = (no, code) => request({ - url:'api/twoPda/st/ivtDtlQuery', - data: { - box_no: no, - bill_code: code - } -}) -// 1.3木箱明细(点木箱超链接跳转) -export const twoPdaIvtbBoxDtlQuery = (no) => request({ - url:'api/twoPda/st/ivtbBoxDtlQuery', - data: { - box_no: no - } -}) -// 1.4【出库确认】按钮(二级页面按钮) -export const twoPdaOutConfirm = (no) => request({ - url:'api/twoPda/st/outConfirm', - data: { - box_no: no - } -}) -/** - * 二期表处工序 - */ -// 出入烘箱 -export const surfaceOperate = (code, name, option) => request({ - url:'api/pda/surface/operate', - data: { - point_code: code, - container_name: name, - option: option - } -}) -// 允许进入 -export const surfaceConfirm = (code) => request({ - url:'api/pda/surface/confirm', - data: { - point_code: code - } -}) -/** - * 生箔工序 - */ -// 1.1呼叫 -export const needEmptyAxisTest = (code, name) => request({ - url: 'api/pda/raw/needEmptyAxisTest', - data: { - point_code: code, - container_name: name, - } -}) \ No newline at end of file diff --git a/utils/mork2.js b/utils/mork2.js index 1a47a37..7a86e0c 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -2,7 +2,6 @@ export const authority = () => { let res = { code: '1', result: { - rf_menu0: { sonTree: [ {menu_id: '1', path: 'RF01', title: '生产管理', sonTree: [ {menu_id: '1', title: '生箔生产进度', path: '/pages/ProductManage/SboProdProgress'}, @@ -52,40 +51,9 @@ export const authority = () => { {menu_id: '1', title: '任务管理', path: '/pages/DispatchManage/TaskManage'}, {menu_id: '2', title: 'RGV状态查询', path: '/pages/DispatchManage/RGVStatus'} ]} - ] - }, - rf_menu1: { - sonTree: [ - {menu_id: '1', path: 'RF08', title: '载具入库', sonTree: [ - {menu_id: '1', title: '空载具入库', path: '/pages/SecondPhase/EmptyVehicleInStore'} - ]}, - {menu_id: '2', path: 'RF11', title: '空木箱入库', sonTree: [ - {menu_id: '1', title: '空木箱入库', path: '/pages/SecondPhase/EmptyBoxInStore'} - ]}, - {menu_id: '3', path: 'RF12', title: '发货区', sonTree: [ - {menu_id: '1', title: '发货区解绑', path: '/pages/SecondPhase/DeliveryUnbind'} - ]}, - {menu_id: '4', path: 'RF01', title: '生产管理', sonTree: [ - {menu_id: '1', title: '生箔生产进度', path: '/pages/SecondPhase/production/SboProdProgress'}, - {menu_id: '2', title: '生箔工序', path: '/pages/SecondPhase/production/SboProcess'}, - {menu_id: '3', title: '烘烤工序', path: '/pages/SecondPhase/production/BakeProcess'}, - {menu_id: '4', title: '表处工序', path: '/pages/SecondPhase/production/SurfaceProcess'}, - {menu_id: '5', title: '人工烘烤', path: '/pages/SecondPhase/production/ManmadeBake'} - ]}, - {menu_id: '5', path: 'RF03', title: '分切管理', sonTree: [ - {menu_id: '1', title: '分切上料', path: '/pages/SecondPhase/slitting/SlittingFeeding'}, - {menu_id: '2', title: '空轴套管', path: '/pages/SecondPhase/slitting/ZjCasing'}, - {menu_id: '3', title: '空轴配送', path: '/pages/SecondPhase/slitting/ZjDelivery'}, - {menu_id: '4', title: '空轴进站', path: '/pages/SecondPhase/slitting/ZjInStore'}, - {menu_id: '5', title: '子卷出站', path: '/pages/SecondPhase/slitting/ZjOutStore'}, - ]}, - {menu_id: '6', path: 'RF04', title: '点位管理', sonTree: [ - {menu_id: '1', title: '点位管理', path: '/pages/SecondPhase/point/PointManage'}, - {menu_id: '2', title: '异常出库解锁', path: '/pages/SecondPhase/point/ErrorOutUnlock'} - ]}, - ] + ] } - }} + } return res } export const twoPdaIvtQuery = (no, code) => {