Commit Graph

771 Commits

Author SHA1 Message Date
joylink_cuiweidong
e66723adff 右键操作折返策略代码调整
地图绘图转化函数调整
2020-07-01 14:22:06 +08:00
zyy
485533ff33 调整成都三号线现地操作 2020-07-01 09:39:13 +08:00
zyy
4eee003b97 调整成都按钮发送事件 2020-06-30 17:03:35 +08:00
fan
6a0433f12f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-30 14:43:20 +08:00
zyy
405158b2e3 调整成都三号线现地操作定义 2020-06-30 14:39:09 +08:00
zyy
9748ca2f63 调整成都三号线操作定义,位置提示 2020-06-30 13:32:50 +08:00
fan
f7e162cab0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-29 14:25:45 +08:00
fan
3f80fc1d0e 公共菜单提取 2020-06-29 14:25:35 +08:00
zyy
4f8371ce22 调整成都三号线 行调实操 2020-06-29 13:27:01 +08:00
zyy
db1c1daf2f 调整成都三号线行调操作,及现地样式 2020-06-29 09:53:30 +08:00
zyy
2ddd8f12d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-28 16:04:18 +08:00
zyy
7873917d43 调整数据模型过滤空置,调整成都3号线实操 2020-06-28 16:03:59 +08:00
joylink_cuiweidong
be2a5e7150 福州一号线行调操作调整 2020-06-28 15:55:25 +08:00
fan
fe7b727f31 福州行调仿真增加信号机操作 2020-06-28 15:28:20 +08:00
fan
9637c7edc6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-28 14:50:22 +08:00
fan
1fc6bd7058 控制权转移调整 2020-06-28 14:50:09 +08:00
zyy
621a077e86 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-28 13:27:24 +08:00
zyy
e3ee44aae7 调整道岔失表状态,成都3号线实操定义 2020-06-28 13:27:10 +08:00
fan
fd2347e4e7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-28 11:01:34 +08:00
fan
618419e4ba 佛山信号机操作调整 2020-06-28 11:01:13 +08:00
joylink_cuiweidong
dea4481783 北京一号线现地操作代码调整 2020-06-28 10:38:34 +08:00
zyy
6b78dc89f4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 18:40:09 +08:00
zyy
b5a22e2dd1 调整佛山实训定义操作配置 2020-06-24 18:39:49 +08:00
joylink_cuiweidong
c0c60e0bb4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 18:39:11 +08:00
joylink_cuiweidong
97320237c3 西安三号线道岔添加 道岔钩锁操作 2020-06-24 18:38:46 +08:00
zyy
678f0ba839 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 17:37:24 +08:00
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
3bd16e211f 调整佛山新路操作定义配置 2020-06-24 16:04:05 +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
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
9e3ee28611 车站右键操作代码调整 2020-06-23 17:15:17 +08:00
fan
e67f98e9a0 合并代码 2020-06-23 15:26:26 +08:00
fan
a2664eb5dc 登录调整&综合演练调整&菜单调整 2020-06-23 15:18:44 +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