diff --git a/pages.json b/pages.json index 645c232..5222e7e 100644 --- a/pages.json +++ b/pages.json @@ -26,6 +26,14 @@ } } + ,{ + "path" : "pages/manage/equip", + "style" : + { + "navigationStyle": "custom" + } + + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/home/home.vue b/pages/home/home.vue index 2840eb4..e40ae68 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -32,7 +32,8 @@ return { userName: '', menuList: [ - {title: '配料任务', icon: 'RF07', path: '/pages/manage/mix-task'} + {title: '配料任务', icon: 'RF01', path: '/pages/manage/mix-task'}, + {title: '设备管理', icon: 'RF02', path: '/pages/manage/equip'} ], show: false, secM: [] diff --git a/pages/manage/equip.vue b/pages/manage/equip.vue new file mode 100644 index 0000000..9d1d030 --- /dev/null +++ b/pages/manage/equip.vue @@ -0,0 +1,97 @@ + + + + + diff --git a/static/image/menu/RF01.png b/static/image/menu/RF01.png index 4b8ce5c..ab42ca3 100644 Binary files a/static/image/menu/RF01.png and b/static/image/menu/RF01.png differ diff --git a/static/image/menu/RF02.png b/static/image/menu/RF02.png index ee6ef08..5f06944 100644 Binary files a/static/image/menu/RF02.png and b/static/image/menu/RF02.png differ diff --git a/static/image/menu/RF03.png b/static/image/menu/RF03.png deleted file mode 100644 index 18a06e7..0000000 Binary files a/static/image/menu/RF03.png and /dev/null differ diff --git a/static/image/menu/RF04.png b/static/image/menu/RF04.png deleted file mode 100644 index af989ff..0000000 Binary files a/static/image/menu/RF04.png and /dev/null differ diff --git a/static/image/menu/RF05.png b/static/image/menu/RF05.png deleted file mode 100644 index 7e9ddd2..0000000 Binary files a/static/image/menu/RF05.png and /dev/null differ diff --git a/static/image/menu/RF06.png b/static/image/menu/RF06.png deleted file mode 100644 index e18e35a..0000000 Binary files a/static/image/menu/RF06.png and /dev/null differ diff --git a/static/image/menu/RF07.png b/static/image/menu/RF07.png deleted file mode 100644 index ab42ca3..0000000 Binary files a/static/image/menu/RF07.png and /dev/null differ diff --git a/static/image/menu/RF08.png b/static/image/menu/RF08.png deleted file mode 100644 index 7eb0396..0000000 Binary files a/static/image/menu/RF08.png and /dev/null differ diff --git a/static/image/menu/RF09.png b/static/image/menu/RF09.png deleted file mode 100644 index b48d6da..0000000 Binary files a/static/image/menu/RF09.png and /dev/null differ diff --git a/utils/getData2.js b/utils/getData2.js index c4baace..cf5451a 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -39,4 +39,17 @@ export const queryZDDevice = (code) => request({ export const confirmZZDevice = (code, work, ncode) => request({ url:'api/hand/confirmZZDevice', data: {mfg_order_name: code, work_code: work, next_device_code: ncode} +}) +// 设备管理 +export const queryPoints = () => request({ + url: 'api/pda/queryPoints', + data: {} +}) +// 更新设备 +export const operation = (code, type) => request({ + url: 'api/pda/operation', + data: { + point_code: code, + type: type + } }) \ No newline at end of file diff --git a/utils/mork2.js b/utils/mork2.js index a52b867..1c4c474 100644 --- a/utils/mork2.js +++ b/utils/mork2.js @@ -61,4 +61,12 @@ export const queryZDDevice = () => { export const confirmZZDevice = () => { let res = {message: 'ok'} return res +} +export const queryPoints = () => { + let res = [{point_code: 'aaa1'}] + return res +} +export const operation = () => { + let res = {message: 'ok'} + return res } \ No newline at end of file