gitadmin
/
tuoheng_air_monitor_move_20240705
Suivre 2
Ajouter aux favoris 0
Bifurcation 0
Code Tickets 0 Demandes d'ajout 0 Versions 6 Wiki Activité

Graphique des révisions

  • *
  • |\
  • | *
  • | |\
  • | | *
  • | * |
  • | |\|
  • | | *
  • * | |
  • |\| |
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | | |\
  • | | * |
  • | * | |
  • | |\ \ \
  • | | | |/
  • | | |/|
  • | | * |
  • | | |/
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | | |\
  • | | * |
  • | * | |
  • | |\ \ \
  • | | | |/
  • | | |/|
  • | | * |
  • | * | |
  • | |\| |
  • | | * |
  • | * | |
  • | |\| |
  • | | * |
  • | | |/
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | | *
  • | * |
  • | |\|
  • | | *
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | | |\
  • | | * |
  • | * | |
  • | |\ \ \
  • | | | |/
  • | | |/|
  • | | * |
  • | | |/
  • | | *
  • | | *
  • * | |
  • | * |
  • | |\|
  • | | *
  • * | |
  • |\| |
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | * |
  • | |\|
  • | | *
  • | | *
  • | | *
  • | * |
  • | |\|
  • | | *
  • * | |
  • |\| |
  • | * |
  • | |\|
  • | | *
  • * | |
  • |\| |
  • | * |
  • | |\|
  • | | *
  • * | |
  • |\| |
  • | * |
  • | |\|
  • | | *
  • * | |
  • |\| |
  • | * |
  • | |\|
  • | | *
  • * | |
  • |\| |
  • | * |
  • | |\|
  • | | *
  • * | |
  • |\| |
  • | * |
  • | |\|
  • | | *
  • * | |
  • |\| |
  • 1b97d33 (HEAD -> master) Merge branch 'release' of gitadmin/tuoheng_air_monitor into master by xuziqing 2023-12-28 19:01:34 +0800
  • d4de237 (refs/pull/107/head, release) Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by xuziqing 2023-12-28 18:43:42 +0800
  • 25fdb29 (refs/pull/106/head, develop) 更新word图片样式 by xiaoying 2023-12-28 18:43:02 +0800
  • 298b7e5 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by xuziqing 2023-12-28 18:06:43 +0800
  • b31cec5 (refs/pull/105/head) 更新 by xiaoying 2023-12-28 18:05:56 +0800
  • 5664c22 Merge branch 'release' by suqin 2023-12-28 17:37:01 +0800
  • c7aaa0d (refs/pull/104/head) Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by xuziqing 2023-12-28 17:19:47 +0800
  • ec348cc (refs/pull/103/head) 更新 by xiaoying 2023-12-28 17:16:08 +0800
  • 1f4048d (refs/pull/101/head) Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by xuziqing 2023-12-28 17:03:28 +0800
  • 5bd3fa6 (refs/pull/102/head) 更新类名 by xiaoying 2023-12-28 16:59:07 +0800
  • dc4247d Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by xuziqing 2023-12-28 15:50:21 +0800
  • 0459c15 (refs/pull/100/head) 更新word图片插入 by xiaoying 2023-12-28 15:49:43 +0800
  • 24d36de Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by xuziqing 2023-12-28 14:55:38 +0800
  • 9b13b04 (refs/pull/99/head) 更新 by xiaoying 2023-12-28 14:55:07 +0800
  • ab2a51e Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by suqin 2023-12-28 14:52:41 +0800
  • 2689424 (refs/pull/98/head) Merge remote-tracking branch 'origin/develop' into develop by suqin 2023-12-28 14:21:14 +0800
  • b6a9157 改：导出word图片尺寸比例 by suqin 2023-12-28 14:20:47 +0800
  • cecfee7 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-27 18:53:48 +0800
  • c57b61f (refs/pull/97/head) 修改任务回放地址 by wanjing 2023-12-27 18:53:30 +0800
  • 0d1249c Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by suqin 2023-12-27 18:16:49 +0800
  • a6dee6a (refs/pull/96/head) 改：导出word by suqin 2023-12-27 18:15:47 +0800
  • 16b63d1 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by suqin 2023-12-27 18:03:00 +0800
  • 4e9c1f5 (refs/pull/95/head) Merge remote-tracking branch 'origin/develop' into develop by suqin 2023-12-27 18:02:01 +0800
  • 3c8fa3b 任务详情的vo展示航线名称和机场名称 by suqin 2023-12-27 18:01:53 +0800
  • 19b5276 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-27 17:53:27 +0800
  • f787c76 (refs/pull/94/head) 修改dsp推送录制视频地址，去掉前缀 by wanjing 2023-12-27 17:53:07 +0800
  • 3bfd993 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-27 17:39:32 +0800
  • 5188fd3 (refs/pull/93/head) 调用dsp传pushurl为空 by wanjing 2023-12-27 17:38:54 +0800
  • 52445c5 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-27 16:27:15 +0800
  • eefd698 (refs/pull/92/head) 新增根据航线ID获取航线信息接口 by wanjing 2023-12-27 16:24:37 +0800
  • c6451ef Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-27 15:57:29 +0800
  • 5060ba1 (refs/pull/91/head) 修改根据机场任务ID获取航线 by wanjing 2023-12-27 15:57:04 +0800
  • 07c8468 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-27 15:49:08 +0800
  • 26ad90f (refs/pull/90/head) 1、修改添加任务代码；2、修改编辑任务代码； by wanjing 2023-12-27 15:45:03 +0800
  • b4637cf Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-27 15:35:56 +0800
  • 619ad01 (refs/pull/89/head) 修改dsp回调代码 by wanjing 2023-12-27 15:35:27 +0800
  • 0a0e3ae Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-27 15:20:20 +0800
  • 937e130 (refs/pull/88/head) 修改调用dspdiam by wanjing 2023-12-27 15:19:42 +0800
  • f74da69 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-27 14:45:27 +0800
  • 57d6480 (refs/pull/87/head) 修改停止录制代码 by wanjing 2023-12-27 14:45:05 +0800
  • eaeadb5 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-27 14:19:30 +0800
  • 42d5410 (refs/pull/86/head) 修改停止录制代码 by wanjing 2023-12-27 14:19:00 +0800
  • 6430a8e Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-27 11:34:35 +0800
  • ba6e38d (refs/pull/85/head) 修改dsp录制代码 by wanjing 2023-12-27 11:34:12 +0800
  • 5ca6198 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-27 10:04:26 +0800
  • 301b897 (refs/pull/84/head) 修改dsp分析代码 by wanjing 2023-12-27 10:03:51 +0800
  • cf2b7d1 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-27 09:51:57 +0800
  • 977e431 (refs/pull/83/head) 机场回调，播放地址存入通道表 by wanjing 2023-12-27 09:51:33 +0800
  • 4cf06d9 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-27 09:33:58 +0800
  • 694db96 (refs/pull/82/head) 修改调用dsp开始录制、停止录制、查询录制接口地址 by wanjing 2023-12-27 09:33:38 +0800
  • 97d805e Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-27 09:28:14 +0800
  • c498ea9 (refs/pull/81/head) 修改创建航线中，生成的航线id问题 by wanjing 2023-12-27 09:27:49 +0800
  • 2ac1f52 去掉查询视频信息中打印日志代码 by wanjing 2023-12-27 09:20:42 +0800
  • cfce078 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-27 09:02:54 +0800
  • 6015032 (refs/pull/80/head) 提交调用dsp开始录屏，停止录屏，查询录屏信息代码日志 by wanjing 2023-12-27 09:02:29 +0800
  • d3926ec 取出HttpUtilsd doGet方法中打印返回数据 by wanjing 2023-12-27 08:55:58 +0800
  • b24a44b Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-26 16:23:29 +0800
  • cd2a945 (refs/pull/79/head) 1、任务中去掉机场名称、航线名称字段，改为动态获取； by wanjing 2023-12-26 16:23:02 +0800
  • c46cfac Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-26 15:41:00 +0800
  • 7564eb3 (refs/pull/78/head) Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_air_monitor into develop by wanjing 2023-12-26 15:40:33 +0800
  • ef8f1e3 修改任务执行流程 by wanjing 2023-12-26 15:40:29 +0800
  • 472cc10 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by suqin 2023-12-26 15:22:01 +0800
  • 8262ea9 (refs/pull/77/head) 修改： 停止录屏 发送请求方式 by suqin 2023-12-26 10:32:14 +0800
  • cf27eef 添加： 开始录屏 停止录屏 查询录屏信息 by suqin 2023-12-26 10:01:53 +0800
  • e0ceb22 改：从前端参数获取参照指标图片地址 by suqin 2023-12-25 12:43:58 +0800
  • 0fa6861 (tag: v1.0.5) 获取参照指标图片地址方式改为从前端参数获取 by suqin 2023-12-25 10:50:16 +0800
  • 8ad1260 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-25 10:03:09 +0800
  • e6889fc (refs/pull/76/head) 1、获取机场航线列表，增加sourceCode字段；2、操作无人机，增加code字段； by wanjing 2023-12-25 10:02:40 +0800
  • c482744 (tag: v1.0.4) Merge branch 'release' of gitadmin/tuoheng_air_monitor into master by wanjing 2023-12-18 17:17:07 +0800
  • a78e07b (refs/pull/75/head) Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-18 16:51:07 +0800
  • ac5556c (refs/pull/74/head) 修改创建航线代码 by wanjing 2023-12-18 16:50:36 +0800
  • 11e5ba9 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-18 15:46:34 +0800
  • a14f21b (refs/pull/73/head) 修改创建航线代码 by wanjing 2023-12-18 15:46:03 +0800
  • 3008c61 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-18 15:20:14 +0800
  • b508540 (refs/pull/72/head) 查询航线列表增加平台code字段 by wanjing 2023-12-18 15:19:50 +0800
  • 064fd57 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-18 14:57:58 +0800
  • 452b721 (refs/pull/71/head) 修改创建航线代码 by wanjing 2023-12-18 14:56:55 +0800
  • 74168f1 新增根据机场ID获取航线列表接口 by wanjing 2023-12-18 14:52:37 +0800
  • 40b0266 新增根据机场ID获取航线列表接口 by wanjing 2023-12-18 14:50:10 +0800
  • a9e5e93 Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-15 09:49:06 +0800
  • aacfa1f (refs/pull/70/head) 根据任务id获取无人机信息中增加遥测信号字段 by wanjing 2023-12-15 09:47:29 +0800
  • 087b11d (tag: v1.0.3) Merge branch 'release' of gitadmin/tuoheng_air_monitor into master by wanjing 2023-12-14 17:12:35 +0800
  • 7098d5c (refs/pull/69/head, refs/pull/68/head) Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-14 13:21:34 +0800
  • 3b8da14 (refs/pull/67/head) 1、修改no2,ox,o3计算公式；2、修改vocs导出表格中单位为ppm； by wanjing 2023-12-14 13:20:13 +0800
  • a6c09f2 Merge branch 'release' of gitadmin/tuoheng_air_monitor into master by wanjing 2023-12-11 10:55:49 +0800
  • 7291b0a (refs/pull/66/head) Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-07 10:15:53 +0800
  • 132b8ca (refs/pull/65/head) 解决数据采样时间时差问题 by wanjing 2023-12-07 10:14:58 +0800
  • d8971e2 Merge branch 'release' of gitadmin/tuoheng_air_monitor into master by wanjing 2023-12-06 14:05:21 +0800
  • 9d28216 (refs/pull/64/head) Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-12-06 14:05:02 +0800
  • a28eb0b (refs/pull/63/head) 修改so2计算公式 by wanjing 2023-12-06 14:03:15 +0800
  • d8f731b (tag: v1.0.2) Merge branch 'release' of gitadmin/tuoheng_air_monitor into master by wanjing 2023-10-19 15:13:50 +0800
  • 1d9f43c (refs/pull/62/head) Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-10-19 15:13:31 +0800
  • 9da23f2 (refs/pull/61/head) 修改获取机场平台天气接口报错问题 by wanjing 2023-10-18 15:10:59 +0800
  • 73d3e8b Merge branch 'release' of gitadmin/tuoheng_air_monitor into master by wanjing 2023-10-18 13:42:14 +0800
  • 7bda997 (refs/pull/60/head) Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-10-18 13:41:52 +0800
  • 4d95043 (refs/pull/59/head) 优化导出监测数据代码 by wanjing 2023-10-18 13:41:24 +0800
  • 9f45124 Merge branch 'release' of gitadmin/tuoheng_air_monitor into master by wanjing 2023-10-18 13:21:50 +0800
  • 7c09f35 (refs/pull/58/head) Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release by wanjing 2023-10-18 13:17:31 +0800
  • 6fa2214 (refs/pull/57/head) 1、相对高度改为海拔高度；2、采样点时间加8 小时； by wanjing 2023-10-18 13:16:58 +0800
  • 37a5858 Merge branch 'release' of gitadmin/tuoheng_air_monitor into master by wanjing 2023-10-16 14:38:29 +0800