From 95678b2302b7efa540b9c4e8795fbcfed16f0ea3 Mon Sep 17 00:00:00 2001
From: qlsxk <qlsxk@qq.com>
Date: 星期二, 14 十月 2025 13:21:48 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/ConsoleController.java | 21 +++++++++++++++++++++
src/main/webapp/views/admin/locMap/locMap.html | 9 +++++----
2 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index ea1ce40..af8220c 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -7,7 +7,9 @@
import com.core.common.R;
import com.zy.asrs.domain.param.SystemSwitchParam;
import com.zy.asrs.entity.BasMap;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.service.BasMapService;
+import com.zy.asrs.service.LocMastService;
import com.zy.common.model.MapNode;
import com.zy.common.model.enums.NavigationMapType;
import com.zy.common.utils.NavigateMapData;
@@ -36,6 +38,8 @@
private RedisUtil redisUtil;
@Autowired
private NavigateMapData navigateMapData;
+ @Autowired
+ private LocMastService locMastService;
@PostMapping("/system/running/status")
@ManagerAuth(memo = "绯荤粺杩愯鐘舵��")
@@ -105,6 +109,23 @@
List<List<MapNode>> arrayList = (List<List<MapNode>>) data;
List<List<MapNode>> lists = navigateMapData.filterMap(NavigationMapType.getMapTypes(NavigationMapType.NONE), arrayList, lev, null, null);//杩囨护鍦板浘鏁版嵁
+
+ //鑾峰彇褰撳墠妤煎眰搴撲綅鏁版嵁
+ List<LocMast> locMasts = locMastService.selectLocByLev(lev);
+ for (LocMast locMast : locMasts) {
+ Integer row = locMast.getRow1();
+ Integer bay = locMast.getBay1();
+
+ List<MapNode> list = lists.get(row);
+ MapNode mapNode = list.get(bay);
+
+ mapNode.setLocSts(locMast.getLocSts());
+ mapNode.setLocNo(locMast.getLocNo());
+
+ //鏇存柊list
+ list.set(bay, mapNode);
+ lists.set(row, list);
+ }
return R.ok().add(lists);
}
diff --git a/src/main/webapp/views/admin/locMap/locMap.html b/src/main/webapp/views/admin/locMap/locMap.html
index 1942958..25d50c5 100644
--- a/src/main/webapp/views/admin/locMap/locMap.html
+++ b/src/main/webapp/views/admin/locMap/locMap.html
@@ -59,9 +59,9 @@
>
<div v-if="drawerLocNoData!=null">
<div style="margin: 10px;">
- <div style="margin-top: 5px;">X锛歿{drawerLocNoData.x}}</div>
- <div style="margin-top: 5px;">Y锛歿{drawerLocNoData.y}}</div>
- <div style="margin-top: 5px;">Z锛歿{drawerLocNoData.z}}</div>
+ <div style="margin-top: 5px;">鎺掞細{{drawerLocNoData.row}}</div>
+ <div style="margin-top: 5px;">鍒楋細{{drawerLocNoData.bay}}</div>
+ <div style="margin-top: 5px;">灞傦細{{drawerLocNoData.lev}}</div>
<div style="margin-top: 5px;">搴撲綅鍙凤細{{drawerLocNoData.locNo}}</div>
<div style="margin-top: 5px;">搴撲綅鐘舵�侊細{{drawerLocNoData.locSts}}</div>
</div>
@@ -581,7 +581,8 @@
},
rightEvent(x, y, e) {
this.drawerLocNo = true
- this.drawerLocNoData = {x:x, y: y, z: this.currentLev, locNo: this.map[x][y].locNo, locSts: this.map[x][y].locSts};
+ this.drawerLocNoData = {x:x, y: y, z: this.currentLev, locNo: this.map[x][y].locNo,
+ locSts: this.map[x][y].locSts,row:this.map[x][y].row, bay: this.map[x][y].bay, lev: this.currentLev};
},
findDiffList(arr1, arr2) {
let diff = []
--
Gitblit v1.9.1