diff --git a/pages.json b/pages.json index 8a86183..7372152 100644 --- a/pages.json +++ b/pages.json @@ -671,6 +671,30 @@ } } + ,{ + "path" : "pages/SecondPhase/slitting/BaitRoll", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/SecondPhase/slitting/EmptyAxisBind", + "style" : + { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/SecondPhase/slitting/EmptyAxisReturn", + "style" : + { + "navigationStyle": "custom" + } + + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/SecondPhase/slitting/BaitRoll.vue b/pages/SecondPhase/slitting/BaitRoll.vue new file mode 100644 index 0000000..95709e2 --- /dev/null +++ b/pages/SecondPhase/slitting/BaitRoll.vue @@ -0,0 +1,213 @@ + + + \ No newline at end of file diff --git a/pages/SecondPhase/slitting/EmptyAxisBind.vue b/pages/SecondPhase/slitting/EmptyAxisBind.vue new file mode 100644 index 0000000..8e71a4d --- /dev/null +++ b/pages/SecondPhase/slitting/EmptyAxisBind.vue @@ -0,0 +1,115 @@ + + + \ No newline at end of file diff --git a/pages/SecondPhase/slitting/EmptyAxisReturn.vue b/pages/SecondPhase/slitting/EmptyAxisReturn.vue new file mode 100644 index 0000000..7c8e948 --- /dev/null +++ b/pages/SecondPhase/slitting/EmptyAxisReturn.vue @@ -0,0 +1,152 @@ + + + \ No newline at end of file diff --git a/pages/home/home.vue b/pages/home/home.vue index 34f7da0..1c95944 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -217,6 +217,8 @@ border-top-right-radius 20rpx z-index 2017 transition all .3s + max-height 90vh + overflow-y auto .modal position fixed bottom 0 diff --git a/utils/getData3.js b/utils/getData3.js index f58dc57..1fbf74f 100644 --- a/utils/getData3.js +++ b/utils/getData3.js @@ -527,4 +527,34 @@ export const boxReturn = (code, box) => request({ device_code: code, box: box } +}) +/** + * 空轴退回 + */ +export const returnShaft = (code) => request({ + url:'api/pda/slitter/returnShaft', + data: {point_code: code} +}) +/** + * 空轴绑定 + */ +export const slitterShaftBinding = (code, size) => request({ + url:'api/pda/slitter/ShaftBinding', + data: {point_code: code, size: size} +}) +/** + * 饵料下卷 + */ +export const downBait = (area, device, point, lk, lkv, rk, rkv, up) => request({ + url:'api/pda/slitter/downBait', + data: { + area: area, + device_code: device, + point_code: point, + left_spec: lk, + left_spec_value: lkv, + right_spec: rk, + right_spec_value: rkv, + up_or_down: up + } }) \ No newline at end of file diff --git a/utils/mork2.js b/utils/mork2.js index e16a243..2660e83 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -105,7 +105,10 @@ export const allAuthority = () => { {menu_id: '8', title: '分切上轴2', path: '/pages/SecondPhase/slitting/UpperShaftCut2'}, {menu_id: '8', title: '分切呼叫送轴', path: '/pages/SecondPhase/slitting/CallShaft'}, {menu_id: '8', title: '人工呼叫套轴顺序', path: '/pages/SecondPhase/slitting/CallAxisSeq'}, - {menu_id: '8', title: '母卷暂存管理', path: '/pages/SecondPhase/slitting/RollCacheManage'} + {menu_id: '8', title: '母卷暂存管理', path: '/pages/SecondPhase/slitting/RollCacheManage'}, + {menu_id: '8', title: '饵料下卷', path: '/pages/SecondPhase/slitting/BaitRoll'}, + {menu_id: '8', title: '空轴绑定', path: '/pages/SecondPhase/slitting/EmptyAxisBind'}, + {menu_id: '8', title: '空轴退回', path: '/pages/SecondPhase/slitting/EmptyAxisReturn'} ]}, {menu_id: '10', path: 'RF15', title: '打包间管理', sonTree: [ {menu_id: '1', title: '子卷包装解绑', path: '/pages/SecondPhase/SubRollPackUnbind'},