#

vincentlu

2 天以前 a217d0355a08f65251b3cdd6c505ee62a0b0bb58

#

 zy-acs-flow/src/i18n/en.js

@@ -894,6 +894,7 @@
                direction: 'DIRECTION',
                agv: 'AGV',
                point: 'POINT',
                code: 'CODE',
                area: 'AREA',
            },
            action: {
@@ -938,6 +939,25 @@
                    outbound: 'Outbound',
                    updateStatus: 'Update Status',
                },
                code: {
                    summary: {
                        qr: 'QR Preview',
                    },
                    sections: {
                        rules: 'Movement Rules',
                    },
                    fields: {
                        mapPosition: 'Map Position',
                        rotation: 'Rotation (°)',
                    },
                    actions: {
                        openDetail: 'Edit',
                    },
                    relations: {
                        routes: 'Routes',
                        empty: 'No related info',
                    },
                },
                control: {
                    type: {
                        MOVE: 'MOVE',

 zy-acs-flow/src/i18n/zh.js

@@ -894,6 +894,7 @@
                direction: '方向',
                agv: '车辆',
                point: '定位点',
                code: '地面码',
                area: '区域',
            },
            action: {
@@ -938,6 +939,25 @@
                    outbound: '出库',
                    updateStatus: '修改状态',
                },
                code: {
                    summary: {
                        qr: '二维码预览',
                    },
                    sections: {
                        rules: '通行规则',
                    },
                    fields: {
                        mapPosition: '地图坐标',
                        rotation: '旋转角度(°)',
                    },
                    actions: {
                        openDetail: '编辑',
                    },
                    relations: {
                        routes: '关联路线',
                        empty: '暂无关联信息',
                    },
                },
                control: {
                    type: {
                        MOVE: '移动',

 zy-acs-flow/src/map/insight/code/CodeMain.jsx

@@ -133,18 +133,18 @@
                                    />
                                )}
                                <FieldGrid items={spatialItems} loading={loading} />
                                <Button
                                    variant="contained"
                                    color="primary"
                                    startIcon={<OpenInNewIcon />}
                                    onClick={handleOpenDetail}
                                    disabled={!info?.id}
                                    sx={{ alignSelf: 'flex-start', textTransform: 'none', px: 3 }}
                                >
                                    {translate('page.map.insight.code.actions.openDetail', { _: '编辑' })}
                                </Button>
                            </Stack>
                        </Paper>
                        <Button
                            variant="contained"
                            color="primary"
                            startIcon={<OpenInNewIcon />}
                            onClick={handleOpenDetail}
                            disabled={!info?.id}
                            sx={{ alignSelf: 'flex-start', textTransform: 'none', px: 3 }}
                        >
                            {translate('page.map.insight.code.actions.openDetail', { _: '编辑' })}
                        </Button>
                    </Stack>
                </Grid>
                <Grid item xs={12} md={7}>
@@ -477,32 +477,32 @@
    const theme = useTheme();
    const enabledCount = rules.filter(rule => rule.enabled).length;
    const placement = {
        0: { gridColumn: 2, gridRow: 1 },
        90: { gridColumn: 3, gridRow: 2 },
        180: { gridColumn: 2, gridRow: 3 },
        270: { gridColumn: 1, gridRow: 2 },
        0: { gridColumn: '2 / span 3', gridRow: 1 },
        90: { gridColumn: '4 / span 2', gridRow: 2 },
        180: { gridColumn: '2 / span 3', gridRow: 3 },
        270: { gridColumn: '1 / span 2', gridRow: 2 },
    };

    return (
        <Box
            sx={{
                display: 'grid',
                gridTemplateColumns: 'repeat(3, minmax(0, 1fr))',
                gridTemplateRows: 'repeat(3, minmax(58px, auto))',
                gridTemplateColumns: 'repeat(5, minmax(0, 1fr))',
                gridTemplateRows: 'repeat(3, minmax(44px, auto))',
                gap: 1,
                alignItems: 'stretch',
            }}
        >
            <Box
                sx={{
                    gridColumn: 2,
                    gridColumn: 3,
                    gridRow: 2,
                    borderRadius: 3,
                    border: '1px dashed',
                    borderColor: 'divider',
                    backgroundColor: alpha(theme.palette.primary.main, 0.04),
                    px: 1,
                    py: 0.75,
                    py: 0.5,
                    display: 'flex',
                    alignItems: 'center',
                    justifyContent: 'center',
@@ -530,9 +530,9 @@
                            backgroundColor: rule.enabled
                                ? alpha(theme.palette.success.main, 0.08)
                                : alpha(theme.palette.error.main, 0.08),
                            px: 1,
                            py: 0.75,
                            minHeight: 60,
                            px: 1.25,
                            py: 0.5,
                            minHeight: 46,
                            display: 'flex',
                            alignItems: 'center',
                            justifyContent: 'center',
@@ -547,6 +547,7 @@
                                variant="caption"
                                sx={{
                                    lineHeight: 1.1,
                                    fontSize: '0.73rem',
                                    color: rule.enabled ? 'success.dark' : 'error.dark',
                                    fontWeight: 600,
                                }}

 zy-acs-flow/src/map/insight/code/index.jsx

@@ -13,7 +13,7 @@
    const [loading, setLoading] = useState(false);

    const codeLabel = translate('page.map.devices.code', {
        _: '地面码'
        _: 'Code'
    });

    const fetchCodeInfo = useCallback(async (code, options = {}) => {
@@ -83,7 +83,7 @@

            <Divider />

            <Box flex={1} pt={2} sx={{ overflow: 'hidden' }}>
            <Box flex={1} pt={2} sx={{ minHeight: 0, overflowY: 'auto', overflowX: 'hidden', pr: 1 }}>
                {activeTab === 0 && (
                    <CodeMain
                        sprite={sprite}

 zy-acs-flow/src/page/code/CodeEdit.jsx

@@ -219,7 +219,7 @@
        <Edit
            redirect="list"
            mutationMode={EDIT_MODE}
            actions={<CustomerTopToolBar />}
            actions={<CustomerTopToolBar backPrevious />}
            aside={<EditBaseAside />}
        >
            <SimpleForm