Commit Graph

10499 Commits

Author SHA1 Message Date
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
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
fan
b9c03b591d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-02 16:48:02 +08:00
fan
ac67ca762a 添加中航锐创(实验室登录) 2021-09-02 16:47:48 +08:00
joylink_cuiweidong
284e051ef7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-01 10:56:33 +08:00
joylink_cuiweidong
197f560437 地图绘制 区段绘制 添加 向左延伸方式 2021-09-01 10:56:04 +08:00
fan
012f2ee8d9 删除操作 设置默认发车轨 2021-09-01 10:03:16 +08:00
fan
91be7c3a83 atr调整 2021-09-01 10:01:42 +08:00
fan
5bc819af6d 关闭南京二新版入口 2021-08-31 10:31:01 +08:00
fan
5e81b002e1 西安三添加操作 设置默认发车轨 (问题调整) 2021-08-31 09:53:58 +08:00
fan
33b2c3cb43 西安三添加操作 设置默认发车轨 2021-08-31 09:28:34 +08:00
fan
99e4db9529 西安问题调整BUG125 道岔定位失表,反位表示时道岔故障灯不红闪 2021-08-30 15:45:53 +08:00
fan
0ce7e458b7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-30 15:20:32 +08:00