joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
10,818 Commits 20 Branches 0 Tags 448 MiB
2f84cd6482
Commit Graph

10563 Commits

Author SHA1 Message Date
sunzhenyu
5d01ca21b4 修改三维驾驶操作 2021-09-24 16:29:12 +08:00
fan
549079fbdb 增加批量反向操作（区段左右关联关系信号机运行方向反向）， 信号机批量设置显示方向，新增信号机显示方向字段showRight 2021-09-24 15:05:50 +08:00
sunzhenyu
8e34f93a9d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-24 10:04:14 +08:00
sunzhenyu
f9ed9cca22 修改三维列车驾驶 2021-09-24 10:04:05 +08:00
fan
f5b2fcbacc 西安三道岔操作名称调整 2021-09-22 13:57:24 +08:00
fan
e0abfe2798 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-22 10:12:30 +08:00
fan
19a6663762 添加信号机型号 黄红白（列车兼调车信号机） 2021-09-22 10:12:15 +08:00
sunzhenyu
cd2aecc566 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-18 18:02:03 +08:00
sunzhenyu
d92906d7d5 修改三维课程大铁考试数据结构 2021-09-18 18:01:53 +08:00
joylink_cuiweidong
bd3d138acd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-18 10:47:10 +08:00
joylink_cuiweidong
6602f21a82 bug387 南京二：挤岔故障的显示不正确，挤岔应该是黄色长闪 修改 2021-09-18 10:46:54 +08:00
sunzhenyu
fdd2701512 修改三维cctv站台轨计算方式 2021-09-18 09:56:20 +08:00
sunzhenyu
f748202bef Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-16 16:53:39 +08:00
sunzhenyu
600831f9c1 修改三维cctv动态停车位置 2021-09-16 16:53:31 +08:00
joylink_cuiweidong
14324f80dc 代码调整 2021-09-16 15:56:06 +08:00
joylink_cuiweidong
982f383981 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-16 15:02:52 +08:00
joylink_cuiweidong
21b279646c 路由过滤代码调整 2021-09-16 15:02:35 +08:00
fan
1f0e855512 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-16 09:24:27 +08:00
fan
3623a39ffa 派班工作站&司机驾驶站场图显示调整 2021-09-16 09:24:15 +08:00
sunzhenyu
325af74192 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-15 18:08:47 +08:00
sunzhenyu
8603bed561 修改三维TDT位置 2021-09-15 18:08:39 +08:00
fan
40624c3177 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-15 17:35:40 +08:00
fan
7f6f3f0db1 清除设备setShowMode函数&&岔芯显示问题调整 2021-09-15 17:35:27 +08:00
sunzhenyu
6ad577695f merge 2021-09-15 17:15:34 +08:00
sunzhenyu
739d3749b7 综合演练三维通号故障增加，北交大站台车厢三维通信修改 2021-09-15 17:14:51 +08:00
fan
6bc79aca79 merge 2021-09-15 16:58:27 +08:00
fan
01fa5856dc 显示问题调整 2021-09-15 16:56:25 +08:00
yuan
7b3a441b5d 地图草稿列表增加一键删除按钮 2021-09-15 16:54:49 +08:00
joylink_cuiweidong
d16a79e15d 代码调整 2021-09-15 16:15:27 +08:00
joylink_cuiweidong
0c7a9b3348 删除无用的代码 2021-09-15 15:57:41 +08:00
joylink_cuiweidong
04678df413 Merge remote-tracking branch 'remotes/origin/test_deplotSimulation' into test 
# Conflicts:
#	src/jmapNew/shape/graph/Signal/index.js
 2021-09-15 11:02:12 +08:00
joylink_cuiweidong
109dd75eac Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-15 11:00:34 +08:00
sunzhenyu
a3f08b2768 merge 2021-09-15 10:53:44 +08:00
sunzhenyu
cc1af29545 修改三维仿真通信消息 2021-09-15 10:53:17 +08:00
fan
b321a29320 大屏显示影响 恢复 2021-09-15 10:07:58 +08:00
joylink_cuiweidong
1a06ea9c43 福州一号线 车辆段仿真 车站station操作调整 2021-09-14 18:07:05 +08:00
fan
619a049408 显示调整 again 2021-09-14 18:00:56 +08:00
fan
9f361fd143 显示调整 2021-09-14 17:45:48 +08:00
joylink_cuiweidong
f1f2bf4029 Merge remote-tracking branch 'remotes/origin/test' into test_deplotSimulation 
# Conflicts:
#	src/jmapNew/shape/graph/Switch/index.js
#	src/utils/baseUrl.js
#	src/views/newMap/displayNew/menuSchema.vue
 2021-09-14 17:15:37 +08:00
