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 |
|
fan
|
eec1210b3f
|
Merge remote-tracking branch 'origin/test'
|
2021-05-20 17:59:33 +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
|
84cd86f664
|
Merge remote-tracking branch 'remotes/origin/test'
|
2021-05-19 18:12:13 +08:00 |
|
joylink_cuiweidong
|
f20793ec0d
|
代码调整
|
2021-05-19 18:11:32 +08:00 |
|
fan
|
64c44fddce
|
Merge remote-tracking branch 'origin/test'
|
2021-05-19 18:04:42 +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 |
|