Commit Graph

6746 Commits

Author SHA1 Message Date
zyy
f8d3ffa91d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-21 16:38:35 +08:00
zyy
e86c0b9c45 调整发布地图导入流程 2020-08-21 16:38:22 +08:00
joylink_cuiweidong
c1a9fed683 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-21 15:42:49 +08:00
joylink_cuiweidong
c3675a0bd4 剧本仿真代码调整 2020-08-21 15:41:46 +08:00
fan
b495f542e6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-21 15:31:51 +08:00
fan
cfed1c5c4a 取消和利时登录页面基于开发字样 2020-08-21 15:30:51 +08:00
joylink_cuiweidong
43207730bf 剧本仿真代码调整 2020-08-21 14:55:28 +08:00
joylink_cuiweidong
72ca8ed962 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-21 14:17:16 +08:00
joylink_cuiweidong
e699efc06f 剧本录制预览代码调整 2020-08-21 14:16:44 +08:00
fan
5df9b4aa6f 宁波三号线进路样式调整 2020-08-21 14:14:26 +08:00
fan
ea2d1b9dd1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-21 08:51:43 +08:00
fan
f5cd2af55d 宁波三号线menubar菜单调整 2020-08-21 08:51:20 +08:00
joylink_cuiweidong
5dcf14c81f 代码调整 2020-08-20 20:39:38 +08:00
joylink_cuiweidong
66587a17fb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-20 20:28:12 +08:00
joylink_cuiweidong
171353a4d3 仿真 剧本代码调整 2020-08-20 20:27:19 +08:00
fan
428d547a25 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-20 16:57:58 +08:00
fan
3f67544296 宁波三号线menubar样式调整 2020-08-20 16:57:46 +08:00
zyy
d026ce783f 调整车站配置 2020-08-20 16:43:35 +08:00
zyy
33e773a940 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-20 16:02:32 +08:00
zyy
41b9adcc28 调整宁波三号线列车配置 2020-08-20 16:02:21 +08:00
fan
af132ae2dd 宁波三号线菜单调整 2020-08-20 15:42:47 +08:00
fan
23d0eab9f7 北京和利时页面增加 2020-08-20 14:17:40 +08:00
fan
862262a6c4 merge 2020-08-20 13:19:14 +08:00
fan
a44132056c 地图绘制添加防淹门 2020-08-20 13:17:58 +08:00
zyy
e6fb5c0f17 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-20 09:32:34 +08:00
zyy
8f6388e1c2 调整多余输出 2020-08-20 09:32:22 +08:00
fan
d729e84615 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-19 18:27:45 +08:00
fan
d1cff9ff94 宁波三号线站台样式调整 2020-08-19 18:27:36 +08:00
joylink_cuiweidong
9d0fe20a88 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-19 17:21:35 +08:00
joylink_cuiweidong
b3b37fd19f 宁波三号线 信号机绘图代码调整 2020-08-19 17:21:19 +08:00
fan
3520e53679 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-19 17:14:37 +08:00
fan
509b92c71a 宁波三号线样式调整 2020-08-19 17:14:27 +08:00
zyy
87275e3021 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-19 16:45:16 +08:00
zyy
db065dc76a 调整宁波三号线 道岔样式 2020-08-19 16:45:05 +08:00
fan
1afb1f3a09 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-19 16:39:19 +08:00
fan
94fbb77912 宁波三号线区段调整 2020-08-19 16:39:09 +08:00
zyy
2e6d45baab 调整宁波三号线配置 2020-08-19 15:50:33 +08:00
fan
101ddea2b1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-19 14:12:20 +08:00
fan
d92a86f146 代码调整 2020-08-19 14:11:58 +08:00
zyy
280b766d91 增加宁波三号线配置 2020-08-19 14:06:01 +08:00
zyy
7caac2f5f3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-19 13:43:22 +08:00
zyy
70945cbbc1 调整区段配置 2020-08-19 13:43:13 +08:00
fan
830a648be9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-19 09:03:43 +08:00
fan
96346ccf68 代码调整 2020-08-19 09:03:27 +08:00
joylink_cuiweidong
8ac2bcf0db Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-18 18:37:54 +08:00
joylink_cuiweidong
5e5f322c3b 剧本预览 剧本编制代码调整 2020-08-18 18:37:38 +08:00
zyy
901af70400 调整线路右键操作 2020-08-18 16:41:19 +08:00
joylink_cuiweidong
33acf41a94 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-18 16:32:01 +08:00
joylink_cuiweidong
74d7b6695c 剧本预览代码优化 2020-08-18 16:29:23 +08:00
zyy
c448e2e1ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-18 16:02:35 +08:00