Commit Graph

10868 Commits

Author SHA1 Message Date
joylink_cuiweidong
ee7543fb0d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-14 09:46:23 +08:00
fan
13ff4ae7c0 显示配置添加清除配置 2021-09-14 09:37:20 +08:00
fan
7e02fa4f1c 行调显示配置自动生成添加车站 && 信号机recover隐藏箭头 2021-09-13 18:14:29 +08:00
fan
c0831fd403 数据操作 配置 点击响应范围调整&生成车辆段联锁数据后关闭弹框 2021-09-13 17:51:12 +08:00
fan
8c8fa154d3 车辆段生成联锁数据3 2021-09-13 16:49:55 +08:00
fan
b1042ee52b 车辆段生成联锁数据 2021-09-13 16:26:08 +08:00
fan
de040bdc45 生成车辆段联锁数据 2021-09-13 16:24:00 +08:00
fan
863af1b9d8 iscs屏蔽门显示调整 2021-09-13 15:52:55 +08:00
joylink_cuiweidong
0e7291986a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-13 15:45:00 +08:00
fan
e84bbf7470 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_display 2021-09-13 15:33:09 +08:00
fan
083362cde8 ISCS新添状态调整 2021-09-13 15:19:46 +08:00
yuan
de11b14023 bugfix 2021-09-13 15:00:57 +08:00
yuan
2548c8375f bugfix 2021-09-13 14:59:08 +08:00
yuan
11f4805417 bugfix 2021-09-13 14:58:48 +08:00
yuan
106307b9cc Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into test 2021-09-13 14:22:50 +08:00
yuan
12a585b93a 导入导出bugfix 2021-09-13 14:19:34 +08:00
fan
a9014d510d 注释systemGraphShape的引入导致的设备类覆盖问题 2021-09-13 13:52:18 +08:00
fan
a9aea1908e outFrame recover状态处理错误调整 2021-09-13 13:45:49 +08:00
fan
bef8fee318 绘图显现调整 2021-09-13 13:43:24 +08:00
fan
0e7155116d 显示判断函数调整 2021-09-13 13:26:42 +08:00
joylink_cuiweidong
077a4454c6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/shape/graph/Switch/index.js
2021-09-13 11:20:48 +08:00
yuan
b5eab3f1cd Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_ElmImport 2021-09-13 11:12:22 +08:00
yuan
0f74396bab 地图绘制-元素导入导出 2021-09-13 11:02:45 +08:00
fan
778bf5f3ee ISCS状态显示调整 2021-09-13 10:58:42 +08:00
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
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