Commit Graph

9350 Commits

Author SHA1 Message Date
sunzhenyu
5ead363453 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-08 11:28:46 +08:00
sunzhenyu
7a607d308d 修改三维客流pis 2020-12-08 11:28:34 +08:00
zyy
407d1d421b 调整新建地图列表获取 2020-12-08 11:26:45 +08:00
zyy
085990f755 增加站台紧急按钮批量删除,增加区段批量删除范围 2020-12-08 11:09:02 +08:00
zyy
5088838db6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-08 09:52:15 +08:00
zyy
d6dccd10d7 调整车站隐藏流程 2020-12-08 09:52:07 +08:00
joylink_cuiweidong
4edd31f699 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-08 09:42:56 +08:00
joylink_cuiweidong
40141c7428 剧本编制代码调整 2020-12-08 09:42:38 +08:00
fan
49968e00ec Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-08 09:02:20 +08:00
fan
fd92d2bb63 国赛title调整 2020-12-08 09:02:06 +08:00
fan
5c8697e881 国赛界面调整 2020-12-07 20:23:11 +08:00
zyy
4362eef88b 增加删除范围 2020-12-07 18:36:53 +08:00
zyy
ed93c3159e 删除元素补充 2020-12-07 18:19:31 +08:00
zyy
c97074f585 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-07 18:00:42 +08:00
zyy
b0234db4a2 调整道岔生成逻辑 2020-12-07 18:00:26 +08:00
sunzhenyu
ce7a3de96f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-07 17:14:15 +08:00
sunzhenyu
d973dbc46e 修改三维设备界面隐藏显示 2020-12-07 17:14:06 +08:00
zyy
84d140b639 调整车站绘制流程 2020-12-07 16:34:57 +08:00
zyy
6b53bc55d6 调整删除区段关联车次窗 2020-12-07 16:10:03 +08:00
zyy
a797f63e93 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-07 15:10:07 +08:00
zyy
6995a8a962 增加以区段为目标删除左右所有元素 2020-12-07 15:09:53 +08:00
sunzhenyu
357862d2d4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-07 09:46:17 +08:00
sunzhenyu
d52fe18281 修改三维客流上下车参数 2020-12-07 09:46:00 +08:00
fan
0294839530 国赛界面调整 2020-12-07 09:13:03 +08:00
zyy
75f883bf05 Merge branch 'master' of https://git.code.tencent.com/lian-cbtc/jl-client 2020-12-06 21:56:59 +08:00
zyy
cbe5307f98 Merge remote-tracking branch 'remotes/origin/test' 2020-12-06 21:56:35 +08:00
zyy
9f0465beac 增加过滤条件 2020-12-06 21:56:00 +08:00
joylink_cuiweidong
a1a17b0192 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-04 18:44:49 +08:00
joylink_cuiweidong
6ceddeda92 代码调整 2020-12-04 18:44:33 +08:00
fan
275fea9713 Merge remote-tracking branch 'origin/test' 2020-12-04 18:36:01 +08:00
fan
049ab8aa4c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-04 18:35:11 +08:00
fan
e2e9978cbd 大赛信息添加 2020-12-04 18:34:58 +08:00
joylink_cuiweidong
cd39147257 实训平台代码调整 2020-12-04 18:10:07 +08:00
zyy
85cc4ee3d5 过滤报错提示 2020-12-04 17:22:58 +08:00
zyy
f466ec6fee Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-04 17:10:14 +08:00
zyy
7054f6c1e6 增加运行图编辑 2020-12-04 17:10:03 +08:00
joylink_cuiweidong
a0e3875e69 实训平台样式调整 2020-12-04 15:46:45 +08:00
joylink_cuiweidong
e36e9e84e3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-04 13:21:59 +08:00
joylink_cuiweidong
0884f6d227 实训平台 样式调整 2020-12-04 13:21:41 +08:00
zyy
0277a04558 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-04 10:15:50 +08:00
zyy
c35a0729bc 调整package 2020-12-04 10:15:26 +08:00
fan
2c9225e939 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-04 10:08:07 +08:00
fan
ac8f9bc978 哈尔滨限速调整 2020-12-04 10:07:55 +08:00
joylink_cuiweidong
b0a3c8b83f Merge remote-tracking branch 'remotes/origin/test' 2020-12-04 09:33:11 +08:00
joylink_cuiweidong
c6f58607be Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-04 09:32:20 +08:00
joylink_cuiweidong
666ff5afbb 实训平台样式调整
代码调整
2020-12-04 09:31:45 +08:00
fan
1b6d212e7d 试题定义 placeholder 调整 2020-12-04 09:17:34 +08:00
joylink_cuiweidong
071d44f41a Merge remote-tracking branch 'remotes/origin/test' 2020-12-03 18:59:20 +08:00
fan
915cd1963c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-03 18:45:13 +08:00
fan
386e742a31 注释单位 2020-12-03 18:44:51 +08:00