joylink_cuiweidong
|
8a284215c5
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 19:31:38 +08:00 |
|
joylink_cuiweidong
|
36ca6dc3d1
|
综合演练 聊天代码调整
|
2020-05-13 19:31:14 +08:00 |
|
fan
|
39edb68018
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 18:22:05 +08:00 |
|
fan
|
e35709ac2c
|
学生管理调整
|
2020-05-13 18:21:55 +08:00 |
|
joylink_cuiweidong
|
4631590df0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 18:06:15 +08:00 |
|
joylink_cuiweidong
|
2b8757a074
|
实训平台 综合演练 聊天代码调整
|
2020-05-13 18:05:48 +08:00 |
|
zyy
|
d82f381eb1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 18:01:06 +08:00 |
|
fan
|
9aca6deb77
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 18:01:03 +08:00 |
|
zyy
|
e238dbbd19
|
删除大屏提示
|
2020-05-13 18:00:37 +08:00 |
|
fan
|
847efa84ce
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 18:00:33 +08:00 |
|
fan
|
c30b221dc3
|
学生管理调整
|
2020-05-13 17:59:08 +08:00 |
|
zyy
|
e271702129
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 17:58:52 +08:00 |
|
zyy
|
85c1a89d01
|
调整大屏系统宽度
|
2020-05-13 17:58:39 +08:00 |
|
sunzhenyu
|
7288644258
|
Merget pu branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 17:39:33 +08:00 |
|
sunzhenyu
|
19dc753a7f
|
修改三维设备旧数据窗口关闭bug
|
2020-05-13 17:39:16 +08:00 |
|
zyy
|
98a4a7b622
|
调整大屏系统推出流程
|
2020-05-13 17:34:38 +08:00 |
|
zyy
|
ecf563e8de
|
调整大屏系统保存
|
2020-05-13 16:29:10 +08:00 |
|
zyy
|
0f34b4293e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 15:31:27 +08:00 |
|
zyy
|
cd229f7f81
|
调整地图大屏编辑，宁波线路道岔操作
|
2020-05-13 15:31:12 +08:00 |
|
sunzhenyu
|
1142ad1f3b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 14:34:22 +08:00 |
|
sunzhenyu
|
92eed74c94
|
修改老数据地图三维设备显示交互功能
|
2020-05-13 14:34:17 +08:00 |
|
joylink_cuiweidong
|
1cae47b8d7
|
实训平台 综合演练 聊天代码调整
|
2020-05-13 13:14:58 +08:00 |
|
joylink_cuiweidong
|
3e2a6b511b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 10:22:44 +08:00 |
|
joylink_cuiweidong
|
6866b58b19
|
实训平台 综合演练 聊天代码调整
|
2020-05-13 10:21:53 +08:00 |
|
zyy
|
0a09f6a79b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-13 10:07:34 +08:00 |
|
zyy
|
781f96f89c
|
调整大屏预览，区段字段调整
|
2020-05-13 10:07:07 +08:00 |
|
fan
|
4d18c4ac2e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 19:08:11 +08:00 |
|
fan
|
92eaa38aef
|
贵州装备班级相关&绘图逻辑区段调整
|
2020-05-12 19:07:48 +08:00 |
|
joylink_cuiweidong
|
6fe3fe6ecb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 19:03:19 +08:00 |
|
joylink_cuiweidong
|
13a3ccf066
|
代码调整
|
2020-05-12 19:02:53 +08:00 |
|
sunzhenyu
|
364c0afcef
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 18:34:18 +08:00 |
|
sunzhenyu
|
1d3c00502a
|
三维设备展示页面转辙机界面样式逻辑修改
|
2020-05-12 18:34:09 +08:00 |
|
zyy
|
86ecb843eb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 18:24:09 +08:00 |
|
zyy
|
52cbb7fd1e
|
调整大屏系统列车缩放
|
2020-05-12 18:23:56 +08:00 |
|
joylink_cuiweidong
|
376662d96e
|
实训平台 综合演练 聊天代码调整
|
2020-05-12 17:49:00 +08:00 |
|
joylink_cuiweidong
|
808236a6fa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 16:47:08 +08:00 |
|
joylink_cuiweidong
|
6fe5363706
|
实训平台 综合演练 聊天代码调整
|
2020-05-12 16:46:41 +08:00 |
|
zyy
|
dd6030d346
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 16:45:59 +08:00 |
|
zyy
|
ecec0ec1e0
|
调整西安一号鼠标移入样式
|
2020-05-12 16:45:45 +08:00 |
|
fan
|
b3dfe242e2
|
iscs
|
2020-05-12 14:17:47 +08:00 |
|
fan
|
d11f64b7bd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 13:57:48 +08:00 |
|
fan
|
a707d142be
|
逻辑区段生成调整
|
2020-05-12 13:57:33 +08:00 |
|
joylink_cuiweidong
|
c997e5d244
|
代码调整
|
2020-05-12 13:39:52 +08:00 |
|
joylink_cuiweidong
|
27a54d5842
|
代码调整
|
2020-05-12 10:51:17 +08:00 |
|
joylink_cuiweidong
|
fb17b72e5e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-05-12 10:14:20 +08:00 |
|
joylink_cuiweidong
|
d0ed6ed859
|
iscs 代码调整
实训平台 缓存跳转代码调整
|
2020-05-12 10:13:27 +08:00 |
|
fan
|
d03b3c1978
|
存在仿真管理
|
2020-05-12 09:04:17 +08:00 |
|
fan
|
795503d227
|
大屏调整
|
2020-05-11 18:15:49 +08:00 |
|
fan
|
9a0465879c
|
合并代码
|
2020-05-11 17:43:33 +08:00 |
|
fan
|
68fdc7f2ec
|
问题调整
|
2020-05-11 17:40:52 +08:00 |
|