yulong
/
NewN_UAVPlane
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
781 Commits 1 Branch 0 Tags 13 GiB
Commit Graph

663 Commits

Author SHA1 Message Date
王志勋 7ff4302abf 1 2024-03-04 16:55:26 +08:00
王志勋 44f1046be0 Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane 2024-03-04 13:44:44 +08:00
王志勋 5e73da145f 1 2024-03-04 13:42:20 +08:00
yulong 053dbfcc04 111 2024-03-04 13:36:31 +08:00
王志勋 42ea8a8e5a 1 2024-03-01 10:22:54 +08:00
王志勋 3fae2be142 1 2024-03-01 09:36:10 +08:00
YangHua 2fb543e382 添加多端打组逻辑 2024-02-29 23:18:34 +08:00
YangHua 5cbeb0097e ewe 2024-02-29 22:48:53 +08:00
YangHua 8f41ba628e 23 2024-02-29 22:44:46 +08:00
YangHua 92932a10e1 qw 2024-02-29 22:38:41 +08:00
YangHua 483068ce52 ee 2024-02-29 22:36:03 +08:00
YangHua b3743f199c 12 2024-02-29 22:31:33 +08:00
YangHua 55a7e3e109 修改打组逻辑 2024-02-29 22:23:45 +08:00
YangHua dfcfd33ad0 修复无人机端重新登录编组数据不同步问题 2024-02-29 11:10:31 +08:00
YangHua 730ca9d9e7 添加动态获取分组操作 2024-02-29 00:34:02 +08:00
YangHua 95464f34f8 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-02-28 21:38:17 +08:00
YangHua 0b773deefb 添加更改数据库中设备得属性 
更新设备数据结构
 2024-02-28 21:36:57 +08:00
