#
luxiaotao1123
2024-10-17 b6de988979952b5084ec2563181acc34612928fe
#
5个文件已修改
2个文件已添加
58 ■■■■■ 已修改文件
zy-acs-flow/src/i18n/core/enMap.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/i18n/core/zhMap.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/i18n/en.js 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/i18n/zh.js 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/map/MapPage.jsx 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/map/insight/shelf/ShelfMain.jsx 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/vite.config.ts 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-flow/src/i18n/core/enMap.js
New file
@@ -0,0 +1,4 @@
const enMap = {
}
export default enMap;
zy-acs-flow/src/i18n/core/zhMap.js
New file
@@ -0,0 +1,5 @@
const zhMap = {
}
export default zhMap;
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',
            },
        },
    }
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: '详情',
            },
        },
    }
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'));
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>
zy-acs-flow/vite.config.ts
@@ -11,7 +11,7 @@
    }
  },
  server: {
    port: 3000,
    port: 5000,
    host: '0.0.0.0'
  },
  base: './',