Commit Graph

3913 Commits

Author SHA1 Message Date
sunzhenyu
098c997912 新数据三维驾驶读取场景 2020-03-11 18:39:20 +08:00
joylink_cuiweidong
42010f4d8d Merge remote-tracking branch 'remotes/origin/dev' into test 2020-03-11 18:24:16 +08:00
fan
8ad0544dc2 创建小站台时,不设置区段为站台轨 2020-03-11 18:00:45 +08:00
fan
bd2938173a Merge remote-tracking branch 'origin/dev' into test 2020-03-11 16:59:47 +08:00
fan
939360917e 调整信号机接近区段颜色变化 2020-03-11 16:58:14 +08:00
fan
3273724484 调整自动折返非空校验 2020-03-11 15:50:47 +08:00
fan
95e2832cec 删除打印日志 2020-03-11 15:14:38 +08:00
fan
036fa8811e Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-11 15:10:26 +08:00
fan
ef60af34c0 绘图预览切换现地行调显示 2020-03-11 15:10:08 +08:00
sunzhenyu
b4d5363559 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-03-11 14:33:54 +08:00
sunzhenyu
e80a864018 新数据三维仿真行车优化通车 2020-03-11 14:33:46 +08:00
joylink_cuiweidong
d42b6845d7 Merge remote-tracking branch 'remotes/origin/dev' into test 2020-03-11 14:19:52 +08:00
fan
0aac76bb0e Merge remote-tracking branch 'origin/dev' into test 2020-03-11 10:54:08 +08:00
fan
5d39b8e84e 绘图显示调整 2020-03-11 10:53:09 +08:00
joylink_cuiweidong
4ceaba9c59 北京一号线新版指令代码调整 2020-03-11 10:52:36 +08:00
joylink_cuiweidong
c0819a4745 北京一号线新版指令操作代码调整 2020-03-11 10:36:45 +08:00
joylink_cuiweidong
0db45c3956 代码调整 2020-03-10 20:24:24 +08:00
joylink_cuiweidong
27c8b0204e 成都一号线 列车精确位置三角代码修改 2020-03-10 20:15:47 +08:00
sunzhenyu
d3d1909a82 新数据三维仿真优化 2020-03-10 18:57:13 +08:00
fan
3ef47d146d Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-10 18:56:12 +08:00
fan
50bb1ad59e 绘图高级数据调整 2020-03-10 18:56:03 +08:00
zyy
8c71459ac1 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/shape/Automactic/index.js
2020-03-10 14:47:13 +08:00
zyy
c51302638f 调整区段分隔符 2020-03-10 14:45:30 +08:00
fan
36ae4e001e 成都三现地调整 2020-03-10 13:22:41 +08:00
fan
394b80e0e9 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-10 13:05:36 +08:00
fan
ee53da67bc 调整点击设备中组成元素的数据处理 2020-03-10 13:05:20 +08:00
joylink_cuiweidong
a65ad91129 站台绘图代码调整 2020-03-10 11:16:53 +08:00
joylink_cuiweidong
ed3adcab6b 北京一号线 现地 自动进路操作代码调整 2020-03-10 11:11:18 +08:00
fan
6980bb099f 调整公共绘图元素显示条件 2020-03-10 10:21:33 +08:00
fan
91531c7521 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-10 10:08:40 +08:00
fan
f6a43ed6aa 宁波一调整道岔正反操为联动操作 2020-03-10 10:08:28 +08:00
fan
a4e5bf3d81 现地行调显示区分 2020-03-10 09:49:05 +08:00
program-walker
827a287e8a Merge remote-tracking branch 'origin/dev' into test 2020-03-09 20:26:53 +08:00
joylink_cuiweidong
259f688ef5 Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-09 19:42:29 +08:00
joylink_cuiweidong
6c39080e7c 成都一号线 列车小三角添加 2020-03-09 19:41:51 +08:00
fan
70e15f5329 Merge remote-tracking branch 'origin/dev' into test 2020-03-09 18:48:33 +08:00
fan
75218e87ce 自动折返按钮调整 2020-03-09 18:47:50 +08:00
fan
2a61f97663 Merge remote-tracking branch 'origin/dev' into test 2020-03-09 18:39:30 +08:00
fan
d45950fa68 自动折返调整 2020-03-09 18:35:01 +08:00
fan
96a9c73c29 列车位置调整 2020-03-09 18:25:25 +08:00
fan
1148ea5ad8 Merge branches 'dev' and 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev 2020-03-09 17:38:28 +08:00
fan
7f4e6fb13c 初始化按计划行车状态and其他调整 2020-03-09 17:38:15 +08:00
zyy
e59fe1cae5 Merge branch 'dev' into test 2020-03-09 17:05:43 +08:00
zyy
751a8e792c Merge branch 'dev' of https://git.code.tencent.com/lian-cbtc/jl-client into dev
# Conflicts:
#	src/jmapNew/config/skinCode/haerbin_01.js
2020-03-09 17:03:08 +08:00
zyy
103afa9f05 调整哈尔滨线路道岔显示问题 2020-03-09 17:02:13 +08:00
fan
2b971cdf12 初始化按计划行车状态and其他调整 2020-03-09 14:23:44 +08:00
fan
815e4446d4 哈尔滨列车调整 2020-03-09 09:58:49 +08:00
sunleking
a87d551751 修改三维仿真停车点 2020-03-08 23:10:57 +08:00
sunleking
a64e2e0880 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-03-08 19:41:03 +08:00
sunleking
674674bf86 修改三维仿真通信结构优化代码 2020-03-08 19:40:46 +08:00