zyy
|
b231f2b96f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 14:30:52 +08:00 |
|
zyy
|
dfc478b8d4
|
调整哈尔滨综合演练按钮位置，调整角色设置样式
|
2020-07-14 14:30:37 +08:00 |
|
joylink_cuiweidong
|
a752c1e636
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 14:28:14 +08:00 |
|
joylink_cuiweidong
|
99b622ef24
|
地图绘图代码调整
|
2020-07-14 14:27:35 +08:00 |
|
zyy
|
cb4e2bec19
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-14 13:28:08 +08:00 |
|
zyy
|
8fb216dbae
|
增加项目中设备管理页面
|
2020-07-14 13:27:00 +08:00 |
|
joylink_cuiweidong
|
a462e540fb
|
socket 退出登陆 断开连接
绘图代码调整
|
2020-07-14 11:01:22 +08:00 |
|
fan
|
440eeed75f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 18:40:53 +08:00 |
|
fan
|
7cdc3c5878
|
贵州导入班级报错提示&哈尔滨指令调整
|
2020-07-13 18:40:41 +08:00 |
|
zyy
|
1b61866b37
|
删除样式
|
2020-07-13 17:28:32 +08:00 |
|
zyy
|
06fecf9aad
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 17:27:49 +08:00 |
|
zyy
|
1c15fdbdd9
|
增加所有线路列车故障模式
|
2020-07-13 17:27:33 +08:00 |
|
joylink_cuiweidong
|
3898f66e78
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 17:02:11 +08:00 |
|
joylink_cuiweidong
|
d9ed44b218
|
剧本预览代码调整
新版地图绘制代码优化
|
2020-07-13 17:01:34 +08:00 |
|
fan
|
40402a9a8e
|
试卷规则bug修复&哈尔滨操作调整
|
2020-07-13 16:48:23 +08:00 |
|
fan
|
1b3a491d52
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 14:35:07 +08:00 |
|
fan
|
0ca0153c60
|
旧地图综合演练调整
|
2020-07-13 14:34:56 +08:00 |
|
zyy
|
ee9cf9f54d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 14:30:16 +08:00 |
|
zyy
|
6817323fe1
|
调整宁波列车故障右键
|
2020-07-13 14:30:01 +08:00 |
|
fan
|
938e789173
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 13:01:44 +08:00 |
|
fan
|
a5649cc6e8
|
哈尔滨操作调整
|
2020-07-13 13:01:28 +08:00 |
|
joylink_cuiweidong
|
1add21a740
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 10:16:07 +08:00 |
|
joylink_cuiweidong
|
57125367fc
|
剧本编制与剧本预览代码调整
|
2020-07-13 10:15:44 +08:00 |
|
zyy
|
fccbc9ecd0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 18:42:05 +08:00 |
|
zyy
|
f205ddf0fc
|
删除多余配置
|
2020-07-10 18:41:29 +08:00 |
|
fan
|
32f4657f4e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 18:30:46 +08:00 |
|
fan
|
b10f08df67
|
设备登录调整&成员管理调整
|
2020-07-10 18:30:37 +08:00 |
|
joylink_cuiweidong
|
9627e85bf0
|
剧本编制 会话消息代码调整
|
2020-07-10 18:06:55 +08:00 |
|
joylink_cuiweidong
|
bf7ae6684e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 17:33:55 +08:00 |
|
joylink_cuiweidong
|
fe3ca3af2f
|
剧本编制代码调整
|
2020-07-10 17:33:37 +08:00 |
|
zyy
|
e6e0bb6d51
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 17:23:31 +08:00 |
|
zyy
|
1c98da6c11
|
调整路由配置
|
2020-07-10 17:23:17 +08:00 |
|
sunzhenyu
|
4dfe9d661b
|
修改录制三维驾驶托管逻辑
|
2020-07-10 17:15:57 +08:00 |
|
sunzhenyu
|
135d40ba49
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 17:15:13 +08:00 |
|
joylink_cuiweidong
|
5deef9fe6b
|
剧本编制代码调整
|
2020-07-10 17:14:30 +08:00 |
|
sunzhenyu
|
8831528b9a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 16:42:21 +08:00 |
|
sunzhenyu
|
eada9df066
|
修改录制三维状态
|
2020-07-10 16:42:12 +08:00 |
|
joylink_cuiweidong
|
2b5b21c1cf
|
剧本编制 角色列表代码调整
|
2020-07-10 16:40:42 +08:00 |
|
joylink_cuiweidong
|
6d3cd29a48
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 15:34:35 +08:00 |
|
joylink_cuiweidong
|
4bd986b7eb
|
剧本编制代码调整
|
2020-07-10 15:34:19 +08:00 |
|
sunzhenyu
|
b1f2f173b2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 14:48:01 +08:00 |
|
sunzhenyu
|
8b3b151b95
|
修改三维驾驶录制获取驾驶员托管状态接口
|
2020-07-10 14:47:52 +08:00 |
|
joylink_cuiweidong
|
c432c8ffcb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 14:46:38 +08:00 |
|
joylink_cuiweidong
|
54a5a29f26
|
剧本预览代码调整
|
2020-07-10 14:46:18 +08:00 |
|
fan
|
31c8e8828f
|
通号打开三维界面
|
2020-07-10 14:39:47 +08:00 |
|
sunzhenyu
|
9ff6b5f574
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 11:32:37 +08:00 |
|
sunzhenyu
|
8f8192a8f7
|
修改综合演练三维退出重定向
|
2020-07-10 11:32:26 +08:00 |
|
zyy
|
9def448e4a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 10:56:16 +08:00 |
|
zyy
|
6cc8b3beaa
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/views/newMap/jointTrainingNew/index.vue
|
2020-07-10 10:55:48 +08:00 |
|
joylink_cuiweidong
|
4c307cc848
|
剧本编制代码调整
|
2020-07-10 10:53:44 +08:00 |
|