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

2659 Commits

Author SHA1 Message Date
fan
827e52e0f4 宁波一： 全站进路交自动控 2021-02-19 09:12:09 +08:00
joylink_cuiweidong
1aa597fa39 宁波一号线 区故解指令代码调整 计轴预复位报错调整 2021-02-18 18:23:33 +08:00
joylink_cuiweidong
8bd93ba1d7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-18 17:03:25 +08:00
joylink_cuiweidong
0e9454f890 宁波一号线 现地 设置进路报错提示调整 2021-02-18 17:03:08 +08:00
fan
b30ffd5635 宁波一 设置/取消全站自动通过进路 2021-02-18 16:58:35 +08:00
fan
c7e63a3d22 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-18 16:22:23 +08:00
fan
e2a36fdf92 宁波一 设置/取消全站自动通过进路 2021-02-18 16:22:15 +08:00
joylink_cuiweidong
c0c5356f8a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-18 15:50:32 +08:00
joylink_cuiweidong
5762399c6b 宁波一号线 菜单样式调整 2021-02-18 15:50:14 +08:00
fan
3e5f101a3a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-18 15:38:35 +08:00
fan
731c8e7fc3 宁波一 设置/取消强制点灯 2021-02-18 15:38:20 +08:00
lVAL
88e0c99135 线路：宁波 
问题：修改排列进路预览，选择性进路后，以左侧信号机左对齐设置显示偏移
 2021-02-18 10:18:51 +08:00
lVAL
b0fe7b7755 线路：宁波1 
问题：排列进路展开预览多次后，图不显示的问题
 2021-02-18 09:57:31 +08:00
lVAL
c6fc85397a 修改排列进路的操作的问题 2021-02-18 09:55:15 +08:00
lVAL
f05a3d496e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/map.js
#	src/jmapNew/shape/Cross/index.js
#	src/jmapNew/shape/Section/index.js
 2021-02-18 09:23:17 +08:00
fan
510b26c86c 宁波一新指令 2021-02-05 18:10:55 +08:00
lVAL
3475d573a6 修改代码 2021-02-05 18:07:35 +08:00
lVAL
a038ca7040 增加 宁波线处理 2021-02-05 18:01:16 +08:00
lVAL
d7c17d0935 修改道岔太短的问题 2021-02-05 18:00:06 +08:00
fan
b6550e6500 国赛取消注释 取消临时限速函数 2021-02-05 16:30:11 +08:00
fan
1cea217aa9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-05 15:17:41 +08:00
fan
f3ec3a1476 南京二号线折行显示调整 2021-02-05 15:12:57 +08:00
joylink_cuiweidong
62bf080515 成都三号线 引导总锁 实训代码调整 2021-02-05 14:55:55 +08:00
joylink_cuiweidong
871a04e441 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-05 11:01:41 +08:00
joylink_cuiweidong
9cdecca6bd 成都三号线 添加设置联锁控操作 
成都三号线 添加设置 联锁控实训，引导总锁，取消引导总锁实训
 2021-02-05 11:01:21 +08:00
fan
88683b3763 代码调整 2021-02-05 09:19:18 +08:00
fan
766059611c 国赛=》取消临时限速 取消注释 
(cherry picked from commit 18b5688cdf)
 2021-02-05 09:18:15 +08:00
lVAL
d0ce0a9132 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-04 13:30:03 +08:00
lVAL
c70a383e91 线路：宁波3 
问题：增加宁波3 用户权限/转移控制/请求区域控制权|授权转移|下放站控|回收站控 菜单和实训配置。
 2021-02-04 13:29:47 +08:00
fan
3bfa419bbe 宁波一 上电解锁调整 2021-02-04 13:23:42 +08:00
fan
3b87f7ef14 注释：执行关键操作测试 2021-02-04 13:10:24 +08:00
fan
e8de151360 宁波一操作实训策略调整&线路配置参数 2021-02-04 13:08:59 +08:00
lVAL
ff7e32ec0d 线路：宁波1，成都3 
问题：补充缺失部分实训，成都的全线取消扣车，宁波的设置折返
 2021-02-03 17:07:05 +08:00
