fan
|
926a95a818
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-16 14:50:36 +08:00 |
|
fan
|
f9ee7ff8e8
|
哈尔滨行调不显示基础按钮
|
2021-06-16 14:50:14 +08:00 |
|
joylink_cuiweidong
|
49d30f0e6d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-16 14:41:10 +08:00 |
|
joylink_cuiweidong
|
d1083cc871
|
哈尔滨 项目 生成计划接口调整
|
2021-06-16 14:40:36 +08:00 |
|
yuan
|
7ef2f896cf
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_xa3_jzfw
|
2021-06-16 14:30:22 +08:00 |
|
yuan
|
35cb4fcb32
|
IBP盘报警器逻辑修复
|
2021-06-16 14:30:11 +08:00 |
|
fan
|
9726928f1a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-16 14:27:53 +08:00 |
|
fan
|
152b7983a3
|
模板运行图添加编辑
|
2021-06-16 14:27:44 +08:00 |
|
joylink_cuiweidong
|
67c10547a1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-16 13:38:27 +08:00 |
|
joylink_cuiweidong
|
4ede6b61da
|
哈尔滨 综合监控设备登陆 代码调整
|
2021-06-16 13:37:50 +08:00 |
|
fan
|
c84c50efbb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-06-16 13:23:30 +08:00 |
|
fan
|
9c991484d7
|
西安仿真测试反馈40、42调整 扣车跳停标志显示点击调整
|
2021-06-16 13:23:15 +08:00 |
|
yuan
|
0a1720920e
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_xa3_jzfw
|
2021-06-16 11:26:08 +08:00 |
|
yuan
|
6cc2cfcbd2
|
IBP盘改造
|
2021-06-16 11:23:55 +08:00 |
|
joylink_cuiweidong
|
6128cc8d50
|
地图发布 添加描述字段
发布地图 发布历史展示描述字段
|
2021-06-16 11:15:31 +08:00 |
|
joylink_cuiweidong
|
7ea966b539
|
西安三 行调添加 强制取消扣车
|
2021-06-16 10:30:17 +08:00 |
|
yuan
|
6965c2f9fd
|
bugfix-ibp盘复位按钮缺少字段
|
2021-06-15 17:43:23 +08:00 |
|
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 |
|