sunzhenyu
|
d08be87108
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 13:54:26 +08:00 |
|
sunzhenyu
|
4dfe892f18
|
修改三维客流初始化仿真重置数据
|
2020-12-16 13:54:08 +08:00 |
|
fan
|
bd0aac34fe
|
综合演练现地显示调整
|
2020-12-16 13:25:55 +08:00 |
|
fan
|
d5b0508467
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 10:55:25 +08:00 |
|
fan
|
eebb034208
|
现地增加ibp& 现地切换值班员角色调整
|
2020-12-16 10:54:55 +08:00 |
|
joylink_cuiweidong
|
1715dcad32
|
北交大 客流数据代码调整
|
2020-12-16 10:18:58 +08:00 |
|
joylink_cuiweidong
|
525fc25469
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-16 09:42:15 +08:00 |
|
joylink_cuiweidong
|
0a5eb83904
|
代码调整
|
2020-12-16 09:41:53 +08:00 |
|
joylink_cuiweidong
|
3f7d5da3b1
|
代码调整
|
2020-12-16 09:40:37 +08:00 |
|
fan
|
1faa02cffa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-15 18:16:04 +08:00 |
|
fan
|
19e9cb7948
|
缓存运行图数据
|
2020-12-15 18:15:48 +08:00 |
|
joylink_cuiweidong
|
1453d5538a
|
北交大客流仿真代码调整
|
2020-12-15 18:09:10 +08:00 |
|
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 |
|
fan
|
3c6047d4ad
|
打包调整
|
2020-12-15 11:18:15 +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 |
|
fan
|
80ebd84062
|
宁波三号线调整
|
2020-12-10 17:34:13 +08:00 |
|
joylink_cuiweidong
|
acf23ef747
|
运行图编制代码调整
|
2020-12-10 17:26:18 +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
|
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
|
4361d503f3
|
调整信号机联锁站设置搜索
|
2020-12-09 15:03: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 |
|
fan
|
a9b94c8e5d
|
国赛界面去掉截止日期&拦截器提示登出修复&宁波三号线
|
2020-12-08 18:43:55 +08:00 |
|
zyy
|
d5925c305b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-08 18:41:30 +08:00 |
|
zyy
|
7ce6cf6e8a
|
调整修改区段bug
|
2020-12-08 18:41:18 +08:00 |
|
sunzhenyu
|
ed5f1dd7eb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-12-08 16:43:20 +08:00 |
|
sunzhenyu
|
e656be567d
|
三维客流，修复列车人数显示，增加列车进站语音，修改列车pis显示，更新客流站台贴图，修改编辑器车站name。code校对
|
2020-12-08 16:43:12 +08:00 |
|
zyy
|
9ede8ad97d
|
增加删除范围，调整退出仿真发送取消订阅
|
2020-12-08 13:56:36 +08:00 |
|
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
|
085990f755
|
增加站台紧急按钮批量删除，增加区段批量删除范围
|
2020-12-08 11:09:02 +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 |
|
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
|
6b53bc55d6
|
调整删除区段关联车次窗
|
2020-12-07 16:10:03 +08:00 |
|
zyy
|
6995a8a962
|
增加以区段为目标删除左右所有元素
|
2020-12-07 15:09:53 +08:00 |
|