program-walker
|
18ec0312f7
|
Merge remote-tracking branch 'origin/test'
|
2020-05-20 11:10:16 +08:00 |
|
sunzhenyu
|
a58f175afc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-20 10:50:18 +08:00 |
|
sunzhenyu
|
01f90f6a2d
|
隐藏三维站台
|
2020-05-20 10:50:13 +08:00 |
|
joylink_cuiweidong
|
5ad20c5659
|
剧本代码调整
|
2020-05-20 10:46:38 +08:00 |
|
joylink_cuiweidong
|
c8f362a213
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-20 10:28:35 +08:00 |
|
joylink_cuiweidong
|
ca7e92f6a1
|
剧本编制代码调整
|
2020-05-20 10:28:16 +08:00 |
|
fan
|
5435ac382f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-20 10:02:20 +08:00 |
|
fan
|
ea8222504e
|
添加竞赛接口
|
2020-05-20 10:02:07 +08:00 |
|
program-walker
|
92aad88344
|
Merge remote-tracking branch 'origin/test'
|
2020-05-20 09:28:13 +08:00 |
|
joylink_cuiweidong
|
582543dd22
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 18:56:49 +08:00 |
|
joylink_cuiweidong
|
a51ae0aa30
|
西安二号线 列车正占用的区段，计轴标示也会显示为红色 代码调整
|
2020-05-19 18:54:51 +08:00 |
|
fan
|
46a28d3cd5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 18:39:31 +08:00 |
|
fan
|
597af25b40
|
iscs&站台故障
|
2020-05-19 18:38:58 +08:00 |
|
sunzhenyu
|
e40de65e9f
|
三维贴图加载日志清除
|
2020-05-19 18:12:42 +08:00 |
|
sunzhenyu
|
4819efc14e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 18:00:47 +08:00 |
|
sunzhenyu
|
21beb69fcb
|
修改三维数据加载逻辑，增加贴图背景资源简易配置
|
2020-05-19 18:00:36 +08:00 |
|
zyy
|
ce0c5c074c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 17:26:20 +08:00 |
|
zyy
|
7b0f662912
|
调整裁判平台页面样式
|
2020-05-19 17:26:12 +08:00 |
|
fan
|
bfb3c9357c
|
竞赛系统调整
|
2020-05-19 17:06:34 +08:00 |
|
joylink_cuiweidong
|
394b60b007
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 17:05:38 +08:00 |
|
joylink_cuiweidong
|
e69840c87f
|
综合演练代码调整
|
2020-05-19 17:05:23 +08:00 |
|
zyy
|
cfe3ccd6bf
|
调整竞赛系统首页样式
|
2020-05-19 17:01:58 +08:00 |
|
zyy
|
85dde7c4f8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 16:56:46 +08:00 |
|
zyy
|
cb0fcd1a3f
|
增加报名页面
|
2020-05-19 16:56:36 +08:00 |
|
sunzhenyu
|
5046a886fd
|
merge
|
2020-05-19 16:50:34 +08:00 |
|
sunzhenyu
|
6a25030a53
|
修改三维数据
|
2020-05-19 16:49:56 +08:00 |
|
joylink_cuiweidong
|
3b2d431400
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 15:45:17 +08:00 |
|
joylink_cuiweidong
|
c1ce6f46ae
|
综合演练代码调整
|
2020-05-19 15:44:57 +08:00 |
|
fan
|
247bc7ef30
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 15:44:13 +08:00 |
|
fan
|
45422c8cd2
|
信号机批量设置引导信号&虚拟信号机旋转
|
2020-05-19 15:44:01 +08:00 |
|
joylink_cuiweidong
|
e3b7d513ba
|
综合演练行调添加 列车选择
|
2020-05-19 14:47:47 +08:00 |
|
joylink_cuiweidong
|
eed312e72f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/jointTrainingNew/index.vue
|
2020-05-19 14:03:44 +08:00 |
|
joylink_cuiweidong
|
736c81a61d
|
综合演练 剧本代码调整
|
2020-05-19 14:01:23 +08:00 |
|
fan
|
df83fbb904
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 13:42:06 +08:00 |
|
fan
|
cc3f117a8f
|
宁波一综合演练现地设置显示站
|
2020-05-19 13:41:48 +08:00 |
|
zyy
|
4b683de30f
|
调整竞赛开始考试
|
2020-05-19 13:15:36 +08:00 |
|
zyy
|
28123b0525
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 13:10:56 +08:00 |
|
zyy
|
63e52f1986
|
调整理论竞赛流程页面
|
2020-05-19 13:10:45 +08:00 |
|
fan
|
6afafc9371
|
调整绘图批量设置信号机类型&竞赛考试详情
|
2020-05-19 11:20:09 +08:00 |
|
fan
|
f6dd6b00cc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 10:34:51 +08:00 |
|
fan
|
c48ea602e7
|
去除登出清除project
|
2020-05-19 10:34:40 +08:00 |
|
zyy
|
f2430c3625
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/router/index_Common.js
|
2020-05-19 10:32:07 +08:00 |
|
zyy
|
3a72195e15
|
调整竞赛系统页面路由
|
2020-05-19 10:30:27 +08:00 |
|
joylink_cuiweidong
|
f0cb7a11cf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 10:25:09 +08:00 |
|
joylink_cuiweidong
|
9fc821f940
|
综合演练代码调整（添加获取所有需要值班员的车站接口）
|
2020-05-19 10:24:48 +08:00 |
|
fan
|
462b8e972b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 10:18:10 +08:00 |
|
fan
|
eba0bff786
|
竞赛系统
|
2020-05-19 10:18:01 +08:00 |
|
joylink_cuiweidong
|
a1097088ea
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 09:45:31 +08:00 |
|
joylink_cuiweidong
|
08991c8694
|
剧本代码调整
|
2020-05-19 09:45:15 +08:00 |
|
fan
|
1357400c75
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-19 09:09:47 +08:00 |
|