joylink_cuiweidong
|
93d6bb5cd6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 18:53:32 +08:00 |
|
joylink_cuiweidong
|
a903464d2b
|
代码调整
|
2020-09-21 18:53:15 +08:00 |
|
zyy
|
a620e029e0
|
调整绘图配置
|
2020-09-21 18:14:17 +08:00 |
|
zyy
|
212138f370
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 18:05:36 +08:00 |
|
zyy
|
dd99815868
|
福州一号线绘图配置
|
2020-09-21 18:05:25 +08:00 |
|
fan
|
893ecd7ff4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 17:39:18 +08:00 |
|
fan
|
8199d383fb
|
iscs调整
|
2020-09-21 17:39:06 +08:00 |
|
joylink_cuiweidong
|
e094134960
|
剧本代码调整
|
2020-09-21 16:24:17 +08:00 |
|
joylink_cuiweidong
|
0945448549
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 16:00:41 +08:00 |
|
joylink_cuiweidong
|
0b380b3b0f
|
福州线路iscs系统 样式调整
|
2020-09-21 16:00:24 +08:00 |
|
fan
|
99894a1443
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 14:29:23 +08:00 |
|
fan
|
bf4ce9d247
|
iscs调整
|
2020-09-21 14:29:02 +08:00 |
|
zyy
|
179ea283b7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 14:24:04 +08:00 |
|
zyy
|
165cef3f69
|
调整文件路径
|
2020-09-21 14:23:51 +08:00 |
|
joylink_cuiweidong
|
a93adc7094
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 14:20:46 +08:00 |
|
joylink_cuiweidong
|
047c9aa127
|
剧本 代码调整
|
2020-09-21 14:20:33 +08:00 |
|
zyy
|
1636659889
|
增加综合监控配置文件
|
2020-09-21 14:11:02 +08:00 |
|
joylink_cuiweidong
|
2a4d7d750a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 13:38:53 +08:00 |
|
joylink_cuiweidong
|
91e34add37
|
剧本代码调整
|
2020-09-21 13:38:37 +08:00 |
|
fan
|
0a33127068
|
iscs调整
|
2020-09-21 13:20:30 +08:00 |
|
joylink_cuiweidong
|
aaead41423
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 10:54:02 +08:00 |
|
joylink_cuiweidong
|
a22715ab23
|
剧本会话代码调整
|
2020-09-21 10:53:45 +08:00 |
|
fan
|
1c5f972e74
|
调整iscs
|
2020-09-21 10:26:34 +08:00 |
|
fan
|
39a1acd081
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-21 10:17:47 +08:00 |
|
fan
|
05b879f63d
|
综合演练ibp按钮显示调整
|
2020-09-21 10:17:37 +08:00 |
|
fan
|
942cbe72a1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-18 18:30:26 +08:00 |
|
fan
|
4eafbd72ea
|
iscs调整&宁波道岔取消故障失表取消动画
|
2020-09-18 18:30:14 +08:00 |
|
sunzhenyu
|
b9247b1bb1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-18 18:29:08 +08:00 |
|
sunzhenyu
|
60554583d1
|
修改三维驾驶列车模型距离，三维编辑器增加车站坐标校准，增加站台停车点显示
|
2020-09-18 18:29:02 +08:00 |
|
joylink_cuiweidong
|
f6f1d45fe5
|
竞赛 剧本代码调整
|
2020-09-18 18:18:02 +08:00 |
|
joylink_cuiweidong
|
ee61b0615b
|
剧本修改代码调整（添加满分时长、及格时长、零分时长字段）
|
2020-09-18 17:04:35 +08:00 |
|
joylink_cuiweidong
|
41548dd32f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/displayNew/dispatherContest/index.vue
|
2020-09-18 16:05:07 +08:00 |
|
joylink_cuiweidong
|
6cad4eabdb
|
竞赛系统 剧本加载逻辑调整
|
2020-09-18 16:02:22 +08:00 |
|
fan
|
6b585fbca6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-18 14:42:27 +08:00 |
|
fan
|
0d31203b74
|
ibp盘状态处理&时间同步
|
2020-09-18 14:42:17 +08:00 |
|
zyy
|
733503afe6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-18 11:08:30 +08:00 |
|
zyy
|
e66a5a5687
|
调整道岔绘制逻辑
|
2020-09-18 11:08:17 +08:00 |
|
sunzhenyu
|
af322ec7aa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-18 09:26:50 +08:00 |
|
sunzhenyu
|
a37a3214f8
|
修改三维通号读取新数据bug
|
2020-09-18 09:26:44 +08:00 |
|
fan
|
89fcb3fe2f
|
iscs调整&ibp接口参数修改
|
2020-09-18 09:26:25 +08:00 |
|
fan
|
aa52945003
|
行调大赛
|
2020-09-17 18:30:31 +08:00 |
|
fan
|
639dc474a1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-17 18:25:52 +08:00 |
|
fan
|
f7e350ca95
|
行调大赛理论考试&福州Iscs
|
2020-09-17 18:25:37 +08:00 |
|
sunzhenyu
|
c7e0380510
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-17 18:12:42 +08:00 |
|
sunzhenyu
|
d409476963
|
增加三维沙盘行车高度行驶数据更新，修改三维设备站台贴图获取，修改三维编辑器区段连接获取
|
2020-09-17 18:12:37 +08:00 |
|
zyy
|
c2e3df8dbc
|
调整ibp按钮点击
|
2020-09-17 17:45:04 +08:00 |
|
zyy
|
3134142ab3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-17 16:33:33 +08:00 |
|
zyy
|
e98b53d8ad
|
调整ibp鼠标逻辑
|
2020-09-17 16:33:22 +08:00 |
|
sunzhenyu
|
465248872f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-09-17 15:41:02 +08:00 |
|
sunzhenyu
|
308007c6b1
|
修改三维cctv初始化渲染大小
|
2020-09-17 15:40:55 +08:00 |
|