Commit Graph

824 Commits

Author SHA1 Message Date
fan
996b71da05 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 16:54:09 +08:00
fan
126278ee01 状态表示道岔故障调整 2020-05-14 16:53:58 +08:00
fan
abec4b2b4c 西安二号线添加是否灭灯显示(CTC级) 2020-05-14 16:45:48 +08:00
zyy
0533ddfcfe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 16:44:39 +08:00
zyy
42402f6223 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 16:44:11 +08:00
zyy
b735cd5b06 调整区段回车问题 2020-05-14 16:43:55 +08:00
joylink_cuiweidong
4fec468885 剧本预览代码调整 2020-05-14 15:48:25 +08:00
joylink_cuiweidong
812a7534b7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 15:19:59 +08:00
joylink_cuiweidong
bbeb6d44aa 剧本预览代码调整 2020-05-14 15:19:07 +08:00
zyy
7833afa1fd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 15:05:32 +08:00
zyy
04aacc3818 调整物理区段创建逻辑区段逻辑 2020-05-14 15:05:19 +08:00
joylink_cuiweidong
0684d2a93c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 14:37:17 +08:00
joylink_cuiweidong
70f06409df 综合演练 语音聊天接口调整
剧本预览 代码调整
2020-05-14 14:36:15 +08:00
zyy
ba1365b951 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 11:00:27 +08:00
zyy
2de0a0fc5b 调整区段鼠标移入元素绘制 2020-05-14 11:00:09 +08:00
joylink_cuiweidong
36ca6dc3d1 综合演练 聊天代码调整 2020-05-13 19:31:14 +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
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
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
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
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
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
zyy
18fbae9114 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-11 17:36:39 +08:00
zyy
68e63ee5ef 调整地图绘制报错 2020-05-11 17:36:21 +08:00
fan
a04f353473 大屏缩放按钮影藏 2020-05-11 17:01:56 +08:00
fan
e8e63f2976 逻辑区段始终点偏移 2020-05-11 16:54:53 +08:00