Commit Graph

944 Commits

Author SHA1 Message Date
joylink_cuiweidong
9fc8948bba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-25 13:15:47 +08:00
joylink_cuiweidong
65a10b26af 哈尔滨线路 实训操作调整
剧本录制页面聊天代码调整
2020-08-25 13:15:32 +08:00
zyy
54720bc848 处理西安二号线列车冲突代码 2020-08-25 09:33:20 +08:00
zyy
1112ee8322 删除西安二号线列车多余菜单样式 2020-08-25 09:31:07 +08:00
joylink_cuiweidong
b1380e5e45 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-24 19:18:31 +08:00
joylink_cuiweidong
8db06da732 哈尔滨线路操作代码调整 2020-08-24 19:18:12 +08:00
fan
009d911a75 merge 2020-08-24 18:27:09 +08:00
fan
44791d3d54 宁波三号线菜单调整 2020-08-24 18:25:07 +08:00
zyy
19b6f7fb6e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-24 18:17:30 +08:00
zyy
50c185671f 调整西安二号线列车操作 2020-08-24 18:17:17 +08:00
joylink_cuiweidong
15ba67c43a 西安二号线折返策略代码调整 2020-08-24 18:15:55 +08:00
joylink_cuiweidong
5410cb037c 西安二号线折返策略代码调整 2020-08-24 17:52:27 +08:00
zyy
18235dc096 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-24 16:44:19 +08:00
zyy
b1d42694fd 调整西安二号线列车右键菜单操作 2020-08-24 16:44:04 +08:00
joylink_cuiweidong
ea1955cf34 哈尔滨线路 站台实训调整 2020-08-24 16:42:05 +08:00
joylink_cuiweidong
e4a13de455 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-24 16:11:50 +08:00
joylink_cuiweidong
e6193e3469 哈尔滨线路实训操作代码调整 2020-08-24 16:11:31 +08:00
zyy
59a3fbb082 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-24 16:00:15 +08:00
zyy
6afae4e1bc 调整西安二号线排列进路操作 2020-08-24 16:00:00 +08:00
fan
0e26ab9d6f 西安二列车操作调整 2020-08-24 15:01:47 +08:00
fan
94f7fd7698 宁波三菜单调整 2020-08-24 13:48:19 +08:00
fan
f5cd2af55d 宁波三号线menubar菜单调整 2020-08-21 08:51:20 +08:00
fan
3f67544296 宁波三号线menubar样式调整 2020-08-20 16:57:46 +08:00
fan
af132ae2dd 宁波三号线菜单调整 2020-08-20 15:42:47 +08:00
fan
101ddea2b1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-19 14:12:20 +08:00
fan
d92a86f146 代码调整 2020-08-19 14:11:58 +08:00
zyy
280b766d91 增加宁波三号线配置 2020-08-19 14:06:01 +08:00
zyy
70945cbbc1 调整区段配置 2020-08-19 13:43:13 +08:00
zyy
901af70400 调整线路右键操作 2020-08-18 16:41:19 +08:00
zyy
e383ab201d 调整哈尔滨线路延续保护计时,增加配置项 2020-08-17 16:48:19 +08:00
zyy
9f22395605 删除多余右键操作组件,调整发布状态 2020-08-17 14:46:48 +08:00
zyy
179ad8fa1d 调整信号机字段调整 2020-08-14 16:02:01 +08:00
zyy
d1fdb7af5c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-14 14:32:29 +08:00
zyy
3d4230e78d 调整佛山线路错误提示,增加联锁配置字段 2020-08-14 14:32:14 +08:00
joylink_cuiweidong
255c59629b 道岔故障模式下右键菜单代码调整 2020-08-14 13:28:44 +08:00
zyy
c948e517b4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 19:27:13 +08:00
zyy
86d6cf7a14 调整区段延时解锁流程 2020-08-13 19:27:02 +08:00
joylink_cuiweidong
2615460674 剧本编制代码调整 2020-08-13 17:25:52 +08:00
joylink_cuiweidong
0ed57e5488 剧本编制代码调整 2020-08-13 16:45:27 +08:00
zyy
5ff93390cd 调整右键操作整合 2020-08-13 15:41:40 +08:00
zyy
2e2feac47d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-13 11:03:43 +08:00
zyy
6e61050067 整合右键操作 2020-08-13 11:03:28 +08:00
joylink_cuiweidong
60b07ef132 剧本编制控制权转移代码还原 2020-08-13 10:46:26 +08:00
joylink_cuiweidong
c3c65fba5c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-12 17:34:55 +08:00
joylink_cuiweidong
8fd00b3493 剧本录制控制权转移代码调整 2020-08-12 17:34:37 +08:00
fan
0348d143b5 合并代码 2020-08-12 11:04:04 +08:00
fan
30e30d5ef3 佛山线路问题调整&iscs样式调整 2020-08-12 11:02:47 +08:00
zyy
0e36937718 添加区段操作 2020-08-12 10:02:19 +08:00
zyy
2d5f4520d4 增加佛山线路 强制取消扣车 2020-08-12 09:50:10 +08:00
joylink_cuiweidong
95a4bf40e9 宁波一号线 佛山有轨电车 控制权转移代码调整 2020-08-10 18:23:14 +08:00