Commit Graph

7299 Commits

Author SHA1 Message Date
lVAL
d62f17b3d8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 14:09:00 +08:00
lVAL
0feea5cb1a 增加绘图实例此操作界面 2020-10-13 14:08:47 +08:00
zyy
8ad2b2b3a3 调整综合监控字典及图片展示 2020-10-13 14:01:24 +08:00
zyy
a65b9fe0bf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 13:08:30 +08:00
zyy
1134d42c3c 调整综合监控配置 2020-10-13 13:08:17 +08:00
fan
b7a423fe4f baseUrl 2020-10-13 13:07:25 +08:00
joylink_cuiweidong
ac47e8c346 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 13:06:34 +08:00
joylink_cuiweidong
512973eb3a 剧本 添加 仿真角色 2020-10-13 13:06:17 +08:00
fan
63e3943932 baseUrl 2020-10-13 10:04:44 +08:00
fan
29d642e09d 方向杆问题调整 2020-10-13 10:01:39 +08:00
fan
05740d7d57 方向杆问题调整 2020-10-13 09:36:48 +08:00
fan
1b1b3fc221 故障调整 2020-10-12 20:13:42 +08:00
fan
443e3d7748 故障调整 2020-10-12 20:09:00 +08:00
fan
3708167c4b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 19:08:17 +08:00
fan
48b36d54f5 会话添加上级本门成员角色 2020-10-12 19:08:05 +08:00
sunzhenyu
c38a0acf91 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 18:59:46 +08:00
sunzhenyu
41b3c668bf 修改三维车站列车渲染bug,修改/cbtc/static路径 2020-10-12 18:59:37 +08:00
program-walker
4303629ab3 Merge remote-tracking branch 'origin/test' into test 2020-10-12 18:55:33 +08:00
program-walker
ffd7c9797f 打包发布路径配置逻辑修改 2020-10-12 18:55:03 +08:00
fan
84c097407f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 18:53:22 +08:00
fan
fd00154f0c 宁波一取消临时限速 2020-10-12 18:53:04 +08:00
joylink_cuiweidong
24d93e9c64 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/iscs/shape/stateTable.js
2020-10-12 18:35:00 +08:00
joylink_cuiweidong
63824fb35f 福州一号线 iscs 页面代码调整 2020-10-12 18:33:15 +08:00
fan
0715dcc3c7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 18:08:42 +08:00
fan
31e963474a baseUrl 2020-10-12 18:08:25 +08:00
fan
a99698696b baseUrl 2020-10-12 17:56:34 +08:00
fan
44d1a8459b 触发故障调整 2020-10-12 17:55:57 +08:00
lVAL
c14e0fc4c0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 17:55:44 +08:00
lVAL
43b837c7d4 添加风扇机 2020-10-12 17:55:28 +08:00
fan
d6d3b59cc9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 17:23:59 +08:00
fan
d99738c85e 方向杆调整 2020-10-12 17:23:49 +08:00
fan
a790971fb3 故障触发问题调整 2020-10-12 16:47:43 +08:00
zyy
52d4d16013 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 16:46:21 +08:00
zyy
f85edb85cd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 16:45:37 +08:00
zyy
e336410a58 调整图片 2020-10-12 16:45:24 +08:00
fan
537e03a5e7 故障触发问题调整 2020-10-12 16:33:59 +08:00
fan
17cd2bfcd7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 16:21:42 +08:00
fan
f1106541ae 故障触发问题调整&方向杆 2020-10-12 16:21:24 +08:00
fan
2fd024e73a 故障触发问题调整&方向杆 2020-10-12 16:01:12 +08:00
joylink_cuiweidong
936d01fdd1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 16:00:12 +08:00
joylink_cuiweidong
cee2b90048 竞赛 场景代码调整 2020-10-12 15:59:28 +08:00
fan
9e3b62b32f 故障触发问题调整 2020-10-12 15:50:11 +08:00
fan
875c8a021f 故障触发问题调整 2020-10-12 15:29:29 +08:00
fan
709ef4ddd0 故障触发问题调整 2020-10-12 15:25:55 +08:00
fan
da0276e0b8 故障触发问题调整 2020-10-12 15:22:39 +08:00
fan
5e69a04814 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-12 15:19:15 +08:00
fan
6b3a2b3875 故障触发问题调整 2020-10-12 15:19:03 +08:00
lVAL
24252fc5ff 添加活塞风井 2020-10-12 15:00:16 +08:00
lVAL
505a2d0770 修改链接地址为测试 2020-10-12 14:48:57 +08:00
lVAL
fae5fd0332 修改冲突 2020-10-12 14:33:22 +08:00