Commit Graph

8165 Commits

Author SHA1 Message Date
sunzhenyu
28d0891365 merge 2020-11-23 14:27:22 +08:00
sunzhenyu
23411b5ddc 剔除项目三维本地模型 2020-11-23 14:26:33 +08:00
zyy
af2cac53ad 删除多余指令 2020-11-23 13:45:13 +08:00
joylink_cuiweidong
dc1ccfe699 地图绘制代码调整 2020-11-23 13:41:19 +08:00
joylink_cuiweidong
acd3e5c6ff 删除无效的文件 2020-11-23 10:47:33 +08:00
zyy
c65fe8dd37 调整指令错误提示 2020-11-23 10:43:52 +08:00
joylink_cuiweidong
5056e18e0a 删除暂时无用的枚举 2020-11-23 10:14:42 +08:00
joylink_cuiweidong
c32dc326c4 北交大 客流站场仿真页面 订阅顺序调整 图例调整 2020-11-20 17:37:17 +08:00
joylink_cuiweidong
e98baa752d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-20 15:38:10 +08:00
joylink_cuiweidong
504f23e84f 代码调整 2020-11-20 15:36:28 +08:00
fan
fb565f1f43 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-20 15:27:39 +08:00
fan
b4e9942566 删除三维文件 2020-11-20 15:27:11 +08:00
joylink_cuiweidong
a131fd12d7 代码调整 2020-11-20 14:59:24 +08:00
joylink_cuiweidong
fece30a51d 北交大 客流站场仿真界面 代码调整 2020-11-20 14:53:50 +08:00
joylink_cuiweidong
756aca9281 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-20 14:22:15 +08:00
joylink_cuiweidong
1010df5613 北交大 客流站场仿真界面 代码调整 2020-11-20 14:21:57 +08:00
fan
9de00dba1c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-20 13:47:53 +08:00
fan
3f241fc598 留言板表情包调整&删除张赛说的接口 2020-11-20 13:47:34 +08:00
zyy
a50264a8df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-20 13:22:19 +08:00
zyy
a6e0808092 调整客流量流程 2020-11-20 13:22:03 +08:00
fan
4ae8979563 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-20 11:22:42 +08:00
fan
9d4f0d6804 留言板表情包调整 2020-11-20 11:22:21 +08:00
zyy
c10283c256 增加客流量数据渲染 2020-11-20 11:13:47 +08:00
sunzhenyu
5fab868d50 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-19 18:11:24 +08:00
sunzhenyu
3827cff0cd 三维加载模型字符错误 2020-11-19 18:11:17 +08:00
joylink_cuiweidong
99e7abd361 运行图编制代码调整 2020-11-19 17:02:55 +08:00
fan
9b9fcd01e5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-19 14:17:46 +08:00
fan
11b54cef43 留言板表情包 2020-11-19 14:17:01 +08:00
joylink_cuiweidong
3052bf2843 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-19 13:48:30 +08:00
joylink_cuiweidong
954cb25ab0 北京交大项目 添加客流视图(未处理状态) 2020-11-19 13:48:11 +08:00
zyy
c098f68702 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-19 09:40:17 +08:00
zyy
648f38e68d 调整运行图间距 2020-11-19 09:40:03 +08:00
sunzhenyu
4b28d2b9f6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-18 18:04:17 +08:00
sunzhenyu
4e61d7270d 修改三维列车车站车门动画逻辑 2020-11-18 18:04:09 +08:00
lVAL
516920d24c 修改文本样式 2020-11-18 17:01:15 +08:00
lVAL
fd5467a741 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-18 15:42:13 +08:00
lVAL
a3651cde07 优化 AUSTool 配置 2020-11-18 15:41:37 +08:00
joylink_cuiweidong
224ca3785d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-18 13:24:16 +08:00
joylink_cuiweidong
88ac007ebd 运行图代码调整 2020-11-18 13:22:53 +08:00
zyy
6897317693 增加索引 2020-11-18 13:16:47 +08:00
zyy
d8c25dde1e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-18 13:15:40 +08:00
zyy
83e74cc53b 增加运行图客流量配置 2020-11-18 13:15:28 +08:00
fan
4c7e601406 调整北交大按钮顺序 2020-11-18 11:01:22 +08:00
fan
ba77b1b052 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-18 10:55:30 +08:00
fan
c1a357fe28 留言板项目接口调整 2020-11-18 10:55:11 +08:00
sunzhenyu
6bb859e27d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-18 09:52:58 +08:00
sunzhenyu
a06a7d24ac url merge 2020-11-18 09:52:50 +08:00
sunzhenyu
c54b9edcd3 修改三维客流人数显示 2020-11-18 09:51:49 +08:00
fan
dc57a1a82b 北交大添加留言板&联系方式&背景图片压缩 2020-11-18 09:31:10 +08:00
fan
34775ad690 jenkins调整 2020-11-17 19:38:41 +08:00