#

luxiaotao1123

2024-10-15 d635a3441a4d4297af71eb7ca3bc644931092e83

#

 zy-acs-flow/src/map/MapPage.jsx

@@ -49,6 +49,7 @@
    const [mapContainer, setMapContainer] = useState(null);

    const [mode, setMode] = useState(MAP_MODE.OBSERVER_MODE);
    const [dataFetched, setDataFetched] = useState(false);
    const [insightVisible, setInsightVisible] = useState(false);
    const [deviceVisible, setDeviceVisible] = useState(false);
    const [settingsVisible, setSettingsVisible] = useState(false);
@@ -87,7 +88,7 @@
            websocket.onMessage = (wsMsg) => {
                Tool.generateDynamicGraphic(curZone, JSON.parse(wsMsg));
            }

            setDataFetched(true);
            setTimeout(() => {
                player.adaptScreen();
                notify.info(translate('page.map.welcome'));
@@ -252,6 +253,7 @@
                <MapSearch
                    mode={mode}
                    setMode={setMode}
                    dataFetched={dataFetched}
                    curZone={curZone}
                    setSpriteSettings={setSpriteSettings}
                />

 zy-acs-flow/src/map/header/MapSearch.jsx

@@ -35,6 +35,7 @@
    const {
        mode,
        setMode,
        dataFetched,
        curZone,
        setCurSprite,
        setSpriteSettings,
@@ -59,11 +60,10 @@
    };

    useEffect(() => {
        if (!Tool.getMapContainer()) return;
        setTimeout(() => {
        if (dataFetched) {
            resetSearch();
        }, 200);
    }, [curDeviceType, curZone]);
        }
    }, [curDeviceType, dataFetched, curZone]);

    useEffect(() => {
        if (!Tool.getMapContainer()) return;
@@ -195,6 +195,7 @@
                onInputChange={(event, newInputValue) => {
                    setInputValue(newInputValue);
                }}
                disableClearable
            />
        </Stack>
    );

 zy-acs-flow/src/map/settings/MapSettings.jsx

@@ -43,11 +43,11 @@
        if (sprite) {
            setCopyVisible(false);
            reset({
                x: sprite.position.x,
                y: sprite.position.y,
                scaleX: sprite.scale.x,
                scaleY: sprite.scale.y,
                rotation: (sprite.rotation * 180) / Math.PI,
                x: sprite?.position.x,
                y: sprite?.position.y,
                scaleX: sprite?.scale.x,
                scaleY: sprite?.scale.y,
                rotation: (sprite?.rotation * 180) / Math.PI,
            });
        }
    }, [sprite, reset]);