diff --git a/acs2/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java b/acs2/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java index afc10f5..62a0fd7 100644 --- a/acs2/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java +++ b/acs2/nladmin-system/src/main/java/org/nl/acs/device/service/impl/StorageCellServiceImpl.java @@ -47,10 +47,14 @@ public class StorageCellServiceImpl implements StorageCellService { @Override public Map queryAll(Map whereJson, Pageable page) { String storage_code = MapUtil.getStr(whereJson, "storage_code"); + String region_code = MapUtil.getStr(whereJson, "region_code"); String where = ""; if (StrUtil.isNotEmpty(storage_code)) { where = " and storage_code like '%" + storage_code + "%'"; } + if (StrUtil.isNotEmpty(region_code)) { + where = " and region_code = '" + region_code + "'"; + } WQLObject wo = WQLObject.getWQLObject("acs_storage_cell"); ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1 = 1 " + where, "update_time desc"); final JSONObject json = rb.pageResult(); diff --git a/acs2/nladmin-ui/src/views/acs/device/storageCell/index.vue b/acs2/nladmin-ui/src/views/acs/device/storageCell/index.vue index bf0d0ad..e6a0395 100644 --- a/acs2/nladmin-ui/src/views/acs/device/storageCell/index.vue +++ b/acs2/nladmin-ui/src/views/acs/device/storageCell/index.vue @@ -12,6 +12,18 @@ style="width: 200px;" class="filter-item" /> + + + @@ -60,6 +72,7 @@ +