王志勋 acbc730412 1 2024-02-28 18:09:32 +08:00
yulong cdbc867b4b Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-02-28 09:26:47 +08:00
yulong ecaac0b0a1 11 2024-02-28 09:24:38 +08:00
王志勋 4e927017dc Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane 2024-02-28 09:08:12 +08:00
王志勋 8e962f03a1 1 2024-02-28 09:08:02 +08:00
陈向学 5415500133 asdada 2024-02-27 19:00:07 +08:00
王志勋 c004b28565 1 2024-02-27 17:32:15 +08:00
陈向学 fcce007966 asdad 2024-02-27 16:45:49 +08:00
王志勋 49dd61e697 1 2024-02-27 16:34:06 +08:00
陈向学 addc37e8a8 as 2024-02-27 16:04:43 +08:00
陈向学 1c478006bc saccacac 2024-02-27 15:58:01 +08:00
陈向学 1f491565a4 ssssss 2024-02-27 15:33:01 +08:00
陈向学 e29060cbfe 删除 2024-02-27 13:42:57 +08:00
王志勋 823cbef0f6 1 2024-02-27 11:23:28 +08:00
王志勋 8488edaace 删除Mqtt通信，改为原始通信 2024-02-27 11:13:07 +08:00
YangHua 78349f174f Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-02-27 00:35:36 +08:00
YangHua d4bb384209 添加组标志 2024-02-27 00:35:11 +08:00
王志勋 71d0c94fd9 Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane 2024-02-26 18:50:30 +08:00
王志勋 aca66a67c0 1 2024-02-26 18:50:09 +08:00
yulong 8dfca84928 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-02-26 18:05:15 +08:00
yulong 1ad647b2e3 无人机视角修改 2024-02-26 18:04:59 +08:00
YangHua 3555b0dcc0 修复问题 2024-02-23 22:21:16 +08:00
YangHua 96e8c51844 修改编组逻辑 2024-02-23 00:36:53 +08:00
YangHua 20b0b3e0db 添加编组功能 2024-02-22 23:46:04 +08:00
YangHua f3eaa58269 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-02-22 01:12:47 +08:00
YangHua 4d8a06266b 添加编队逻辑 2024-02-22 00:46:37 +08:00
王志勋 dcec03025c Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane 2024-02-21 18:05:40 +08:00
王志勋 42dd810654 1 2024-02-21 18:05:18 +08:00
yulong d66d034a6f 提交 2024-02-21 17:51:27 +08:00
YangHua 834b89fdd6 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-02-21 11:13:45 +08:00
yulong 49f3df6e06 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-02-21 10:43:04 +08:00
yulong 4b9c71d9d2 提交 2024-02-21 10:42:16 +08:00
王志勋 d8ea7d1a9b Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane 2024-02-21 09:36:37 +08:00
王志勋 712161be56 1 2024-02-21 09:36:08 +08:00
yulong 0571fcc29f 提交 2024-02-21 09:28:49 +08:00
YangHua 907d284537 qweq 2024-02-21 00:19:07 +08:00
YangHua f2877ee0ee 添加组代码 2024-02-20 23:58:42 +08:00
yulong a358598095 提交 2024-02-20 17:56:47 +08:00
王志勋 449c1914a4 1 2024-02-20 10:20:19 +08:00
yulong 92163cadb5 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-02-20 09:37:06 +08:00
yulong a85f35943c 想定 2024-02-20 09:34:43 +08:00
王志勋 19c52cae93 Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane 2024-02-20 09:33:41 +08:00
王志勋 ee340b47fb 1 2024-02-20 09:33:27 +08:00
YangHua db416cbfd5 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-02-19 17:50:42 +08:00
YangHua 2690ae1cfb 121 2024-02-19 17:50:32 +08:00
陈向学 50c7cf2033 改配置 2024-02-18 16:08:59 +08:00
YangHua d06b7f36a6 修改多窗口 打开 逻辑 2024-02-06 17:54:56 +08:00
YangHua 31c8629b05 融合 2024-02-06 14:56:34 +08:00
YangHua 465d55cbe6 ewewe 2024-02-06 14:55:24 +08:00
yulong 5256a1448b 设备数量 2024-02-05 17:54:34 +08:00
王志勋 e47d967348 Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane 2024-02-04 17:17:09 +08:00
王志勋 3c45c15d84 1 2024-02-04 17:16:59 +08:00
YangHua 9afdd9b4f5 取代wzx登出逻辑 2024-02-04 16:44:53 +08:00
YangHua 3ef0b0d112 修复登出逻辑 2024-02-04 16:37:40 +08:00
王志勋 4ec85ab30e Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane 2024-02-04 14:03:21 +08:00
王志勋 f796579305 1 2024-02-04 14:03:09 +08:00
yulong bdc8c8bbe8 想定 2024-02-04 13:54:23 +08:00
yulong 1c4687d832 1 2024-02-04 10:37:52 +08:00
yulong 5ac22b1c48 想定编辑 2024-02-04 10:00:46 +08:00
yulong 439ea9c48b Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-02-02 17:12:48 +08:00
yulong 7ddc2b9250 1 2024-02-02 17:12:31 +08:00
王志勋 d3fabeb5ef 1 2024-02-02 17:11:06 +08:00
王志勋 c095484b0a 1 2024-02-02 17:08:26 +08:00
YangHua 1445fb76e0 添加态势画面 移动 缩放功能 2024-02-02 13:33:43 +08:00
YangHua 66274c1bc0 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-02-02 12:13:20 +08:00
YangHua 12e0809d4d 添加放大缩小逻辑 2024-02-02 12:13:15 +08:00
yulong 442758cd05 雷达盲区和车辆名字 2024-02-01 14:17:30 +08:00
yulong 0656d005df Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-02-01 13:44:27 +08:00
yulong fced58f6ee 2 2024-02-01 13:44:17 +08:00
王志勋 2eb28ee5af 1 2024-02-01 11:16:10 +08:00
yulong e70b5eab69 11 2024-02-01 11:00:34 +08:00
yulong 1c16df548a 提交 2024-02-01 10:58:11 +08:00
王志勋 83ff5aa777 Merge branch 'master' of http://172.16.1.12/yulong/NewN_UAVPlane 2024-02-01 09:43:18 +08:00
王志勋 ff3b5e2769 1 2024-02-01 09:43:10 +08:00
YangHua 9dd7c20e5d 添加loading 2024-02-01 09:19:13 +08:00
yulong b266249130 1 2024-01-30 18:23:05 +08:00
YangHua 1b04f8000b Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-30 17:38:14 +08:00
YangHua 721c030834 weewe 2024-01-30 17:38:03 +08:00
账号名 a3e5d273f7 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-30 17:03:00 +08:00
账号名 40f569d2c2 1 2024-01-30 17:02:41 +08:00
YangHua ed4fc75cad 4112 2024-01-30 16:09:54 +08:00
YangHua 7fbed65272 rerer 2024-01-30 16:08:03 +08:00
账号名 429f2bb1a7 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-30 15:47:01 +08:00
账号名 564bda3dd5 1 2024-01-30 15:46:44 +08:00
yulong ae19fb8ff9 1 2024-01-30 15:45:34 +08:00
账号名 a1898229d8 1 2024-01-29 22:15:31 +08:00
账号名 d64d5a8e3d 1 2024-01-29 22:04:37 +08:00
账号名 b1379f43f4 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-29 21:50:52 +08:00
账号名 646dad2213 1 2024-01-29 21:50:34 +08:00
YangHua ec8e3dad6c rewr 2024-01-29 19:01:11 +08:00
YangHua a26d9ee922 ewew 2024-01-29 18:52:18 +08:00
YangHua d7e88405ad wqewe 2024-01-29 18:06:57 +08:00
账号名 425d5a8ab3 1 2024-01-29 17:43:02 +08:00
账号名 2f341e93d8 1 2024-01-29 16:01:45 +08:00
账号名 2e4373b2d2 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-29 15:46:24 +08:00
账号名 9f074ec875 1 2024-01-29 15:46:15 +08:00
YangHua e5c6733f60 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-29 15:45:14 +08:00
YangHua dbea88a61d wewe 2024-01-29 15:44:59 +08:00
yulong 280475be0c Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-29 15:06:30 +08:00
yulong 2b6815c369 1 2024-01-29 15:06:21 +08:00
账号名 640bb4f529 1 2024-01-29 15:04:05 +08:00
账号名 845a7ca740 1 2024-01-29 14:43:43 +08:00
账号名 9c17e11cf8 1 2024-01-29 14:30:20 +08:00
账号名 be6067fdac 1 2024-01-29 14:11:54 +08:00
账号名 66d6a79fd8 1 2024-01-29 14:03:01 +08:00
YangHua 2da0c9d838 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-29 11:47:50 +08:00
YangHua 0e62083e80 ewew 2024-01-29 11:47:44 +08:00
yulong 50a0800366 1 2024-01-29 11:36:11 +08:00
yulong 4327751b70 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-29 11:28:40 +08:00
yulong efa7f0fe20 1 2024-01-29 11:28:34 +08:00
YangHua f429f9c2a2 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-29 11:28:10 +08:00
YangHua be99e74bec ewew 2024-01-29 11:28:07 +08:00
账号名 9004c0fef7 1 2024-01-29 11:27:25 +08:00
YangHua e9cd6195c0 ewewe 2024-01-29 11:03:07 +08:00
账号名 4bc25c4c02 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-29 10:58:21 +08:00
账号名 4c8183c7e2 1 2024-01-29 10:58:14 +08:00
YangHua 3c4dba9959 werer 2024-01-29 10:47:43 +08:00
YangHua 795eb05dd8 dsd 2024-01-29 10:30:53 +08:00
YangHua ac20a2451b Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-29 10:25:00 +08:00
YangHua b861ac2372 eweweq 2024-01-29 10:24:52 +08:00
yulong 378161ebec Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-29 09:58:08 +08:00
yulong a664bce204 材质 2024-01-29 09:57:54 +08:00
账号名 bbaec15d7c 1 2024-01-29 09:55:42 +08:00
YangHua 06a9408fac er 2024-01-28 18:50:03 +08:00
YangHua e6f5f9bebd dsd 2024-01-28 18:47:59 +08:00
YangHua 3f30b3c849 weed 2024-01-28 18:41:45 +08:00
YangHua 8dbbc60083 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-28 17:27:19 +08:00
YangHua 98f2297cb8 eq 2024-01-28 17:27:16 +08:00
账号名 9f95bbadf3 Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane 2024-01-28 17:26:03 +08:00
账号名 dabbcc0ebf 1 2024-01-28 17:25:54 +08:00
yulong 85bcdb333b 2 2024-01-28 17:23:53 +08:00
YangHua eeb9868254 ewq 2024-01-28 17:13:46 +08:00
YangHua a30d997487 w 2024-01-28 17:03:02 +08:00