Commit Graph

5208 Commits

Author SHA1 Message Date
zyy
191f9358be Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 18:36:42 +08:00
zyy
2faa2688e5 综合监控广播 2020-05-15 18:36:31 +08:00
joylink_cuiweidong
b1ca16b62f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 17:11:59 +08:00
joylink_cuiweidong
bda901f4c9 剧本代码调整 2020-05-15 17:11:15 +08:00
zyy
7945dedade Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 16:55:35 +08:00
zyy
dc783bd2a8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 16:55:14 +08:00
zyy
7992a2e11e 调整格式 2020-05-15 16:55:00 +08:00
joylink_cuiweidong
f775f76aa8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 16:54:59 +08:00
joylink_cuiweidong
901ab1a8bd 剧本添加提示 2020-05-15 16:54:31 +08:00
fan
6aeb2d1b8d 删除localStore 操作 2020-05-15 16:33:14 +08:00
fan
a13567faaf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 16:26:37 +08:00
fan
9db76cbf52 添加贵州装备教师课程删除功能 2020-05-15 16:26:21 +08:00
zyy
bc00f1660a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 16:01:28 +08:00
zyy
6391e8e881 调整竞赛系统路径,页面路由配置 2020-05-15 16:01:16 +08:00
fan
e4b14d96e5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-05-15 15:58:19 +08:00
fan
dff3a090a5 调整右键跳转车站 2020-05-15 15:58:08 +08:00
zyy
399111c682 调整列表字段显示 2020-05-15 14:59:53 +08:00
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