Commit Graph

10793 Commits

Author SHA1 Message Date
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