f封装完成点 无人机和 机器人 地图清空实时轨迹和清空规划轨迹
This commit is contained in:
@@ -51,6 +51,7 @@ export default function RobotTaskPage() {
|
||||
const [robotRealtimePosition, setRobotRealtimePosition] = useState(null);
|
||||
const [execute, setExecute] = useState(false); // 是否执行任务
|
||||
const [taskList, setTaskList] = useState([]);
|
||||
const [arrivedPoint, setArrivedPoint] = useState(null);//完成点
|
||||
|
||||
|
||||
// 设备数据
|
||||
@@ -59,6 +60,8 @@ export default function RobotTaskPage() {
|
||||
|
||||
const [focusLocation, setFocusLocation] = useState(null);
|
||||
const [points, setPoints] = useState([]);
|
||||
const [clearNavLine, setClearNavLine] = useState(0);
|
||||
const [clearPlanLine, setClearPlanLine] = useState(0);
|
||||
|
||||
const [routeSearch, setRouteSearch] = useState('');
|
||||
const [routeList, setRouteList] = useState([]);
|
||||
@@ -115,12 +118,18 @@ export default function RobotTaskPage() {
|
||||
if (controllerRef.current) {
|
||||
controllerRef.current.destroy?.();
|
||||
}
|
||||
controllerRef.current = null;
|
||||
setSelectedRobotForExecute(null);
|
||||
setSelectedRouteForExecute(null);
|
||||
fetchTaskList();
|
||||
fetchTaskHistoryList();
|
||||
fetchTaskPoolList();
|
||||
|
||||
|
||||
}
|
||||
const handleFinishEdPoint = (point) => {
|
||||
console.log('到达完成点11111111111', point);
|
||||
setArrivedPoint(point);
|
||||
}
|
||||
|
||||
|
||||
useEffect(() => {
|
||||
@@ -128,6 +137,7 @@ export default function RobotTaskPage() {
|
||||
|
||||
controller.onDeviceInfoUpdate = setRobotRealtimePosition;
|
||||
controller.onIsFinished = handleFinish;
|
||||
controller.handleArrivedPoint = handleFinishEdPoint;
|
||||
controller.init();
|
||||
|
||||
|
||||
@@ -154,7 +164,7 @@ export default function RobotTaskPage() {
|
||||
if (robotRealtimePosition && execute) {
|
||||
let warningMsg = '';
|
||||
|
||||
if (robotRealtimePosition?.controlMode != "3") {
|
||||
if (robotRealtimePosition?.controlMode == "1") {
|
||||
warningMsg = `请切换到远程模式 ${robotRealtimePosition?.controlMode}`;
|
||||
} else if (robotRealtimePosition?.qual != "4") {
|
||||
warningMsg = '定位未固定';
|
||||
@@ -316,7 +326,7 @@ export default function RobotTaskPage() {
|
||||
message.error('请选择执行设备');
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
||||
try {
|
||||
const params = {
|
||||
@@ -438,7 +448,6 @@ export default function RobotTaskPage() {
|
||||
if (controllerRef.current) {
|
||||
controllerRef.current.destroy?.();
|
||||
}
|
||||
controllerRef.current = null;
|
||||
setSelectedRobotForExecute(null);
|
||||
setSelectedRouteForExecute(null);
|
||||
} else {
|
||||
@@ -888,10 +897,10 @@ export default function RobotTaskPage() {
|
||||
{/* 控制模式 */}
|
||||
<span>
|
||||
控制模式:{robotRealtimePosition?.controlMode}
|
||||
{robotRealtimePosition?.controlMode == '3' ? (
|
||||
<span style={{ color: '#9eff9e' }}>远程</span>
|
||||
{robotRealtimePosition?.controlMode == '1' ? (
|
||||
<span style={{ color: '#9eff9e' }}>本地</span>
|
||||
) : (
|
||||
<span style={{ color: '#ff6f6f' }}>本地</span>
|
||||
<span style={{ color: '#ff6f6f' }}>远程</span>
|
||||
)}
|
||||
</span>
|
||||
|
||||
@@ -918,14 +927,7 @@ export default function RobotTaskPage() {
|
||||
)}
|
||||
</div>}
|
||||
size="small"
|
||||
extra={
|
||||
<Space size={4}>
|
||||
<Button size="small" icon={<PlusOutlined />} style={{ borderRadius: 4 }}>新增路线</Button>
|
||||
<Button size="small" icon={<ImportOutlined />} style={{ borderRadius: 4 }}>导入</Button>
|
||||
<Button size="small" icon={<SaveOutlined />} style={{ borderRadius: 4 }}>保存</Button>
|
||||
<Button size="small" icon={<Maximize2 size={12} />} />
|
||||
</Space>
|
||||
}
|
||||
|
||||
bordered={false}
|
||||
bodyStyle={{ padding: 0, position: 'relative' }}
|
||||
style={{ ...cardStyle, marginBottom: 10 }}
|
||||
@@ -939,6 +941,9 @@ export default function RobotTaskPage() {
|
||||
realtimeType="robot"
|
||||
from="device-control"
|
||||
drawRealTime={execute}
|
||||
finishPoint={arrivedPoint}
|
||||
ifClearNavLine={clearNavLine}
|
||||
ifClearPlanLine={clearPlanLine}
|
||||
/>
|
||||
</div>
|
||||
</Card>
|
||||
@@ -1108,7 +1113,7 @@ export default function RobotTaskPage() {
|
||||
{activeTab === 'history' && (
|
||||
<>
|
||||
<div style={{ marginBottom: 8, display: 'flex', gap: 8, alignItems: 'center' }}>
|
||||
<RangePicker
|
||||
{/*<RangePicker
|
||||
size="small"
|
||||
format="YYYY-MM-DD HH:mm:ss"
|
||||
placeholder={['开始时间', '结束时间']}
|
||||
@@ -1117,7 +1122,7 @@ export default function RobotTaskPage() {
|
||||
setHistoryFilterForm(prev => ({ ...prev, dateRange: dates }));
|
||||
}}
|
||||
showTime
|
||||
/>
|
||||
/>*/}
|
||||
<Select
|
||||
style={{ width: 120 }}
|
||||
size="small"
|
||||
@@ -1126,7 +1131,7 @@ export default function RobotTaskPage() {
|
||||
options={[
|
||||
{ label: '执行成功', value: 'FINISH' },
|
||||
{ label: '执行失败', value: 'FAILED' },
|
||||
{ label: '已取消', value: 'CANCELLED' },
|
||||
{ label: '已取消', value: 'CANCELED' },
|
||||
]}
|
||||
value={historyFilterForm.taskStatus}
|
||||
onChange={(val) => {
|
||||
@@ -1134,7 +1139,7 @@ export default function RobotTaskPage() {
|
||||
}}
|
||||
/>
|
||||
<Select
|
||||
style={{ width: 140 }}
|
||||
style={{ width: 340 }}
|
||||
size="small"
|
||||
placeholder="全部机器人"
|
||||
allowClear
|
||||
|
||||
Reference in New Issue
Block a user