zyy
|
e0f7175923
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-17 18:28:56 +08:00 |
|
zyy
|
04f1205e56
|
调整上行是否向右地图字段
|
2020-07-17 18:28:38 +08:00 |
|
joylink_cuiweidong
|
f0d0b6db79
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-17 17:19:26 +08:00 |
|
fan
|
f954e3cf53
|
设备配置调整
|
2020-07-17 17:20:32 +08:00 |
|
joylink_cuiweidong
|
451b5343e0
|
剧本编制代码调整
|
2020-07-17 17:18:48 +08:00 |
|
fan
|
3e1e36c921
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-17 16:35:34 +08:00 |
|
fan
|
fefd4b53b6
|
会话调整&设备配置调整
|
2020-07-17 16:35:24 +08:00 |
|
joylink_cuiweidong
|
a5ce9e4a88
|
地图绘制代码调整
|
2020-07-17 15:45:44 +08:00 |
|
fan
|
7368cd14ca
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-17 14:32:43 +08:00 |
|
fan
|
c537063f8a
|
设备配置调整
|
2020-07-17 14:32:33 +08:00 |
|
joylink_cuiweidong
|
7449689d2c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-17 14:09:08 +08:00 |
|
joylink_cuiweidong
|
1e91cb616d
|
地图绘图代码调整
|
2020-07-17 14:08:14 +08:00 |
|
fan
|
3aa8807e63
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-17 13:05:30 +08:00 |
|
fan
|
b49aa386dd
|
设备配置调整
|
2020-07-17 13:05:18 +08:00 |
|
joylink_cuiweidong
|
56089e1a55
|
地图绘图代码优化
|
2020-07-17 11:14:50 +08:00 |
|
joylink_cuiweidong
|
da2fa63253
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-17 10:52:35 +08:00 |
|
joylink_cuiweidong
|
70b1dd7815
|
列车通信故障/ 取消故障操作调整
|
2020-07-17 10:51:45 +08:00 |
|
zyy
|
6042d58262
|
调整列车发送指令流程
|
2020-07-17 10:22:47 +08:00 |
|
fan
|
fb4864496a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-16 19:11:35 +08:00 |
|
fan
|
0a50c69b2c
|
设备配置调整
|
2020-07-16 19:11:20 +08:00 |
|
joylink_cuiweidong
|
98d55deb64
|
地图绘制代码调整
|
2020-07-16 17:49:36 +08:00 |
|
joylink_cuiweidong
|
7ff599d49f
|
地图绘制布局调整（去掉scrollBar）
|
2020-07-16 16:18:13 +08:00 |
|
joylink_cuiweidong
|
ad37c3087d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-16 14:42:07 +08:00 |
|
joylink_cuiweidong
|
f6e4e3c324
|
地图绘图样式调整
|
2020-07-16 14:41:21 +08:00 |
|
zyy
|
af1115edff
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-16 13:36:14 +08:00 |
|
zyy
|
b37fbdd967
|
调整西安线路列车操作
|
2020-07-16 13:35:54 +08:00 |
|
joylink_cuiweidong
|
8a34f47dbc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-16 13:34:11 +08:00 |
|
joylink_cuiweidong
|
2e91788a78
|
退出登陆 关闭socket连接调整
|
2020-07-16 13:33:45 +08:00 |
|
fan
|
0451bf1ab2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-16 13:31:36 +08:00 |
|
fan
|
c761e07ba2
|
设备配置调整
|
2020-07-16 13:31:05 +08:00 |
|
joylink_cuiweidong
|
a5df03f7c7
|
退出登陆 断开socket连接
|
2020-07-16 13:22:33 +08:00 |
|
joylink_cuiweidong
|
d2ae5169d1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-16 10:51:16 +08:00 |
|
joylink_cuiweidong
|
ea429f36a9
|
地图绘图样式调整
|
2020-07-16 10:50:59 +08:00 |
|
zyy
|
7b400d83b5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-16 09:38:35 +08:00 |
|
zyy
|
f61ab58d0f
|
调整设备管理字段显示
|
2020-07-16 09:38:20 +08:00 |
|
joylink_cuiweidong
|
ae083cb20d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-15 19:05:45 +08:00 |
|
joylink_cuiweidong
|
cce290e73c
|
剧本预览代码调整
|
2020-07-15 19:05:32 +08:00 |
|
fan
|
24197cba1a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-15 18:36:58 +08:00 |
|
fan
|
6ed2916b2c
|
贵州学生管理分数计算精度统一
|
2020-07-15 18:36:46 +08:00 |
|
joylink_cuiweidong
|
2558f7ce98
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-15 18:09:27 +08:00 |
|
joylink_cuiweidong
|
94d02dc0f8
|
剧本编制样式调整
|
2020-07-15 18:08:49 +08:00 |
|
fan
|
531edc0d46
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-15 16:12:07 +08:00 |
|
fan
|
803941e838
|
设备管理道岔配置调整
|
2020-07-15 16:11:58 +08:00 |
|
joylink_cuiweidong
|
4fc77ee04b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-15 16:09:34 +08:00 |
|
joylink_cuiweidong
|
adde89a41d
|
剧本编制代码调整
|
2020-07-15 16:09:15 +08:00 |
|
fan
|
5c0285969c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-15 14:26:03 +08:00 |
|
fan
|
6ed3784a3f
|
socket代码调整
|
2020-07-15 14:25:51 +08:00 |
|
zyy
|
61ad045189
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-15 13:31:30 +08:00 |
|
zyy
|
a1cbcff9ea
|
调整道岔绘图，右键操作
|
2020-07-15 13:31:07 +08:00 |
|
fan
|
a6fc89bf85
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-15 10:22:13 +08:00 |
|