Commit Graph

5762 Commits

Author SHA1 Message Date
zyy
293a9b0204 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-23 13:52:47 +08:00
zyy
143325e6f6 调整西安一三线路 导航名称显示流程 2020-06-23 13:52:34 +08:00
joylink_cuiweidong
3aba371b1f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-23 13:28:05 +08:00
joylink_cuiweidong
9752bd4244 佛山右键操作代码调整 2020-06-23 13:27:46 +08:00
zyy
5984d0c7ac Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-23 11:24:18 +08:00
zyy
98b24fac42 删除多余注释 2020-06-23 11:24:02 +08:00
joylink_cuiweidong
677ebcaa7f 剧本编制修改会话代码调整 2020-06-23 10:57:35 +08:00
joylink_cuiweidong
68624ba8ac 剧本编制修改会话代码调整 2020-06-23 10:27:18 +08:00
sunzhenyu
869ddc78b6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-23 10:08:01 +08:00
sunzhenyu
01351fb34a test 2020-06-23 10:07:52 +08:00
zyy
81cde0b3d5 调整默认值 2020-06-23 09:40:15 +08:00
zyy
88211cee8f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-23 09:27:10 +08:00
zyy
4e36c7b456 调整默认配置 2020-06-23 09:26:58 +08:00
joylink_cuiweidong
d789a30333 剧本编制代码调整 2020-06-22 18:37:09 +08:00
joylink_cuiweidong
d3d17f7bf6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-22 14:30:14 +08:00
joylink_cuiweidong
5580a79344 仿真右侧列车列表调整
福州线操作代码调整
2020-06-22 14:29:55 +08:00
zyy
e934860885 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-22 13:49:59 +08:00
zyy
58ab773ec9 删除多余配置 2020-06-22 13:49:42 +08:00
joylink_cuiweidong
717e04c4c5 宁波车站操作添加,哈尔滨右键操作代码调整 2020-06-22 11:00:39 +08:00
fan
5cfec3e09f 课程创建角色可以直接发布课程&&sockjs恢复版本 2020-06-22 10:49:41 +08:00
fan
630440a6e9 sockjs恢复版本 2020-06-22 10:38:59 +08:00
fan
461c08f5f3 sockjs降级至1.0.0 2020-06-22 10:11:12 +08:00
fan
ab6b0036d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-22 09:49:58 +08:00
fan
0f519c8a89 贵装备导入学生信息后刷新班级列表 2020-06-22 09:49:45 +08:00
sunleking
1b36efd859 修改cctv老板数据中加载bug 2020-06-20 19:35:54 +08:00
joylink_cuiweidong
9cb46f16b7 剧本添加动作类型Drive 2020-06-19 19:08:33 +08:00
joylink_cuiweidong
ba05a22eb9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-19 18:59:13 +08:00
joylink_cuiweidong
32f4ead036 剧本代码调整 2020-06-19 18:58:55 +08:00
fan
2f996e10e8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-19 18:39:51 +08:00
fan
4d3a1eed73 项目设备管理调整 2020-06-19 18:39:41 +08:00
joylink_cuiweidong
b1439d4903 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-19 18:32:46 +08:00
joylink_cuiweidong
c463f8ef69 宁波一号线哈尔滨一号线操作代码调整 2020-06-19 18:32:31 +08:00
zyy
06bbc69389 删除老版本绘图 2020-06-19 18:19:45 +08:00
zyy
093058158b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-19 18:15:25 +08:00
zyy
c0a9674725 调整判断 2020-06-19 18:14:07 +08:00
fan
7bf2ce406c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-19 18:03:02 +08:00
fan
df983b2cb9 项目设备管理调整 2020-06-19 18:02:50 +08:00
joylink_cuiweidong
8c7a5e7796 右键操作代码整理 2020-06-19 17:03:39 +08:00
joylink_cuiweidong
ee12c33025 西安一号线右键操作代码调整 2020-06-19 16:13:21 +08:00
joylink_cuiweidong
5b5949b23d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-19 15:34:35 +08:00
joylink_cuiweidong
dd9959b2f4 右键菜单代码调整 2020-06-19 15:34:20 +08:00
fan
a1c3935ba7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-19 15:19:40 +08:00
fan
75116c32da 控制模式实操调整&sock降至1.0.0 2020-06-19 15:19:28 +08:00
joylink_cuiweidong
b4394a7092 右键菜单代码整理 2020-06-19 14:20:57 +08:00
zyy
bcc5fdf92c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-19 14:16:35 +08:00
zyy
5334049fcc 提取公共函数组件 删除线路多余配置 2020-06-19 14:16:21 +08:00
joylink_cuiweidong
f5ee525b20 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-19 14:09:08 +08:00
joylink_cuiweidong
b34a9fdf25 右键菜单代码整理 2020-06-19 14:08:52 +08:00
zyy
06ff692181 删除老板本成都4、3 北京1 线路配置 2020-06-19 13:56:46 +08:00
zyy
3a66119f81 删除多余配置 2020-06-19 13:40:56 +08:00