Commit Graph

8409 Commits

Author SHA1 Message Date
fan
70e260cc4f 哈尔滨屏蔽门调整 2020-12-11 19:49:48 +08:00
fan
35d760b0f1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-11 19:28:56 +08:00
fan
a80b6c7fb0 一键领取权限 2020-12-11 19:28:38 +08:00
sunzhenyu
dcc1bb4506 综合演练三维驾驶返回bug 2020-12-11 18:11:20 +08:00
sunzhenyu
8287e984da Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-11 18:03:05 +08:00
sunzhenyu
caeea6d9d6 修改综合演练三维驾驶返回未destory 2020-12-11 18:02:56 +08:00
fan
97241040f6 调整宁波三号线站台样式 2020-12-11 16:38:13 +08:00
fan
f8876c452e Text调整 2020-12-11 16:33:51 +08:00
fan
0d8f0f021a 添加通用配置项 2020-12-11 14:51:04 +08:00
fan
772c611704 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-11 13:20:01 +08:00
fan
f9d8bda8b0 宁波三号线延续保护添加箭头 2020-12-11 13:19:34 +08:00
joylink_cuiweidong
0c970e24ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-11 13:15:23 +08:00
joylink_cuiweidong
afa359d22a 运行图绘制代码调整 2020-12-11 13:15:07 +08:00
fan
2a0efafc1a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-11 10:01:00 +08:00
fan
05958bb619 添加南铁院登录页 2020-12-11 10:00:38 +08:00
fan
2fdfaa2561 添加南铁院登录页 2020-12-11 09:59:27 +08:00
joylink_cuiweidong
082f18e5eb 运行图编制代码调整 2020-12-10 18:43:17 +08:00
joylink_cuiweidong
1b0ab87020 车站绘图代码调整(去除公里标名称必填)
文字绘图代码调整(调整文字字体,与车站名称字体一致)
2020-12-10 18:33:18 +08:00
joylink_cuiweidong
9a7a69201a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-10 18:03:19 +08:00
joylink_cuiweidong
fd267160b1 信号机绘图代码调整(解决设置信号机归属联锁站bug)
运行图编制代码调整
2020-12-10 18:02:59 +08:00
fan
f97f2fc4a2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-10 17:34:46 +08:00
fan
80ebd84062 宁波三号线调整 2020-12-10 17:34:13 +08:00
joylink_cuiweidong
6e3b07edac Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-10 17:26:38 +08:00
joylink_cuiweidong
acf23ef747 运行图编制代码调整 2020-12-10 17:26:18 +08:00
fan
aa4012b08f 宁波三号线操作 2020-12-10 14:50:43 +08:00
fan
c75b6f2119 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-10 14:40:59 +08:00
fan
9114578e22 宁波三号线操作 2020-12-10 14:40:41 +08:00
joylink_cuiweidong
a22445552a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-10 13:54:13 +08:00
joylink_cuiweidong
3f7eccdc2f 运行图编制代码调整 2020-12-10 13:53:34 +08:00
sunzhenyu
72abaf9643 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-10 11:29:23 +08:00
sunzhenyu
dae99ee4ad 修改综合演练三维驾驶初始样式 2020-12-10 11:29:12 +08:00
fan
c297594128 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-10 10:33:02 +08:00
fan
5fb24707ee 江苏的爱脑子信息职业学院登录页 2020-12-10 10:32:48 +08:00
fan
c118fccd3f 宁波三号线操作调整 2020-12-10 10:01:51 +08:00
joylink_cuiweidong
0bfc5cb330 运行图编制代码调整 2020-12-09 18:28:25 +08:00
joylink_cuiweidong
5bc8ec230c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-09 17:13:57 +08:00
joylink_cuiweidong
c16e9a528f 运行图编制代码调整 2020-12-09 17:13:35 +08:00
zyy
1bd1af2df3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-09 17:08:52 +08:00
zyy
1a093e6594 调整交控皮肤显示条件,增加自动折返进路显示 2020-12-09 17:08:36 +08:00
joylink_cuiweidong
dab2a00313 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-09 17:03:39 +08:00
joylink_cuiweidong
5e78f3ac64 运行图编制代码调整 2020-12-09 17:03:22 +08:00
zyy
a984e6b4ed Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-09 15:03:59 +08:00
zyy
4361d503f3 调整信号机联锁站设置搜索 2020-12-09 15:03:46 +08:00
joylink_cuiweidong
1389c3dfb9 代码调整 2020-12-09 11:21:30 +08:00
joylink_cuiweidong
5287652d90 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-09 10:56:42 +08:00
joylink_cuiweidong
108ec9ef83 西安二号线列车 三角形位置绘图调整 2020-12-09 10:56:24 +08:00
zyy
e7d5a85b4f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-09 10:38:58 +08:00
zyy
a71217220a 调整mapDevice数据 2020-12-09 10:38:46 +08:00
fan
06dbabf05a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-08 18:44:47 +08:00
fan
8f7caf199c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-08 18:44:06 +08:00