diff --git a/pages.json b/pages.json index b45b120..31d0daa 100644 --- a/pages.json +++ b/pages.json @@ -65,6 +65,13 @@ } } + ,{ + "path" : "pages/modules/forced-rest", + "style": { + "navigationStyle": "custom" + } + + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/home/home.vue b/pages/home/home.vue index f993505..ae991a3 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -39,13 +39,18 @@ data() { return { userName: '', + // menuList: [ + // {menu_id: '1', icon: 'RF01', name: '设备点检', path: '/pages/modules/equip-inspection', sonTree: []}, + // {menu_id: '2', icon: 'RF02', name: '设备操作', path: '/pages/modules/equip-operate', sonTree: []}, + // {menu_id: '3', icon: 'RF03', name: '人工分拣操作', path: '/pages/modules/man-sort-operate', sonTree: []}, + // {menu_id: '4', icon: 'RF04', name: '人工分拣排产', path: '/pages/modules/man-sort-schedue', sonTree: []}, + // {menu_id: '5', icon: 'RF05', name: '人工组盘', path: '', sonTree: []}, + // {menu_id: '6', icon: 'RF06', name: '混碾搬运', path: '', sonTree: []} + // ], menuList: [ {menu_id: '1', icon: 'RF01', name: '设备点检', path: '/pages/modules/equip-inspection', sonTree: []}, - {menu_id: '2', icon: 'RF02', name: '设备操作', path: '/pages/modules/equip-operate', sonTree: []}, - {menu_id: '3', icon: 'RF03', name: '人工分拣操作', path: '/pages/modules/man-sort-operate', sonTree: []}, - {menu_id: '4', icon: 'RF04', name: '人工分拣排产', path: '/pages/modules/man-sort-schedue', sonTree: []}, - {menu_id: '5', icon: 'RF05', name: '人工组盘', path: '', sonTree: []}, - {menu_id: '6', icon: 'RF06', name: '混碾搬运', path: '', sonTree: []} + {menu_id: '2', icon: 'RF05', name: '人工组盘', path: '', sonTree: []}, + {menu_id: '3', icon: 'RF07', name: '强制静置', path: '/pages/modules/forced-rest', sonTree: []} ], show: false, secM: [] diff --git a/pages/modules/forced-rest.vue b/pages/modules/forced-rest.vue new file mode 100644 index 0000000..42743e6 --- /dev/null +++ b/pages/modules/forced-rest.vue @@ -0,0 +1,94 @@ + + + + + + + + + + 困料位置 + 设备号 + 静置时间 + 剩余静置时间 + 预计完成时间 + + + + + {{e.point_code}} + {{e.device_code}} + {{e.standing_time}} + {{e.plan_start_date}} + {{e.timeDifferenceMinutes}} + {{e.estimatedCompletionTimeString}}> + + + + + + + + 刷新 + 确认 + + + + + + + diff --git a/static/image/menu/RF07.png b/static/image/menu/RF07.png new file mode 100644 index 0000000..ba6628a Binary files /dev/null and b/static/image/menu/RF07.png differ diff --git a/utils/getData2.js b/utils/getData2.js index b2e9c41..ac85f99 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -89,3 +89,20 @@ export const virtualprintType = (url) => request1({ url: `${url}/` + 'api/pda/virtual/printType', data: {} }) + +/** + * 强制静置 + */ +// 显示静置信息 +export const forcedRestingShow = () => request({ + url:'api/pda/forcedResting/show', + data: {} +}) +// 强制静置 +export const forcedRestingSubmit = (stime, id) => request({ + url:'api/pda/forcedResting/submit', + data: { + stand_time: stime, + group_id: id + } +}) \ No newline at end of file