Commit Graph

5275 Commits

Author SHA1 Message Date
fan
fa4c481d40 删除新建列车参数 2020-05-21 14:40:21 +08:00
fan
82adf8e241 西安三号线列车识别号修改 2020-05-21 14:21:04 +08:00
fan
34fba46cc3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-21 13:16:36 +08:00
fan
96f5c31b18 新建列车调整 2020-05-21 13:16:20 +08:00
joylink_cuiweidong
b382b6e0d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-21 10:44:22 +08:00
joylink_cuiweidong
cf021736b2 竞赛裁判系统代码调整 2020-05-21 10:43:32 +08:00
fan
19bd41b214 调整hydIcon路径 2020-05-21 10:02:13 +08:00
fan
6fc8d7edf6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-21 09:31:29 +08:00
fan
650b0c00ee 调整列车早晚点显示 2020-05-21 09:31:16 +08:00
zyy
81187912f0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 18:33:08 +08:00
zyy
af26f55e9b 调整裁判管理报名列表 2020-05-20 18:32:52 +08:00
joylink_cuiweidong
4132eba1ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/api/competition.js
#	src/views/jsxt/refereeList/index.vue
2020-05-20 18:28:59 +08:00
joylink_cuiweidong
dc6819df4d 裁判平台代码调整 2020-05-20 18:26:04 +08:00
fan
9e8f4a48f4 调整站台扣车显示 2020-05-20 18:11:39 +08:00
fan
7bbe7b26d7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 17:44:57 +08:00
fan
ddee6156f7 竞赛管理显示地址 2020-05-20 17:44:47 +08:00
zyy
43ee4a89ed 调整报名接口调整 2020-05-20 17:35:48 +08:00
zyy
8b8f43378e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/utils/baseUrl.js
2020-05-20 17:20:54 +08:00
zyy
801d420db8 调整竞赛报名api 2020-05-20 17:19:45 +08:00
fan
f93f432d7e ARB故障状态&哈尔滨列车早晚点时间 2020-05-20 17:08:21 +08:00
fan
3e84ec6a6b 裁判加载实操 2020-05-20 16:10:45 +08:00
fan
c2cee7817a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 15:36:57 +08:00
fan
e1f932c5e3 竞赛管理 2020-05-20 15:36:49 +08:00
joylink_cuiweidong
1cc644d893 剧本编制代码调整 2020-05-20 15:29:41 +08:00
joylink_cuiweidong
df718218e3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 14:51:35 +08:00
joylink_cuiweidong
0b37830a8d 剧本录制代码调整 2020-05-20 14:50:34 +08:00
fan
e3034f630e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 14:46:39 +08:00
fan
b137adbd69 哈尔滨地图问题调整&竞赛管理 2020-05-20 14:46:26 +08:00
zyy
93b92ad36a 调整报名系统增加电话验证码 2020-05-20 14:35:55 +08:00
zyy
31bcad0449 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 13:25:44 +08:00
zyy
61c3650621 路由权限生成调整逻辑 2020-05-20 13:25:31 +08:00
joylink_cuiweidong
71cd5af93b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-20 11:14:01 +08:00
joylink_cuiweidong
74665d7b25 剧本编制代码调整 2020-05-20 11:13:32 +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
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