Commit Graph

9970 Commits

Author SHA1 Message Date
joylink_cuiweidong
bc83661f1f 大铁线路 区段状态代码调整 2021-04-13 17:23:12 +08:00
joylink_cuiweidong
58d7f9233e 大铁 区段状态代码调整 2021-04-13 17:06:13 +08:00
ival
68cad1616a 删除无用代码 2021-04-13 15:48:01 +08:00
ival
584852038c 增加大铁仿真display
# Conflicts:
#	src/iscs_new/plugins/shapeBuilder/entry.vue
2021-04-13 15:47:49 +08:00
joylink_cuiweidong
de4691da44 代码调整 2021-04-13 15:40:35 +08:00
joylink_cuiweidong
bd5a46e9dc 代码调整 2021-04-13 15:17:09 +08:00
joylink_cuiweidong
7eb6725147 代码调整 2021-04-13 14:27:33 +08:00
fan
e239f1e8c6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-13 14:10:30 +08:00
fan
8a363c068a 大铁调整 2021-04-13 14:10:20 +08:00
joylink_cuiweidong
259ee2570a 添加帮助链接地址 2021-04-13 14:06:24 +08:00
fan
0bb06fd142 大铁调整 2021-04-13 13:52:39 +08:00
fan
34859f8f51 大铁调整 2021-04-13 13:50:24 +08:00
fan
0adef8a9c9 宁波三调整 2021-04-13 13:43:56 +08:00
sunzhenyu
3aa47086a8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-13 11:03:25 +08:00
sunzhenyu
36b203746b 修改三维沙盘特殊车站加载 2021-04-13 11:02:16 +08:00
fan
75e7c00957 地图分组管理 2021-04-13 10:15:11 +08:00
fan
22c6924db8 宁波三操作调整 2021-04-12 18:58:40 +08:00
fan
5fbe0161ac 宁波三操作调整 2021-04-12 18:55:26 +08:00
fan
cbb02621d9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-12 18:19:58 +08:00
fan
7901886d3b 宁波三操作调整 2021-04-12 18:19:52 +08:00
fan
8d5de4cc1a 地图分组管理 2021-04-12 18:09:49 +08:00
ival
dde06f834d 修改语言校验页面 2021-04-12 17:11:36 +08:00
fan
904d84e8ab 语音 2021-04-12 14:56:21 +08:00
fan
c81be6f866 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-12 13:29:40 +08:00
fan
5ebfa5ce38 宁波三号线操作调整 2021-04-12 13:29:26 +08:00
sunzhenyu
f86c13ea86 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-09 18:21:45 +08:00
sunzhenyu
cea95f9d92 三维课程编辑器课程组件和数据结构修改,升级threejs版本 2021-04-09 18:21:24 +08:00
fan
51d2d32979 宁波三号线操作调整 2021-04-09 17:49:46 +08:00
fan
8e9afa9c9b 宁波三号线操作调整 2021-04-09 13:18:51 +08:00
fan
c58609528a 导入运行图调整 2021-04-08 17:55:35 +08:00
fan
7532c86e15 宁波三操作调整&导入运行图放开 2021-04-08 17:28:46 +08:00
fan
cd936dea42 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-07 17:15:06 +08:00
fan
f5e00dd717 宁波三列车操作调整 2021-04-07 17:14:54 +08:00
joylink_cuiweidong
5f9e6fe882 运行图编制代码调整 2021-04-07 14:21:26 +08:00
fan
2d5b863231 iscs Button hideType 赋值调整 2021-04-07 09:27:31 +08:00
fan
9a84b61e5a ISCS调整 2021-04-06 17:48:33 +08:00
ival
a8ec3f1d79 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-06 16:01:23 +08:00
ival
a215004143 修改代码 2021-04-06 16:01:14 +08:00
fan
17995e2f40 取消mfa等故障状态add 2021-04-06 15:05:54 +08:00
fan
dd2722180d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-06 09:44:08 +08:00
fan
924e6154a3 南京十一站屏蔽门开启影响站停时间显示调整 2021-04-06 09:43:45 +08:00
sunzhenyu
fb00e1418e 修改三维课程存读 2021-04-02 18:05:19 +08:00
sunzhenyu
a9745eb709 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-02 15:49:32 +08:00
sunzhenyu
1cab2116d6 三维课程代码,修改课程组件间逻辑,修改课程数据结构。(未实装) 2021-04-02 15:49:24 +08:00
fan
4a037c0e77 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-02 09:58:56 +08:00
fan
fc861b1c70 组织管理调整 2021-04-02 09:58:45 +08:00
joylink_cuiweidong
f8bebd192e 南京二号线 封锁岔心 状态代码跳转 2021-04-01 17:31:19 +08:00
fan
baf424cfad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-01 16:37:25 +08:00
fan
a5b3f9cf04 组织管理调整 2021-04-01 16:28:30 +08:00
joylink_cuiweidong
81ecf0ac20 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-01 10:59:05 +08:00