joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
6,547 Commits 20 Branches 0 Tags 448 MiB
c448e2e1ab
Commit Graph

6402 Commits

Author SHA1 Message Date
fan
8687650e41 ibp系统调整&发布地图管理调整 2020-08-11 14:34:17 +08:00
joylink_cuiweidong
c82edc8516 地图绘图代码调整 2020-08-11 14:17:00 +08:00
joylink_cuiweidong
be112d3b96 代码调整 2020-08-11 13:34:55 +08:00
joylink_cuiweidong
b0f238c655 地图绘制代码调整 2020-08-11 13:13:38 +08:00
joylink_cuiweidong
15ecca61a7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-11 10:57:41 +08:00
joylink_cuiweidong
740757896b 地图绘制代码调整 2020-08-11 10:57:20 +08:00
fan
e40032a24e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-11 09:21:43 +08:00
fan
775847029a 模板运行图添加仿真数据校验（接口未加） 2020-08-11 09:21:31 +08:00
zyy
05d650efa6 删除注释 2020-08-11 09:11:38 +08:00
zyy
0f4fa8feab 修改代码 2020-08-10 18:38:16 +08:00
zyy
20706dd67f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-10 18:37:43 +08:00
zyy
a2f9e18847 调整地图导出流程 2020-08-10 18:37:34 +08:00
joylink_cuiweidong
662ea6c87b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-10 18:23:35 +08:00
joylink_cuiweidong
95a4bf40e9 宁波一号线 佛山有轨电车 控制权转移代码调整 2020-08-10 18:23:14 +08:00
fan
870ee5130f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-10 17:40:33 +08:00
fan
a0bd7a309d 整合申请管理 2020-08-10 17:40:17 +08:00
joylink_cuiweidong
d03532ecea 剧本预览和加载剧本 添加指令提示 2020-08-10 16:29:32 +08:00
joylink_cuiweidong
76bf1706ab Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-10 15:55:01 +08:00
joylink_cuiweidong
11dc3abf42 剧本编制代码调整（剧本编制对应的会话逻辑调整） 2020-08-10 15:54:38 +08:00
zyy
a4beb31ee6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-10 13:02:11 +08:00
zyy
fda63a7ca6 调整多余注释 2020-08-10 13:01:59 +08:00
joylink_cuiweidong
4b11c2e28f 剧本编制代码调整 2020-08-10 09:47:01 +08:00
joylink_cuiweidong
69e224be35 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 19:03:20 +08:00
joylink_cuiweidong
3c301b93ce 剧本编制 添加指令 代码 2020-08-07 19:02:59 +08:00
fan
9bb0af959a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 18:28:55 +08:00
fan
a5ee8ebed2 问题调整 2020-08-07 18:28:40 +08:00
joylink_cuiweidong
fd6360611b 福州一号线，西安三号线控制权转移代码调整 2020-08-07 18:20:45 +08:00
joylink_cuiweidong
c4c1f79258 控制权转移代码调整 2020-08-07 17:33:12 +08:00
joylink_cuiweidong
ed6694a080 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 17:13:35 +08:00
joylink_cuiweidong
1895dc42b0 西安三号线控制权转移代码调整 2020-08-07 17:13:12 +08:00
sunzhenyu
ba6797bbda Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 15:19:07 +08:00
sunzhenyu
51c2bb296f 修改三维cctv寻路路径地址 2020-08-07 15:19:01 +08:00
joylink_cuiweidong
18f2265e36 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 14:12:45 +08:00
joylink_cuiweidong
fda52feb52 代码调整 2020-08-07 14:12:32 +08:00
fan
521a75df32 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 14:09:10 +08:00
fan
115f5a539f 有扣车跳停显示状态时调整菜单位置 2020-08-07 14:09:00 +08:00
joylink_cuiweidong
9e9e7dbed3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 14:01:05 +08:00
joylink_cuiweidong
cc6bbe8073 北京一号线 成都线路 佛山有轨电车 福州一号线 哈尔滨一号线 控制权转移代码调整 2020-08-07 14:00:32 +08:00
fan
dcfd07c267 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 13:59:29 +08:00
fan
76512af530 运行图预览数据调整 2020-08-07 13:59:19 +08:00
joylink_cuiweidong
e2a7f160cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/shape/Station/index.js
 2020-08-07 13:23:08 +08:00
joylink_cuiweidong
e08dcd9c8d 宁波一号线控制权转移代码调整 
综合演练页面 后退退出房间
 2020-08-07 13:17:09 +08:00
