Commit Graph

7475 Commits

Author SHA1 Message Date
lVAL
7f4f0d661f 修改代码 2020-10-13 18:38:43 +08:00
lVAL
9bcb18baae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 18:36:03 +08:00
lVAL
a042147faf 增加group组功能 2020-10-13 18:35:50 +08:00
zyy
407afa8cd5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 18:31:47 +08:00
zyy
e625f4ddb7 增加编组元素列表 2020-10-13 18:31:34 +08:00
fan
8370b0cbd2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 18:13:21 +08:00
fan
42f706d39d 会话调整 2020-10-13 18:13:10 +08:00
sunzhenyu
645877580d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 18:12:06 +08:00
sunzhenyu
96ffe64eb6 修改三维vr通号上下车切换站台bug,分离三维vr通号中冗杂代码,优化部分vr功能 2020-10-13 18:11:55 +08:00
joylink_cuiweidong
d9802336c5 竞赛平台实操代码调整 2020-10-13 17:32:39 +08:00
joylink_cuiweidong
2c3c46c5bc 场景编辑代码调整 2020-10-13 17:11:46 +08:00
joylink_cuiweidong
f3f1bd8b5d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 16:40:27 +08:00
joylink_cuiweidong
95eb654911 场景代码调整 2020-10-13 16:39:11 +08:00
fan
d1aa2b8f39 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 16:34:44 +08:00
fan
9e437e43ad 方向杆调整 2020-10-13 16:34:33 +08:00
zyy
e2518c3eef Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 16:19:22 +08:00
zyy
eb87177bae 调整编组内容数字跟着变化 2020-10-13 16:19:13 +08:00
lVAL
d07db0e516 增加 card页面 2020-10-13 15:38:07 +08:00
zyy
912af6424d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 14:55:53 +08:00
zyy
4c00f1f2bd 调整综合监控绘图流程 2020-10-13 14:55:42 +08:00
joylink_cuiweidong
6038352d88 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 14:42:13 +08:00
joylink_cuiweidong
39b06463b8 代码调整 2020-10-13 14:41:42 +08:00
zyy
16951bb78e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 14:33:41 +08:00
zyy
04b6dbfba1 调整综合监控模板类型 2020-10-13 14:33:30 +08:00
fan
6e479fdb3f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-13 14:10:17 +08:00
fan
a0da15d731 方向杆调整 2020-10-13 14:10:08 +08:00
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