From 15900588491c6f5859bb8910821aa04a1de5a0f7 Mon Sep 17 00:00:00 2001 From: caill <815519168@qq.com> Date: Wed, 8 Nov 2023 16:46:40 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8A=A5=E4=BF=AE=EF=BC=8C?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/style/layout.css | 6 +- pages.json | 16 +++++ pages/device/DeviceList.vue | 130 ++++++++++++++++++++++++++++++++++ pages/device/RepairReport.vue | 127 +++++++++++++++++++++++++++++++++ pages/home/home.vue | 3 +- utils/getData2.js | 38 ++++++++++ 6 files changed, 316 insertions(+), 4 deletions(-) create mode 100644 pages/device/DeviceList.vue create mode 100644 pages/device/RepairReport.vue diff --git a/common/style/layout.css b/common/style/layout.css index 194dff1..e87cb99 100644 --- a/common/style/layout.css +++ b/common/style/layout.css @@ -119,7 +119,7 @@ uni-button:after { } .filter_item { display: flex; - align-items: center; + align-items: flex-start; width: 100%; margin-bottom: 10rpx; } @@ -166,12 +166,12 @@ uni-button:after { .filter_input_wraper { /* flex: 1; */ width: calc(100% - 170rpx); - height: 80rpx; + min-height: 80rpx; padding: 5rpx 0; margin-left: 30rpx; display: flex; justify-content: flex-start; - align-items: center; + align-items: flex-start; } .filter_input_wraper_1 { height: 30rpx; diff --git a/pages.json b/pages.json index 9e940e1..5256316 100644 --- a/pages.json +++ b/pages.json @@ -125,6 +125,22 @@ } } + ,{ + "path" : "pages/device/RepairReport", + "style": { + "navigationStyle": "custom" + } + + } + ,{ + "path" : "pages/device/DeviceList", + "style": { + "navigationStyle": "custom", + "enablePullDownRefresh": true, + "onReachBottomDistance": 50 + } + + } ], "globalStyle": { // "pageOrientation": "landscape", diff --git a/pages/device/DeviceList.vue b/pages/device/DeviceList.vue new file mode 100644 index 0000000..2aa6c7b --- /dev/null +++ b/pages/device/DeviceList.vue @@ -0,0 +1,130 @@ + + + + + diff --git a/pages/device/RepairReport.vue b/pages/device/RepairReport.vue new file mode 100644 index 0000000..037f9db --- /dev/null +++ b/pages/device/RepairReport.vue @@ -0,0 +1,127 @@ + + + + + diff --git a/pages/home/home.vue b/pages/home/home.vue index f9f989d..d382fcb 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -51,7 +51,8 @@ {menu_id: '2', name: '设备维修作业', path: '/pages/device/RepairWork'}, {menu_id: '3', name: '设备点检作业', path: '/pages/device/CheckWork'}, {menu_id: '4', name: '设备润滑作业', path: '/pages/device/LubricateWork'}, - {menu_id: '5', name: '设备保养作业', path: '/pages/device/MaintainWork'} + {menu_id: '5', name: '设备保养作业', path: '/pages/device/MaintainWork'}, + {menu_id: '6', name: '设备报修', path: '/pages/device/RepairReport'} ]} ], show: false, diff --git a/utils/getData2.js b/utils/getData2.js index 531a220..794e1c5 100644 --- a/utils/getData2.js +++ b/utils/getData2.js @@ -132,3 +132,41 @@ export const deviceManageGetDtl = (code, type, jcode) => request({ } }) +/** + * 设备报修 + */ +// 1.1设备列表 +export const queryDevice2 = (code, page, size) => request({ + url:'api/devicemaintenanceplanmst/queryDevice3', + data: { + device_code: code, + page: page, + size: size + } +}) +// export const queryDevice2 = (code, page, size) => { +// let res = { +// data: [{device_code: 'code', device_name: 'device_name', devicerecord_id: 'devicerecord_id', material_type_id: 'material_type_id'}], +// totalCount: 1 +// } +// return res +// } +// 1.2故障类型 +export const devicefaultclass = (id) => request({ + url:'api/devicefaultclass/dtl3', + data: { + material_type_id: id + } +}) +// 1.3报修 +export const devicerepairrequest = (code, id, mid, did, lev, desc) => request({ + url:'api/devicerepairrequest', + data: { + device_code: code, + devicerecord_id: id, + material_type_id: mid, + device_faultclass_id: did, + fault_level: lev, + fault_desc: desc + } +})