sunzhenyu
|
763e0841c0
|
注释
|
2020-06-10 16:30:48 +08:00 |
|
sunzhenyu
|
365cd7de44
|
增加列车开关门操作
|
2020-06-10 16:30:23 +08:00 |
|
joylink_cuiweidong
|
c953d98ffa
|
佛山线路 现地信号机 操作调整
|
2020-06-10 14:37:43 +08:00 |
|
joylink_cuiweidong
|
4118eb7a32
|
线路配置添加参数 列车控制模式/级别
|
2020-06-10 13:42:06 +08:00 |
|
joylink_cuiweidong
|
c73769f90d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-10 13:24:27 +08:00 |
|
joylink_cuiweidong
|
b169bb1e20
|
佛山有轨电车指令代码调整
|
2020-06-10 13:24:12 +08:00 |
|
zyy
|
e4ec3dfbde
|
调整佛山线路 站台操作
|
2020-06-10 11:18:50 +08:00 |
|
zyy
|
c8bf7c80ef
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 18:41:08 +08:00 |
|
zyy
|
62ede6fec7
|
增加佛山线路现地操作，调整状态字段
|
2020-06-09 18:40:48 +08:00 |
|
fan
|
5c65653ef7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 18:33:26 +08:00 |
|
fan
|
1d56ae8249
|
合并代码
|
2020-06-09 18:33:17 +08:00 |
|
fan
|
fa8c31b2d4
|
iscs 照明系统模式表&时间表
|
2020-06-09 18:31:21 +08:00 |
|
joylink_cuiweidong
|
174c15bafc
|
佛山线路添加 设置临时限速
|
2020-06-09 18:30:00 +08:00 |
|
joylink_cuiweidong
|
56eae6302a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 17:54:28 +08:00 |
|
joylink_cuiweidong
|
cc3fe9353f
|
佛山有轨电车 宁波一号线 全线扣车代码调整
|
2020-06-09 17:53:54 +08:00 |
|
zyy
|
d360dc26b3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 17:48:28 +08:00 |
|
zyy
|
015dd9e113
|
调整综合监控数据，调整绘图
|
2020-06-09 17:48:08 +08:00 |
|
program-walker
|
8d25428411
|
Merge remote-tracking branch 'origin/test'
|
2020-06-09 16:36:51 +08:00 |
|
sunzhenyu
|
1657859e08
|
修改三维cctv清客触发逻辑
|
2020-06-09 16:03:18 +08:00 |
|
sunzhenyu
|
40cfdca979
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 15:55:08 +08:00 |
|
sunzhenyu
|
e83553c39a
|
替换优化后三维cctv模型，修改切换站台未清空当前列车编号bug
|
2020-06-09 15:54:57 +08:00 |
|
joylink_cuiweidong
|
3628ad2d6e
|
排列进路代码调整
|
2020-06-09 15:11:21 +08:00 |
|
fan
|
c119d5130f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 14:39:43 +08:00 |
|
fan
|
4b67f81cf0
|
iscs 小系统模式表
|
2020-06-09 14:39:32 +08:00 |
|
joylink_cuiweidong
|
3c3a355fb6
|
道岔单解操作代码调整
|
2020-06-09 14:29:36 +08:00 |
|
joylink_cuiweidong
|
f3d37dd240
|
代码调整
|
2020-06-09 14:16:06 +08:00 |
|
joylink_cuiweidong
|
5bc3bfc8dd
|
操作指令代码调整
|
2020-06-09 14:09:15 +08:00 |
|
joylink_cuiweidong
|
6b551b04fc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-09 13:34:48 +08:00 |
|
joylink_cuiweidong
|
83e8a6658a
|
线路配置添加字段（道岔正/反操是否联动，道岔单解/锁是否联动，是否强制取消进路/在接近区段占用时是否依旧强制执行取消进路）
|
2020-06-09 13:34:32 +08:00 |
|
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 |
|