Commit Graph

1278 Commits

Author SHA1 Message Date
zyy
3bd16e211f 调整佛山新路操作定义配置 2020-06-24 16:04:05 +08:00
zyy
74b5f8a291 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 15:44:14 +08:00
zyy
e4b730f300 调整配置 2020-06-24 15:43:58 +08:00
joylink_cuiweidong
12ab61179e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 14:07:22 +08:00
joylink_cuiweidong
5715c7cc98 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 14:06:48 +08:00
zyy
45cac99681 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 14:06:45 +08:00
zyy
3b330a0932 调整佛山线路实训定义,删除区段定义 2020-06-24 14:06:17 +08:00
joylink_cuiweidong
eec3d47b84 西安二号线操作代码整理 2020-06-24 14:06:12 +08:00
fan
e71f74a769 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 13:28:07 +08:00
fan
9a620f8629 西安三道岔设置故障&iscs调整(未完) 2020-06-24 13:27:58 +08:00
joylink_cuiweidong
ccdbf781a0 西安二号线信号机右键操作代码调整 2020-06-24 11:25:17 +08:00
joylink_cuiweidong
555552af28 删除多余的文件 2020-06-24 10:56:40 +08:00
fan
0128576386 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-24 09:25:04 +08:00
fan
d5cd233e98 调整故障操作 2020-06-24 09:24:54 +08:00
joylink_cuiweidong
b85362460e 剧本代码调整 2020-06-23 18:59:20 +08:00
joylink_cuiweidong
9e3ee28611 车站右键操作代码调整 2020-06-23 17:15:17 +08:00
fan
0ae6ec9237 调整登录状态检测&删除冗余配置 2020-06-23 16:21:54 +08:00
fan
e67f98e9a0 合并代码 2020-06-23 15:26:26 +08:00
fan
a2664eb5dc 登录调整&综合演练调整&菜单调整 2020-06-23 15:18:44 +08:00
joylink_cuiweidong
2462ba7413 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-23 13:58:20 +08:00
joylink_cuiweidong
83c348ef55 删除多余文件 2020-06-23 13:58:03 +08:00
zyy
293a9b0204 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-23 13:52:47 +08:00
zyy
143325e6f6 调整西安一三线路 导航名称显示流程 2020-06-23 13:52:34 +08:00
joylink_cuiweidong
3aba371b1f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-23 13:28:05 +08:00
joylink_cuiweidong
9752bd4244 佛山右键操作代码调整 2020-06-23 13:27:46 +08:00
zyy
98b24fac42 删除多余注释 2020-06-23 11:24:02 +08:00
zyy
81cde0b3d5 调整默认值 2020-06-23 09:40:15 +08:00
zyy
88211cee8f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-23 09:27:10 +08:00
zyy
4e36c7b456 调整默认配置 2020-06-23 09:26:58 +08:00
joylink_cuiweidong
d3d17f7bf6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-22 14:30:14 +08:00
joylink_cuiweidong
5580a79344 仿真右侧列车列表调整
福州线操作代码调整
2020-06-22 14:29:55 +08:00
zyy
e934860885 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-22 13:49:59 +08:00
zyy
58ab773ec9 删除多余配置 2020-06-22 13:49:42 +08:00
joylink_cuiweidong
717e04c4c5 宁波车站操作添加,哈尔滨右键操作代码调整 2020-06-22 11:00:39 +08:00
fan
0f519c8a89 贵装备导入学生信息后刷新班级列表 2020-06-22 09:49:45 +08:00
joylink_cuiweidong
c463f8ef69 宁波一号线哈尔滨一号线操作代码调整 2020-06-19 18:32:31 +08:00
joylink_cuiweidong
8c7a5e7796 右键操作代码整理 2020-06-19 17:03:39 +08:00
joylink_cuiweidong
ee12c33025 西安一号线右键操作代码调整 2020-06-19 16:13:21 +08:00
joylink_cuiweidong
5b5949b23d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-19 15:34:35 +08:00
joylink_cuiweidong
dd9959b2f4 右键菜单代码调整 2020-06-19 15:34:20 +08:00
fan
a1c3935ba7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-19 15:19:40 +08:00
fan
75116c32da 控制模式实操调整&sock降至1.0.0 2020-06-19 15:19:28 +08:00
joylink_cuiweidong
b4394a7092 右键菜单代码整理 2020-06-19 14:20:57 +08:00
zyy
bcc5fdf92c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-19 14:16:35 +08:00
zyy
5334049fcc 提取公共函数组件 删除线路多余配置 2020-06-19 14:16:21 +08:00
joylink_cuiweidong
f5ee525b20 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-06-19 14:09:08 +08:00
joylink_cuiweidong
b34a9fdf25 右键菜单代码整理 2020-06-19 14:08:52 +08:00
zyy
3a66119f81 删除多余配置 2020-06-19 13:40:56 +08:00
zyy
996a0d1a89 删除多余文件 2020-06-19 13:33:55 +08:00
zyy
5934c61b8f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
#	src/jmapNew/theme/beijing_01/menus/dialog/cancelAllLimit.vue
2020-06-19 13:32:40 +08:00