joylink_cuiweidong
dd6f3cf7d3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-03 13:40:40 +08:00
joylink_cuiweidong
2968b1ddfb 北交大客流策略 添加 2021-02-03 13:40:11 +08:00
lVAL
7a10d0497a 线路：佛山，宁波3 
问题：控制模式实训配置
 2021-02-03 13:27:11 +08:00
lVAL
579858d02a 线路：南京2 
问题：配置插芯的实训区段限制
 2021-02-03 09:46:17 +08:00
lVAL
b7b90fe707 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-02 19:00:15 +08:00
fan
3e50519732 宁波一实训折返策略调整 2021-02-02 19:00:48 +08:00
lVAL
6dd4e305b3 修改实训配置 2021-02-02 19:00:03 +08:00
fan
f5e0539e6d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-02 18:55:42 +08:00
fan
83a1eecb40 宁波一实训折返策略调整 2021-02-02 18:55:33 +08:00
joylink_cuiweidong
eeb7e3afad Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/initializeSignalCanBlock.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/signalBlock.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/stationControl.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/switchActive.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/switchBlock.vue
 2021-02-02 18:16:51 +08:00
joylink_cuiweidong
c149f33a99 删除无用的代码 2021-02-02 18:06:02 +08:00
fan
18dcc3b089 BUG 160: 宁波一：控制模式（按钮）处缺少紧急站控 2021-02-02 17:54:40 +08:00
fan
1729082bac 折返策略 宁波一实训 2021-02-02 17:28:56 +08:00
fan
ec32fb62ff 折返策略 宁波一实训 2021-02-02 17:13:05 +08:00
lVAL
a6070c49f2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/allocateTime.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/signalModel.vue
#	src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue
 2021-02-02 16:45:24 +08:00
lVAL
7d9803165c 修改，宁波线路，道岔状态更改，操作界面检测，不刷新页面的问题 2021-02-02 16:40:58 +08:00
joylink_cuiweidong
efd8c86762 宁波一号线，南京二号线，哈尔滨一号线 删除不需要的代码 2021-02-02 16:28:03 +08:00
joylink_cuiweidong
e73d5d33d8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-02 15:22:28 +08:00
joylink_cuiweidong
14cd1948b3 福州一号线 佛山一号线 删除不需要的代码 2021-02-02 15:22:13 +08:00
fan
e4881b4efc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-02 14:53:46 +08:00
fan
a431f17246 实训调整 2021-02-02 14:53:33 +08:00
joylink_cuiweidong
1abd14d7e9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-02 14:10:06 +08:00
joylink_cuiweidong
2ddd9a0dc8 北京一号线/成都1，3号线 删除不需要的代码 2021-02-02 14:09:46 +08:00
fan
d594af49e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-02 11:03:24 +08:00
fan
f66e3e3cc0 实训代码调整 2021-02-02 11:03:11 +08:00
joylink_cuiweidong
2ca7c33966 宁波三号线 操作调整 2021-02-02 10:57:41 +08:00
lVAL
dbdfe26e86 修改宁波3 检测selected的方式 2021-02-02 10:49:25 +08:00
lVAL
7c80fc77c6 修改代码 2021-02-02 10:25:21 +08:00
lVAL
7b11378443 修改 宁波 selected报错问题 2021-02-02 09:41:35 +08:00
lVAL
cb7ae5fe6b 线路：宁波3 
问题：实训提示描述
 2021-02-02 09:09:11 +08:00
lVAL
6be29c157b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 18:36:20 +08:00
lVAL
0a2f2b08b3 增加信号机和站台 显示 2021-02-01 18:36:07 +08:00
fan
07efc9ae51 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 18:31:23 +08:00
fan
fa384b79ee 代码调整 2021-02-01 18:31:09 +08:00
joylink_cuiweidong
077457a4ac 西安二号线 添加帮助 操作定义 2021-02-01 18:11:58 +08:00
lVAL
26a82237b1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 17:56:15 +08:00
lVAL
7095f145c9 增加 西安02 的信号机帮助和站台帮助实训 2021-02-01 17:56:03 +08:00
joylink_cuiweidong
def8b44d97 佛山 宁波 竞赛 车站操作 调整 2021-02-01 15:23:45 +08:00
joylink_cuiweidong
2ad9f691bf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 14:38:09 +08:00
joylink_cuiweidong
2aadda7606 福州一号线 实训 操作定义 代码调整 2021-02-01 14:37:52 +08:00
fan
900a858010 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 14:31:28 +08:00
fan
8982177e99 代码调整 2021-02-01 14:31:16 +08:00
lVAL
9071ce93e9 线路：南京2 
问题：行调 交出控制、接受控制实训流程问题
 2021-02-01 13:46:59 +08:00
