Commit Graph

9873 Commits

Author SHA1 Message Date
sunzhenyu
d71c4d7d6d 增加大铁三维驾驶模块 2021-05-27 18:15:54 +08:00
joylink_cuiweidong
bb73608a1b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-27 17:28:36 +08:00
joylink_cuiweidong
8c232d2b13 大铁项目 代码调整 2021-05-27 17:27:50 +08:00
zyy
a46a2764a5 增加用户查询id列表 2021-05-27 17:19:05 +08:00
zyy
b2806165ef 调整信号机接近区段更新流程 2021-05-27 16:40:28 +08:00
zyy
672c95c6c6 调整信号接近区段 2021-05-27 16:10:58 +08:00
zyy
529839b3ac 调整进路更新,延续保护更新 2021-05-27 15:15:58 +08:00
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
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
fan
fbd700d52e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-21 10:01:54 +08:00
fan
2438b9f0a0 删除仿真、绘图、运行图编制的心跳检测 2021-05-21 10:01:45 +08:00
fan
22cfed1774 暂提 2021-05-21 09:42:03 +08:00
zyy
54ad4bf93b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 17:58:42 +08:00
zyy
55ee64479f 调整系统绘图模块新增 2021-05-20 17:58:23 +08:00
fan
e49840afc8 绑定数据编辑调整 2021-05-20 17:51:00 +08:00
fan
7a33bae3fe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 17:39:32 +08:00
fan
4c948d91ff 绑定数据编辑调整 2021-05-20 17:38:55 +08:00
zyy
89b63e9709 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 17:13:19 +08:00
zyy
c4ec37a403 调整权限字段显示 2021-05-20 17:13:05 +08:00
sunzhenyu
f3c9bfdcb6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 17:06:35 +08:00
sunzhenyu
5392755eda 修改三维课程联控菜单位置,修改三维模型添加bug,修改移动模型指示器,修改操作切换,修改模型场景中显示移除逻辑,修改事件触发器逻辑 2021-05-20 17:06:28 +08:00
zyy
9789fb4d91 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 16:38:08 +08:00
zyy
3a2baf8374 调整权限流程 2021-05-20 16:37:55 +08:00
fan
3ac0069577 暂提 2021-05-20 15:53:21 +08:00
fan
1b62198d55 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 15:40:10 +08:00
fan
0b716d7bc3 pad检索调整 2021-05-20 15:39:44 +08:00
fan
32ef41b405 暂提 2021-05-20 15:18:02 +08:00
zyy
24aefdebd4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 15:13:54 +08:00
zyy
be1106fc20 调整权限字段显示,地图绘制新增 2021-05-20 15:13:37 +08:00
fan
6590c10ab7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 15:06:24 +08:00
fan
e212bd52e9 pdf上传检索调整 2021-05-20 15:06:14 +08:00
joylink_cuiweidong
7094b1d497 南京二号线 列车详览页面 代码调整 2021-05-20 15:05:57 +08:00
fan
5ee943a313 暂提 2021-05-20 11:04:21 +08:00
fan
db6e9503f3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test—nanjing02 2021-05-20 09:29:10 +08:00
joylink_cuiweidong
beb086e57f 南京二号线 列车总览页面 代码调整 2021-05-20 09:20:31 +08:00
joylink_cuiweidong
f1e44a9ee8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 09:02:02 +08:00
zyy
fbb9365b62 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-19 18:14:44 +08:00
zyy
83561a2545 调整权限分发 2021-05-19 18:14:27 +08:00
joylink_cuiweidong
f20793ec0d 代码调整 2021-05-19 18:11:32 +08:00
fan
8db97250d8 暂提 2021-05-19 18:03:58 +08:00
joylink_cuiweidong
7cac00b163 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-19 16:46:29 +08:00
joylink_cuiweidong
e6e09d24fb 代码调整 2021-05-19 16:46:07 +08:00
fan
9b422cd3b9 南京二号线调整(未完) 2021-05-19 16:07:52 +08:00
fan
999c0197cf 区域选择不随仿真角色变化调整 2021-05-19 15:58:52 +08:00
fan
43f523cf88 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-19 15:46:13 +08:00
fan
6b57369b8f 车站值班员名称显示调整&暂停前端仿真计时&仿真倍速管理员可见 2021-05-19 15:45:49 +08:00
zyy
267dc4d878 删除多余配置 2021-05-19 15:20:46 +08:00
zyy
4cd675cf67 增加系统预览绘制 2021-05-19 15:07:59 +08:00
zyy
850897bd4f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-19 10:22:53 +08:00
zyy
c281a51424 调整流程 2021-05-19 10:22:39 +08:00
joylink_cuiweidong
65daf903bf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-19 09:44:05 +08:00
joylink_cuiweidong
17c4fdafa6 代码调整 2021-05-19 09:43:24 +08:00
fan
be74067c7e 轨道详览 2021-05-18 17:49:08 +08:00
fan
853e049cc5 哈尔滨运行图调整 2021-05-18 14:19:28 +08:00