Merge remote-tracking branch 'origin/master'

luxiaotao1123

2024-12-26 d14e77e0da0db122867500fecf6d0607ef4d3bd5

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

@@ -119,7 +119,6 @@
        operation: 'Operation',
        config: 'Config',
        tenant: 'Tenant',
        role: 'Role',
        userLogin: 'Token',
        base: 'Base',
        warehouse: 'Warehouse',
@@ -217,7 +216,6 @@
            },
            user: {
                username: "username",
                password: "password",
                password: "password",
                confirmPwd: "confirm password",
                nickname: "nickname",
@@ -397,7 +395,8 @@
                workTime: "work time",
                workDistance: "mileage",
                backpack: "backpack",
                password: "password",
                error: "error",
                errorTime: "errorTime",
                online: 'online',
                task: 'task',
            },
@@ -493,6 +492,7 @@
                endNode: "end node",
                posType: "type",
                backpack: "backpack",
                algoTime: "algo time",
                state: "state",
                segDesc: "seg no",
            },
@@ -628,7 +628,7 @@
            }
        },
        map: {
            welcome: 'Welcome To Rcs',
            welcome: 'Welcome to the RCS System. Tip: Left-click to select objects, right-click to pan the view, and use the scroll wheel to zoom the view.',
            devices: {
                title: 'Icons',
                shelf: 'SHELF',
@@ -645,6 +645,9 @@
                save: 'Save Map',
                clear: 'Clear Map',
                adapt: 'ADAPT',
                rotate: 'ROTATE',
                fake: 'FAKE',
                route: 'ROUTE',
                disable: 'DISABLE',
                enable: 'ENABLE',
                reset: 'RESET',
@@ -672,7 +675,6 @@
                        MOVE: 'MOVE',
                        TO_CHARGE: 'TO_CHARGE',
                        TO_STANDBY: 'TO_STANDBY',
                        TO_CHARGE: 'TO_CHARGE',
                        LOC_TO_LOC: 'LOC_TO_LOC',
                        LOC_TO_STA: 'LOC_TO_STA',
                        STA_TO_LOC: 'STA_TO_LOC',