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
|
14e916e3b3
|
Merge remote-tracking branch 'origin/test' into master11
|
2021-09-08 14:52:14 +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 |
|
yuan
|
9f80982d14
|
去掉console.log()
|
2021-09-07 17:10:53 +08:00 |
|
yuan
|
e350ae04dc
|
车辆段道岔操作
|
2021-09-07 17:02:27 +08:00 |
|
yuan
|
1efcb7491f
|
倒计时
|
2021-09-07 16:31:45 +08:00 |
|
yuan
|
1c7c43e28d
|
倒计时
|
2021-09-07 15:37:05 +08:00 |
|
yuan
|
733f198b27
|
conflict resolve
|
2021-09-07 15:33:51 +08:00 |
|
yuan
|
6e6f54a0dc
|
conflict resolve
|
2021-09-07 15:32:44 +08:00 |
|
yuan
|
e85986a5f7
|
Merge branch 'test_deplotSimulation' of git.code.tencent.com:lian-cbtc/jl-client into test_deplotSimulation
|
2021-09-07 15:31:00 +08:00 |
|
yuan
|
976b1d8781
|
福州车辆段倒计时
|
2021-09-07 15:27:58 +08:00 |
|
joylink_cuiweidong
|
5d1297176f
|
Merge branch 'test_deplotSimulation' of https://git.code.tencent.com/lian-cbtc/jl-client into test_deplotSimulation
# Conflicts:
# src/jmapNew/theme/fuzhou_01/menus/menuDeplotButton.vue
|
2021-09-07 15:15:41 +08:00 |
|
joylink_cuiweidong
|
35cea8a8f7
|
福州一号线 车辆段仿真 添加 排列进路 取消进路 信号重开指令
|
2021-09-07 15:13:38 +08:00 |
|
sunzhenyu
|
297e417113
|
修改三维驾驶门开关逻辑
|
2021-09-07 14:53:36 +08:00 |
|
yuan
|
939cf77b2e
|
merge
|
2021-09-07 14:35:20 +08:00 |
|
yuan
|
bafc4d65e7
|
Merge branch 'test_deplotSimulation' of git.code.tencent.com:lian-cbtc/jl-client into test_deplotSimulation
|
2021-09-07 14:01:03 +08:00 |
|
yuan
|
738c96444e
|
福州车辆段
|
2021-09-07 13:54:23 +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 |
|
joylink_cuiweidong
|
77f49468d4
|
Merge branch 'test_deplotSimulation' of https://git.code.tencent.com/lian-cbtc/jl-client into test_deplotSimulation
|
2021-09-07 13:06:16 +08:00 |
|
joylink_cuiweidong
|
67bf5babb0
|
福州三号线车辆端 信号机 添加操作指令
|
2021-09-07 13:05:30 +08:00 |
|
yuan
|
23ef185419
|
commit
|
2021-09-07 10:55:46 +08:00 |
|
sunzhenyu
|
117487be56
|
merge
|
2021-09-07 09:54:47 +08:00 |
|
sunzhenyu
|
ba0999856c
|
修改三维行车和三维课程编辑器
|
2021-09-07 09:53:47 +08:00 |
|
joylink_cuiweidong
|
c699a09431
|
代码调整
|
2021-09-06 18:09:55 +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 |
|
joylink_cuiweidong
|
071d88878f
|
福州一号线 车辆段操作 指令调整
|
2021-09-06 17:20:48 +08:00 |
|
joylink_cuiweidong
|
648d04f0b4
|
代码调整
|
2021-09-06 16:55:16 +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 |
|
joylink_cuiweidong
|
8fc7907f42
|
代码调整
|
2021-09-06 15:47:15 +08:00 |
|
fan
|
9ed4b26a57
|
地图绘制添加属性ctcSetOverlap
|
2021-09-06 15:41:38 +08:00 |
|
fan
|
ab38588aaa
|
显示配置调整
|
2021-09-06 15:17:58 +08:00 |
|
joylink_cuiweidong
|
429c208f62
|
代码调整
|
2021-09-06 14:42:42 +08:00 |
|
joylink_cuiweidong
|
534fa3d106
|
福州一号线 添加 车辆段 操作按钮
|
2021-09-06 13:57:09 +08:00 |
|