From b6de988979952b5084ec2563181acc34612928fe Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 17 十月 2024 08:29:53 +0800 Subject: [PATCH] # --- zy-acs-flow/src/i18n/core/zhMap.js | 5 +++++ zy-acs-flow/src/i18n/en.js | 10 ++++++---- zy-acs-flow/src/i18n/zh.js | 9 ++++++--- zy-acs-flow/src/map/MapPage.jsx | 2 +- zy-acs-flow/vite.config.ts | 2 +- zy-acs-flow/src/i18n/core/enMap.js | 4 ++++ zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx | 26 ++++++++++++++++---------- 7 files changed, 39 insertions(+), 19 deletions(-) diff --git a/zy-acs-flow/src/i18n/core/enMap.js b/zy-acs-flow/src/i18n/core/enMap.js new file mode 100644 index 0000000..991cd64 --- /dev/null +++ b/zy-acs-flow/src/i18n/core/enMap.js @@ -0,0 +1,4 @@ +const enMap = { +} + +export default enMap; \ No newline at end of file diff --git a/zy-acs-flow/src/i18n/core/zhMap.js b/zy-acs-flow/src/i18n/core/zhMap.js new file mode 100644 index 0000000..d7a250f --- /dev/null +++ b/zy-acs-flow/src/i18n/core/zhMap.js @@ -0,0 +1,5 @@ +const zhMap = { + +} + +export default zhMap; \ No newline at end of file diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js index 6669ec3..c2c6000 100644 --- a/zy-acs-flow/src/i18n/en.js +++ b/zy-acs-flow/src/i18n/en.js @@ -1,8 +1,9 @@ -import { settings } from 'pixi.js'; import englishMessages from 'ra-language-english'; +import enMap from './core/enMap'; const customEnglishMessages = { ...englishMessages, + ...enMap, hello: 'Hello World', common: { response: { @@ -648,6 +649,10 @@ }, insight: { title: 'Insight', + shelf: { + outbound: 'Outbound', + updateStatus: 'Update Status', + }, }, settings: { title: 'Settings', @@ -695,9 +700,6 @@ bay: 'Bay', }, }, - }, - insight: { - title: 'Insight', }, }, } diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js index 107b235..d2007f8 100644 --- a/zy-acs-flow/src/i18n/zh.js +++ b/zy-acs-flow/src/i18n/zh.js @@ -1,7 +1,9 @@ import chineseMessages from "./core/chineseMessages"; +import zhMap from "./core/zhMap"; const customChineseMessages = { ...chineseMessages, + ...zhMap, hello: '浣犲ソ涓栫晫', common: { response: { @@ -646,6 +648,10 @@ }, insight: { title: '璇︽儏', + shelf: { + outbound: '鍑哄簱', + updateStatus: '淇敼鐘舵��', + }, }, settings: { title: '璁剧疆', @@ -693,9 +699,6 @@ bay: '鍒�', }, }, - }, - insight: { - title: '璇︽儏', }, }, } diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx index 01c1cae..6172e01 100644 --- a/zy-acs-flow/src/map/MapPage.jsx +++ b/zy-acs-flow/src/map/MapPage.jsx @@ -88,7 +88,7 @@ websocket.onMessage = (wsMsg) => { Tool.generateDynamicGraphic(curZone, JSON.parse(wsMsg)); } - + setTimeout(() => { player.adaptScreen(); notify.info(translate('page.map.welcome')); diff --git a/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx b/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx index e8d8f0e..fe2b0fb 100644 --- a/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx +++ b/zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx @@ -155,15 +155,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 +185,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> diff --git a/zy-acs-flow/vite.config.ts b/zy-acs-flow/vite.config.ts index 91e0747..ed41f0d 100644 --- a/zy-acs-flow/vite.config.ts +++ b/zy-acs-flow/vite.config.ts @@ -11,7 +11,7 @@ } }, server: { - port: 3000, + port: 5000, host: '0.0.0.0' }, base: './', -- Gitblit v1.9.1