From b4288288ba1047c891b53c2a98f5a4c87db5eca0 Mon Sep 17 00:00:00 2001 From: mmc <1556375442@qq.com> Date: Wed, 17 Jun 2026 11:14:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=86=E8=8A=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- env.js | 4 ++-- src/components/Draggable.tsx | 2 +- src/components/Map.jsx | 4 ++-- src/components/devices/DeviceStatusPage.tsx | 8 ++++---- src/components/devices/RobotTaskPage.tsx | 2 +- src/components/useWebRTCStream.tsx | 3 ++- src/pages/Devices.tsx | 2 +- src/pages/WorkOrder.tsx | 2 +- 8 files changed, 14 insertions(+), 13 deletions(-) diff --git a/env.js b/env.js index fabe523..7be8c3e 100644 --- a/env.js +++ b/env.js @@ -12,7 +12,7 @@ const envConfig = { baseURL: 'http://192.168.2.59:8081',//http://192.168.2.56:8081 //baseURL: 'http://1.95.137.212:59015',//http://192.168.2.56:8081 WS_URL: 'ws://192.168.2.59:9002/ws/', - mqtt_url: "ws://192.168.2.59:8083/mqtt", + mqtt_url: "ws://1.95.137.212:8083/mqtt", geoserver_url: "http://192.168.2.59:7000/geoserver" //baseURL: 'http://1.95.137.212:8081',//http://192.168.2.56:8081 @@ -32,7 +32,7 @@ const envConfig = { 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:59017/ws/', - mqtt_url: "ws://1.95.137.212:59021/mqtt", + mqtt_url: "ws://1.95.137.212:8083/mqtt", geoserver_url: "http://1.95.137.212:59018/geoserver" }, }; diff --git a/src/components/Draggable.tsx b/src/components/Draggable.tsx index 7dc1c18..f5aecce 100644 --- a/src/components/Draggable.tsx +++ b/src/components/Draggable.tsx @@ -29,7 +29,7 @@ const DraggableBox: React.FC = ({ ref={nodeRef} className={clsx( 'fixed select-none z-[9999] bg-white shadow-xl rounded-lg overflow-hidden', - 'border-[8px] border-slate-200 top-[8px] right-[8px] w-[700px] h-[580px] ' // 整体8px外边框 + 'border-[8px] border-slate-200 top-[8px] right-[8px] w-[800px] h-[580px] ' // 整体8px外边框 )} > {/* 拖拽标题栏 + 关闭按钮 */} diff --git a/src/components/Map.jsx b/src/components/Map.jsx index 7ee055b..b6c2dfb 100644 --- a/src/components/Map.jsx +++ b/src/components/Map.jsx @@ -1518,8 +1518,8 @@ const CesiumMap = React.forwardRef(({ ifClear, ifClearPlanLine, ifClearNavLine, if (entity.billboard) entity.billboard.show = false; }); - const lon = Number(realtimePosition.lon); - const lat = Number(realtimePosition.lat); + const lon = Number(realtimePosition.lon || finishPoint.lng); + const lat = Number(realtimePosition.lat || finishPoint.lat); const position = Cesium.Cartesian3.fromDegrees(lon, lat, 1); diff --git a/src/components/devices/DeviceStatusPage.tsx b/src/components/devices/DeviceStatusPage.tsx index e82b548..030cb29 100644 --- a/src/components/devices/DeviceStatusPage.tsx +++ b/src/components/devices/DeviceStatusPage.tsx @@ -746,8 +746,8 @@ export default function DeviceStatusPage({ {!isUAV && (
{fix2(runningStatus?.rightMotorTemp)} ℃ {fix2(runningStatus?.chipTemp)} ℃ {(runningStatus?.headingStatus == 1 ? "已初始化" : "未初始化")} - {(runningStatus?.controlMode == 1 ? "本地模式" : runningStatus?.controlMode == 3 ? "远程模式" : "控制模式2")} + {(runningStatus?.controlMode == 1 ? "本地模式" : runningStatus?.controlMode == 3 ? "远程模式" : "控制模式")} diff --git a/src/components/devices/RobotTaskPage.tsx b/src/components/devices/RobotTaskPage.tsx index 8e2003c..303ee8c 100644 --- a/src/components/devices/RobotTaskPage.tsx +++ b/src/components/devices/RobotTaskPage.tsx @@ -235,7 +235,7 @@ export default function RobotTaskPage() { let warningMsg = ''; if (robotRealtimePosition?.controlMode == "1") { - warningMsg = `请切换到远程模式 ${robotRealtimePosition?.controlMode}`; + warningMsg = `请切换到远程模式 `; } else if (robotRealtimePosition?.qual != "4") { warningMsg = '定位未固定'; } else if (robotRealtimePosition?.headingStatus != "1") { diff --git a/src/components/useWebRTCStream.tsx b/src/components/useWebRTCStream.tsx index 5ca1a14..d948406 100644 --- a/src/components/useWebRTCStream.tsx +++ b/src/components/useWebRTCStream.tsx @@ -47,7 +47,8 @@ export function useWebRTCPlayer(deviceId: string, url: string) { v.style.height = '100%'; v.style.objectFit = 'contain'; videoRef.current = v; - const token = "eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjdjMjUwODExLTEwYjAtNDVlYS05NzM3LWFiYTc4M2ExZGMzZiJ9.A61n89qWXEYnWZv8l8nntt9Abcp4k2s1_sW-mRa16FLTBFjuWiVsqfZJMGMzXpKN-O4geii1SBp2-2esRmGTGQ" + const token = "eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImQ5MzBiOTU3LTBiNGEtNDgyNy1iZmYxLTIyODM3YmMyYWI4YiJ9.N4zHRPu_JsgdGWTaAGgrg6qu7CSYuECSu237Vg79JAjuoB6Qd52df3Pb6bqBCj1oMLi5456Sg9sgH0QMIJxd8A" + //const token = localStorage.getItem('videotoken') || JSON.parse(localStorage.getItem('userInfo') || '{}')?.token; diff --git a/src/pages/Devices.tsx b/src/pages/Devices.tsx index e2ceb7d..493d18f 100644 --- a/src/pages/Devices.tsx +++ b/src/pages/Devices.tsx @@ -108,7 +108,7 @@ export default function DeviceIndexPage() { return (
-
+
装备控制
diff --git a/src/pages/WorkOrder.tsx b/src/pages/WorkOrder.tsx index a77e7b1..9a2dc21 100644 --- a/src/pages/WorkOrder.tsx +++ b/src/pages/WorkOrder.tsx @@ -703,7 +703,7 @@ const WorkOrderPage = () => { AI 建议与关联信息} - style={{ ...cardStyle, marginTop: 16 }} bodyStyle={{ padding: '16px' }}> + style={{ ...cardStyle, marginTop: 8 }} bodyStyle={{ padding: '16px' }}>