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

2648 Commits

Author SHA1 Message Date
fan
ba7233d1c8 Revert "Revert "Revert "显示配置调整""" 
This reverts commit 15cfbd02
 2021-09-13 10:00:03 +08:00
fan
2f703ebedb merge 2021-09-13 09:51:22 +08:00
joylink_cuiweidong
a4cab2090e 删掉 中航锐创 实训平台 虚拟cctv页面 退出按钮 2021-09-13 09:29:38 +08:00
fan
b130f4ce5b 显示调整 2021-09-13 09:06:50 +08:00
yuan
ee26677046 TODO 2021-09-10 18:10:59 +08:00
yuan
8f3835ad32 Merge branch 'test' of git.code.tencent.com:lian-cbtc/jl-client into yly_ElmImport 2021-09-10 18:06:45 +08:00
yuan
eaed1afd1b commit 2021-09-10 18:03:17 +08:00
yuan
04dc6f3e1b commit 2021-09-10 18:03:11 +08:00
joylink_cuiweidong
d541259695 修改 道岔位置定位、反位 为pos字段 2021-09-10 17:11:49 +08:00
joylink_cuiweidong
f35684d74d 修改 中航锐创 实训平台 虚拟cctv页面 视频地址 2021-09-10 17:11:46 +08:00
joylink_cuiweidong
76854d925c 中航锐创 实训平台 虚拟cctv页面调整 2021-09-10 17:02:50 +08:00
joylink_cuiweidong
9ce42ff199 中航锐创 实训平台 综合演练添加 cctv页面 2021-09-10 16:25:23 +08:00
fan
7dfa74857c Revert "显示配置调整" 
This reverts commit ab38588a
 2021-09-08 14:42:44 +08:00
fan
7ed9e882cc Revert "显示配置调整" 
This reverts commit ab38588a
 2021-09-08 14:41:31 +08:00
fan
249e9f1a3d Revert "地图绘制添加属性ctcSetOverlap" 
This reverts commit 9ed4b26a
 2021-09-08 14:40:58 +08:00
fan
9bad0d61a7 Revert "显示配置调整" 
This reverts commit 5e5474ae
 2021-09-08 14:40:35 +08:00
fan
d7aec11a91 Revert "显示配置调整" 
This reverts commit 8bf3d38f
 2021-09-08 14:38:48 +08:00
fan
8bf3d38f95 显示配置调整 2021-09-08 10:30:04 +08:00
fan
5e5474aee9 显示配置调整 2021-09-06 17:49:44 +08:00
fan
9ed4b26a57 地图绘制添加属性ctcSetOverlap 2021-09-06 15:41:38 +08:00
fan
ab38588aaa 显示配置调整 2021-09-06 15:17:58 +08:00
joylink_cuiweidong
284e051ef7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-09-01 10:56:33 +08:00
joylink_cuiweidong
197f560437 地图绘制 区段绘制 添加 向左延伸方式 2021-09-01 10:56:04 +08:00
fan
91be7c3a83 atr调整 2021-09-01 10:01:42 +08:00
fan
33b2c3cb43 西安三添加操作 设置默认发车轨 2021-08-31 09:28:34 +08:00
fan
0ce7e458b7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-30 15:20:32 +08:00
fan
24a887e7e8 南京二号线调整=》atr 2021-08-30 15:20:15 +08:00
joylink_cuiweidong
88c327698f 地图绘制 添加 信号机设备里 信号机型号（signalModel） 字段 
更改 进路编辑里 信号是否开放绿灯字段 为 信号显示（aspect） 字段
 2021-08-27 10:17:13 +08:00
