Commit Graph

6391 Commits

Author SHA1 Message Date
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
joylink_cuiweidong
7857be23bf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-15 10:16:29 +08:00
joylink_cuiweidong
e66e49daf4 socket代码调整 2020-07-15 10:16:08 +08:00
fan
897407dde6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-15 10:11:36 +08:00
fan
fac190e91d 代码调整 2020-07-15 10:11:25 +08:00
zyy
ca6a07eb08 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 18:23:16 +08:00
joylink_cuiweidong
1d6868ee54 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 18:22:31 +08:00
joylink_cuiweidong
f9f58a70c4 剧本预览代码调整
绘图高级页面代码调整
2020-07-14 18:21:40 +08:00
zyy
40fea0108f 宁波线路道岔封锁显示调整 2020-07-14 18:19:19 +08:00
zyy
b2f9e388aa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 18:14:53 +08:00
zyy
172623c0f1 调整宁波线路道岔失表显示 2020-07-14 18:14:39 +08:00
fan
9efc0d4bfb 成员管理高度调整 2020-07-14 17:30:35 +08:00
fan
75fdf24d84 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 17:21:47 +08:00
fan
286d38db5c 会话调整 2020-07-14 17:21:39 +08:00
zyy
112b6a8ce3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 17:17:06 +08:00
zyy
fbf4cd7652 调整组件间传递事件 2020-07-14 17:16:49 +08:00
joylink_cuiweidong
28261153df Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 16:52:52 +08:00
joylink_cuiweidong
8d41a5d730 剧本发布暂时去掉了审核
socket断线重连代码调整
2020-07-14 16:51:22 +08:00
fan
15f095a406 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 16:40:18 +08:00
fan
05284736d3 登录校验二维码登录调整 2020-07-14 16:40:09 +08:00
zyy
77b02b947e 调整设备连接流程 2020-07-14 16:07:43 +08:00
fan
22f70897c4 北信坤成页面调整 2020-07-14 16:04:55 +08:00
zyy
c2d158da5b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 15:35:19 +08:00
zyy
952de95f4c 调整列车列表样式 2020-07-14 15:35:03 +08:00
fan
135fe2d917 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 15:32:29 +08:00
fan
0db415d5ca 北信坤成页面调整&&综合演练会话调整 2020-07-14 15:32:18 +08:00
sunzhenyu
9352cac2b3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-07-14 15:03:38 +08:00