From 70930071a49190f414c8d8bc9c9e9795a4096739 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 23 三月 2026 16:08:27 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into jdxaj
---
zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx b/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx
index 545c0bf..5db1b65 100644
--- a/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx
+++ b/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx
@@ -48,10 +48,10 @@
const promises = [];
const singleHeight = 123;
for (const item of info) {
- const { lev } = item;
+ const { levNo } = item;
promises.push(new Promise((resolve) => {
loader.load('model/shelf.fbx', (mesh) => {
- mesh.position.set(0, singleHeight * (lev - 1), 0);
+ mesh.position.set(0, singleHeight * (levNo - 1), 0);
mesh.scale.set(5, 5, 5);
mesh.name = item.locNo;
mesh.traverse((child) => {
@@ -167,13 +167,13 @@
<KeyValuePair label={translate('table.field.loc.locNo')} value={selectedLoc?.locNo || 'N/A'} />
</Grid>
<Grid item xs={12}>
- <KeyValuePair label={translate('table.field.loc.row')} value={selectedLoc?.row || 'N/A'} />
+ <KeyValuePair label={translate('table.field.loc.rowNo')} value={selectedLoc?.rowNo || 'N/A'} />
</Grid>
<Grid item xs={12}>
- <KeyValuePair label={translate('table.field.loc.bay')} value={selectedLoc?.bay || 'N/A'} />
+ <KeyValuePair label={translate('table.field.loc.bayNo')} value={selectedLoc?.bayNo || 'N/A'} />
</Grid>
<Grid item xs={12}>
- <KeyValuePair label={translate('table.field.loc.lev')} value={selectedLoc?.lev || 'N/A'} />
+ <KeyValuePair label={translate('table.field.loc.levNo')} value={selectedLoc?.levNo || 'N/A'} />
</Grid>
<Grid item xs={12}>
<KeyValuePair label={translate('table.field.loc.offset')} value={selectedLoc?.offset || 'N/A'} />
@@ -203,7 +203,7 @@
color="primary"
variant="contained"
onClick={() => {
- const searchQuery = encodeURIComponent(JSON.stringify({ row, bay }));
+ const searchQuery = encodeURIComponent(JSON.stringify({ rowNo: selectedLoc?.rowNo ?? row, bayNo: selectedLoc?.bayNo ?? bay }));
redirect(`/loc?filter=${searchQuery}`);
}}
>
--
Gitblit v1.9.1