fan
05854c4239 车辆段显示调整 2021-09-14 17:10:00 +08:00
joylink_cuiweidong
0c356f18b8 福州一号线 车辆段仿真 去除多余的按钮（button) 2021-09-14 16:53:23 +08:00
fan
43b8751d55 iscs消息状态增加非空判断 2021-09-14 15:49:17 +08:00
fan
358c717752 添加无logo项目 2021-09-14 15:14:44 +08:00
fan
ce9f11d55e ISCS添加下行状态处理 2021-09-14 14:47:45 +08:00
joylink_cuiweidong
30d8af073f 福州一号线 车辆段仿真 信号机signal操作调整 2021-09-14 14:45:03 +08:00
sunzhenyu
f183ab6da6 merge 2021-09-14 14:37:08 +08:00
sunzhenyu
ea9c01de89 url 2021-09-14 13:36:47 +08:00
joylink_cuiweidong
5e3006bf91 Merge remote-tracking branch 'remotes/origin/test_switch' into test_deplotSimulation 2021-09-14 10:56:03 +08:00
fan
79439f4a28 修改问题：按计划行车后被误清集中站 2021-09-14 10:11:51 +08:00
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
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
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
joylink_cuiweidong
ed7bc52ced 代码调整 2021-09-06 11:24:01 +08:00
joylink_cuiweidong
f40fab2d47 福州一号线 添加 车辆段 操作按钮文件 2021-09-06 11:05:38 +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
fan
24a887e7e8 南京二号线调整=》atr 2021-08-30 15:20:15 +08:00
sunzhenyu
babbbc68cf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-27 18:06:17 +08:00
sunzhenyu
bdb734a5e4 修改三维课程编辑界面逻辑，增加三维驾驶设备柜 2021-08-27 18:06:08 +08:00
joylink_cuiweidong
88c327698f 地图绘制 添加 信号机设备里 信号机型号（signalModel） 字段 
更改 进路编辑里 信号是否开放绿灯字段 为 信号显示（aspect） 字段
 2021-08-27 10:17:13 +08:00
zyy
455e102696 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-25 11:09:58 +08:00
zyy
178e2aa4a9 调整运行图加载优化 2021-08-25 11:09:38 +08:00
fan
d6659506f7 西安三号线 通信车占用=》粉光带故障 2021-08-24 16:55:24 +08:00
fan
8182e2966c 添加线路配置routeDefaultCheckConflict=》进路默认开启冲突检测 2021-08-24 15:06:11 +08:00
fan
510c29081b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-20 09:44:10 +08:00
fan
46c62a5182 南京二号线 调整 2021-08-20 09:43:58 +08:00
sunzhenyu
128f00772d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-19 09:39:30 +08:00
sunzhenyu
5cc6aeb092 修改三维驾驶按钮runlevel影响 2021-08-19 09:39:20 +08:00
joylink_cuiweidong
7999dedba1 代码调整 2021-08-18 18:16:56 +08:00
joylink_cuiweidong
e0c073034a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-18 17:37:08 +08:00
joylink_cuiweidong
900ae7ca9f 仿真添加暂停/开始按钮，暂时只管理员可见 2021-08-18 17:36:04 +08:00
fan
5ca6867294 南京二号线道岔区段延时解锁 闪烁逻辑调整 2021-08-18 16:58:49 +08:00
fan
51cfa55f08 南京二号线道岔区段延时解锁 闪烁不同步调整 2021-08-18 16:15:50 +08:00
joylink_cuiweidong
f65e84b5a4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-17 17:48:58 +08:00
joylink_cuiweidong
9f1f985e3d 仿真发生异常，去掉初始化，由用户自行初始化 2021-08-17 17:48:30 +08:00
fan
e07a8ab95f 南京二号线限速值显示调整 2021-08-17 17:43:51 +08:00
fan
d5c79b2ae1 南京二号线操作调整 2021-08-17 16:58:35 +08:00
fan
a4dea11f3b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-17 14:14:37 +08:00
fan
7a71a573f5 南京二号线操作调整 2021-08-17 14:14:22 +08:00
joylink_cuiweidong
1ccf237b6d 西安一号线 运行图导入 添加trackName字段 2021-08-16 14:59:34 +08:00
sunzhenyu
448edcf4b7 修改三维课程中跳跃 2021-08-12 18:03:45 +08:00
sunzhenyu
ddcfcaa465 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-12 17:50:24 +08:00
sunzhenyu
b1e951a2bb 三维课程修改大铁停车场相关内容 2021-08-12 17:50:15 +08:00
fan
2cd974565e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-12 13:39:10 +08:00
fan
56fa301651 添加故障处理 回库操作 2021-08-12 13:38:59 +08:00
sunzhenyu
1674ac32ed Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-12 10:03:47 +08:00
sunzhenyu
7ba34c4f3f 修改三维驾驶列车位置初始化 2021-08-12 10:01:40 +08:00
fan
951eac98d4 南京二 调整 故障模式不弹出 进路操作弹框 2021-08-11 14:39:43 +08:00
fan
9e2c7f67a1 南京二 调整PSL 出现多个的问题 2021-08-11 09:08:29 +08:00
fan
8fb2e6eb66 南京二 故障名称调整 2021-08-10 15:47:00 +08:00
fan
b64065fb5b 西安三 仿真问题反馈表 109 2021-08-09 17:09:11 +08:00
fan
fdf781951b BUG356 南京11站：无法跨联锁区排列进路 2021-08-09 16:42:18 +08:00
fan
0bc72ed589 南京二号线 传输信号机控制权判断调整 2021-08-09 15:21:15 +08:00
fan
e81585b706 南京二号线调整 2021-08-09 09:59:41 +08:00
fan
38f7a7b83e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-06 17:47:37 +08:00
fan
a01ffd71d0 接收登出消息根据token 判断是否登出 2021-08-06 17:47:13 +08:00
sunzhenyu
744544d2a6 修改三维驾驶tms界面逻辑，修改三维课程成绩考试模块 2021-08-06 16:36:33 +08:00
sunzhenyu
bc47132b21 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-06 10:28:59 +08:00
sunzhenyu
69ef5440f7 修改综合演练中数字沙盘显示 2021-08-06 10:28:40 +08:00
fan
486c3afd8c 调整应答器 IB 保存数据 signalCode 2021-08-06 10:24:28 +08:00
fan
8ed470fffa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-05 18:26:18 +08:00
fan
cb128f6f21 超限区段数据 调整 2021-08-05 18:25:58 +08:00
fan
8d0edf3e52 关联超限区段 显示调整 2021-08-05 18:25:43 +08:00
fan
9e6cb0788d IB 应答器 放开关联信号机 2021-08-05 18:25:30 +08:00
fan
fd7df04cc5 站控和强制站控显示调整 2021-08-05 18:25:18 +08:00
fan
693a60d72c 关联超限区段调整 2021-08-05 18:25:01 +08:00
fan
91c31ea155 设置联锁自动触发 灰显调整 2021-08-05 18:24:47 +08:00
fan
c321020325 超限区段 rules 调整 2021-08-05 18:24:34 +08:00
fan
b55f0cc583 进路关联超限区段 2021-08-05 18:24:21 +08:00
fan
88ab2d31f3 Merge remote-tracking branch 'origin/test_conflictRoute' into test 2021-08-05 18:22:16 +08:00
fan
ed42c57f36 添加超限区段调整 2021-08-05 18:17:29 +08:00
fan
5656e77cb2 添加超限区段 2021-08-05 18:17:14 +08:00
sunzhenyu
2f4026f320 修改三维课程界面 2021-08-04 18:14:00 +08:00
fan
69e0e54c6c 保存延续保护和进路 2021-08-03 14:58:13 +08:00
walker-sheng
4b5ff657c9 Merge branch 'test' into test_conflictRoute 
# Conflicts:
#	src/jmapNew/theme/components/menus/dialog/routeHandControl.vue
 2021-08-03 14:33:47 +08:00
