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
|
3157e8f65c
|
道岔信号机字段调整
|
2021-09-13 09:29:40 +08:00 |
|
joylink_cuiweidong
|
ad40b827c9
|
修改 道岔位置定位、反位 为pos字段
|
2021-09-13 09:29:40 +08:00 |
|
joylink_cuiweidong
|
f44ce9cf27
|
修改 道岔位置定位、反位 为pos字段
修改 信号机红绿黄显示的三个字段 为aspect
|
2021-09-13 09:29:39 +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 |
|
yuan
|
ee26677046
|
TODO
|
2021-09-10 18:10:59 +08:00 |
|
yuan
|
8f3835ad32
|
Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_ElmImport
|
2021-09-10 18:06:45 +08:00 |
|
yuan
|
eaed1afd1b
|
commit
|
2021-09-10 18:03:17 +08:00 |
|
yuan
|
04dc6f3e1b
|
commit
|
2021-09-10 18:03:11 +08:00 |
|
joylink_cuiweidong
|
a271f99163
|
道岔信号机字段调整
|
2021-09-10 17:11:50 +08:00 |
|
joylink_cuiweidong
|
d541259695
|
修改 道岔位置定位、反位 为pos字段
|
2021-09-10 17:11:49 +08:00 |
|
joylink_cuiweidong
|
7d21d75ad0
|
修改 道岔位置定位、反位 为pos字段
修改 信号机红绿黄显示的三个字段 为aspect
|
2021-09-10 17:11:48 +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 |
|
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 |
|