Commit Graph

690 Commits

Author SHA1 Message Date
joylink_cuiweidong
411c1cc13e 宁波线路操作代码整理 2020-06-19 09:44:03 +08:00
fan
5bf46c151c 合并代码 2020-06-19 09:18:50 +08:00
fan
915f1fb959 故障操作和新建计划车迁移&信号机处理添加canSetCi属性(是否可设置联锁触发) 2020-06-19 09:17:03 +08:00
joylink_cuiweidong
30cd335845 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-18 18:32:37 +08:00
joylink_cuiweidong
aedf2b85fd 宁波一号线操作代码整理(部分) 2020-06-18 18:32:02 +08:00
zyy
914eb55b03 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-18 18:13:41 +08:00
zyy
0da6a64af7 调整临时限速配置 2020-06-18 18:13:28 +08:00
joylink_cuiweidong
aa632c457d 西安一号线 操作代码整理 2020-06-18 18:00:17 +08:00
joylink_cuiweidong
81f418afe5 西安二号线操作调整 2020-06-18 17:50:26 +08:00
zyy
003bf13395 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-18 17:31:29 +08:00
zyy
47e44c0a76 调整全局组件配置 2020-06-18 17:31:14 +08:00
fan
cf961927db Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-18 17:30:00 +08:00
fan
b8dfa50306 调整西安三号箱操作定义 2020-06-18 17:29:46 +08:00
joylink_cuiweidong
4b7c7f3f84 绘图代码调整 2020-06-18 16:58:21 +08:00
zyy
a039778083 调整路径设置 2020-06-18 16:03:32 +08:00
zyy
67ec40549c 调整顺序 2020-06-18 15:54:59 +08:00
zyy
5bb54b07cd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/xian_01/menus/dialog/routeDetail.vue
#	src/jmapNew/theme/xian_01/menus/dialog/routeHandControl.vue
#	src/jmapNew/theme/xian_01/menus/menuSignal.vue
2020-06-18 14:59:43 +08:00
zyy
97b0a3f9eb 调整公共提示路径,删除多余文件 2020-06-18 14:57:32 +08:00
fan
08a3bbaa7c 合并代码 2020-06-18 14:49:14 +08:00
fan
76eed898a5 福州操作定义调整 2020-06-18 14:47:00 +08:00
joylink_cuiweidong
4c99069752 剧本代码调整 2020-06-18 14:19:13 +08:00
joylink_cuiweidong
350043c3d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-18 11:25:01 +08:00
joylink_cuiweidong
acd3b0f87e 信号机进路代码整理 2020-06-18 11:24:42 +08:00
zyy
e439eb6048 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-18 11:01:49 +08:00
zyy
cfa6445b02 调整区段组件 2020-06-18 11:01:33 +08:00
joylink_cuiweidong
f3022a6bf7 信号机操作代码整理 2020-06-18 10:22:07 +08:00
fan
39bc38701e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-18 10:05:20 +08:00
fan
f892440294 调整操作定义 2020-06-18 10:05:12 +08:00
joylink_cuiweidong
b0e5d7a6b6 信号机操作代码整理 2020-06-18 09:46:29 +08:00
zyy
6c272d3a6c 调整组件 2020-06-17 18:29:35 +08:00
zyy
b39f278a5d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-17 17:48:33 +08:00
zyy
c35ceb948c 道岔公共组件提取 2020-06-17 17:48:19 +08:00
joylink_cuiweidong
1886663445 宁波一号线,北京一号线,佛山有轨电车操作代码调整 2020-06-17 17:08:34 +08:00
zyy
a047c9996e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-17 15:24:28 +08:00
zyy
ba8f138de3 提取信号机通用组件 2020-06-17 15:24:16 +08:00
fan
7ae4206448 福州一号线操作定义配置 2020-06-17 14:57:20 +08:00
zyy
52bee79e22 删除多余组件 2020-06-17 11:16:56 +08:00
joylink_cuiweidong
4fb17151df 佛山有轨电车操作代码调整 2020-06-17 09:01:18 +08:00
zyy
73338a7eaa 增加宁波线路车站折返逻辑 2020-06-16 17:49:55 +08:00
fan
d0e862823a 控制模式转换调整 2020-06-16 15:33:38 +08:00
fan
db98a53907 福州道岔&列车操作 2020-06-16 14:52:57 +08:00
fan
5292afe4dd 宁波一号线人工车头码车显示&哈尔滨title+V1.0&福州道岔操作调整(未完) 2020-06-16 13:56:33 +08:00
fan
ae0a6d6dcd 福州一号线:站台详情 2020-06-16 09:32:19 +08:00
fan
2f81b142f3 宁波一号线设置头码车放开服务号输入框 2020-06-16 09:03:06 +08:00
fan
f60e69f8ff 福州车站站台操作&西安车站站台操作调整 2020-06-15 18:00:24 +08:00
fan
3c9dd88e31 福州线路信号机调整 2020-06-15 14:26:31 +08:00
fan
a381bfdcd8 退出计划调整为初始化,并不限制点击 2020-06-15 13:34:24 +08:00
fan
98bdbc43ab 福州信号机操作调整 2020-06-12 18:28:32 +08:00
fan
be0208c943 福州操作暂存 2020-06-12 16:34:11 +08:00
fan
2e82a362af Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-12 16:15:30 +08:00