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
|
c89e53b689
|
添加无logo项目
|
2021-09-14 15:19:49 +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 |
|
fan
|
921dda306d
|
三维虚拟CCTV调整
|
2021-09-14 13:50:59 +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 |
|
fan
|
c425aa572b
|
贵装备综合演练添加cctv
|
2021-09-14 09:52:06 +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 |
|