lVAL
2e890a378c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 13:44:14 +08:00
lVAL
f0e3ee1f49 线路：南京2 
问题：修改现地 强制站控，交出控制权，接受控制的实训流程。
 2021-02-01 13:43:48 +08:00
joylink_cuiweidong
c4619c0784 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 11:24:14 +08:00
joylink_cuiweidong
7818a149c4 福州一号线 道岔计轴预复位 操作定义调整 2021-02-01 11:23:37 +08:00
fan
e0245e4cbd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-01 10:19:07 +08:00
fan
143f517097 卡斯柯 紧急站控实训调整 2021-02-01 10:18:54 +08:00
lVAL
ad385fbe97 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 18:37:37 +08:00
lVAL
0598e48b42 修改宁波线状态刷新 2021-01-29 18:37:10 +08:00
joylink_cuiweidong
7e173b4c4c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 17:32:09 +08:00
joylink_cuiweidong
8c4f24f9e2 bug101 交控仿真路线:控制模式转换的操作与手册不一致 实训 调整 2021-01-29 17:31:48 +08:00
fan
96256020c5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 17:17:50 +08:00
fan
39e7cb83b9 南京二选中区段调整 2021-01-29 17:17:41 +08:00
lVAL
8c25f274f5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 16:21:35 +08:00
lVAL
fa5b6027d3 删除无用打印 2021-01-29 16:21:19 +08:00
fan
84a438a74d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 15:01:50 +08:00
fan
318d120db6 BUG 107: 浙大网新仿真线路：对立的功能应设置有误 2021-01-29 15:01:38 +08:00
joylink_cuiweidong
fcf3ec5b8e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 14:40:27 +08:00
joylink_cuiweidong
f1106b7dc0 运行图编制 菜单顺序 调整 2021-01-29 14:40:09 +08:00
fan
f1822495d2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 13:23:41 +08:00
fan
12e16f9a99 BUG 152: 教学系统：在课程中点击实训进入实训后点击返回应退出到课程详情页面，目前退出到教学系统界面了，建议修改 2021-01-29 13:23:29 +08:00
lVAL
f91f045a1e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 11:08:19 +08:00
lVAL
20a71051c7 线路：佛州 
问题：设置限速和取消限速，配置逻辑区段生成实训
 2021-01-29 11:08:03 +08:00
joylink_cuiweidong
67d7008ec0 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 09:57:39 +08:00
joylink_cuiweidong
45572a9f2a 删除不需要的文件 2021-01-29 09:57:22 +08:00
lVAL
4d3d92e18b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-29 09:46:05 +08:00
lVAL
e28047773d 线路：福州1 
问题：设置运行等级实训提示运行时间未提示的问题
 2021-01-29 09:45:43 +08:00
fan
80cb675d9d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 18:54:57 +08:00
fan
f4e3deaabc 仿真异常不清除订阅 2021-01-28 18:54:48 +08:00
joylink_cuiweidong
a9f47fdeb2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 18:49:59 +08:00
joylink_cuiweidong
381f26b661 成都三号线 设置/取消 自动进路/自动折返 实训 操作定义代码调整 2021-01-28 18:49:36 +08:00
lVAL
d4014b53c4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 18:44:21 +08:00
lVAL
31f9e2a4d3 修改生成实训配置 佛山1 2021-01-28 18:44:03 +08:00
fan
3f70632b84 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 17:47:56 +08:00
fan
b1d944c52f 国赛购买成功调整 2021-01-28 17:47:43 +08:00
lVAL
6a033b2a9d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 16:28:14 +08:00
lVAL
590fb34edf 修改 宁波线操作 2021-01-28 16:27:44 +08:00
joylink_cuiweidong
694fe461a6 成都1和3，北京1，佛山有轨电车，哈尔滨1，南京2 运行图 折返点计算 代码调整 2021-01-28 16:12:10 +08:00
joylink_cuiweidong
909a5cb7f9 宁波一、三号线，西安二号线 运行图 转换函数 调整 2021-01-28 14:45:33 +08:00
joylink_cuiweidong
f6d3a6f030 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-28 13:38:29 +08:00
joylink_cuiweidong
c9a8d09e67 福州一号线 运行图绘图 折返点计算调整 2021-01-28 13:38:10 +08:00
lVAL
035ae9d367 修改 南京2 实训配置 2021-01-28 09:27:32 +08:00
lVAL
369c5446cc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuButton.vue
 2021-01-27 18:39:11 +08:00
