diff --git a/env.js b/env.js index 4dbc7d3..17630ec 100644 --- a/env.js +++ b/env.js @@ -23,9 +23,9 @@ const envConfig = { }, [ENV.PROD]: { //baseURL: 'https://pvcloudservice.satabot.com', - baseURL: 'http://1.95.137.212:8081',//http://192.168.2.56:8081 + baseURL: 'http://1.95.137.212:59015',//http://192.168.2.56:8081 //baseURL: 'https://serviceri.satabot.com', - WS_URL: 'ws://1.95.137.212:9001/ws/', + WS_URL: 'ws://1.95.137.212:59017/ws/', mqtt_url: "ws://1.95.137.212:59021/mqtt", geoserver_url: "http://1.95.137.212:59018/geoserver" }, diff --git a/src/components/Layout.tsx b/src/components/Layout.tsx index eaafb76..fa1357a 100644 --- a/src/components/Layout.tsx +++ b/src/components/Layout.tsx @@ -7,7 +7,9 @@ import zhCN from 'antd/locale/zh_CN'; import { DashboardOutlined, ExperimentOutlined, VideoCameraOutlined, BellOutlined, UserOutlined, LogoutOutlined, - AppstoreOutlined, SettingOutlined, MenuUnfoldOutlined, MenuFoldOutlined + AppstoreOutlined, SettingOutlined, MenuUnfoldOutlined, MenuFoldOutlined, + CompressOutlined, + ExpandOutlined } from '@ant-design/icons'; import logo from '../assets/logo.png'; import { useSelector } from 'react-redux'; @@ -25,6 +27,8 @@ export default function AppLayout() { const [time, setTime] = useState(new Date().toLocaleString()); const [menuList, setMenuList] = useState([]); const [stationList, setStationList] = useState([]); + const [isFullScreen, setIsFullScreen] = useState(false); // 新增全屏标识 + const navigate = useNavigate(); const location = useLocation(); @@ -49,6 +53,17 @@ export default function AppLayout() { } }); }; + const toggleFullScreen = () => { + if (!document.fullscreenElement) { + document.documentElement.requestFullscreen(); + setIsFullScreen(true); + } else { + if (document.exitFullscreen) { + document.exitFullscreen(); + setIsFullScreen(false); + } + } + }; const handleStationChange = (id: number) => { const station = stationList.find(s => s.id === id); @@ -98,6 +113,14 @@ export default function AppLayout() { return () => clearInterval(timer); }, [userInfo]); + useEffect(() => { + const fullscreenChange = () => { + setIsFullScreen(!!document.fullscreenElement); + }; + document.addEventListener('fullscreenchange', fullscreenChange); + return () => document.removeEventListener('fullscreenchange', fullscreenChange); + }, []); + return ( + {time} { setExecute(false); utils.message.success('任务已完成'); - if (controllerRef.current) { - controllerRef.current.destroy?.(); - } + //if (controllerRef.current) { + // controllerRef.current.destroy?.(); + //} + setClearNavLine(clearNavLine + 1); setSelectedRobotForExecute(null); setSelectedRouteForExecute(null); fetchTaskList(); @@ -445,9 +446,9 @@ export default function RobotTaskPage() { fetchTaskPoolList(); fetchTaskHistoryList(); setExecute(false); - if (controllerRef.current) { - controllerRef.current.destroy?.(); - } + //if (controllerRef.current) { + // controllerRef.current.destroy?.(); + //} setSelectedRobotForExecute(null); setSelectedRouteForExecute(null); } else { @@ -1147,7 +1148,7 @@ export default function RobotTaskPage() { {activeTab === 'history' && ( <>
- {/* ({ ...prev, dateRange: dates })); }} showTime - />*/} + />