diff --git a/components/service/service-property.vue b/components/service/service-property.vue index c467ed4..91195ff 100644 --- a/components/service/service-property.vue +++ b/components/service/service-property.vue @@ -140,11 +140,11 @@ src: this.imgUrl + '/h5/images/serve/order4.png', href: '/pages/appointment/appointment' }, - // { - // name: '设备', - // src: this.imgUrl + '/h5/images/serve/order4.png', - // href: '/pages/machine/machine?machineId=102022110791780032&communityId=2022110264250009' - // }, + { + name: '设备', + src: this.imgUrl + '/h5/images/serve/order4.png', + href: '/pages/machine/machine?machineId=102022110791780032&communityId=2022110264250009' + }, ]; } } diff --git a/pages/machine/machine.vue b/pages/machine/machine.vue index c08153e..480fa87 100644 --- a/pages/machine/machine.vue +++ b/pages/machine/machine.vue @@ -92,7 +92,7 @@ {{equipmentAccountDetail.usefulLife}} - + @@ -192,7 +192,8 @@ getMachines({ page:1, row:1, - machineId:this.machineId + machineId:this.machineId, + communityId:this.communityId }).then(_data=>{ if(_data.data.length < 1){ return ; diff --git a/pages/machine/machineInspection.vue b/pages/machine/machineInspection.vue index a80347e..951ec5c 100644 --- a/pages/machine/machineInspection.vue +++ b/pages/machine/machineInspection.vue @@ -80,7 +80,7 @@ communityId: this.communityId, state:'20200407' }).then(_data=>{ - _that.details = _data.data; + _that.details = _data.inspectionTaskDetails; }) } } diff --git a/pages/machine/machineMaintainance.vue b/pages/machine/machineMaintainance.vue index fda15f5..3cc1134 100644 --- a/pages/machine/machineMaintainance.vue +++ b/pages/machine/machineMaintainance.vue @@ -88,7 +88,7 @@ communityId: this.communityId, state:'20200407' }).then(_data=>{ - _that.details = _data.inspectionTaskDetails; + _that.details = _data.data; }) } }