Commit Graph

6301 Commits

Author SHA1 Message Date
zyy
c570e418e1 调整佛山操作定义,调整个人信息 2020-06-24 17:37:09 +08:00
fan
92000b3d09 宁波一运行图预览调整 2020-06-24 17:31:21 +08:00
joylink_cuiweidong
f3859ba247 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 16:22:18 +08:00
joylink_cuiweidong
73b2da9421 右键操作取消故障代码调整 2020-06-24 16:21:56 +08:00
fan
8722316b7d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 16:19:59 +08:00
fan
2399be67d0 宁波道岔失表增加表示红色矩形 2020-06-24 16:19:47 +08:00
zyy
6bba94355a Merge branch 'test' 2020-06-24 16:04:47 +08:00
zyy
3bd16e211f 调整佛山新路操作定义配置 2020-06-24 16:04:05 +08:00
zyy
81ecb046ba 删除创建道岔区段字符 2020-06-24 15:45:46 +08:00
zyy
74b5f8a291 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 15:44:14 +08:00
zyy
e4b730f300 调整配置 2020-06-24 15:43:58 +08:00
fan
599afaaeae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 15:02:23 +08:00
fan
86c7e44876 iscs调整 2020-06-24 15:02:09 +08:00
joylink_cuiweidong
12ab61179e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 14:07:22 +08:00
joylink_cuiweidong
5715c7cc98 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 14:06:48 +08:00
zyy
45cac99681 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 14:06:45 +08:00
zyy
3b330a0932 调整佛山线路实训定义,删除区段定义 2020-06-24 14:06:17 +08:00
joylink_cuiweidong
eec3d47b84 西安二号线操作代码整理 2020-06-24 14:06:12 +08:00
fan
e71f74a769 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 13:28:07 +08:00
fan
9a620f8629 西安三道岔设置故障&iscs调整(未完) 2020-06-24 13:27:58 +08:00
joylink_cuiweidong
ccdbf781a0 西安二号线信号机右键操作代码调整 2020-06-24 11:25:17 +08:00
joylink_cuiweidong
555552af28 删除多余的文件 2020-06-24 10:56:40 +08:00
fan
45b88d3a46 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 10:00:24 +08:00
fan
8c476d0dcc 新建课程参数丢失问题调整 2020-06-24 10:00:13 +08:00
fan
0128576386 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 09:25:04 +08:00
fan
d5cd233e98 调整故障操作 2020-06-24 09:24:54 +08:00
joylink_cuiweidong
45a0f35901 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 09:24:36 +08:00
joylink_cuiweidong
0f7cdb2b8e 剧本编制代码调整 2020-06-24 09:24:08 +08:00
joylink_cuiweidong
b85362460e 剧本代码调整 2020-06-23 18:59:20 +08:00
joylink_cuiweidong
9e3ee28611 车站右键操作代码调整 2020-06-23 17:15:17 +08:00
zyy
47a9ee6e1f 调整正式上个人信息样式名称 2020-06-23 17:01:10 +08:00
program-walker
3b58c017c5 Merge remote-tracking branch 'origin/test' 2020-06-23 16:34:24 +08:00
fan
0ae6ec9237 调整登录状态检测&删除冗余配置 2020-06-23 16:21:54 +08:00
fan
e67f98e9a0 合并代码 2020-06-23 15:26:26 +08:00
fan
a2664eb5dc 登录调整&综合演练调整&菜单调整 2020-06-23 15:18:44 +08:00
joylink_cuiweidong
f1004dd52a 剧本编制代码调整 2020-06-23 15:15:46 +08:00
joylink_cuiweidong
df475ab28a 剧本编制修改会话代码调整 2020-06-23 14:17:35 +08:00
joylink_cuiweidong
2462ba7413 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-23 13:58:20 +08:00
joylink_cuiweidong
83c348ef55 删除多余文件 2020-06-23 13:58:03 +08:00
zyy
293a9b0204 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-23 13:52:47 +08:00
zyy
143325e6f6 调整西安一三线路 导航名称显示流程 2020-06-23 13:52:34 +08:00
joylink_cuiweidong
3aba371b1f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-23 13:28:05 +08:00
joylink_cuiweidong
9752bd4244 佛山右键操作代码调整 2020-06-23 13:27:46 +08:00
zyy
5984d0c7ac Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-23 11:24:18 +08:00
zyy
98b24fac42 删除多余注释 2020-06-23 11:24:02 +08:00
joylink_cuiweidong
677ebcaa7f 剧本编制修改会话代码调整 2020-06-23 10:57:35 +08:00
joylink_cuiweidong
68624ba8ac 剧本编制修改会话代码调整 2020-06-23 10:27:18 +08:00
sunzhenyu
869ddc78b6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-23 10:08:01 +08:00
sunzhenyu
01351fb34a test 2020-06-23 10:07:52 +08:00
zyy
81cde0b3d5 调整默认值 2020-06-23 09:40:15 +08:00