Commit Graph

1625 Commits

Author SHA1 Message Date
zyy
d991a65517 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-28 11:31:10 +08:00
zyy
1f8641e3ea 调整运行图 2020-08-28 11:30:55 +08:00
fan
0adf841597 行调大赛调整 2020-08-28 10:59:44 +08:00
fan
3c016a5c4b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 17:21:13 +08:00
fan
deded7ed6e 宁波三号线菜单调整 2020-08-27 16:48:03 +08:00
zyy
ad29ed8890 调整考试系统加载流程 2020-08-27 16:43:37 +08:00
zyy
06699507e4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 13:13:29 +08:00
zyy
8a3287ca22 删除多余代码注释 2020-08-27 13:13:15 +08:00
fan
9dc290a550 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 10:45:54 +08:00
fan
f2469920fe 菜单配置调整 2020-08-27 10:45:43 +08:00
fan
a01267abe1 区段切除报错调整 2020-08-27 10:45:06 +08:00
zyy
c2f549523a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-27 09:56:15 +08:00
zyy
699053f46f 调整西安运行图流程 2020-08-27 09:56:00 +08:00
fan
7a7ae9591a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 18:24:58 +08:00
fan
f3e6291582 区段切除报错调整 2020-08-26 18:24:14 +08:00
zyy
bbae7bfb1b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-26 17:44:17 +08:00
zyy
fc14cc41a7 调整发布地图导出,调整大屏流程 2020-08-26 17:44:01 +08:00
fan
9fcb1cd9bb 代码调整 2020-08-25 18:50:42 +08:00
fan
932360dd88 merge 2020-08-25 17:10:08 +08:00
fan
f611f5057d 西安二菜单调整 2020-08-25 17:02:48 +08:00
joylink_cuiweidong
a9fd33c413 哈尔滨线路实训操作调整 2020-08-25 16:54:16 +08:00
joylink_cuiweidong
1668b25337 哈尔滨线路实训操作代码调整 2020-08-25 16:38:08 +08:00
joylink_cuiweidong
f2957c370c 哈尔滨线路实训操作代码调整 2020-08-25 15:09:04 +08:00
joylink_cuiweidong
2dad56ac07 哈尔滨线路实训操作调整 2020-08-25 15:01:47 +08:00
joylink_cuiweidong
5549b7bc9f 哈尔滨线路实训操作代码调整 2020-08-25 14:49:19 +08:00
joylink_cuiweidong
92ba51a548 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-25 14:17:44 +08:00
joylink_cuiweidong
2320ae42a9 剧本预览代码调整 2020-08-25 14:17:04 +08:00
zyy
69f7b9deca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-25 13:51:42 +08:00
zyy
13160dfc91 增加西安二号线列车右键菜单 2020-08-25 13:51:27 +08:00
joylink_cuiweidong
9fc8948bba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-25 13:15:47 +08:00
joylink_cuiweidong
65a10b26af 哈尔滨线路 实训操作调整
剧本录制页面聊天代码调整
2020-08-25 13:15:32 +08:00
zyy
54720bc848 处理西安二号线列车冲突代码 2020-08-25 09:33:20 +08:00
zyy
1112ee8322 删除西安二号线列车多余菜单样式 2020-08-25 09:31:07 +08:00
fan
664e174fcf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-25 09:25:50 +08:00
fan
6a268fa095 宁波三菜单调整 2020-08-25 09:25:36 +08:00
joylink_cuiweidong
b1380e5e45 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-24 19:18:31 +08:00
joylink_cuiweidong
8db06da732 哈尔滨线路操作代码调整 2020-08-24 19:18:12 +08:00
fan
009d911a75 merge 2020-08-24 18:27:09 +08:00
fan
44791d3d54 宁波三号线菜单调整 2020-08-24 18:25:07 +08:00
zyy
19b6f7fb6e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-24 18:17:30 +08:00
zyy
50c185671f 调整西安二号线列车操作 2020-08-24 18:17:17 +08:00
joylink_cuiweidong
15ba67c43a 西安二号线折返策略代码调整 2020-08-24 18:15:55 +08:00
joylink_cuiweidong
5410cb037c 西安二号线折返策略代码调整 2020-08-24 17:52:27 +08:00
zyy
23b024dff4 调整折返策略状态显示 2020-08-24 17:21:12 +08:00
zyy
18235dc096 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-24 16:44:19 +08:00
zyy
b1d42694fd 调整西安二号线列车右键菜单操作 2020-08-24 16:44:04 +08:00
joylink_cuiweidong
ea1955cf34 哈尔滨线路 站台实训调整 2020-08-24 16:42:05 +08:00
joylink_cuiweidong
e4a13de455 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-24 16:11:50 +08:00
joylink_cuiweidong
e6193e3469 哈尔滨线路实训操作代码调整 2020-08-24 16:11:31 +08:00
zyy
59a3fbb082 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-24 16:00:15 +08:00