lVAL
|
4aec3917de
|
修改页面 Plan为Add 计划为Plan
|
2020-10-16 10:54:47 +08:00 |
|
joylink_cuiweidong
|
f9356747b6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-16 10:52:08 +08:00 |
|
joylink_cuiweidong
|
dad592e155
|
竞赛实操结果页面代码调整
|
2020-10-16 10:51:45 +08:00 |
|
lVAL
|
56482db23f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-16 10:50:24 +08:00 |
|
lVAL
|
bbe9ca1e28
|
修改运行图操作
|
2020-10-16 10:50:07 +08:00 |
|
joylink_cuiweidong
|
edcb1a4ab7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-16 09:51:40 +08:00 |
|
joylink_cuiweidong
|
68dd6923e3
|
竞赛场景结束页面代码调整
|
2020-10-16 09:51:22 +08:00 |
|
lVAL
|
4bff618aee
|
增加AUS运行图平移的功能
|
2020-10-16 09:21:00 +08:00 |
|
ival
|
891ff8362a
|
AUS运行编辑功能完善
|
2020-10-15 22:57:06 +08:00 |
|
joylink_cuiweidong
|
5651075342
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-15 19:01:27 +08:00 |
|
joylink_cuiweidong
|
b55f8d00b5
|
竞赛代码调整
|
2020-10-15 19:01:09 +08:00 |
|
lVAL
|
4e6d4e6a73
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/router/index_Common.js
修改冲突
|
2020-10-15 18:55:07 +08:00 |
|
lVAL
|
df1fcc8f82
|
修改代码
|
2020-10-15 18:53:45 +08:00 |
|
fan
|
54cde2a1da
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-15 18:33:47 +08:00 |
|
fan
|
63ad2d4e48
|
添加公司单位管理
|
2020-10-15 18:33:36 +08:00 |
|
joylink_cuiweidong
|
09eb9e2a00
|
竞赛 实操结果弹窗代码调整
|
2020-10-15 18:21:02 +08:00 |
|
joylink_cuiweidong
|
dbfbf19c0f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-15 17:47:36 +08:00 |
|
joylink_cuiweidong
|
653c01cec2
|
竞赛结果弹窗代码调整
|
2020-10-15 17:47:13 +08:00 |
|
zyy
|
26b0b146de
|
调整页面逻辑
|
2020-10-15 17:06:55 +08:00 |
|
zyy
|
c000d35911
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-15 17:02:46 +08:00 |
|
zyy
|
83f696cb25
|
调整综合监控页面展示
|
2020-10-15 17:02:34 +08:00 |
|
sunzhenyu
|
9b3ce6f8b7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-15 16:34:07 +08:00 |
|
sunzhenyu
|
8cc2d0ce30
|
修改三维vr重面模型，修改vr通号车站停车对齐车门，修改三维驾驶车厢内相机位置
|
2020-10-15 16:33:22 +08:00 |
|
lVAL
|
fe93ecebe2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-15 16:06:06 +08:00 |
|
lVAL
|
c2b87acfe3
|
增加AUS运行图编辑工具代码
|
2020-10-15 16:05:55 +08:00 |
|
lVAL
|
80fb7641ae
|
增加AUS运行图工具的代码
|
2020-10-15 16:05:30 +08:00 |
|
joylink_cuiweidong
|
cd55c5b269
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-15 15:39:50 +08:00 |
|
joylink_cuiweidong
|
45932bb10a
|
代码调整
|
2020-10-15 15:39:33 +08:00 |
|
zyy
|
89958942de
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-15 15:28:36 +08:00 |
|
zyy
|
114516abb8
|
调整综合监控
|
2020-10-15 15:28:23 +08:00 |
|
fan
|
41f70aadd8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-15 14:18:11 +08:00 |
|
fan
|
a0ac1a58e7
|
方向杆调整数据
|
2020-10-15 14:17:55 +08:00 |
|
zyy
|
78dd2f3d26
|
调整综合监控开关状态
|
2020-10-15 10:30:30 +08:00 |
|
zyy
|
3770b4a153
|
保存状态
|
2020-10-15 09:38:36 +08:00 |
|
zyy
|
f28262bb72
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-14 19:10:10 +08:00 |
|
zyy
|
4b9a98c35a
|
调整综合监控流程
|
2020-10-14 19:09:53 +08:00 |
|
lVAL
|
d68824b79a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-14 18:50:17 +08:00 |
|
lVAL
|
0010d78570
|
增加澳大利亚运行图编辑功能
|
2020-10-14 18:50:03 +08:00 |
|
joylink_cuiweidong
|
126a413819
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-14 18:10:48 +08:00 |
|
joylink_cuiweidong
|
f91dd07cab
|
竞赛 场景代码调整
|
2020-10-14 18:10:32 +08:00 |
|
sunzhenyu
|
a18fe74ab5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-14 18:04:16 +08:00 |
|
sunzhenyu
|
105b738416
|
修复三维cctv中列车和屏蔽门渲染顺序bug
|
2020-10-14 18:04:09 +08:00 |
|
joylink_cuiweidong
|
17a18eb328
|
竞赛 实操 场景调整
|
2020-10-14 17:10:25 +08:00 |
|
joylink_cuiweidong
|
96dfec83eb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-14 16:20:08 +08:00 |
|
joylink_cuiweidong
|
f02a55724b
|
代码调整
|
2020-10-14 16:19:52 +08:00 |
|
fan
|
c1d630d9f8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-14 14:28:02 +08:00 |
|
fan
|
17beb7b37f
|
方向杆调整
|
2020-10-14 14:27:52 +08:00 |
|
joylink_cuiweidong
|
9c0ef5d8af
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-14 13:35:57 +08:00 |
|
joylink_cuiweidong
|
5f921b7430
|
代码调整
|
2020-10-14 13:35:40 +08:00 |
|
fan
|
ac00ecfea7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-14 13:29:41 +08:00 |
|
fan
|
61fe081713
|
方向杆调整
|
2020-10-14 13:29:31 +08:00 |
|
joylink_cuiweidong
|
ce505f915b
|
竞赛平台代码调整
|
2020-10-14 09:47:19 +08:00 |
|
joylink_cuiweidong
|
a5025eda1c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-10-13 18:42:18 +08:00 |
|
joylink_cuiweidong
|
cafa638438
|
竞赛代码调整
|
2020-10-13 18:41:55 +08:00 |
|
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 |
|
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 |
|