Commit Graph

10114 Commits

Author SHA1 Message Date
zyy
3a06aae186 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-27 14:19:43 +08:00
zyy
e150fda807 调整延续保护 2021-05-27 14:19:28 +08:00
joylink_cuiweidong
aa9c961cb0 旧版仿真 增加 仿真订阅(/queue/simulation/{id}/state) 2021-05-27 13:56:17 +08:00
joylink_cuiweidong
796983e9e8 合并 设计平台菜单(pdf上传和编辑器) 2021-05-27 13:28:35 +08:00
joylink_cuiweidong
2938528c2e sock 断线重连 代码调整 2021-05-27 11:30:03 +08:00
joylink_cuiweidong
411099fdc1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-27 09:33:48 +08:00
joylink_cuiweidong
1c2f663d9c 西安三号线 行调添加设置/取消自动触发、自动进路 2021-05-27 09:33:15 +08:00
fan
4191df5fff Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-26 17:25:26 +08:00
fan
b776b48bf5 哈尔滨列监显示条件限制 2021-05-26 17:25:16 +08:00
fan
7412e01b32 代码暂提 2021-05-26 17:18:20 +08:00
zyy
f9e9efc70c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-26 17:03:54 +08:00
zyy
2b338ba0de 调整进路预览 2021-05-26 17:03:38 +08:00
fan
ce1b6c5f8a meger 2021-05-26 15:48:55 +08:00
fan
46d74d3002 代码暂提 2021-05-26 15:46:29 +08:00
joylink_cuiweidong
04f156cc28 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-26 15:01:26 +08:00
joylink_cuiweidong
7b3e127898 南京二号线 十一站型 时刻表 页面添加 2021-05-26 15:01:02 +08:00
zyy
8b2f8c7bc1 Merge branch 'test-nan02' of https://git.code.tencent.com/lian-cbtc/jl-client into test-nan02 2021-05-26 14:43:51 +08:00
zyy
2d6f8ad984 增加车场弹窗 2021-05-26 14:43:34 +08:00
fan
49c1eba347 列监代码显示 2021-05-26 14:19:40 +08:00
fan
86e2520b05 代码暂提 2021-05-26 14:04:36 +08:00
fan
455fe9dccd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-26 10:40:29 +08:00
fan
c4b4955541 BUG176、174 2021-05-26 10:40:17 +08:00
joylink_cuiweidong
300dd3d6d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-26 10:16:45 +08:00
joylink_cuiweidong
cc4eaf034c 西安三号线 右键的车站切换划分问题(bug281) 2021-05-26 10:16:22 +08:00
c392f41b28 Merge remote-tracking branch 'origin/test' into test 2021-05-25 18:09:38 +08:00
b53f8576ec 哈尔滨本地打包配置修改 2021-05-25 18:09:26 +08:00
fan
16faefb526 线路配置添加 figuresOfTripNumber(车次号位数)&figuresOfServiceNumber(服务号位数) 2021-05-25 18:02:59 +08:00
fan
5188192736 BUG275 南京11站:车次号步进,在马群创建的车次步进到油坊桥的区段后,列车不显示 2021-05-25 17:53:23 +08:00
fan
3b3c964636 宁波问题调整 2021-05-25 16:33:20 +08:00
fan
c4894290f4 Merge branch 'test-nan02' of https://git.code.tencent.com/lian-cbtc/jl-client into test—nanjing02 2021-05-25 16:07:22 +08:00
fan
337ed03f78 哈尔滨问题调整 2021-05-25 16:05:45 +08:00
fan
a42e3ecafc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-25 13:18:19 +08:00
fan
3ea6c67b0f 哈尔滨问题调整 2021-05-25 13:17:55 +08:00
joylink_cuiweidong
60fce71f8a 西安三号线 鼠标右键无法出现菜单快速切换车站 处理 2021-05-25 10:36:20 +08:00
joylink_cuiweidong
8abbe2e05a 修改西安三号线问题 道岔失表不能设置定位或反位失表,只能设置成道岔定反位都失表 2021-05-25 09:48:54 +08:00
joylink_cuiweidong
45371fb2d3 修改canvasId 初始化位置 2021-05-25 09:32:11 +08:00
fan
6ec48dab9d BUG273 设置故障时,点击故障列表后,直接点击关闭按钮,故障列表还会显示 2021-05-24 17:41:54 +08:00
fan
6ce5bdfbed 调整heartBeat重连条件 2021-05-24 17:22:36 +08:00
fan
8c1e968213 BUG269 哈尔滨:报警信息缺少故障描述 2021-05-24 17:01:10 +08:00
fan
640793241a BUG270 问题调整 2021-05-24 16:08:52 +08:00
fan
9548e24464 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-24 15:53:50 +08:00
fan
49011b95e2 添加线路配置delayWhenCancelRouteWithAbnormalInterlock & 哈尔滨部分问题调整 2021-05-24 15:53:38 +08:00
fan
4796e7f648 代码暂提 2021-05-24 11:29:59 +08:00
sunzhenyu
e031986664 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-21 15:31:29 +08:00
sunzhenyu
04b112223c baseurl 2021-05-21 15:31:25 +08:00
sunzhenyu
351d268e52 三维课程增加场景id显示,修改提示窗下一步功能区分,修改事件驱动条件 2021-05-21 15:30:50 +08:00
joylink_cuiweidong
e17104f537 地图绘制 停站时间/运行等级 代码调整 2021-05-21 15:12:40 +08:00
joylink_cuiweidong
13af28467c 地图绘制 停站时间/运行等级 界面与接口代码调整
生成联锁配置 删除 延续保护构建是否只考虑一个道岔计轴
生成联锁配置 新增 延续保护最小长度
2021-05-21 15:02:28 +08:00
joylink_cuiweidong
4cefb0cfbe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-21 11:34:28 +08:00
joylink_cuiweidong
bf8d0eb574 地图绘制 停站时间 界面与接口代码调整 2021-05-21 11:33:37 +08:00