lVAL
ba5de90773 配置 南京2实训 2021-01-27 18:32:16 +08:00
fan
3c499369a6 meger 2021-01-27 15:53:09 +08:00
fan
cb894aec34 南京二号线操作调整显示 2021-01-27 15:37:01 +08:00
lVAL
fbcfca4f9b 优化 南京2 提示信息的代码 2021-01-27 13:42:33 +08:00
lVAL
89c0b4f693 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-27 13:31:31 +08:00
lVAL
d5dd86be69 删除南京2 无用代码 2021-01-27 13:31:18 +08:00
joylink_cuiweidong
ccaceffeca 删除暂不需要文件 2021-01-27 13:13:44 +08:00
joylink_cuiweidong
b2adbb8eda 删除不需要的文件 2021-01-27 13:06:24 +08:00
lVAL
14e7acd715 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/nanjing_02/menus/menuBar.vue
 2021-01-27 11:25:23 +08:00
lVAL
62d52fd27f 修改南京2错误提示功能 2021-01-27 11:24:14 +08:00
joylink_cuiweidong
030a603da4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-27 10:40:50 +08:00
joylink_cuiweidong
c52474b771 宁波三号线（泰雷兹） 
扣车后没有显示扣车标识修改
 2021-01-27 10:38:34 +08:00
fan
d562037967 调整报警闪烁 2021-01-27 10:18:47 +08:00
fan
c0d1ffffd6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-27 09:47:38 +08:00
fan
ca1b5892af 剧本编辑框和请求栈堆微调 2021-01-27 09:47:26 +08:00
lVAL
b237d09402 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-27 09:27:59 +08:00
lVAL
ad0590dfe4 修改南京2 登录密码为1 以及限制普通站不能登录 2021-01-27 09:27:44 +08:00
fan
86dfe7a5f5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 18:19:14 +08:00
fan
f92e017f1b 调整南京二号线岔区设限显示 2021-01-26 18:19:04 +08:00
lVAL
be6610a850 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 17:45:39 +08:00
lVAL
4efca07ac8 配置 宁波3 设置跳停和取消跳停配置 2021-01-26 17:45:24 +08:00
fan
aa74b86dbd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 16:19:39 +08:00
fan
abed3ef7c1 BUG108: 浙大网新仿真：道岔单解时出现字母“E”后，右键点击出现“使能”，此时不点击使能，而点击空白处，再点击字母E，没有反应，并且初始化后E还在闪烁 && 南京二排列进路后封锁区段显示调整 2021-01-26 16:19:29 +08:00
lVAL
0c527d8b63 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 15:03:00 +08:00
lVAL
5858bb1eb3 优化代码 2021-01-26 15:02:39 +08:00
fan
324f662c8f BUG109: 浙大网新：站台设置停站时间时有误，详细请看图 2021-01-26 14:54:37 +08:00
joylink_cuiweidong
519916458f 成都三号线 实训操作定义代码调整 2021-01-26 14:40:17 +08:00
joylink_cuiweidong
2525d57f8f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 14:04:36 +08:00
joylink_cuiweidong
bd9917c0ca 道岔区段 切除闪烁绘图代码调整 2021-01-26 14:04:17 +08:00
fan
4f911227fe Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 13:07:11 +08:00
fan
c32009a9d2 南京二号线折行显示列车调整 2021-01-26 13:07:02 +08:00
joylink_cuiweidong
ebcd6b9bd9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-26 11:10:38 +08:00