zyy
178e2aa4a9 调整运行图加载优化 2021-08-25 11:09:38 +08:00
joylink_cuiweidong
7999dedba1 代码调整 2021-08-18 18:16:56 +08:00
joylink_cuiweidong
900ae7ca9f 仿真添加暂停/开始按钮，暂时只管理员可见 2021-08-18 17:36:04 +08:00
joylink_cuiweidong
9f1f985e3d 仿真发生异常，去掉初始化，由用户自行初始化 2021-08-17 17:48:30 +08:00
sunzhenyu
bc47132b21 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-08-06 10:28:59 +08:00
sunzhenyu
69ef5440f7 修改综合演练中数字沙盘显示 2021-08-06 10:28:40 +08:00
fan
486c3afd8c 调整应答器 IB 保存数据 signalCode 2021-08-06 10:24:28 +08:00
fan
cb128f6f21 超限区段数据 调整 2021-08-05 18:25:58 +08:00
fan
8d0edf3e52 关联超限区段 显示调整 2021-08-05 18:25:43 +08:00
fan
9e6cb0788d IB 应答器 放开关联信号机 2021-08-05 18:25:30 +08:00
fan
693a60d72c 关联超限区段调整 2021-08-05 18:25:01 +08:00
fan
c321020325 超限区段 rules 调整 2021-08-05 18:24:34 +08:00
fan
b55f0cc583 进路关联超限区段 2021-08-05 18:24:21 +08:00
fan
ed42c57f36 添加超限区段调整 2021-08-05 18:17:29 +08:00
fan
5656e77cb2 添加超限区段 2021-08-05 18:17:14 +08:00
fan
69e0e54c6c 保存延续保护和进路 2021-08-03 14:58:13 +08:00
joylink_cuiweidong
ab96efb1c6 地图绘制 现地配置 增加 可切换显示的车站 字段 2021-07-29 11:08:36 +08:00
joylink_cuiweidong
fd53f8643b 西安三号线问题 菜单下方时间显示有误 修改 2021-07-26 10:49:18 +08:00
fan
c9ce97534a 进路添加批量操作 2021-07-20 13:48:21 +08:00
fan
cdfe2a9a65 添加联锁配置项 =》 进路联锁不包含站台扣车 routeInterlockDoNotIncludeStandHoldTrain 2021-07-19 13:19:56 +08:00
yuan
6a674f7db9 综合演练 上下行列表显示问题修复 2021-07-16 10:30:27 +08:00
fan
d2357e0797 一键生成集中站现地配置 2021-07-15 10:50:29 +08:00
fan
3bb9c2a8d4 调整集中站设备显示 2021-07-14 09:32:12 +08:00
fan
79a85639fc 非管理员开放倍速功能（5倍速） 2021-07-12 10:38:39 +08:00
joylink_cuiweidong
a39996e457 福州一号线 运行图 加线抽线 
去除 西安三 运行图 加线抽线
 2021-07-02 16:45:51 +08:00
joylink_cuiweidong
4e2b07829c 西安三号线 运行图 加线抽线功能 添加 2021-07-02 13:44:21 +08:00
joylink_cuiweidong
87095b4f4e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/store/modules/runplan.js
 2021-07-01 10:09:23 +08:00
joylink_cuiweidong
c7e75739c3 西安三加线逻辑调整 2021-07-01 10:06:35 +08:00
fan
a8f4b06fbf 删除runPlan 弃用代码 2021-07-01 09:42:13 +08:00
fan
bcf9cc1d7f 左键点击关闭车次窗 2021-06-30 14:55:28 +08:00
fan
53041725ac 更换折返方式枚举 2021-06-29 13:53:39 +08:00
joylink_cuiweidong
cd2c43ac97 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-29 09:43:38 +08:00
joylink_cuiweidong
95882eeeef 第三方登陆联系方式调整 2021-06-29 09:43:20 +08:00
yuan
65d84a98a8 信号机距离计算方式修改 2021-06-24 18:14:36 +08:00
fan
e1b5c43fb7 zc设备数据添加noService属性 2021-06-24 13:54:44 +08:00
joylink_cuiweidong
3d4ba98297 zc 代码调整 2021-06-23 15:55:04 +08:00
joylink_cuiweidong
8f9ab98fb2 zc 绘图 添加 集中站列表 2021-06-23 15:36:23 +08:00
joylink_cuiweidong
b841022401 zc 绘图 代码调整 2021-06-23 13:52:22 +08:00
yuan
55ae33c204 移除无用代码 2021-06-22 18:03:29 +08:00
yuan
f032e3f1ee 地图编辑-应答器增加一键关联到信号机功能 2021-06-22 17:18:49 +08:00
yuan
1523ab6f51 应答器关联区段显示bug修复,增加选中高亮 2021-06-22 14:40:21 +08:00
fan
c574f0249c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-16 16:55:49 +08:00
fan
1fdde772c1 BUG316哈尔滨：右键点击列车车次框，不应弹出列监对话框，只左键点击弹出即可&BUG312哈尔滨：现地无法追踪全开 2021-06-16 16:55:38 +08:00
joylink_cuiweidong
4f74d4b33d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-16 16:07:11 +08:00
joylink_cuiweidong
23d760d1a9 哈尔滨项目 右下角退出操作 代码调整 2021-06-16 16:06:30 +08:00
fan
5cf6a1e84f 哈尔滨项目打开运行图报错调整 2021-06-16 15:31:55 +08:00
fan
c84c50efbb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-16 13:23:30 +08:00
fan
9c991484d7 西安仿真测试反馈40、42调整 扣车跳停标志显示点击调整 2021-06-16 13:23:15 +08:00
joylink_cuiweidong
6128cc8d50 地图发布 添加描述字段 
发布地图 发布历史展示描述字段
 2021-06-16 11:15:31 +08:00
