yuan
|
a12106a329
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_xa3_jzfw
|
2021-06-15 17:24:41 +08:00 |
|
yuan
|
da1b23404d
|
计轴复位暂存
|
2021-06-15 17:24:26 +08:00 |
|
joylink_cuiweidong
|
eeb75b6a6d
|
Merge remote-tracking branch 'remotes/origin/test_thirdLogin' into test
|
2021-06-15 15:34:42 +08:00 |
|
joylink_cuiweidong
|
a0861633f2
|
zc 添加管理的区段列表（计轴区段）
|
2021-06-15 15:33:50 +08:00 |
|
fan
|
4c52f9354f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_tmt
|
2021-06-15 10:12:01 +08:00 |
|
fan
|
580ef87fa7
|
列监显示调整
|
2021-06-15 10:11:48 +08:00 |
|
yuan
|
5fc61b053e
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_xa3_jzfw
|
2021-06-15 09:40:38 +08:00 |
|
joylink_cuiweidong
|
6b7827bd91
|
zc 代码调整
|
2021-06-11 18:17:48 +08:00 |
|
yuan
|
8ada789234
|
baseurl
|
2021-06-11 17:34:49 +08:00 |
|
joylink_cuiweidong
|
2007c3b3ce
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-11 15:37:10 +08:00 |
|
joylink_cuiweidong
|
bea9855e79
|
地图绘制 地图列表代码bug处理
|
2021-06-11 15:36:23 +08:00 |
|
yuan
|
263d32e9cb
|
计轴预复位修改字段
|
2021-06-11 13:52:05 +08:00 |
|
yuan
|
c089649220
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_xa3_jzfw
|
2021-06-11 11:04:14 +08:00 |
|
yuan
|
63033dc90a
|
西安3 修改计轴复位逻辑(双按钮三秒)
|
2021-06-11 11:04:06 +08:00 |
|
joylink_cuiweidong
|
602dc9df71
|
在线用户管理 登陆系统字段 调整
|
2021-06-11 10:33:21 +08:00 |
|
joylink_cuiweidong
|
7a861f406f
|
Merge remote-tracking branch 'remotes/origin/test_thirdLogin' into test
|
2021-06-11 09:41:48 +08:00 |
|
joylink_cuiweidong
|
151eb83981
|
用户管理添加根据账户、父账户条件查询
|
2021-06-11 09:40:24 +08:00 |
|
joylink_cuiweidong
|
e2165918bf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-11 09:17:55 +08:00 |
|
joylink_cuiweidong
|
79fa65c145
|
宁波一号线 实训操作定义中的 实训说明 修改
|
2021-06-11 09:17:38 +08:00 |
|
sunzhenyu
|
a2216d8608
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-10 18:07:35 +08:00 |
|
sunzhenyu
|
734a69751b
|
三维大铁驾驶简化
|
2021-06-10 18:07:27 +08:00 |
|
joylink_cuiweidong
|
7577c5571d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-10 16:08:25 +08:00 |
|
joylink_cuiweidong
|
ce78cb8e08
|
Merge remote-tracking branch 'remotes/origin/test_thirdLogin' into test
|
2021-06-10 16:08:04 +08:00 |
|
yuan
|
0ddc2844d0
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_responder_batch
|
2021-06-10 15:46:30 +08:00 |
|
yuan
|
a4e6119c4b
|
应答器批量创建增加区段偏移值
|
2021-06-10 15:46:20 +08:00 |
|
joylink_cuiweidong
|
298999d7ff
|
删除账户(逻辑删除) 代码调整
|
2021-06-10 14:48:24 +08:00 |
|
joylink_cuiweidong
|
b1a0fd88d0
|
将权限分发包分发给指定账户
|
2021-06-10 14:31:30 +08:00 |
|
joylink_cuiweidong
|
c024fd281f
|
更改宁波一号线的 操作定义中的 实训说明
|
2021-06-10 13:42:33 +08:00 |
|
joylink_cuiweidong
|
e31f5aaed5
|
更改福州一号线的 操作定义中的 实训说明
|
2021-06-10 11:10:53 +08:00 |
|
joylink_cuiweidong
|
3a2670a367
|
Merge remote-tracking branch 'remotes/origin/test_thirdLogin' into test
|
2021-06-10 10:15:52 +08:00 |
|
joylink_cuiweidong
|
4b75808aea
|
在线用户代码调整
|
2021-06-10 10:09:55 +08:00 |
|
yuan
|
2bef634a07
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_responder_batch
|
2021-06-10 10:01:46 +08:00 |
|
yuan
|
4bd21b30c5
|
地图编辑-应答器-批量创建 页面修改
|
2021-06-10 10:01:34 +08:00 |
|
joylink_cuiweidong
|
15c94bd50c
|
添加 在线用户查询
|
2021-06-09 18:10:21 +08:00 |
|
joylink_cuiweidong
|
de337d4aa6
|
西安三 菜单修改
CM改成SM
URM改成NRM
|
2021-06-09 17:05:40 +08:00 |
|
joylink_cuiweidong
|
7781801171
|
第三方账号通过url登陆 以及 创建第三方账号 功能添加
|
2021-06-09 16:37:02 +08:00 |
|
fan
|
532fd1d5da
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_ibpHold
|
2021-06-08 16:01:06 +08:00 |
|
fan
|
4b7e2efcba
|
西安三号线ibp盘扣车显示调整
|
2021-06-08 16:00:55 +08:00 |
|
sunzhenyu
|
62f339d3cf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-08 14:55:58 +08:00 |
|
sunzhenyu
|
9a2e993b5d
|
修改大铁三维单体设备通信和显示逻辑
|
2021-06-08 14:55:37 +08:00 |
|
fan
|
1ed9fd4d5d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_tmt
|
2021-06-08 14:44:36 +08:00 |
|
fan
|
c09da2aa5d
|
列车操作调整
|
2021-06-08 14:44:23 +08:00 |
|
yuan
|
d94a95f261
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yuanliye_PSL
|
2021-06-08 10:09:01 +08:00 |
|
yuan
|
3093a1bc1c
|
修改PSL菜单显示逻辑为非故障模式且角色为车站值班员
|
2021-06-08 10:08:48 +08:00 |
|
fan
|
ae42915db5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_shichang
|
2021-06-07 16:11:47 +08:00 |
|
fan
|
891db1539c
|
教学管理添加使用时长
|
2021-06-07 16:11:36 +08:00 |
|
yuan
|
e30f81b93d
|
替换PSL亮灯图片
|
2021-06-07 10:46:52 +08:00 |
|
yuan
|
c3a3f8ce63
|
修正PSL试灯按钮不显示
|
2021-06-07 10:08:50 +08:00 |
|
fan
|
2524e45c42
|
Revert "Revert "PSL""
This reverts commit 9832b0c8
|
2021-06-07 09:12:43 +08:00 |
|
fan
|
c0c1ef8d05
|
Revert "Revert "PSL""
This reverts commit 74249e59
|
2021-06-07 09:12:13 +08:00 |
|