Commit Graph

4608 Commits

Author SHA1 Message Date
zyy
81c8ad5210 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 16:54:59 +08:00
zyy
ccf186e98e 调整区段停车点偏移量 2020-05-14 16:54:31 +08:00
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
fan
eceaf463f8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 16:04:44 +08:00
fan
b3743326bc 西安二号线信号机调整逻辑点灯 2020-05-14 16:04:23 +08:00
joylink_cuiweidong
b78f20bbfb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 15:48:48 +08:00
joylink_cuiweidong
4fec468885 剧本预览代码调整 2020-05-14 15:48:25 +08:00
fan
6eb6cd5340 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 15:37:37 +08:00
fan
f8a6908d8c 西安二号线调整 2020-05-14 15:37:18 +08:00
joylink_cuiweidong
77a8fd7c41 西安二号线 列车在站台停车时,站台框也显示为绿色 2020-05-14 15:32:51 +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
fan
7242d7ba76 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 14:39:55 +08:00
fan
48b931897c 调整考试列表实训类型 2020-05-14 14:39:38 +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
fan
55fdd65195 调整学生管理权限 2020-05-14 14:03:19 +08:00
fan
ae613fe174 绑定微信调整 2020-05-14 13:55:04 +08:00
fan
8ebe4df256 学生管理问题调整 2020-05-14 13:41:25 +08:00
fan
01456de62a 学生管理问题调整 2020-05-14 11:27:01 +08:00
fan
f95d5e46d7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 11:03:33 +08:00
fan
8335ee1259 调整列车详情显示和路由课程创建角色处理 2020-05-14 11:03:24 +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
352becd47b 西安二号线 列车占用的光带显示为红光带 2020-05-14 10:55:20 +08:00
joylink_cuiweidong
b22365787c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 10:22:31 +08:00
joylink_cuiweidong
8fd1014203 西安二号线 车次窗显示车次号颜色为黑色
列车车次号线显示为五位
实际列车到站开门的过程中列车方向图标不消失 调整
2020-05-14 10:22:13 +08:00
fan
f7d772e192 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 09:15:35 +08:00
fan
034a36d25f 绑定微信调整 2020-05-14 09:15:23 +08:00
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
e72fdcdb78 合并导航栏 2020-05-13 18:59:28 +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