diff --git a/manifest.json b/manifest.json index a164fa8..bcaafc1 100644 --- a/manifest.json +++ b/manifest.json @@ -38,7 +38,8 @@ "", "", "" - ] + ], + "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ] }, /* ios打包配置 */ "ios" : { diff --git a/pages.json b/pages.json index ae030a4..0862c75 100644 --- a/pages.json +++ b/pages.json @@ -30,6 +30,27 @@ "navigationStyle": "custom" } } + ,{ + "path" : "pages/modules/equip-operate", + "style": { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/modules/man-sort-operate", + "style": { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/modules/man-sort-schedue", + "style": { + "navigationStyle": "custom" + } + + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/home/home.vue b/pages/home/home.vue index 1ecc8b6..f993505 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -35,25 +35,28 @@ + + diff --git a/pages/modules/man-sort-operate.vue b/pages/modules/man-sort-operate.vue new file mode 100644 index 0000000..239d03a --- /dev/null +++ b/pages/modules/man-sort-operate.vue @@ -0,0 +1,19 @@ + + + + + diff --git a/pages/modules/man-sort-schedue.vue b/pages/modules/man-sort-schedue.vue new file mode 100644 index 0000000..239d03a --- /dev/null +++ b/pages/modules/man-sort-schedue.vue @@ -0,0 +1,19 @@ + + + + + diff --git a/static/image/menu/RF01.png b/static/image/menu/RF01.png index 4de6e93..5f06944 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 450da60..15c177a 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 index 44fa467..1bc47ed 100644 Binary files a/static/image/menu/RF03.png and b/static/image/menu/RF03.png differ diff --git a/static/image/menu/RF04.png b/static/image/menu/RF04.png index d2b969b..775f2e8 100644 Binary files a/static/image/menu/RF04.png and b/static/image/menu/RF04.png differ diff --git a/static/image/menu/RF05.png b/static/image/menu/RF05.png index 775f2e8..af989ff 100644 Binary files a/static/image/menu/RF05.png and b/static/image/menu/RF05.png differ diff --git a/static/image/menu/RF06.png b/static/image/menu/RF06.png index af989ff..30c871f 100644 Binary files a/static/image/menu/RF06.png and b/static/image/menu/RF06.png differ diff --git a/static/image/menu/RF07.png b/static/image/menu/RF07.png deleted file mode 100644 index 796026f..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 30c871f..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 972a492..0000000 Binary files a/static/image/menu/RF09.png and /dev/null differ diff --git a/static/image/menu/RF10.png b/static/image/menu/RF10.png deleted file mode 100644 index 15c177a..0000000 Binary files a/static/image/menu/RF10.png and /dev/null differ diff --git a/utils/getData2.js b/utils/getData2.js index 4d08a6c..b2e9c41 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -59,23 +59,6 @@ export const handRequest = () => request({ data: {} }) -// 菜单 -export const authority = () => { - let res = { - sonTree: [ - {menu_id: '1', icon: 'RF08', name: '入库搬运', path: '', sonTree: [ - {menu_id: '1', name: '生箔生产进度', path: '/pages/ProductManage/SboProdProgress'} - ]}, - {menu_id: '2', icon: 'RF02', name: '叫料出库', path: '', sonTree: []}, - {menu_id: '3', icon: 'RF03', name: '任务管理', path: '', sonTree: []}, - {menu_id: '4', icon: 'RF07', name: '指令管理', path: '', sonTree: []}, - {menu_id: '5', icon: 'RF04', name: '设备点检', path: '/pages/modules/equip-inspection', sonTree: []}, - {menu_id: '6', icon: 'RF10', name: '设备操作', path: '', sonTree: []} - ] - } - return res -} - /** * 设备点检 */