zyy
|
f43d964d29
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/iscs/constant/iscsData.js
|
2020-06-09 13:26:01 +08:00 |
|
zyy
|
8c52fcc8ef
|
调整iscs 鼠标事件流程
|
2020-06-09 13:24:18 +08:00 |
|
joylink_cuiweidong
|
dd758a1bfb
|
操作指令代码调整
|
2020-06-09 13:16:47 +08:00 |
|
joylink_cuiweidong
|
ff86c8d07f
|
指令字典调整
|
2020-06-09 11:33:42 +08:00 |
|
joylink_cuiweidong
|
be24daabd8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-08 18:42:44 +08:00 |
|
joylink_cuiweidong
|
bbb9df842c
|
代码调整
|
2020-06-08 18:42:20 +08:00 |
|
fan
|
0902d10f4b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-08 18:41:00 +08:00 |
|
fan
|
de2defc461
|
iscs 小系统模式表&交互
|
2020-06-08 18:40:48 +08:00 |
|
sunzhenyu
|
c1b8a6eb3d
|
修改三维cctv人物模型
|
2020-06-08 18:31:43 +08:00 |
|
sunzhenyu
|
a18a7bccc6
|
merge jointtrainningnew/index.vue
|
2020-06-08 18:26:30 +08:00 |
|
sunzhenyu
|
b33f4c17b2
|
merge pull
|
2020-06-08 18:24:09 +08:00 |
|
sunzhenyu
|
9a36ce50eb
|
增加三维cctv多画面，修改cctv初始视角
|
2020-06-08 18:23:24 +08:00 |
|
sunzhenyu
|
6cae01f373
|
增加三维驾驶换端操作，修改三维cctv中前往站台找不到路径点bug，增加综合演练车站cctv
|
2020-06-08 18:22:12 +08:00 |
|
joylink_cuiweidong
|
404a23e35e
|
iscs 小系统代码调整
|
2020-06-08 17:59:28 +08:00 |
|
joylink_cuiweidong
|
98ed49715a
|
综合演练仿真会话自动播放调整
|
2020-06-08 13:55:26 +08:00 |
|
joylink_cuiweidong
|
6f59f03acd
|
裁判系统 获取参赛者的历史对话
|
2020-06-08 11:28:40 +08:00 |
|
joylink_cuiweidong
|
63c3d785dd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-08 10:46:23 +08:00 |
|
joylink_cuiweidong
|
eecc022ae5
|
佛山线路 菜单栏 增加显示功能
列车提示代码调整
|
2020-06-08 10:46:01 +08:00 |
|
fan
|
1170ed5f0c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 18:59:42 +08:00 |
|
fan
|
fc0772a11c
|
iscs调整&站后折返显示调整
|
2020-06-05 18:59:35 +08:00 |
|
sunzhenyu
|
4f6e4ff2fc
|
修改三维驾驶列车排序，修改三维驾驶面板图标刷新，完善三维cctv的乘客上下车，优化ai逻辑，修改进出站闸机逻辑。修改三维编辑器站台内外侧属性赋值。修改通号三维设备初次加载面板bug
|
2020-06-05 18:56:42 +08:00 |
|
joylink_cuiweidong
|
99346c4b02
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 18:48:26 +08:00 |
|
joylink_cuiweidong
|
38b7580f79
|
佛山线路 道岔在单锁的状态时，使用道岔单解的功能，未起到双确认调整
停站时间没有具体停站多少时间调整
|
2020-06-05 18:48:07 +08:00 |
|
zyy
|
c86bb0bff3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 18:04:42 +08:00 |
|
zyy
|
768c62333c
|
调整站台操作，增加综合监控调节
|
2020-06-05 18:04:27 +08:00 |
|
joylink_cuiweidong
|
4d918cc6a7
|
裁判平台回放代码调整
|
2020-06-05 15:54:03 +08:00 |
|
joylink_cuiweidong
|
4aec9679aa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 14:54:12 +08:00 |
|
zyy
|
dd16694b52
|
调整格式
|
2020-06-05 14:53:45 +08:00 |
|
joylink_cuiweidong
|
cf0a078635
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 14:53:43 +08:00 |
|
joylink_cuiweidong
|
7c76ba9021
|
裁判系统回放代码调整
|
2020-06-05 14:53:18 +08:00 |
|
zyy
|
465da976d8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 14:52:20 +08:00 |
|
zyy
|
23119acc74
|
调整综合监控绘图元素
|
2020-06-05 14:51:54 +08:00 |
|
fan
|
e98dab8d56
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 14:46:47 +08:00 |
|
fan
|
7d8a8f8fb6
|
实操竞赛计时调整&iscs调整
|
2020-06-05 14:46:37 +08:00 |
|
joylink_cuiweidong
|
377473ea4c
|
新版剧本增加角色调整
|
2020-06-05 14:22:46 +08:00 |
|
joylink_cuiweidong
|
6f0cc20a42
|
新版剧本修改对话代码调整
|
2020-06-05 14:12:22 +08:00 |
|
joylink_cuiweidong
|
767e5cc48a
|
裁判系统代码调整
|
2020-06-05 13:41:47 +08:00 |
|
zyy
|
fbf26cfafc
|
调整综合监控绘图元素，保存绘图数据
|
2020-06-05 13:24:38 +08:00 |
|
joylink_cuiweidong
|
ea6d74d3c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 13:06:40 +08:00 |
|
joylink_cuiweidong
|
7f72ed4048
|
裁判系统代码调整
|
2020-06-05 13:05:33 +08:00 |
|
fan
|
b47d5a0f57
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 10:50:16 +08:00 |
|
fan
|
ec6ebe78e5
|
列车显示调整
|
2020-06-05 10:50:05 +08:00 |
|
zyy
|
8bd88fe20b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 10:32:56 +08:00 |
|
zyy
|
f4fca9a083
|
调整策略右键弹出窗口，增加综合监控元素配置
|
2020-06-05 10:32:32 +08:00 |
|
joylink_cuiweidong
|
e3b2726d8b
|
裁判系统查看理论考试结果页面调整
|
2020-06-05 10:31:58 +08:00 |
|
zyy
|
3b137ffae9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-05 10:14:23 +08:00 |
|
zyy
|
30d76e763e
|
调整折返按钮 状态返回处理
|
2020-06-05 10:14:12 +08:00 |
|
fan
|
c7d07ebd9d
|
合并代码
|
2020-06-05 09:39:48 +08:00 |
|
fan
|
6dfbe18485
|
实操竞赛比赛计时&题目展示&结果展示
|
2020-06-05 09:38:14 +08:00 |
|
joylink_cuiweidong
|
74b6e66aff
|
裁判系统回放代码调整
|
2020-06-05 09:35:00 +08:00 |
|