fan
|
6ab1c03a24
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-26 14:37:20 +08:00 |
|
fan
|
461a9a9343
|
取消灯丝故障显示
|
2021-09-26 14:37:08 +08:00 |
|
sunzhenyu
|
589747ae92
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-26 14:27:44 +08:00 |
|
sunzhenyu
|
c73386766a
|
修改三维驾驶信息显示，剔除无用方法
|
2021-09-26 14:27:36 +08:00 |
|
fan
|
302b5db236
|
BUG396 哈尔滨：无法删除和步进列车
|
2021-09-26 13:51:34 +08:00 |
|
fan
|
e543b6e357
|
模型初始值添加 显示方向 showRight
|
2021-09-26 13:32:08 +08:00 |
|
fan
|
28da81ef1f
|
批量反向操作提示调整
|
2021-09-26 13:21:19 +08:00 |
|
fan
|
ab8ff51a0e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-26 13:07:31 +08:00 |
|
fan
|
b0e387edd6
|
故障枚举值修改
|
2021-09-26 13:07:16 +08:00 |
|
sunzhenyu
|
bf8631c521
|
修改三维驾驶消息加边框，按钮和后端同步，ato亮灯规则修改
|
2021-09-26 11:21:00 +08:00 |
|
sunzhenyu
|
7b5f4de1bd
|
修改三维驾驶亮灯
|
2021-09-26 09:52:54 +08:00 |
|
sunzhenyu
|
577828dd6f
|
三维驾驶按钮样式调整
|
2021-09-24 17:39:37 +08:00 |
|
sunzhenyu
|
8ff4f20e06
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-24 17:20:21 +08:00 |
|
sunzhenyu
|
41536232f6
|
增加三维驾驶psl
|
2021-09-24 17:20:15 +08:00 |
|
fan
|
18cf41f555
|
merge
|
2021-09-24 16:51:25 +08:00 |
|
fan
|
5c9cd85d52
|
显示配置调整
|
2021-09-24 16:49:57 +08:00 |
|
sunzhenyu
|
93ca66674c
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-09-24 16:29:22 +08:00 |
|
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 |
|