优化细节
This commit is contained in:
4
env.js
4
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"
|
||||
},
|
||||
};
|
||||
|
||||
@@ -29,7 +29,7 @@ const DraggableBox: React.FC<Props> = ({
|
||||
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外边框
|
||||
)}
|
||||
>
|
||||
{/* 拖拽标题栏 + 关闭按钮 */}
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -746,8 +746,8 @@ export default function DeviceStatusPage({
|
||||
{!isUAV && (
|
||||
<div
|
||||
style={{
|
||||
marginBottom: 16,
|
||||
padding: '12px 16px',
|
||||
marginBottom: 8,
|
||||
padding: '4px 0px',
|
||||
background: '#f5f7fa',
|
||||
borderRadius: 8,
|
||||
display: 'flex',
|
||||
@@ -795,7 +795,7 @@ export default function DeviceStatusPage({
|
||||
|
||||
<div
|
||||
style={{
|
||||
marginBottom: 16,
|
||||
marginBottom: 8,
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
gap: 12,
|
||||
@@ -1074,7 +1074,7 @@ export default function DeviceStatusPage({
|
||||
<Descriptions.Item label="右电机温度"><Text>{fix2(runningStatus?.rightMotorTemp)} ℃</Text></Descriptions.Item>
|
||||
<Descriptions.Item label="主控温度"><Text>{fix2(runningStatus?.chipTemp)} ℃</Text></Descriptions.Item>
|
||||
<Descriptions.Item label="航向角状态"><Text>{(runningStatus?.headingStatus == 1 ? "已初始化" : "未初始化")}</Text></Descriptions.Item>
|
||||
<Descriptions.Item label="控制模式"><Text>{(runningStatus?.controlMode == 1 ? "本地模式" : runningStatus?.controlMode == 3 ? "远程模式" : "控制模式2")}</Text></Descriptions.Item>
|
||||
<Descriptions.Item label="控制模式"><Text>{(runningStatus?.controlMode == 1 ? "本地模式" : runningStatus?.controlMode == 3 ? "远程模式" : "控制模式")}</Text></Descriptions.Item>
|
||||
|
||||
|
||||
<Descriptions.Item label="定位质量">
|
||||
|
||||
@@ -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") {
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -108,7 +108,7 @@ export default function DeviceIndexPage() {
|
||||
return (
|
||||
<Layout style={{ minHeight: '100vh', overflow: 'hidden', scrollbarWidth: "thin", scrollbarColor: '#ccc transparent' }}>
|
||||
<div style={{ display: 'flex', paddingBottom: "4px" }}>
|
||||
<div style={{ padding: '8px 12px 0', flexShrink: 0 }}>
|
||||
<div style={{ padding: '8px 0px 0', flexShrink: 0 }}>
|
||||
<Typography.Title level={4} style={{ margin: 0, fontSize: 'clamp(14px, 1.2vw, 18px)' }}>装备控制</Typography.Title>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -703,7 +703,7 @@ const WorkOrderPage = () => {
|
||||
</Card>
|
||||
|
||||
<Card bordered={false} title={<Text strong style={{ fontSize: 14, color: '#1D2129' }}>AI 建议与关联信息</Text>}
|
||||
style={{ ...cardStyle, marginTop: 16 }} bodyStyle={{ padding: '16px' }}>
|
||||
style={{ ...cardStyle, marginTop: 8 }} bodyStyle={{ padding: '16px' }}>
|
||||
<Row gutter={12} style={{ marginBottom: 16 }}>
|
||||
<Col span={8}>
|
||||
<div style={{ background: '#F9F0FF', padding: '16px 8px', borderRadius: 12, textAlign: 'center', height: '100%', border: '1px solid #F3E8FF' }}>
|
||||
|
||||
Reference in New Issue
Block a user