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 |
|
zyy
|
996a0d1a89
|
删除多余文件
|
2020-06-19 13:33:55 +08:00 |
|
zyy
|
5934c61b8f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/beijing_01/menus/dialog/cancelAllLimit.vue
|
2020-06-19 13:32:40 +08:00 |
|
zyy
|
8e409078d9
|
调整公共文件
|
2020-06-19 13:31:31 +08:00 |
|
joylink_cuiweidong
|
f53e5044b7
|
代码调整
|
2020-06-19 13:30:19 +08:00 |
|
joylink_cuiweidong
|
645e425e2c
|
宁波北京一号线操作代码调整
|
2020-06-19 13:28:53 +08:00 |
|
joylink_cuiweidong
|
9138fab486
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 13:01:35 +08:00 |
|
joylink_cuiweidong
|
100c651068
|
剧本代码调整
|
2020-06-19 11:30:12 +08:00 |
|
zyy
|
96456b2280
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 11:29:30 +08:00 |
|
zyy
|
6236e70494
|
调整限速配置
|
2020-06-19 11:29:12 +08:00 |
|
sunzhenyu
|
4a831d4aa7
|
merge baseurl
|
2020-06-19 11:26:40 +08:00 |
|
sunzhenyu
|
45c96bd76f
|
修改三维驾驶录制界面中托管按钮
|
2020-06-19 11:23:47 +08:00 |
|
fan
|
3a4641f06f
|
合并代码
|
2020-06-19 10:24:11 +08:00 |
|
fan
|
f0ae68d94a
|
登录接口调整
|
2020-06-19 10:23:13 +08:00 |
|
joylink_cuiweidong
|
090d2bdfc1
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 10:07:54 +08:00 |
|
joylink_cuiweidong
|
ad756eee10
|
剧本编制代码调整
|
2020-06-19 10:06:58 +08:00 |
|
sunzhenyu
|
3e21c2827c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-19 09:56:53 +08:00 |
|
sunzhenyu
|
2a50dd1be2
|
修改三维驾驶刷新重连列车bug
|
2020-06-19 09:56:40 +08:00 |
|
joylink_cuiweidong
|
411c1cc13e
|
宁波线路操作代码整理
|
2020-06-19 09:44:03 +08:00 |
|
fan
|
5bf46c151c
|
合并代码
|
2020-06-19 09:18:50 +08:00 |
|