55d5b51
Merge branch 'yufei' of gitadmin/tuoheng_lc_web into develop by
2022-08-30 17:03:47 +0800
45b2304
(refs/pull/52/head)
修改首页下拉框宽度 by
2022-08-30 17:03:03 +0800
285ec1e
Merge branch 'yufei' of gitadmin/tuoheng_lc_web into develop by
2022-08-30 16:14:23 +0800
e83de7f
(refs/pull/51/head)
机场位置坐标系转换 by
2022-08-30 16:13:22 +0800
d9ee591
Merge branch 'yufei' of gitadmin/tuoheng_lc_web into develop by
2022-08-30 14:16:41 +0800
527c015
(refs/pull/50/head)
任务详情字段名称更改、首页机场监控地址字段变更 by
2022-08-30 14:15:48 +0800
7b4e56d
Merge branch 'yufei' of gitadmin/tuoheng_lc_web into develop by
2022-08-30 13:19:23 +0800
49a80a1
(refs/pull/49/head)
首页机场展示风向信息新增单位 by
2022-08-30 13:17:58 +0800
d8f80c6
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-23 16:31:37 +0800
aa1c847
(refs/pull/48/head)
change question type by
2022-08-23 16:31:02 +0800
e22d3ce
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-23 16:29:42 +0800
bf8f886
(refs/pull/47/head)
change question type by
2022-08-23 16:28:58 +0800
174b889
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-23 13:54:32 +0800
4b3e824
(refs/pull/46/head)
change question type by
2022-08-23 13:53:58 +0800
cb4e2d0
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-23 08:48:46 +0800
e0fe1be
(refs/pull/45/head)
change video url by
2022-08-23 08:47:44 +0800
3a4312c
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-23 08:28:00 +0800
1ffbd41
(refs/pull/44/head)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_lc_web into zhangtao by
2022-08-23 08:26:12 +0800
a9edf50
chang player by
2022-08-23 08:26:01 +0800
17ba6d7
Merge branch 'yufei' of gitadmin/tuoheng_lc_web into develop by
2022-08-22 09:24:03 +0800
a2e2e8c
(refs/pull/43/head)
overlay组件添加图片预览功能 by
2022-08-22 09:23:11 +0800
748d2fe
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-20 14:03:15 +0800
369e531
(refs/pull/42/head)
zhangtao by
2022-08-20 14:02:22 +0800
2ea20f3
add destroy by
2022-08-20 11:29:12 +0800
60a66d1
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-19 17:09:56 +0800
5cccc7a
(refs/pull/41/head)
add notice by
2022-08-19 17:09:17 +0800
d295a65
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_lc_web into zhangtao by
2022-08-19 16:50:04 +0800
31d2114
clear time now by
2022-08-19 16:49:56 +0800
cfbbf1d
Merge branch 'yufei' of gitadmin/tuoheng_lc_web into develop by
2022-08-19 14:21:39 +0800
b190936
(refs/pull/40/head)
轨迹定位点相对数据更改 by
2022-08-19 14:20:24 +0800
8cddb9e
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-19 13:52:32 +0800
a08b7bb
(refs/pull/39/head)
change time disable by
2022-08-19 13:51:50 +0800
c5666b8
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-19 13:45:48 +0800
1185d01
(refs/pull/38/head)
change time disable by
2022-08-19 13:45:13 +0800
45cfee2
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-19 10:44:26 +0800
142e741
(refs/pull/37/head)
change time disable by
2022-08-19 10:43:25 +0800
a0420c4
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-18 17:28:48 +0800
5561e9a
(refs/pull/36/head)
change report by
2022-08-18 17:28:07 +0800
07b2d2a
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-18 17:22:24 +0800
d7a3fcb
(refs/pull/35/head)
change report by
2022-08-18 17:21:44 +0800
d621ccd
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-18 16:39:07 +0800
e5885ea
(refs/pull/34/head)
change total by
2022-08-18 16:38:28 +0800
20cc729
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-18 16:29:16 +0800
30011a2
(refs/pull/33/head)
change total by
2022-08-18 16:28:43 +0800
e1788e3
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-18 15:34:24 +0800
0ae9e43
(refs/pull/32/head)
change total by
2022-08-18 15:33:00 +0800
1cc940b
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-18 14:06:35 +0800
142b833
(refs/pull/31/head)
change player by
2022-08-18 13:58:59 +0800
772b3b0
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-18 11:31:21 +0800
95b7d06
(refs/pull/30/head)
hide legend by
2022-08-18 11:30:54 +0800
6f51320
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-18 11:28:42 +0800
afe93cd
(refs/pull/29/head)
change datatable by
2022-08-18 11:28:23 +0800
a8d979f
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-18 09:48:13 +0800
2fffe8f
(refs/pull/28/head)
change datatable by
2022-08-18 09:47:21 +0800
3ea881d
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-18 09:23:16 +0800
f0b0f25
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_lc_web into zhangtao by
2022-08-18 08:24:58 +0800
b95d69e
(refs/pull/27/head)
change player by
2022-08-18 08:24:20 +0800
a02894f
video by
2022-08-17 16:27:49 +0800
d5797f1
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-17 15:35:24 +0800
c52a94e
(refs/pull/26/head)
change video by
2022-08-17 15:33:13 +0800
21829c9
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-17 11:41:52 +0800
3750954
(refs/pull/25/head)
change video by
2022-08-17 11:41:17 +0800
f5e821a
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-17 10:00:30 +0800
310cecb
(refs/pull/24/head)
change api by
2022-08-17 09:59:53 +0800
9951260
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-17 09:57:00 +0800
bff91aa
(refs/pull/23/head)
change api by
2022-08-17 09:55:55 +0800
e188308
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-17 09:17:48 +0800
7ce569d
(refs/pull/22/head)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_lc_web into zhangtao by
2022-08-17 09:17:11 +0800
c6c6e87
add download by
2022-08-17 09:17:00 +0800
bfb3417
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-13 13:36:12 +0800
c96e512
(refs/pull/21/head)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_lc_web into zhangtao by
2022-08-13 13:35:38 +0800
c87ada2
change image by
2022-08-13 13:35:28 +0800
e508e85
Merge branch 'yufei' of gitadmin/tuoheng_lc_web into develop by
2022-08-12 11:27:38 +0800
c1ef8a3
(refs/pull/20/head)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_lc_web into yufei by
2022-08-12 11:26:36 +0800
560921b
直播地址更换 by
2022-08-12 11:26:30 +0800
c31a56f
Merge branch 'yufei' of gitadmin/tuoheng_lc_web into develop by
2022-08-11 15:50:47 +0800
c8399ca
(refs/pull/19/head)
合并代码冲突 by
2022-08-11 15:49:58 +0800
fe3d46c
头部UI以及轨迹直播页面部分改动 by
2022-08-11 15:48:39 +0800
5f17997
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-11 15:43:35 +0800
730eddd
(refs/pull/18/head)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_lc_web into zhangtao by
2022-08-11 15:42:44 +0800
f24270f
prev by
2022-08-11 15:42:35 +0800
2d6e05e
change api by
2022-08-11 11:30:22 +0800
94586b9
直播轨迹页面接入真实数据 by
2022-08-10 17:37:44 +0800
4082600
Merge branch 'zhangtao' of gitadmin/tuoheng_lc_web into develop by
2022-08-09 18:05:16 +0800
684c9e9
(refs/pull/17/head)
change player by
2022-08-09 18:03:50 +0800
ae9f434
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_lc_web into zhangtao by
2022-08-09 16:08:53 +0800
c41795a
Merge branch 'yufei' of gitadmin/tuoheng_lc_web into develop by
2022-08-09 16:08:43 +0800
0ba0f82
stash by
2022-08-09 16:07:38 +0800
51be7fb
(refs/pull/16/head)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_lc_web into yufei by
2022-08-09 16:07:37 +0800
6e87192
视频播放 by
2022-08-09 16:07:26 +0800
30fbbfa
live by
2022-08-09 15:33:11 +0800
7ddbf97
Merge branch 'yufei' of gitadmin/tuoheng_lc_web into develop by
2022-08-09 15:29:21 +0800
54b6310
(refs/pull/15/head)
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_lc_web into yufei by
2022-08-09 15:27:22 +0800
aaf4322
视频播放 by
2022-08-09 15:26:30 +0800
242c620
Merge branch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_lc_web into zhangtao by
2022-08-09 14:44:12 +0800
9000515
change name by
2022-08-09 14:44:06 +0800
df995fc
Merge branch 'yufei' of gitadmin/tuoheng_lc_web into develop by
2022-08-09 14:43:32 +0800
8a9148c
(refs/pull/14/head, refs/pull/13/head)
合并冲突 by
2022-08-09 14:41:39 +0800
4ab8438
拉取develop代码 by
2022-08-09 14:39:40 +0800
054438f
轨迹 by
2022-08-09 14:37:00 +0800