joylink_cuiweidong
eeb75b6a6d Merge remote-tracking branch 'remotes/origin/test_thirdLogin' into test 2021-06-15 15:34:42 +08:00
joylink_cuiweidong
a0861633f2 zc 添加管理的区段列表（计轴区段） 2021-06-15 15:33:50 +08:00
fan
4c52f9354f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_tmt 2021-06-15 10:12:01 +08:00
fan
580ef87fa7 列监显示调整 2021-06-15 10:11:48 +08:00
joylink_cuiweidong
6b7827bd91 zc 代码调整 2021-06-11 18:17:48 +08:00
joylink_cuiweidong
bea9855e79 地图绘制 地图列表代码bug处理 2021-06-11 15:36:23 +08:00
yuan
a4e6119c4b 应答器批量创建增加区段偏移值 2021-06-10 15:46:20 +08:00
yuan
4bd21b30c5 地图编辑-应答器-批量创建 页面修改 2021-06-10 10:01:34 +08:00
sunzhenyu
62f339d3cf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-08 14:55:58 +08:00
sunzhenyu
9a2e993b5d 修改大铁三维单体设备通信和显示逻辑 2021-06-08 14:55:37 +08:00
fan
1ed9fd4d5d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test_tmt 2021-06-08 14:44:36 +08:00
fan
c09da2aa5d 列车操作调整 2021-06-08 14:44:23 +08:00
sunzhenyu
23ad69529a 增加三维大铁驾驶界面更新，增加三维大铁信号机，修改大铁三维加载和大铁信号模块 2021-06-04 17:26:41 +08:00
fan
50a7b6e039 南京二号线列监暂提 2021-06-04 14:22:39 +08:00
sunzhenyu
9ae1cf2ead Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-03 18:03:50 +08:00
sunzhenyu
1258bc4771 单独分出大铁三维单体设备，剔除无用接口，修改大铁驾驶界面，调试接口 2021-06-03 18:03:44 +08:00
fan
8004071e6f 绘图添加出站信号机进站信号机 2021-06-03 17:40:44 +08:00
fan
0d27da9d3b 南京二号线列监调整--暂提 2021-06-03 09:47:40 +08:00
fan
5bd0f380b6 南京二号线列监调整 2021-06-02 17:55:24 +08:00
fan
ad0cbdbd0f 南京二号线现地初始化列车没清调整 2021-06-02 10:22:24 +08:00
fan
3301f9abcd 南京二号线车站显示模块调整 2021-06-01 18:13:13 +08:00
fan
a8ce67ee4a 南京二号线调整 2021-06-01 14:06:18 +08:00
fan
c71f2fde96 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-06-01 10:13:25 +08:00
fan
9f4841e9e0 列车指令调整 2021-06-01 10:13:10 +08:00
zyy
e1958b1b8e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-31 15:53:03 +08:00
zyy
137b427ebe 调整新路预览配置 2021-05-31 15:52:46 +08:00
fan
aec02b7752 南京二行调调整 2021-05-31 14:15:09 +08:00
zyy
58f1e06267 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-28 18:12:53 +08:00
zyy
224bbc0177 调整进路更新延续保护配置 2021-05-28 18:12:35 +08:00
sunzhenyu
397c80a967 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-28 18:09:16 +08:00
zyy
5678498fa6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-28 17:20:33 +08:00
zyy
d86566be12 调整延续保护字段 2021-05-28 17:20:16 +08:00
fan
d11b0c6d47 增加列车故障操作-换端&联锁配置项-CTC列车进路延续保护仅折返站处锁闭 2021-05-28 17:18:51 +08:00
fan
ee6dfa9df2 南京二列监 2021-05-28 15:22:23 +08:00
fan
15e1868d6c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-28 14:08:24 +08:00
fan
e09d5f4aff 调整仿真开始显示暂停中 & 南京二列监 2021-05-28 14:07:28 +08:00
zyy
e6f3afd6a0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-28 13:08:17 +08:00
zyy
f9835862ce 调整侧防流程 2021-05-28 13:08:02 +08:00
fan
70ca57d26c 时刻表列车总览详览迁移 2021-05-28 11:00:26 +08:00
fan
af8a7758c2 Merge remote-tracking branch 'origin/test-nan02' into test 
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuBar.vue
 2021-05-28 10:18:57 +08:00
