Commit Graph

1539 Commits

Author SHA1 Message Date
zyy
98e78b3532 调整发布地图 导入 导出逻辑及请求配置 2020-08-17 17:35:00 +08:00
zyy
e383ab201d 调整哈尔滨线路延续保护计时,增加配置项 2020-08-17 16:48:19 +08:00
zyy
9f22395605 删除多余右键操作组件,调整发布状态 2020-08-17 14:46:48 +08:00
zyy
f98faaab8c 删除输出 2020-08-17 13:26:44 +08:00
zyy
1744ea1262 调整信号机高亮配置 2020-08-17 13:25:36 +08:00
zyy
179ad8fa1d 调整信号机字段调整 2020-08-14 16:02:01 +08:00
zyy
d1fdb7af5c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-14 14:32:29 +08:00
zyy
3d4230e78d 调整佛山线路错误提示,增加联锁配置字段 2020-08-14 14:32:14 +08:00
joylink_cuiweidong
4964bdeaa2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-14 13:29:23 +08:00
joylink_cuiweidong
255c59629b 道岔故障模式下右键菜单代码调整 2020-08-14 13:28:44 +08:00
zyy
a1856ca710 调整延时保护计时位置 2020-08-14 13:17:29 +08:00
zyy
3132b982fb 调整延时保护计时逻辑 2020-08-14 10:49:11 +08:00
zyy
c948e517b4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 19:27:13 +08:00
zyy
86d6cf7a14 调整区段延时解锁流程 2020-08-13 19:27:02 +08:00
joylink_cuiweidong
2615460674 剧本编制代码调整 2020-08-13 17:25:52 +08:00
joylink_cuiweidong
0ed57e5488 剧本编制代码调整 2020-08-13 16:45:27 +08:00
zyy
5ff93390cd 调整右键操作整合 2020-08-13 15:41:40 +08:00
zyy
2e2feac47d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 11:03:43 +08:00
zyy
6e61050067 整合右键操作 2020-08-13 11:03:28 +08:00
joylink_cuiweidong
9c5a8238de Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 10:47:19 +08:00
joylink_cuiweidong
60b07ef132 剧本编制控制权转移代码还原 2020-08-13 10:46:26 +08:00
zyy
54bef31576 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-12 18:26:40 +08:00
zyy
36a0b1dd93 调整代码 2020-08-12 18:26:27 +08:00
joylink_cuiweidong
c3c65fba5c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-12 17:34:55 +08:00
joylink_cuiweidong
8fd00b3493 剧本录制控制权转移代码调整 2020-08-12 17:34:37 +08:00
fan
0348d143b5 合并代码 2020-08-12 11:04:04 +08:00
fan
30e30d5ef3 佛山线路问题调整&iscs样式调整 2020-08-12 11:02:47 +08:00
joylink_cuiweidong
55911240b6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-12 10:03:14 +08:00
joylink_cuiweidong
1f0aaffe6f 佛山有轨电车信号机优化(全线信号机设置成图样类型) 2020-08-12 10:02:56 +08:00
zyy
0e36937718 添加区段操作 2020-08-12 10:02:19 +08:00
zyy
2d5f4520d4 增加佛山线路 强制取消扣车 2020-08-12 09:50:10 +08:00
zyy
20706dd67f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-10 18:37:43 +08:00
zyy
a2f9e18847 调整地图导出流程 2020-08-10 18:37:34 +08:00
joylink_cuiweidong
95a4bf40e9 宁波一号线 佛山有轨电车 控制权转移代码调整 2020-08-10 18:23:14 +08:00
zyy
a4beb31ee6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-10 13:02:11 +08:00
zyy
fda63a7ca6 调整多余注释 2020-08-10 13:01:59 +08:00
joylink_cuiweidong
fd6360611b 福州一号线,西安三号线控制权转移代码调整 2020-08-07 18:20:45 +08:00
joylink_cuiweidong
c4c1f79258 控制权转移代码调整 2020-08-07 17:33:12 +08:00
joylink_cuiweidong
1895dc42b0 西安三号线控制权转移代码调整 2020-08-07 17:13:12 +08:00
joylink_cuiweidong
fda52feb52 代码调整 2020-08-07 14:12:32 +08:00
joylink_cuiweidong
cc6bbe8073 北京一号线 成都线路 佛山有轨电车 福州一号线 哈尔滨一号线 控制权转移代码调整 2020-08-07 14:00:32 +08:00
joylink_cuiweidong
e2a7f160cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/shape/Station/index.js
2020-08-07 13:23:08 +08:00
joylink_cuiweidong
e08dcd9c8d 宁波一号线控制权转移代码调整
综合演练页面 后退退出房间
2020-08-07 13:17:09 +08:00
fan
be5f817f03 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 11:28:59 +08:00
fan
ea5cb27128 运行图预览调整 2020-08-07 11:28:50 +08:00
zyy
1f2f7bcf89 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 11:10:04 +08:00
zyy
4a1d3d3863 增加车站批量设置,调整车站绘图逻辑 2020-08-07 11:09:49 +08:00
fan
8e73c01b3f 成都一列车样式调整 2020-08-07 10:15:39 +08:00
joylink_cuiweidong
849770ab0e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-06 19:34:46 +08:00
joylink_cuiweidong
abb0143988 控制权转移代码调整 2020-08-06 19:34:13 +08:00