fan
be5f817f03 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 11:28:59 +08:00
fan
ea5cb27128 运行图预览调整 2020-08-07 11:28:50 +08:00
zyy
1f2f7bcf89 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 11:10:04 +08:00
zyy
4a1d3d3863 增加车站批量设置，调整车站绘图逻辑 2020-08-07 11:09:49 +08:00
fan
cf503299fd 保留stations数据不清除 2020-08-07 10:29:18 +08:00
fan
d449dece06 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 10:15:53 +08:00
fan
8e73c01b3f 成都一列车样式调整 2020-08-07 10:15:39 +08:00
zyy
bf5aa5e1c7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 09:59:29 +08:00
zyy
8c0612fb60 增加车站绘图字段 2020-08-07 09:59:16 +08:00
fan
2668456ffd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-07 09:44:12 +08:00
fan
276babf477 再次进入综合仿真点击操作无效 2020-08-07 09:44:03 +08:00
joylink_cuiweidong
849770ab0e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-06 19:34:46 +08:00
joylink_cuiweidong
abb0143988 控制权转移代码调整 2020-08-06 19:34:13 +08:00
fan
a3f39b3c2f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-06 16:55:15 +08:00
fan
9615f33d88 伸展样式调整 2020-08-06 16:54:53 +08:00
sunzhenyu
a52c804b02 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-06 16:00:43 +08:00
sunzhenyu
43bfcc9d6b 修复三维通号屏蔽门贴图显示bug 2020-08-06 16:00:37 +08:00
zyy
0e9b731e93 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-06 15:08:07 +08:00
zyy
cde3b39753 调整地图绘制流程，调整信号机 2020-08-06 15:07:50 +08:00
fan
492c79ffb9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-06 15:02:46 +08:00
fan
e3e62f85f9 佛山目的地码显示长度调整&联锁配置添加参数generateFls 2020-08-06 15:02:22 +08:00
joylink_cuiweidong
c7f6639801 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-06 13:22:19 +08:00
joylink_cuiweidong
026a8d9a7f 仿真左上角菜单样式调整 2020-08-06 13:21:55 +08:00
zyy
aa63af422b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/newMap/newMapdraft/mapoperate/signal/index.vue
 2020-08-06 11:18:48 +08:00
zyy
7ddbe10832 增加信号机批量操作 2020-08-06 11:15:46 +08:00
joylink_cuiweidong
1a844d20e7 地图绘制信号机添加字段（不生成进路的信号机终端） 2020-08-06 10:55:38 +08:00
sunzhenyu
353d5f7e68 增加三维沙盘列车开门状态转向属性 2020-08-05 17:44:17 +08:00
sunzhenyu
7d024d1fb3 重新merge三维沙盘代码 2020-08-05 17:14:46 +08:00
sunzhenyu
decc8a2db2 merge 2020-08-05 17:13:53 +08:00
sunzhenyu
71850afd98 修改三维沙盘列车转向赋值错误导致的车厢错位 2020-08-05 17:11:02 +08:00
fan
d7fefc6447 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-05 15:12:51 +08:00
fan
aea8dc7eca 清理多余状态 2020-08-05 15:12:40 +08:00
zyy
33b9618b77 调整地图绘制类型显示 2020-08-05 14:28:55 +08:00
fan
968d588914 撤销未完仿真状态管理 2020-08-05 13:23:45 +08:00
fan
afe83ed12b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-05 13:18:15 +08:00
fan
d9e6258e1e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-05 13:17:16 +08:00
fan
2f5421605e 运行图加载设置最大宽高 2020-08-05 13:16:58 +08:00
zyy
1db980b000 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-05 13:14:48 +08:00
zyy
e852eb95db 调整流程 2020-08-05 13:14:30 +08:00
joylink_cuiweidong
4a8d6fabe3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-05 13:04:12 +08:00
joylink_cuiweidong
96f6d5030b 哈尔滨一号线 自动触发进路 绘图代码调整 2020-08-05 13:03:53 +08:00
fan
1314ae64b6 调整参数名=》 是否自动折返始端 2020-08-05 11:23:48 +08:00
fan
58521b0820 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-05 10:58:06 +08:00
fan
6214acf235 信号机添加参数routeEnd&融屏测试 2020-08-05 10:57:58 +08:00
zyy
d9866e8372 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-05 10:28:12 +08:00
zyy
8bdf189e9c 调整哈尔滨操作 2020-08-05 10:27:55 +08:00
fan
49bf6943aa 调整运行图预览按钮&删除无用console 2020-08-05 09:36:13 +08:00
fan
f1622afc0f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-05 09:05:41 +08:00
fan
9cc130e737 仿真状态处理暂存 2020-08-05 09:05:26 +08:00
joylink_cuiweidong
946d212bb9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 18:48:14 +08:00
joylink_cuiweidong
2f6d444cf9 运行图代码调整 2020-08-04 18:47:57 +08:00
zyy
ee7ca07731 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 17:31:20 +08:00
zyy
6dbac54d1f 调整地图绘制相关流程 2020-08-04 17:31:07 +08:00
joylink_cuiweidong
1f6fdb5341 派班计划代码调整 2020-08-04 16:27:23 +08:00
joylink_cuiweidong
e8c3cbfe3c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 15:29:24 +08:00
joylink_cuiweidong
73fe03432b 派班计划代码调整（更改排班计划预览接口） 2020-08-04 15:29:10 +08:00
fan
b5352ef82d 调整设备配置psdCode展示 2020-08-04 14:47:47 +08:00
fan
8ed963fddb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-04 14:18:05 +08:00
fan
fb64429ee8 调整综合仿真开始状态管理 2020-08-04 14:17:47 +08:00
joylink_cuiweidong
01701479fd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 14:02:54 +08:00
joylink_cuiweidong
af0068c972 地图绘制代码调整 
剧本录制代码调整
 2020-08-04 14:02:10 +08:00
