diff --git a/src/views/admin/RepairList.vue b/src/views/admin/RepairList.vue index ef5a7df..dae7acd 100644 --- a/src/views/admin/RepairList.vue +++ b/src/views/admin/RepairList.vue @@ -30,7 +30,7 @@ - {{ item.label }} @@ -40,7 +40,7 @@ - {{ item.label }} @@ -433,6 +433,7 @@ export default { 'type': type, 'repair': { 'explain': this.queryParam.explain, + 'sn': this.queryParam.sn, 'typeId': this.queryParam.typeId, 'deviceId': this.queryParam.deviceId, 'status': this.queryParam.status, diff --git a/src/views/admin/modules/RepairModal.vue b/src/views/admin/modules/RepairModal.vue index 67960f6..9f021e1 100644 --- a/src/views/admin/modules/RepairModal.vue +++ b/src/views/admin/modules/RepairModal.vue @@ -226,9 +226,8 @@ export default { }, getDeviceName (deviceId) { let device = this.deviceList.find(item => item.id == deviceId) - console.log(device) - this.deviceName = device.label - this.deviceId = device.key + this.deviceName = device.name + this.deviceId = device.id }, selectFailureType () { getRepairFailureTypeList().then(res => { @@ -247,14 +246,14 @@ export default { getRepairRoomList({ 'addressId': roomId }).then(res => { this.roomList = res.rows }) - this.address = room.label - this.addressId = room.key + this.address = room.name + this.addressId = room.id }, selectFloorName (floorId) { let floor = this.roomList.find(item => item.id == floorId) - this.floor = floor.label - this.floorId = floor.key + this.floor = floor.name + this.floorId = floor.id }, async handlePreview (file) { diff --git a/src/views/admin/repair/PerformanceList.vue b/src/views/admin/repair/PerformanceList.vue index 36aab03..1441b95 100644 --- a/src/views/admin/repair/PerformanceList.vue +++ b/src/views/admin/repair/PerformanceList.vue @@ -3,11 +3,6 @@
- - - - - diff --git a/src/views/admin/repair/RepairDeviceTypeList.vue b/src/views/admin/repair/RepairDeviceTypeList.vue index c5155a5..2024fc0 100644 --- a/src/views/admin/repair/RepairDeviceTypeList.vue +++ b/src/views/admin/repair/RepairDeviceTypeList.vue @@ -4,7 +4,7 @@ - + @@ -81,7 +81,7 @@ export default { // 表头 columns: [ { - title: '设备类别', + title: '故障类型', dataIndex: 'name' }, { diff --git a/src/views/admin/repair/RepairStatistics.vue b/src/views/admin/repair/RepairStatistics.vue index 6533f39..57dd6c4 100644 --- a/src/views/admin/repair/RepairStatistics.vue +++ b/src/views/admin/repair/RepairStatistics.vue @@ -226,7 +226,7 @@ export default { // 表头 columns: [ { - title: '类型', + title: '故障类型', dataIndex: 'typename' }, {