Commit Graph

5352 Commits

Author SHA1 Message Date
joylink_cuiweidong
845b620e65 北交大仿真 切换客流数据调整 2020-12-15 16:20:11 +08:00
zyy
9e48ca39a8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-15 14:41:36 +08:00
zyy
249bef4802 调整道岔生成逻辑 2020-12-15 14:41:23 +08:00
joylink_cuiweidong
a45374acc3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-15 13:36:05 +08:00
joylink_cuiweidong
da59fdbed6 代码调整 2020-12-15 13:35:38 +08:00
zyy
7ec4a2db59 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-15 11:10:19 +08:00
zyy
b85dcb41dc 调整道岔生成逻辑 2020-12-15 11:10:05 +08:00
sunzhenyu
e9ca305560 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-15 10:58:49 +08:00
sunzhenyu
5dfded5bf1 修复三维客流车站先下后上,修复上行站台下车不均匀分布bug 2020-12-15 10:58:41 +08:00
fan
dff745b94a 南铁院本地打包 2020-12-15 09:54:54 +08:00
fan
76e487b774 南铁院本地打包 2020-12-14 19:43:40 +08:00
fan
3c8fa57b09 南铁院本地打包 2020-12-14 18:10:37 +08:00
fan
081bebf16d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-14 17:55:08 +08:00
fan
8ab05255ab 南铁院本地调整 2020-12-14 17:54:45 +08:00
joylink_cuiweidong
c437ac62c1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-14 17:19:31 +08:00
joylink_cuiweidong
0ecea0aabc 地图绘制代码调整 2020-12-14 17:18:57 +08:00
fan
44fb0805bc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-14 17:13:06 +08:00
zyy
e5a51e0d90 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/utils/baseUrl.js
2020-12-14 17:07:15 +08:00
zyy
40687fcd5b 调整信号机批量设置偏移量 2020-12-14 17:06:23 +08:00
fan
fd7418e4a3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-14 17:00:29 +08:00
fan
aceee45c47 提示调整 2020-12-14 17:00:15 +08:00
joylink_cuiweidong
1deaf4defc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-14 16:54:31 +08:00
joylink_cuiweidong
89b635e24a 地图绘制代码调整 2020-12-14 16:53:43 +08:00
fan
8dc4e2572b 创建项目权限包 2020-12-14 16:28:55 +08:00
fan
0364fa0f2d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-14 15:51:29 +08:00
fan
383287fe56 新窗口ibp展示添加退出按钮 2020-12-14 15:51:14 +08:00
fan
62cba757e6 绘图预览界面 现地行调显示调整 & ibp从发布地图创建调整 & 贵装备信息导入调整 2020-12-14 15:22:47 +08:00
zyy
02a6293d5d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-14 11:29:43 +08:00
zyy
0310ee6c57 调整地图流程 2020-12-14 11:29:26 +08:00
joylink_cuiweidong
1fe7518ddf 代码调整 2020-12-11 21:20:54 +08:00
joylink_cuiweidong
328805ba80 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-11 20:17:41 +08:00
joylink_cuiweidong
d8c6a8657b 哈尔滨运行图编制代码调整 2020-12-11 20:17:18 +08:00
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
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
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