fan
57aabfc973 还原over中switchcount 2020-08-04 14:01:43 +08:00
fan
d95595ca0a 关联登录设备循环检测异常是循环获取二位码 2020-08-04 13:42:57 +08:00
fan
a385aa72c9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-04 13:30:52 +08:00
fan
8096076be3 电子沙盘界面添加退出和消息监听 2020-08-04 13:30:42 +08:00
zyy
1392503b9f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 13:00:55 +08:00
zyy
3f0123a472 调整地图绘制区段修改逻辑 2020-08-04 13:00:42 +08:00
sunzhenyu
3543373604 删除console 2020-08-04 11:15:54 +08:00
sunzhenyu
4aa95a4bd6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 11:11:18 +08:00
sunzhenyu
36d19545f8 修改三维沙盘初始视角，修改车站按钮样式 2020-08-04 11:11:13 +08:00
joylink_cuiweidong
ba7a2b6e38 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 11:09:18 +08:00
joylink_cuiweidong
a4f727be0d 派班计划代码调整（新增排班计划预览） 2020-08-04 11:09:00 +08:00
zyy
402a4f48b8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-04 10:49:33 +08:00
zyy
a8cb84176e 调整大屏逻辑 2020-08-04 10:49:22 +08:00
fan
9a4591effd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-04 10:42:40 +08:00
fan
394fa0ec18 添加电子沙盘设备 2020-08-04 10:42:04 +08:00
joylink_cuiweidong
118e7a6bce 仿真聊天代码调整 2020-08-04 10:24:45 +08:00
fan
f645433696 调整运行图加载方式 2020-08-04 10:03:06 +08:00
fan
313a99260c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-04 09:40:39 +08:00
fan
6c02fe9b75 撤销调整运行图加载方式 2020-08-04 09:40:20 +08:00
joylink_cuiweidong
1413a6a636 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 19:22:12 +08:00
joylink_cuiweidong
da39b8a1b4 哈尔滨一号线 教研机 切换 通号 层级调整 2020-08-03 19:21:56 +08:00
zyy
bd8054bef8 删除注释 2020-08-03 19:01:16 +08:00
fan
0d6641cb85 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-03 19:00:51 +08:00
fan
f89d29ad59 调整司机角色在添加仿真成员是未过滤 2020-08-03 19:00:42 +08:00
zyy
86197114a1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 19:00:04 +08:00
zyy
9aee216961 调整哈尔滨操作判断 2020-08-03 18:59:48 +08:00
joylink_cuiweidong
75c594219e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 18:54:06 +08:00
joylink_cuiweidong
dbc017763a 宁波线控制权转移代码调整 2020-08-03 18:52:39 +08:00
fan
fc64c99c8a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-03 18:48:47 +08:00
fan
cb7b03adbe 加载运行图数据失败调整 2020-08-03 18:45:24 +08:00
zyy
4954e5e344 删除注释 2020-08-03 17:42:42 +08:00
zyy
584fbad941 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 17:30:17 +08:00
zyy
d98e933e79 调整地图绘制样式 2020-08-03 17:30:01 +08:00
joylink_cuiweidong
a554912c09 哈尔滨一号线教研机 行调切通号 按钮显示调整 2020-08-03 17:28:46 +08:00
joylink_cuiweidong
baf0fe4900 故障操作切换代码调整 2020-08-03 16:59:23 +08:00
fan
3c622b6fb5 调整仿真仿真状态 2020-08-03 16:55:05 +08:00
fan
82bfb02b97 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-03 16:20:23 +08:00
fan
f23a3a8112 同步按计划行车时间 2020-08-03 16:20:14 +08:00
zyy
0f03eee53f 调整宁波道岔状态 2020-08-03 15:56:56 +08:00
zyy
057071769f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 15:32:20 +08:00
zyy
8422889940 调整大屏列表逻辑 2020-08-03 15:31:53 +08:00
fan
42d850de66 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_new 2020-08-03 15:27:26 +08:00
joylink_cuiweidong
753f7db809 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 15:27:20 +08:00
fan
8b5e94755c 加载运行图数据失表问题修复&添加新角色同步公共会话成员 2020-08-03 15:27:14 +08:00
joylink_cuiweidong
5c8ca28b52 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 15:25:31 +08:00
joylink_cuiweidong
e7ba329194 哈尔滨一号线 菜单隐藏 代码调整 2020-08-03 15:25:12 +08:00
zyy
c9fc984bc9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-08-03 15:23:00 +08:00