#

vincentlu

昨天 31977c78455774cc5c1ae2fe2bc5578c014ad068

#

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

@@ -368,9 +368,9 @@
                length: "length",
                headOffset: "head (mm)",
                tailOffset: "tail (mm)",
                width: "width",
                height: "height",
                liftHeight: "lift height",
                width: "width (mm)",
                height: "height (mm)",
                liftHeight: "lift height (mm)",
                diameter: "diameter",
                password: "password",
                backpack: "backpack",

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

@@ -368,9 +368,9 @@
                length: "长度",
                headOffset: "车头(毫米)",
                tailOffset: "车尾(毫米)",
                width: "宽度",
                height: "高度",
                liftHeight: "举升高度",
                width: "宽度(毫米)",
                height: "高度(毫米)",
                liftHeight: "举升高度(毫米)",
                diameter: "旋转直径",
                password: "设备密码",
                backpack: "背篓数量",

 zy-acs-flow/src/page/agvModel/AgvModelCreate.jsx

@@ -108,12 +108,12 @@
                                        validate={required()}
                                    />
                                </Grid>
                                <Grid item xs={4} display="flex" gap={1}>
                                {/* <Grid item xs={4} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.agvModel.length"
                                        source="length"
                                    />
                                </Grid>
                                </Grid> */}
                                <Grid item xs={4} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.agvModel.headOffset"
@@ -132,6 +132,7 @@
                                    <NumberInput
                                        label="table.field.agvModel.width"
                                        source="width"
                                        validate={required()}
                                    />
                                </Grid>
                                <Grid item xs={4} display="flex" gap={1}>
@@ -140,19 +141,19 @@
                                        source="height"
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                <Grid item xs={4} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.agvModel.liftHeight"
                                        source="liftHeight"
                                    />
                                </Grid>
                                <Grid item xs={6} display="flex" gap={1}>
                                {/* <Grid item xs={6} display="flex" gap={1}>
                                    <NumberInput
                                        label="table.field.agvModel.diameter"
                                        source="diameter"
                                        validate={required()}
                                    />
                                </Grid>
                                </Grid> */}
                                <Grid item xs={6} display="flex" gap={1}>
                                    <TextInput
                                        label="table.field.agvModel.password"

 zy-acs-flow/src/page/agvModel/AgvModelEdit.jsx

@@ -84,10 +84,10 @@
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                            {/* <NumberInput
                                label="table.field.agvModel.length"
                                source="length"
                            />
                            /> */}
                            <NumberInput
                                label="table.field.agvModel.headOffset"
                                source="headOffset"
@@ -98,27 +98,28 @@
                                source="tailOffset"
                                validate={required()}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.agvModel.width"
                                source="width"
                                validate={required()}
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.agvModel.height"
                                source="height"
                            />
                        </Stack>
                        <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.agvModel.liftHeight"
                                source="liftHeight"
                            />
                        </Stack>
                        {/* <Stack direction='row' gap={2}>
                            <NumberInput
                                label="table.field.agvModel.diameter"
                                source="diameter"
                            />
                        </Stack>
                        </Stack> */}
                        <Stack direction='row' gap={2}>
                            <TextInput
                                label="table.field.agvModel.password"

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java

@@ -37,7 +37,7 @@
 * Created by vincent on 2023/6/14
 */
@Slf4j
@Component("mapService")
@Component
public class MapService {

    private static final double EPS = 1e-7;