diff --git a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceLedgerController.java b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceLedgerController.java index ede4e273..978ce3cc 100644 --- a/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceLedgerController.java +++ b/hw-modules/hw-dms/src/main/java/com/hw/dms/controller/DmsBaseDeviceLedgerController.java @@ -46,6 +46,12 @@ public class DmsBaseDeviceLedgerController extends BaseController List list = dmsBaseDeviceLedgerService.selectDmsBaseDeviceLedgerList(dmsBaseDeviceLedger); return getDataTable(list); } + @GetMapping("/deviceList") + public AjaxResult deviceList(DmsBaseDeviceLedger dmsBaseDeviceLedger) + { + List list = dmsBaseDeviceLedgerService.selectDmsBaseDeviceLedgerList(dmsBaseDeviceLedger); + return AjaxResult.success(list); + } /** * 查询设备台账信息下拉框列表 diff --git a/hw-ui/src/api/dms/ledger.js b/hw-ui/src/api/dms/ledger.js index 5c787008..9c67465a 100644 --- a/hw-ui/src/api/dms/ledger.js +++ b/hw-ui/src/api/dms/ledger.js @@ -8,6 +8,13 @@ export function listLedger(query) { params: query }) } +export function deviceList(query) { + return request({ + url: '/dms/ledger/deviceList', + method: 'get', + params: query + }) +} // 查询设备台账信息详细 export function getLedger(deviceId) { diff --git a/hw-ui/src/views/dms/dmsBaseAlarmRule/index.vue b/hw-ui/src/views/dms/dmsBaseAlarmRule/index.vue index 7e21b89f..5714d4f1 100644 --- a/hw-ui/src/views/dms/dmsBaseAlarmRule/index.vue +++ b/hw-ui/src/views/dms/dmsBaseAlarmRule/index.vue @@ -64,41 +64,41 @@ - - 新增 - - - - 修改 - - - - 删除 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/hw-ui/src/views/dms/dmsInspectRouteDetail/index.vue b/hw-ui/src/views/dms/dmsInspectRouteDetail/index.vue index 82d2db3b..012d91c5 100644 --- a/hw-ui/src/views/dms/dmsInspectRouteDetail/index.vue +++ b/hw-ui/src/views/dms/dmsInspectRouteDetail/index.vue @@ -246,7 +246,7 @@