fan
c79fc46135 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-03 10:37:33 +08:00
fan
3a7c571c6f 西安三号线延续保护显示调整 2021-08-03 10:37:18 +08:00
sunzhenyu
dd64abb10f 修改三维驾驶和沙盘信号机贴图读取 2021-08-02 11:08:31 +08:00
sunzhenyu
b7819fb259 修改综合演练换车 2021-08-02 10:40:25 +08:00
sunzhenyu
4ad7f3d9d2 修改三维注释 2021-07-30 19:04:16 +08:00
sunzhenyu
049c6f174b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-30 19:02:18 +08:00
sunzhenyu
a31a6288f7 修改三维驾驶面板逻辑 2021-07-30 19:02:10 +08:00
fan
b8d2df5cd8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-30 18:07:57 +08:00
fan
23ed027def 西安三现地问题： 站控转换和实际不一样 2021-07-30 18:07:44 +08:00
sunzhenyu
87f94e2dbe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-30 17:00:11 +08:00
sunzhenyu
bec9e1d8c9 修改三维驾驶面板逻辑 2021-07-30 17:00:05 +08:00
fan
7fc996fe7e 修改PSL的关闭且紧缩图片 2021-07-30 09:45:35 +08:00
fan
50ed4fcae4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-29 17:48:40 +08:00
fan
a1d9b80104 西安三行调问题 74 对于可选的进路应显示出反位保护或定位保护 2021-07-29 17:48:16 +08:00
joylink_cuiweidong
5deb4cc9ab 代码调整 2021-07-29 14:06:25 +08:00
joylink_cuiweidong
62977147c5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-29 11:09:01 +08:00
joylink_cuiweidong
ab96efb1c6 地图绘制 现地配置 增加 可切换显示的车站 字段 2021-07-29 11:08:36 +08:00
sunzhenyu
7b55ce33b8 修改三维驾驶界面 2021-07-29 09:36:57 +08:00
sunzhenyu
a98fa35a45 三维驾驶界面修改 2021-07-28 17:57:42 +08:00
sunzhenyu
4c5c312fb5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-07-28 17:07:21 +08:00
sunzhenyu
994df74123 升级threejs版本，修改vr参数 2021-07-28 17:07:13 +08:00
fan
11700cb81f 西安三现地问题调整 33 & 39 2021-07-28 10:26:36 +08:00
fan
335e38d1cc 调整计轴故障=》红光带故障 2021-07-28 09:47:59 +08:00
fan
ec0d69c553 调整屏蔽门开关逻辑 2021-07-28 09:39:26 +08:00