From cf470b2ef256df078a65839c2b81f3b964e986c1 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Thu, 3 Aug 2023 10:45:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E3=80=81=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E9=A1=B5=E3=80=81=E8=AE=BE=E5=A4=87=E7=82=B9=E6=A3=80=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/style/layout.css | 11 +++ pages.json | 6 ++ pages/home/home.vue | 19 +++-- pages/modules/equip-inspection.vue | 124 +++++++++++++++++++++++++++++ utils/getData2.js | 92 ++++++++++++++------- 5 files changed, 215 insertions(+), 37 deletions(-) create mode 100644 pages/modules/equip-inspection.vue diff --git a/common/style/layout.css b/common/style/layout.css index 693f188..cac4beb 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -193,6 +193,17 @@ uni-button:after { color: #606266; border-radius: 10rpx; } +.filter_textarea { + width: 100%; + height: 210rpx; + line-height: 70rpx; + border: 1px solid #dcdfe6; + background-color: #fff; + padding: 0 15rpx; + font-size: 28rpx; + color: #606266; + border-radius: 10rpx; +} .filter_input_disabled { background-color: #eee; } diff --git a/pages.json b/pages.json index 645296e..ae030a4 100644 --- a/pages.json +++ b/pages.json @@ -23,6 +23,12 @@ "style": { "navigationStyle": "custom" } + }, + { + "path" : "pages/modules/equip-inspection", + "style": { + "navigationStyle": "custom" + } } ], "globalStyle": { diff --git a/pages/home/home.vue b/pages/home/home.vue index 183ab45..1ecc8b6 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -3,8 +3,8 @@ 首页 - {{$store.getters.userName}} - 欢迎进入铜箔手持系统！ + {{userName}} + 欢迎进入瑞泰马钢手持系统！ @@ -14,7 +14,7 @@ - + {{e.name}} @@ -39,6 +39,7 @@ export default { data() { return { + userName: this.$store.getters.userInfo !== '' ? JSON.parse(this.$store.getters.userInfo).username : '', menuList: [], show: false, secM: [] @@ -54,10 +55,14 @@ }, toPage1 (e) { - if (e.sonTree.length > 0) { - this.show = true - this.secM = e.sonTree - } + let url = e.path + uni.redirectTo({ + url: url + }) + // if (e.sonTree.length > 0) { + // this.show = true + // this.secM = e.sonTree + // } }, toPage2 (e) { let url = e.path diff --git a/pages/modules/equip-inspection.vue b/pages/modules/equip-inspection.vue new file mode 100644 index 0000000..cfe8fb3 --- /dev/null +++ b/pages/modules/equip-inspection.vue @@ -0,0 +1,124 @@ + + + + + diff --git a/utils/getData2.js b/utils/getData2.js index 77f60e4..4d08a6c 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -21,6 +21,37 @@ export const handLogin = (user, password) => request({ password: password } }) +// export const handLogin = (user, password) => { +// let res = { +// "user": { +// "user": { +// "user_id": "1", +// "username": "admin", +// "person_name": "管理员", +// "gender": "男", +// "phone": "18312365896", +// "email": "201507802@qq.com", +// "avatar_name": "avatar-20200806032259161.png", +// "avatar_path": "/Users/jie/Documents/work/me/admin/eladmin/~/avatar/avatar-20200806032259161.png", +// "password": "f52020dca765fd3943ed40a615dc2c5c", +// "is_admin": true, +// "is_used": true, +// "pwd_reset_user_id": 0, +// "pwd_reset_time": null, +// "create_id": null, +// "create_name": "", +// "create_time": "2022-12-01 00:00:00", +// "update_id": "1", +// "update_name": "admin", +// "update_time": "2023-05-06 14:00:14", +// "extperson_id": null, +// "extuser_id": null +// } +// }, +// "token": "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJsb2dpblR5cGUiOiJsb2dpbiIsImxvZ2luSWQiOiIxIiwicm5TdHIiOiIyZENCQk1uYW03ellTb21aVVN2ZzZnMndJOHJ0V0RmciIsImxvZ2luSW5mbyI6eyJpZCI6IjEiLCJ1c2VybmFtZSI6ImFkbWluIiwicHJlc29uTmFtZSI6IueuoeeQhuWRmCIsInVzZXIiOnsidXNlcl9pZCI6IjEiLCJ1c2VybmFtZSI6ImFkbWluIiwicGVyc29uX25hbWUiOiLnrqHnkIblkZgiLCJnZW5kZXIiOiLnlLciLCJwaG9uZSI6IjE4MzEyMzY1ODk2IiwiZW1haWwiOiIyMDE1MDc4MDJAcXEuY29tIiwiYXZhdGFyX25hbWUiOiJhdmF0YXItMjAyMDA4MDYwMzIyNTkxNjEucG5nIiwiYXZhdGFyX3BhdGgiOiIvVXNlcnMvamllL0RvY3VtZW50cy93b3JrL21lL2FkbWluL2VsYWRtaW4vfi9hdmF0YXIvYXZhdGFyLTIwMjAwODA2MDMyMjU5MTYxLnBuZyIsInBhc3N3b3JkIjoiZjUyMDIwZGNhNzY1ZmQzOTQzZWQ0MGE2MTVkYzJjNWMiLCJpc19hZG1pbiI6dHJ1ZSwiaXNfdXNlZCI6dHJ1ZSwicHdkX3Jlc2V0X3VzZXJfaWQiOjAsImNyZWF0ZV9uYW1lIjoiIiwiY3JlYXRlX3RpbWUiOjE2Njk4MjQwMDAsInVwZGF0ZV9pZCI6IjEiLCJ1cGRhdGVfbmFtZSI6ImFkbWluIiwidXBkYXRlX3RpbWUiOjE2ODMzNTI4MTR9LCJwZXJtaXNzaW9ucyI6WyJhZG1pbiIsIm1vbml0b3I6bGlzdCIsInRpbWluZzpkZWwiLCJ0aW1pbmc6ZWRpdCIsInRpbWluZzphZGQiLCJkaWN0OmRlbCIsImRpY3Q6ZWRpdCIsImRpY3Q6YWRkIiwiZGVwdDpkZWwiLCJkZXB0OmVkaXQiLCJkZXB0OmFkZCIsIm1lbnU6ZGVsIiwibWVudTplZGl0IiwibWVudTphZGQiLCJyb2xlczpkZWwiLCJtZW51Omxpc3QiLCJyb2xlczplZGl0Iiwicm9sZXM6YWRkIiwidXNlcjpkZWwiLCJ1c2VyOmVkaXQiLCJ1c2VyOmFkZCIsInN0b3JhZ2U6ZGVsIiwic3RvcmFnZTplZGl0Iiwic3RvcmFnZTphZGQiLCJzdG9yYWdlOmxpc3QiLCJkaWN0Omxpc3QiLCJkZXB0Omxpc3QiLCJyb2xlczpsaXN0IiwidGltaW5nOmxpc3QiLCJ1c2VyOmxpc3QiLCI5OTkiLCJnZW5Db2RlOmVkaXQiLCJnZW5Db2RlOmRlbCIsImdlbkNvZGU6YWRkIiwiZ2VuQ29kZTpsaXN0Il19fQ.cur9GPyns_MCRCw9vwNogGiCAOxzSd_9-KKythjc9dU" +// } +// return res +// } // 测试状态码报错接口 export const handRequest = () => request({ @@ -32,43 +63,44 @@ export const handRequest = () => request({ export const authority = () => { let res = { sonTree: [ - {menu_id: '1', path: 'RF01', name: '入库搬运', sonTree: [ + {menu_id: '1', icon: 'RF08', name: '入库搬运', path: '', sonTree: [ {menu_id: '1', name: '生箔生产进度', path: '/pages/ProductManage/SboProdProgress'} ]}, - {menu_id: '2', path: 'RF02', name: '叫料出库', sonTree: [ - {menu_id: '1', name: '半成品入库', path: '/pages/WarehouseManage/SemifinishedInStore'} - ]}, - {menu_id: '3', path: 'RF03', name: '任务管理', sonTree: [ - {menu_id: '1', name: '分切上料', path: '/pages/ProductManage/SlittingFeeding'} - ]}, - {menu_id: '4', path: 'RF04', name: '指令管理', sonTree: [ - {menu_id: '1', name: '点位管理', path: '/pages/ProductManage/PointManage'} - ]}, - {menu_id: '5', path: 'RF05', name: '设备点检', sonTree: [ - {menu_id: '1', name: '空管入库', path: '/pages/ProductManage/EmptyPipeInStore'} - ]}, - {menu_id: '6', path: 'RF06', name: '设备操作', sonTree: [ - {menu_id: '1', name: '生产入库', path: '/pages/WarehouseManage/InStoreConfirm'} - ]}, - {menu_id: '7', path: 'RF07', name: '在库管理', sonTree: [ - {menu_id: '1', name: '盘点管理', path: '/pages/WarehouseManage/CheckList'}, - ]}, - {menu_id: '8', path: 'RF08', name: '载具管理', sonTree: [ - {menu_id: '1', name: '空载具入库', path: '/pages/WarehouseManage/EmptyInStore'}, - {menu_id: '2', name: '空载具出库', path: '/pages/WarehouseManage/EmptyOutStore'}, - ]}, - {menu_id: '9', path: 'RF09', name: '打印管理', sonTree: [ - {menu_id: '1', name: '客户标签打印', path: '/pages/WarehouseManage/CustomerLabelPrint'}, - ]}, - {menu_id: '10', path: 'RF10', name: '调度管理', sonTree: [ - {menu_id: '1', name: '任务管理', path: '/pages/DispatchManage/TaskManage'}, - {menu_id: '2', name: 'RGV状态查询', path: '/pages/DispatchManage/RGVStatus'} - ]} + {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 } +/** + * 设备点检 + */ +// 获取设备下拉框 +export const deviceInfo = () => request({ + url:'api/pda/deviceCheck/deviceInfo', + data: {} +}) +// 获取设备状态下拉框 +export const deviceStatus = () => request({ + url:'api/pda/deviceCheck/deviceStatus', + data: {} +}) +// 设备点检 +export const deviceCheckVerify = (code, user, remark, status) => request({ + url:'api/pda/deviceCheck/verify', + data: { + device_code: code, + username: user, + remark: remark, + check_status: status + } +}) + + // 1.3打印机类型 export const virtualprintType = (url) => request1({ url: `${url}/` + 'api/pda/virtual/printType',