joylink_cuiweidong
|
d9ed44b218
|
剧本预览代码调整
新版地图绘制代码优化
|
2020-07-13 17:01:34 +08:00 |
|
fan
|
7ac85def7c
|
合并代码
|
2020-07-13 16:49:26 +08:00 |
|
fan
|
40402a9a8e
|
试卷规则bug修复&哈尔滨操作调整
|
2020-07-13 16:48:23 +08:00 |
|
zyy
|
4704f9e413
|
增加配置
|
2020-07-13 15:47:27 +08:00 |
|
zyy
|
321c59b155
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-13 14:37:43 +08:00 |
|
zyy
|
9d74e75624
|
列车故障配置
|
2020-07-13 14:37:18 +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 |
|
sunzhenyu
|
9cc69e471b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 18:13:18 +08:00 |
|
sunzhenyu
|
e95d97136a
|
三维编辑器存读数据测试
|
2020-07-10 18:13:09 +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
|
7263bb669d
|
删除socket提示信息
|
2020-07-10 11:26:15 +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 |
|
zyy
|
348b07afa4
|
调整大屏系统列车显示问题
|
2020-07-10 10:52:31 +08:00 |
|
joylink_cuiweidong
|
40fe41a8ff
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 10:36:35 +08:00 |
|
joylink_cuiweidong
|
e13fcb02e5
|
故障设置代码调整
|
2020-07-10 10:36:10 +08:00 |
|
sunzhenyu
|
3a25657440
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 10:28:01 +08:00 |
|
sunzhenyu
|
3e84301b42
|
修改综合演练切换带三维界面的处理
|
2020-07-10 10:27:49 +08:00 |
|
fan
|
0d5be61a17
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-07-10 10:00:51 +08:00 |
|