Commit Graph

280 Commits

Author SHA1 Message Date
joylink_cuiweidong
e5dca0b15b 新版剧本 代码调整 2020-05-11 10:44:00 +08:00
joylink_cuiweidong
81f05de40c 添加 根据地图交路一键生成生成所有站间运行等级 接口
修改  根据地图交路区段生成站间运行等级 接口
2020-04-30 16:33:26 +08:00
fan
60fc5e27d0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-30 10:12:30 +08:00
fan
77124d842e 设备联锁关系数据校验&生成联锁功能 2020-04-30 10:12:11 +08:00
joylink_cuiweidong
7961c2c5f9 绘图 交路添加 生成交路区段数据的接口
交路和运行等级代码调整
2020-04-30 10:07:44 +08:00
joylink_cuiweidong
4d1f6a6a9d 新版绘图 高级数据 交路 生成站间运行时间 接口调整 2020-04-26 13:18:25 +08:00
joylink_cuiweidong
7234f95b7d 新版地图 绘图 交路接口调整 2020-04-26 10:25:35 +08:00
zyy
7536022d33 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-24 11:25:41 +08:00
zyy
7997ac6fe0 调整发布地图接口流程 2020-04-24 11:25:30 +08:00
joylink_cuiweidong
cdae58efbe 新版地图绘制 删除地图页面跳转问题
综合演练仿真 聊天  发送语音消息
2020-04-23 17:13:11 +08:00
joylink_cuiweidong
f9ca0138c8 综合演练仿真添加聊天窗口调整(未完成) 2020-04-22 15:33:31 +08:00
joylink_cuiweidong
98fc24ab24 综合演练仿真添加聊天窗口(未完成) 2020-04-21 17:28:13 +08:00
fan
dcf7b951ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-21 15:15:03 +08:00
fan
2f4b765d97 运行图加载调整&交路数据调整 2020-04-21 15:08:27 +08:00
joylink_cuiweidong
3da6d9c538 删除没有用的接口 2020-04-21 10:07:26 +08:00
joylink_cuiweidong
9f6fe40894 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-20 18:13:50 +08:00
joylink_cuiweidong
ad583bf418 综合演练 发送语音功能代码调整 2020-04-20 18:12:16 +08:00
fan
f375b97631 派班工作站调整 2020-04-20 15:38:30 +08:00
fan
ed26ff34d9 地图高级数据停站时间 2020-04-20 09:57:00 +08:00
joylink_cuiweidong
e88bdf8e0f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-16 14:51:52 +08:00
joylink_cuiweidong
fc2d9c1ff7 草稿地图的导入和导出代码调整
北京一号线站台实训操作代码调整
2020-04-16 14:50:40 +08:00
zyy
40021e34f4 调整侧防流程 2020-04-16 10:52:11 +08:00
zyy
df92090509 增加配置中侧防数据,调整接口 2020-04-13 17:03:48 +08:00
fan
7e0834b13a 代码哈尔滨实训数据&本地导入导出 2020-04-09 18:22:10 +08:00
joylink_cuiweidong
c942d4e840 实训一键生成代码调整 2020-04-09 09:23:09 +08:00
zyy
635b593b56 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-04-07 18:23:48 +08:00
zyy
f12f84f97b 调整实训一键生成,调整宁波线路实训定义 2020-04-07 18:22:26 +08:00
fan
88b4bcf2bb 指令接口调整 2020-04-07 16:44:36 +08:00
fan
d3bd167c70 实训管理调整 2020-04-07 16:41:08 +08:00
fan
335132c9b9 Merge remote-tracking branch 'origin/dev' into test 2020-03-31 16:55:58 +08:00
zyy
d0739816da 调整步骤发送数据 2020-03-31 16:03:34 +08:00
fan
63c73ab78c Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
#	src/views/jlmap3d/simulation/jl3dsimulation.vue
2020-03-31 11:14:33 +08:00
joylink_cuiweidong
0d5645a027 新版剧本接口代码调整 2020-03-30 16:56:38 +08:00
fan
b229e9c08a 生成线下用户 2020-03-30 15:28:13 +08:00
joylink_cuiweidong
93dc9a6983 新版剧本编制接口调整 2020-03-27 17:29:01 +08:00
fan
fb8d0b6615 Merge remote-tracking branch 'origin/dev_training' into dev_n
# Conflicts:
#	src/views/designPlatform/demonList.vue
2020-03-27 13:55:00 +08:00
joylink_cuiweidong
966bed109b 新版剧本代码调整 2020-03-27 11:31:40 +08:00
fan
3c1d038a81 实训仿真调整 2020-03-27 10:51:49 +08:00
fan
f34de4f001 实训调整 2020-03-26 18:42:01 +08:00
zyy
d5c9799189 删除路径单元模块 新增设置站间运行等级 2020-03-25 13:45:58 +08:00
fan
9ff1d7e30c Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
#	src/store/modules/socket.js
2020-03-24 10:13:01 +08:00
fan
39420c1432 存在仿真管理调整 2020-03-24 09:23:24 +08:00
fan
88ca3a568e Merge remote-tracking branch 'origin/dev' into test 2020-03-20 18:51:36 +08:00
fan
1e8d304249 Merge remote-tracking branch 'origin/dev_dukang' into dev
# Conflicts:
#	src/scripts/cmdPlugin/CommandEnum.js
#	src/utils/baseUrl.js
2020-03-20 15:16:08 +08:00
fan
73d763b700 Merge remote-tracking branch 'origin/dev' into test 2020-03-18 19:06:23 +08:00
sunzhenyu
2e0b0913d6 修改设计平台三维数据发布 2020-03-16 18:47:55 +08:00
zyy
933f0c1bba 调整综合演练ibp获取数据 2020-03-16 16:06:50 +08:00
fan
4ab462ed5d 合并代码 2020-03-16 15:32:00 +08:00
fan
cd9915668b 综合演练接口修改 2020-03-16 15:29:26 +08:00
zyy
1745bfbcf1 ibp盘绘制更新保存流程调整完成 2020-03-16 14:47:59 +08:00