From f99cd59b1da32f74110661d643879a7a5f865d70 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 19 六月 2024 09:53:17 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasLiftController.java | 6 +++---
zy-asrs-flow/src/pages/device/lift/index.jsx | 9 +++++----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-flow/src/pages/device/lift/index.jsx b/zy-asrs-flow/src/pages/device/lift/index.jsx
index 433b5b8..a797f65 100644
--- a/zy-asrs-flow/src/pages/device/lift/index.jsx
+++ b/zy-asrs-flow/src/pages/device/lift/index.jsx
@@ -90,11 +90,12 @@
try {
const resp = await Http.doPost('api/basLift/getMapLev', {});
if (resp.code === 200) {
- let arr = [];
- for (let i = 1; i <= resp.data; i++) {
+ let arr = JSON.parse(resp.data);
+ for (let i = 1; i <= arr.length; i++) {
+ let lev = arr[i];
arr.push({
- value: i,
- label: i
+ value: lev,
+ label: lev
})
}
setMapLev(arr);
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasLiftController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasLiftController.java
index be4dc2f..bc1d3ff 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasLiftController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/controller/BasLiftController.java
@@ -136,10 +136,10 @@
@PreAuthorize("hasAuthority('core:basLift:list')")
@PostMapping("/basLift/getMapLev")
public R getMapLev() {
- List<Dict> dicts = dictService.list(new LambdaQueryWrapper<Dict>()
- .like(Dict::getFlag, "map-")
+ Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>()
+ .like(Dict::getFlag, "liftOperaLev")
.eq(Dict::getStatus, 1));
- return R.ok().add(dicts.size());
+ return R.ok().add(dict.getValue());
}
@PreAuthorize("hasAuthority('core:basLift:operator')")
--
Gitblit v1.9.1