111 #27

Merged

pxcwqh6yj merged 57 commits from main into fb_branch

pxcwqh6yj commented

Collaborator

There is no content yet.

pxcwqh6yj added 57 commits

a6707aa293 Merge pull request '前端代码' (#5 ) from main into laishengyang

2991bee746 Merge pull request '前端代码1.0' (#6 ) from main into lcf_branch

4ac0dec65e 新增模块

acb823240c 路径规划

275eb0c73f 定位

e5d5af8211 区域规划

10e923f370 调整路径规划

2a36fdf112 修复显示问题

fe2cdf4db5 Merge pull request '前端2.0' (#8 ) from main into lcf_branch

8a07c69c24 文档1.3

1591436d81 Merge pull request '前端2.0' (#7 ) from wangjing into main

163776d844 Merge pull request '文档1.3' (#9 ) from lcf_branch into main

af24343b37 设置威胁区域

77aa42c33b Merge pull request '合并' (#10 ) from main into wangjing

5c6fe7d86a Merge pull request '合并新' (#11 ) from lcf_branch into wangjing

fc3aa2a842 临时保存本地对地图页的修改

e9949b98fc 尝试合并

96349565b9 Merge branch 'wangjing' of https://bdgit.educoder.net/pg9nrcf7t/Drone_project into wangjing

6063649779 路径规划

293fb54cad 合并成功

45c8d863a3 Merge branch 'wangjing' of https://bdgit.educoder.net/pg8nrcf7t/Drone_project into wangjing

e92b5b4e5b 路径规划

a87c2c48f3 Merge pull request '设置威胁区域' (#12 ) from lcf_branch into main

eb246a3cb1 ADD file via upload

99a173afe3 tiaoshi

7b3ef352b0 优化

977a034d10 ok

a4b02ee618 删掉不要的

8fa0c5bde2 修改结构

11fb86ca15 设置大写

0044835731 Merge pull request '两点间的路径规划' (#13 ) from wangjing into main

1ab4944685 Merge pull request '两点间的路径规划' (#14 ) from main into lcf_branch

32dbe7dad0 文档优化

e39c5487ef Merge pull request '设计文档1.0' (#15 ) from lcf_branch into main

0b44b3afe6 Merge pull request '整理仓库' (#16 ) from main into lcf_branch

d33ad253b5 first

c3cd6641de Merge pull request '123' (#17 ) from main into cxf_branch

dc6d91cd63 区域搜索

abe41eac1f Merge pull request '1' (#18 ) from main into laishengyang

2288c03787 完善功能

415b4093e6 Merge pull request '版本0.8' (#19 ) from main into lcf_branch

5e18e07deb 更新无人机项目：添加目标数据模型、视觉模型页面、任务决策页面等功能模块

34875c1180 Merge pull request '合并' (#20 ) from main into cxf_branch

7fee3e6080 本次修改了区域搜索功能~

c0287c4743 Merge pull request '1' (#21 ) from cxf_branch into main

e361621785 try commit

a682dc7f8b 解决合并冲突：保留路径规划功能改动~

0b3bf3fb11 解决合并冲突并移除冗余函数visualizeCoverageMultiPaths

efa054a2d4 11

c44f8c8e61 Merge pull request 'v1.0' (#22 ) from main into lcf_branch

725640927b 代码结构调整

6ce2faa4da 代码调整

7d7413ebea Merge pull request '代码调整' (#23 ) from lcf_branch into main

a2c6c6ff54 任务决策页面更新

0d05315919 Merge pull request '任务决策页面调整' (#24 ) from lcf_branch into main

f999592f8d 修复了区域覆盖规划功能

56e5047d00 Merge pull request '1' (#25 ) from chenxiaofu into main

pxcwqh6yj merged commit 51701c2a09 into fb_branch 1 month ago

pxcwqh6yj referenced this issue from a commit

Merge pull request '111' (#27) from main into fb_branch

The pull request has been merged as 51701c2a09.

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: pg9nrcf7t/Drone_project#27