fan
|
0bb4fe4008
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_display
|
2021-09-13 10:14:15 +08:00 |
|
fan
|
cd69b0ff63
|
merge
|
2021-09-13 10:12:20 +08:00 |
|
fan
|
9f743c2521
|
Revert "Revert "Revert "显示配置调整"""
This reverts commit 2086a06d
|
2021-09-13 10:04:44 +08:00 |
|
fan
|
51d54d2463
|
添加CTC级别是否办理延续保护
|
2021-09-13 10:04:01 +08:00 |
|
fan
|
ba7233d1c8
|
Revert "Revert "Revert "显示配置调整"""
This reverts commit 15cfbd02
|
2021-09-13 10:00:03 +08:00 |
|
fan
|
6b35126161
|
Revert "Revert "Revert "显示配置调整"""
This reverts commit 1f17ebc1
|
2021-09-13 09:56:19 +08:00 |
|
fan
|
2f703ebedb
|
merge
|
2021-09-13 09:51:22 +08:00 |
|
joylink_cuiweidong
|
a4cab2090e
|
删掉 中航锐创 实训平台 虚拟cctv页面 退出按钮
|
2021-09-13 09:29:38 +08:00 |
|
fan
|
158e8a7d15
|
显示调整
|
2021-09-13 09:13:27 +08:00 |
|
fan
|
b130f4ce5b
|
显示调整
|
2021-09-13 09:06:50 +08:00 |
|
sunzhenyu
|
745a2439b7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-10 18:27:36 +08:00 |
|
sunzhenyu
|
25a9f51dab
|
修改三维课程大铁组件
|
2021-09-10 18:27:28 +08:00 |
|
joylink_cuiweidong
|
f35684d74d
|
修改 中航锐创 实训平台 虚拟cctv页面 视频地址
|
2021-09-10 17:11:46 +08:00 |
|
joylink_cuiweidong
|
76854d925c
|
中航锐创 实训平台 虚拟cctv页面调整
|
2021-09-10 17:02:50 +08:00 |
|
joylink_cuiweidong
|
9ce42ff199
|
中航锐创 实训平台 综合演练添加 cctv页面
|
2021-09-10 16:25:23 +08:00 |
|
fan
|
a5335b1d81
|
ISCS订阅调整
|
2021-09-10 13:53:25 +08:00 |
|
fan
|
37bc5bfc53
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-10 13:15:10 +08:00 |
|
fan
|
7216861b67
|
ISCS订阅调整
|
2021-09-10 13:09:46 +08:00 |
|
fan
|
b9e814b53f
|
ISCS状态显示调整
|
2021-09-10 09:49:54 +08:00 |
|
fan
|
9060e0efe2
|
ISCS状态显示调整
|
2021-09-09 17:22:47 +08:00 |
|
sunzhenyu
|
5714bae120
|
merge
|
2021-09-09 16:09:31 +08:00 |
|
sunzhenyu
|
e0bb2d8532
|
修改三维课程编辑器逻辑
|
2021-09-09 16:09:01 +08:00 |
|
fan
|
66636a53fb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-08 14:47:25 +08:00 |
|
fan
|
7dfa74857c
|
Revert "显示配置调整"
This reverts commit ab38588a
|
2021-09-08 14:42:44 +08:00 |
|
fan
|
7ed9e882cc
|
Revert "显示配置调整"
This reverts commit ab38588a
|
2021-09-08 14:41:31 +08:00 |
|
fan
|
249e9f1a3d
|
Revert "地图绘制添加属性ctcSetOverlap"
This reverts commit 9ed4b26a
|
2021-09-08 14:40:58 +08:00 |
|
fan
|
9bad0d61a7
|
Revert "显示配置调整"
This reverts commit 5e5474ae
|
2021-09-08 14:40:35 +08:00 |
|
fan
|
d7aec11a91
|
Revert "显示配置调整"
This reverts commit 8bf3d38f
|
2021-09-08 14:38:48 +08:00 |
|
sunzhenyu
|
dcbe6f6315
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-08 11:00:44 +08:00 |
|
sunzhenyu
|
e3f1ed6b8e
|
修改三维驾驶TDT位置和cctv视角位置
|
2021-09-08 11:00:34 +08:00 |
|
fan
|
f8040a20e7
|
merge
|
2021-09-08 10:31:12 +08:00 |
|
fan
|
8bf3d38f95
|
显示配置调整
|
2021-09-08 10:30:04 +08:00 |
|
sunzhenyu
|
813d694ccc
|
增加三维课程事故特效管理模块
|
2021-09-07 18:21:35 +08:00 |
|
sunzhenyu
|
297e417113
|
修改三维驾驶门开关逻辑
|
2021-09-07 14:53:36 +08:00 |
|
sunzhenyu
|
453435ae94
|
修改三维驾驶面板
|
2021-09-07 13:41:50 +08:00 |
|
sunzhenyu
|
a8fb38add4
|
修改三维行车mmi界面
|
2021-09-07 13:31:17 +08:00 |
|
sunzhenyu
|
6e3ef32360
|
修改三维行车门开关
|
2021-09-07 13:22:23 +08:00 |
|
sunzhenyu
|
117487be56
|
merge
|
2021-09-07 09:54:47 +08:00 |
|
sunzhenyu
|
ba0999856c
|
修改三维行车和三维课程编辑器
|
2021-09-07 09:53:47 +08:00 |
|
fan
|
abf36ad841
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-06 17:50:01 +08:00 |
|
fan
|
5e5474aee9
|
显示配置调整
|
2021-09-06 17:49:44 +08:00 |
|
zyy
|
98c365c448
|
删除大屏功能注释
|
2021-09-06 16:18:31 +08:00 |
|
zyy
|
4813ba4783
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-06 16:11:06 +08:00 |
|
zyy
|
ab01e5e99d
|
增加大屏预览缩放功能
|
2021-09-06 16:10:27 +08:00 |
|
fan
|
9ed4b26a57
|
地图绘制添加属性ctcSetOverlap
|
2021-09-06 15:41:38 +08:00 |
|
fan
|
ab38588aaa
|
显示配置调整
|
2021-09-06 15:17:58 +08:00 |
|
fan
|
d9b5d5752c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-03 14:46:37 +08:00 |
|
fan
|
63b1c572d6
|
iscs调整
|
2021-09-03 14:46:22 +08:00 |
|
sunzhenyu
|
6759c3e680
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-02 18:05:35 +08:00 |
|
sunzhenyu
|
5fe4a7a3fb
|
修改三维课程编辑器组件名，修改播放器切换场景视角流程
|
2021-09-02 18:05:29 +08:00 |
|