Commit Graph

4891 Commits

Author SHA1 Message Date
zyy
322ca86dec Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 14:50:19 +08:00
zyy
ae5916b90a 调整竞赛系统路由配置 2020-05-15 14:50:05 +08:00
fan
c27204aeb7 信号机添加非空校验 2020-05-15 14:18:17 +08:00
fan
b7e8409b1a 西安二号线信号机内三角进路排列后显示样式调整 2020-05-15 13:56:19 +08:00
fan
4bf80d3e5b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 13:43:23 +08:00
fan
4e379324ea 调整贵州成绩计算小数 2020-05-15 13:43:02 +08:00
joylink_cuiweidong
f25a73c4e7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 13:17:33 +08:00
joylink_cuiweidong
d3df0afc94 剧本代码调整 2020-05-15 13:16:55 +08:00
fan
71efb6f575 配置icon 2020-05-15 11:31:22 +08:00
fan
912816d324 学生管理日期限制调整 2020-05-15 11:29:24 +08:00
fan
557d8d2b7a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 11:12:18 +08:00
fan
65a225accd 代码调整 2020-05-15 11:12:06 +08:00
zyy
cb47cd612d 调整加载线路字段 2020-05-15 10:34:15 +08:00
joylink_cuiweidong
fab4e149c8 代码调整 2020-05-14 19:42:49 +08:00
joylink_cuiweidong
bd730d5946 代码调整 2020-05-14 19:42:08 +08:00
joylink_cuiweidong
8f0129a742 代码调整 2020-05-14 19:34:22 +08:00
joylink_cuiweidong
8ff8356d28 代码调整 2020-05-14 19:33:48 +08:00
joylink_cuiweidong
ddbf334419 剧本代码调整 2020-05-14 19:13:44 +08:00
fan
396dd0d899 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 18:55:12 +08:00
fan
71682d00a5 区段计轴调整 2020-05-14 18:54:53 +08:00
zyy
94f33cc2c6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 18:50:07 +08:00
zyy
43e6b4bca1 保存道岔状态 2020-05-14 18:49:47 +08:00
joylink_cuiweidong
c55b7175e4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 17:58:55 +08:00
joylink_cuiweidong
a416b7b443 剧本代码调整 2020-05-14 17:58:26 +08:00
zyy
e3d773dfbe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 17:48:17 +08:00
zyy
b975c1746b 调整西安三号线与一号线列车移入提示信息 2020-05-14 17:48:01 +08:00
fan
e5852949da Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 17:37:56 +08:00
fan
8ffd499c51 信号机调整 2020-05-14 17:37:46 +08:00
joylink_cuiweidong
3968331bbe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 17:25:25 +08:00
joylink_cuiweidong
c226d75d6b 剧本代码调整 2020-05-14 17:24:47 +08:00
fan
027fe43467 删除日志,信号机调整 2020-05-14 17:24:35 +08:00
fan
5ef9b0aaaf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-14 17:03:45 +08:00
fan
4f8de9cc6a 信号机批量操作调整 2020-05-14 17:03:30 +08:00
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