fan
1b5da46e80 背投轨道总览详览调整 2021-05-28 10:10:54 +08:00
sunzhenyu
c2bda14c4f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-27 18:16:01 +08:00
sunzhenyu
d71c4d7d6d 增加大铁三维驾驶模块 2021-05-27 18:15:54 +08:00
joylink_cuiweidong
bb73608a1b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-27 17:28:36 +08:00
joylink_cuiweidong
8c232d2b13 大铁项目 代码调整 2021-05-27 17:27:50 +08:00
zyy
b2806165ef 调整信号机接近区段更新流程 2021-05-27 16:40:28 +08:00
zyy
672c95c6c6 调整信号接近区段 2021-05-27 16:10:58 +08:00
zyy
529839b3ac 调整进路更新，延续保护更新 2021-05-27 15:15:58 +08:00
zyy
3a06aae186 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-27 14:19:43 +08:00
zyy
e150fda807 调整延续保护 2021-05-27 14:19:28 +08:00
joylink_cuiweidong
aa9c961cb0 旧版仿真 增加 仿真订阅（/queue/simulation/{id}/state） 2021-05-27 13:56:17 +08:00
fan
7412e01b32 代码暂提 2021-05-26 17:18:20 +08:00
zyy
2b338ba0de 调整进路预览 2021-05-26 17:03:38 +08:00
fan
ce1b6c5f8a meger 2021-05-26 15:48:55 +08:00
fan
46d74d3002 代码暂提 2021-05-26 15:46:29 +08:00
zyy
8b2f8c7bc1 Merge branch 'test-nan02' of https://git.code.tencent.com/lian-cbtc/jl-client into test-nan02 2021-05-26 14:43:51 +08:00
zyy
2d6f8ad984 增加车场弹窗 2021-05-26 14:43:34 +08:00
fan
86e2520b05 代码暂提 2021-05-26 14:04:36 +08:00
fan
5188192736 BUG275 南京11站：车次号步进，在马群创建的车次步进到油坊桥的区段后，列车不显示 2021-05-25 17:53:23 +08:00
fan
c4894290f4 Merge branch 'test-nan02' of https://git.code.tencent.com/lian-cbtc/jl-client into test—nanjing02 2021-05-25 16:07:22 +08:00
fan
337ed03f78 哈尔滨问题调整 2021-05-25 16:05:45 +08:00
joylink_cuiweidong
45371fb2d3 修改canvasId 初始化位置 2021-05-25 09:32:11 +08:00
fan
4796e7f648 代码暂提 2021-05-24 11:29:59 +08:00
joylink_cuiweidong
e17104f537 地图绘制 停站时间/运行等级 代码调整 2021-05-21 15:12:40 +08:00
joylink_cuiweidong
13af28467c 地图绘制 停站时间/运行等级 界面与接口代码调整 
生成联锁配置 删除 延续保护构建是否只考虑一个道岔计轴
生成联锁配置 新增 延续保护最小长度
 2021-05-21 15:02:28 +08:00
joylink_cuiweidong
4cefb0cfbe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-21 11:34:28 +08:00
joylink_cuiweidong
bf8d0eb574 地图绘制 停站时间 界面与接口代码调整 2021-05-21 11:33:37 +08:00
fan
fbd700d52e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-21 10:01:54 +08:00
fan
2438b9f0a0 删除仿真、绘图、运行图编制的心跳检测 2021-05-21 10:01:45 +08:00
zyy
55ee64479f 调整系统绘图模块新增 2021-05-20 17:58:23 +08:00
zyy
c4ec37a403 调整权限字段显示 2021-05-20 17:13:05 +08:00
zyy
3a2baf8374 调整权限流程 2021-05-20 16:37:55 +08:00
zyy
24aefdebd4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-05-20 15:13:54 +08:00