From c6230b5765eb0b8ac69f8a17c191cc5757d42b18 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 18 十月 2024 12:56:49 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx | 36 +++++++++++++++++-------------------
1 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx b/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx
index 035ab25..275fbac 100644
--- a/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx
+++ b/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx
@@ -1,5 +1,4 @@
import React, { useRef, useEffect, useState } from 'react';
-import * as THREE from 'three';
import { useTranslate } from 'react-admin';
import {
Box,
@@ -10,13 +9,10 @@
Button,
Divider,
Stack,
- Card,
- CardContent,
} from '@mui/material';
import ShelfThree from './ShelfThree';
import { getLocGroup } from '../../http';
import { grey } from '@mui/material/colors';
-import { styled } from '@mui/system';
let shelfThree;
@@ -118,10 +114,6 @@
return endThree;
}, [info]);
- useEffect(() => {
- console.log(selectedLoc);
- }, [selectedLoc])
-
return (
<Box display="flex" height="100%">
<Box
@@ -143,7 +135,7 @@
)}
</Box>
<Box width="50%" height="100%" overflow="auto" pl={1}>
- <Paper elevation={3} style={{
+ <Paper elevation={1} style={{
height: "100%",
padding: '16px',
display: 'flex',
@@ -155,15 +147,24 @@
<Grid item xs={12}>
<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'} />
+ </Grid>
+ <Grid item xs={12}>
+ <KeyValuePair label={translate('table.field.loc.bay')} value={selectedLoc?.bay || 'N/A'} />
+ </Grid>
+ <Grid item xs={12}>
+ <KeyValuePair label={translate('table.field.loc.lev')} value={selectedLoc?.lev || 'N/A'} />
+ </Grid>
+ <Grid item xs={12}>
+ <KeyValuePair label={translate('table.field.loc.offset')} value={selectedLoc?.offset || 'N/A'} />
+ </Grid>
<Grid item xs={12}>
<KeyValuePair label={translate('table.field.loc.locSts')} value={selectedLoc?.locSts$ || 'N/A'} />
</Grid>
-
<Grid item xs={12}>
<KeyValuePair label={translate('table.field.loc.zoneId')} value={selectedLoc?.zoneId$ || 'N/A'} />
</Grid>
-
<Grid item xs={12}>
<KeyValuePair label={translate('table.field.loc.code')} value={selectedLoc?.code$ || 'N/A'} />
</Grid>
@@ -176,14 +177,11 @@
{translate('common.field.opt')}
</Typography>
<Stack spacing={2} mt={2}>
- <Button variant="contained" color="error" fullWidth>
- lock
- </Button>
- <Button variant="contained" disabled fullWidth>
- unlock
- </Button>
<Button variant="contained" fullWidth>
- reset
+ {translate('page.map.insight.shelf.updateStatus')}
+ </Button>
+ <Button variant="contained" color="error" disabled={selectedLoc?.locStsEl !== 'STOCK'} fullWidth>
+ {translate('page.map.insight.shelf.outbound')}
</Button>
</Stack>
</Grid>
--
Gitblit v1.9.1