Commit Graph

  • *
  • |\
  • | *
  • | | *
  • | | |\
  • | |_|/
  • |/| |
  • * | |
  • |\| |
  • | * |
  • | * |
  • | * |
  • | | *
  • | | |\
  • | |_|/
  • |/| |
  • * | |
  • |\| |
  • | * |
  • * | |
  • |\| |
  • | * |
  • * | |
  • |\| |
  • | * |
  • * | |
  • |\| |
  • | * |
  • | |\ \
  • | * | |
  • * | | |
  • |\ \ \ \
  • | | |/ /
  • | |/| |
  • | * | |
  • * | | |
  • |\| | |
  • | * | |
  • | |\| |
  • | | * |
  • * | | |
  • |\| | |
  • | * | |
  • | |\ \ \
  • | * | | |
  • | | |/ /
  • | |/| |
  • * | | |
  • |\ \ \ \
  • | | |/ /
  • | |/| |
  • | * | |
  • | * | |
  • | |\ \ \
  • | * | | |
  • | | * | |
  • | | |/ /
  • | | | *
  • | | | |\
  • | | | |/
  • | | |/|
  • | | * |
  • | | | *
  • | | | |\
  • | |_|_|/
  • |/| | |
  • * | | |
  • |\ \ \ \
  • | | |/ /
  • | |/| |
  • | * | |
  • * | | |
  • |\| | |
  • | * | |
  • * | | |
  • |\| | |
  • | * | |
  • * | | |
  • |\| | |
  • | * | |
  • * | | |
  • |\| | |
  • | * | |
  • * | | |
  • |\| | |
  • | * | |
  • * | | |
  • |\| | |
  • | * | |
  • * | | |
  • |\| | |
  • | * | |
  • | |\ \ \
  • | | |/ /
  • | |/| |
  • | | * |
  • | * | |
  • | |/ /
  • * | |
  • |\| |
  • | * |
  • | |\ \
  • | * | |
  • * | | |
  • |\ \ \ \
  • | | |/ /
  • | |/| |
  • | * | |
  • * | | |
  • |\| | |
  • | * | |
  • * | | |
  • |\| | |
  • | * | |
  • | |\ \ \
  • | | * | |
  • * | | | |
  • |\| | | |
  • | * | | |
  • | |\| | |
  • | | * | |
  • * | | | |
  • |\| | | |
  • | * | | |
  • | |\ \ \ \
  • | | | |/ /
  • | | |/| |
  • | * | | |
  • | |\ \ \ \
  • | | | |/ /
  • | | |/| |
  • | | * | |
  • * | | | |
  • |\ \ \ \ \
  • | | |_|/ /
  • | |/| | |
  • | * | | |
  • | |/ / /
  • * | | |
  • |\| | |
  • | * | |
  • | |\| |
  • | * | |
  • * | | |
  • |\ \ \ \
  • | | |/ /
  • | |/| |
  • | * | |
  • * | | |
  • |\| | |
  • | * | |
  • | |\ \ \
  • | | * | |
  • * | | | |
  • |\| | | |
  • | * | | |
  • | |/ / /
  • * | | |
  • |\| | |
  • | * | |
  • * | | |
  • |\| | |
  • | * | |
  • | |\| |
  • | * | |
  • * | | |
  • |\ \ \ \
  • | | |/ /
  • | |/| |
  • | * | |
  • | |/ /
  • * | |
  • |\| |
  • | * |
  • * | |
  • |\| |
  • | * |
  • * | |
  • |\| |
  • | * |
  • * | |
  • |\| |
  • | * |
  • | |\ \
  • | * \ \
  • | |\ \ \
  • | | * | |
  • * | | | |
  • |\ \ \ \ \
  • | | |_|/ /
  • | |/| | |
  • | * | | |
  • | * | | |
  • | |\| | |
  • 7022000 (refs/pull/56/head) Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-10-16 14:38:13 +0800
  • 077e0b4 (refs/pull/55/head) 修改获取机场添加API by wanjing 2023-10-16 14:37:04 +0800
  • 2124966 Merge branch 'release' of gitadmin/tuoheng_air_monitor into master by wanjing 2023-08-24 16:38:42 +0800
  • e798361 (refs/pull/54/head) Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-08-24 15:52:28 +0800
  • 0495fbe (refs/pull/53/head) 1、修改机场平台地址配置;2、获取机场列表信息; by wanjing 2023-08-24 15:51:54 +0800
  • d9dba89 更新机场对接url by xiaoying 2023-08-23 17:42:05 +0800
  • 1aead73 更新mqtt匹配对应规则 by xiaoying 2023-08-11 10:27:32 +0800
  • f7708de Merge branch 'release' of gitadmin/tuoheng_air_monitor into master by chengwang 2023-07-24 15:31:03 +0800
  • 167b45e (refs/pull/52/head) Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-07-24 08:54:49 +0800
  • 140d5c8 (refs/pull/51/head) 大气数据列表按UTC时间升序排列 by chengwang 2023-07-24 08:43:00 +0800
  • 2e673aa Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-07-21 10:40:39 +0800
  • 5c4e87a (refs/pull/50/head) 新建用户获取角色列表去掉过滤掉角色是001的角色 by chengwang 2023-07-21 10:39:28 +0800
  • 70fd589 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-07-21 10:11:19 +0800
  • a21058d (refs/pull/49/head) 新建用户获取角色列表去掉过滤掉角色是001的角色 by chengwang 2023-07-21 10:10:38 +0800
  • 6a2a470 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-07-21 09:40:07 +0800
  • e589870 (refs/pull/48/head) Merge remote-tracking branch 'origin/develop' into feature_v1.0 by chengwang 2023-07-21 09:38:40 +0800
  • 371c2fd 新建用户获取角色列表去掉过滤掉角色是001的角色 by chengwang 2023-07-21 09:38:33 +0800
  • 217ca8d Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-07-18 10:46:42 +0800
  • 4161317 (refs/pull/47/head) 对接机场修改获取机场信息挂载设备接口 by chengwang 2023-07-18 10:44:27 +0800
  • fd20838 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-07-17 16:22:44 +0800
  • 0ce8ee6 (refs/pull/46/head) Merge branch 'feature_v1.0' into develop by chengwang 2023-07-17 16:21:46 +0800
  • fa0eebd 修改获取机场信息挂载设备接口 by chengwang 2023-07-17 16:21:38 +0800
  • 07719d1 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-07-14 17:51:23 +0800
  • 2a0a314 (refs/pull/45/head) Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_air_monitor into develop by chengwang 2023-07-14 17:50:07 +0800
  • e845fce 修改无人机信息电量单位 by chengwang 2023-07-14 17:49:57 +0800
  • 4d25205 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-07-10 14:45:33 +0800
  • 4cb43ac (refs/pull/44/head) 1、飞手离线任务,srt文件格式支持御3,御3; by wanjing 2023-07-10 14:35:09 +0800
  • 9ca3469 Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_air_monitor into develop by wanjing 2023-07-10 14:31:54 +0800
  • 57d959b 1、飞手离线任务,srt文件格式支持御3,御3; by wanjing 2023-07-10 14:31:25 +0800
  • 98edcc9 更新oidc对接租户状态信息相关 by xiaoying 2023-07-05 13:46:53 +0800
  • 6f72a22 (tag: v1.0.0, tag: V1.0.1) Merge branch 'develop' of gitadmin/tuoheng_air_monitor into master by chengwang 2023-06-29 18:57:22 +0800
  • aa39923 (refs/pull/43/head) 修改查询角色列表 by chengwang 2023-06-29 18:54:32 +0800
  • 31a8a3d Merge branch 'release' of gitadmin/tuoheng_air_monitor into master by wanjing 2023-06-29 14:29:32 +0800
  • 2ed818e (refs/pull/42/head) Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-06-28 16:11:22 +0800
  • 660b01c (refs/pull/41/head) 大气数据入库回调接口判断代码更新 by chengwang 2023-06-28 16:10:07 +0800
  • ddcecf1 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-06-28 15:54:04 +0800
  • 51c1df2 (refs/pull/40/head, refs/pull/39/head) 大气数据入库回调接口判断任务类型选择最新一条任务 by chengwang 2023-06-28 15:51:59 +0800
  • 7c2bc76 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-06-28 15:43:38 +0800
  • 06648c0 (refs/pull/38/head) 大气数据入库回调接口判断任务类型选择最新一条任务 by chengwang 2023-06-28 15:42:34 +0800
  • 7b02cb4 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-06-28 15:00:59 +0800
  • 9234190 (refs/pull/37/head) 大气数据入库方法回调 by chengwang 2023-06-28 14:59:38 +0800
  • 3177c5c Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-06-28 14:40:56 +0800
  • 1aa9847 (refs/pull/36/head) 获取巡检任务 by chengwang 2023-06-28 14:39:42 +0800
  • f56f2d6 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-06-28 14:20:42 +0800
  • d2aad90 (refs/pull/35/head) 代码优化 by chengwang 2023-06-28 14:19:58 +0800
  • 4f4c030 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-06-28 14:00:00 +0800
  • eefaeaf (refs/pull/34/head) 修改主题 by chengwang 2023-06-28 13:59:04 +0800
  • 853fa02 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-06-28 11:48:17 +0800
  • becac97 (refs/pull/33/head) 添加灵嗅设备判断 by chengwang 2023-06-28 11:47:17 +0800
  • bd9f94e 添加灵嗅设备判断 by chengwang 2023-06-28 11:44:58 +0800
  • d34ef4e 重构代码 by wanjing 2023-06-28 11:18:00 +0800
  • 7d99653 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-06-26 21:37:24 +0800
  • 68afa3b (refs/pull/32/head) Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_air_monitor into develop by wanjing 2023-06-26 21:36:22 +0800
  • 40b3016 解决p10导出为空问题 by wanjing 2023-06-26 21:36:14 +0800
  • 5ccaa46 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-06-26 09:20:52 +0800
  • 9b086af (refs/pull/31/head) 大气列表倒序排序 by chengwang 2023-06-26 09:18:39 +0800
  • 54849fa Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-06-21 09:30:42 +0800
  • 1135e72 (refs/pull/30/head) url编码 by chengwang 2023-06-21 09:29:37 +0800
  • c7c9a9d Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-06-20 16:25:16 +0800
  • 70db947 (refs/pull/29/head) Merge branch 'feature_v1.0' into develop by chengwang 2023-06-20 16:24:33 +0800
  • 5376294 修改url地址 by chengwang 2023-06-20 16:24:27 +0800
  • 7e6f602 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-06-20 16:09:15 +0800
  • 6409253 (refs/pull/28/head) Merge branch 'feature_v1.0' into develop by chengwang 2023-06-20 16:08:17 +0800
  • 7aec466 修改报告下载地址进行URL编码 by chengwang 2023-06-20 16:07:59 +0800
  • d4ebd62 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-06-20 15:25:45 +0800
  • 86b716e (refs/pull/27/head) Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_air_monitor into develop by chengwang 2023-06-20 15:24:25 +0800
  • cc9c075 Merge branch 'feature_v1.0' into develop by chengwang 2023-06-20 15:23:59 +0800
  • 22ab182 飞手任务飞行回调添加request打印 by chengwang 2023-06-20 15:23:53 +0800
  • 7be46d0 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-06-20 15:21:53 +0800
  • 56bd83a (refs/pull/26/head) 修改mqtt配置 by wanjing 2023-06-20 15:20:49 +0800
  • e35f58c Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-06-20 13:46:06 +0800
  • 3481d96 (refs/pull/25/head) Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_air_monitor into develop by wanjing 2023-06-20 13:45:24 +0800
  • 9cd77d7 修改mqtt代码 by wanjing 2023-06-20 13:45:09 +0800
  • 6a0e654 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-06-19 09:18:08 +0800
  • 1abebb6 (refs/pull/24/head) 用户列表排序 by chengwang 2023-06-19 09:16:13 +0800
  • 3175de6 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-06-16 17:05:00 +0800
  • c068710 (refs/pull/23/head) Merge branch 'feature_v1.0' into develop by chengwang 2023-06-16 17:03:50 +0800
  • 76f84a4 用户列表排序 by chengwang 2023-06-16 17:03:42 +0800
  • ec30588 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-06-16 14:13:17 +0800
  • 6abe7d0 (refs/pull/22/head) dsp分析完成失败停用释放通道 by chengwang 2023-06-16 14:11:12 +0800
  • 1cf61db Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-06-16 12:01:21 +0800
  • 0827bd2 (refs/pull/21/head) 修改获取无人机实时信息的接口 by chengwang 2023-06-16 12:00:48 +0800
  • 324c098 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-06-16 11:40:47 +0800
  • 6cc8984 (refs/pull/20/head) Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_air_monitor into develop by chengwang 2023-06-16 11:40:12 +0800
  • a8b5b5d 释放通道 by chengwang 2023-06-16 11:40:03 +0800
  • 79b0c24 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-06-16 11:35:29 +0800
  • 50d4153 (refs/pull/19/head, refs/pull/18/head) 导出报告调整修改高度,宽度比例为40 by wanjing 2023-06-16 11:34:38 +0800
  • 18f80e8 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-06-16 10:04:50 +0800
  • 0042311 (refs/pull/17/head) 修改图片大小 by chengwang 2023-06-16 10:04:08 +0800
  • 61b97a9 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-06-16 08:54:33 +0800
  • 5636d76 (refs/pull/16/head) 修改项目名称 by chengwang 2023-06-16 08:52:44 +0800
  • 930539e Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-06-16 08:40:44 +0800
  • 7eaa72c (refs/pull/15/head) 表格添加序号 by chengwang 2023-06-16 08:39:28 +0800
  • d09dd48 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by chengwang 2023-06-15 17:32:45 +0800
  • 215360a (refs/pull/14/head) Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_air_monitor into develop by chengwang 2023-06-15 17:31:50 +0800
  • 8887456 Merge branch 'feature_v1.0' into develop by chengwang 2023-06-15 17:31:42 +0800
  • eec58c8 添加校验 by chengwang 2023-06-15 17:31:34 +0800
  • e5ca9b6 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-06-15 17:02:17 +0800
  • 8ef496f (refs/pull/13/head) 1、解决导出报告大气数据为空问题;2、解决导出报告图片太大问题; by wanjing 2023-06-15 17:00:58 +0800
  • 87352c3 Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_air_monitor into develop by wanjing 2023-06-15 16:20:59 +0800