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

2542 Commits

Author SHA1 Message Date
fan
087f1123b8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 17:00:10 +08:00
fan
45869c5362 信号机状态调整 2021-01-15 16:59:58 +08:00
lVAL
89dacd7deb 增加南京2号线 信号机配置 2021-01-15 16:40:23 +08:00
lVAL
5b4e15a979 修改操作提示 2021-01-15 16:12:49 +08:00
lVAL
c06bad3005 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 16:09:35 +08:00
lVAL
cc5ee4661f 修改 发送命令后 提示的信息 2021-01-15 16:09:26 +08:00
fan
a60209a10f 信号机状态调整 2021-01-15 16:01:15 +08:00
lVAL
bc8f65c149 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 15:25:49 +08:00
lVAL
57acd71924 修改南京2蓝色颜色 2021-01-15 15:25:41 +08:00
fan
cd5bcfe888 信号机&道岔状态调整 2021-01-15 15:24:19 +08:00
fan
93eaaacd96 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 13:34:35 +08:00
fan
0caf3d233a 排列进路 2021-01-15 13:34:25 +08:00
lVAL
25e89c9b1c 配置强解 道岔和区段，（道岔等待后端确定指令） 2021-01-15 12:25:25 +08:00
lVAL
2024cef7c9 修改南京仿真bar遮挡运行图的问题 2021-01-15 12:18:27 +08:00
fan
12925e92bb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 11:21:22 +08:00
fan
29c8e5b4b9 暂提 2021-01-15 11:21:11 +08:00
lVAL
80f8ecf19f 修改南京2号线 tempData 报错问题 2021-01-15 11:16:17 +08:00
lVAL
356042f673 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 11:00:05 +08:00
lVAL
ec30635c02 修改应答器图层以及回车修改属性的问题 2021-01-15 10:59:58 +08:00
joylink_cuiweidong
04e4df6225 代码调整 2021-01-15 10:38:35 +08:00
joylink_cuiweidong
4e28468ad9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 10:33:15 +08:00
joylink_cuiweidong
a86c76422f 岔心绘图代码调整 
区段绘图（左右关联区段 关系）调整
 2021-01-15 10:32:57 +08:00
lVAL
4c89a777ba Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 09:53:46 +08:00
lVAL
c6c59f48b7 修改代码 2021-01-15 09:53:37 +08:00
fan
0671c6e733 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-15 09:42:36 +08:00
fan
15928a6248 道岔封锁状态调整 2021-01-15 09:42:19 +08:00
lVAL
cb364658fc 修改替换错误 2021-01-15 09:39:27 +08:00
lVAL
41f1253746 修改 南京2号线 中心操作弹窗为非模式对话框 2021-01-15 09:34:16 +08:00
lVAL
284899599c 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-14 18:38:29 +08:00
lVAL
b5c2202114 增加 南京线增加参数选择的步骤功能 2021-01-14 18:37:31 +08:00
joylink_cuiweidong
c8d0bf50f5 代码调整 2021-01-14 17:11:10 +08:00
joylink_cuiweidong
06edd5f531 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-14 17:00:04 +08:00
joylink_cuiweidong
3dd6696140 代码调整 2021-01-14 16:59:41 +08:00
fan
359e24dfbd merge 2021-01-14 16:35:45 +08:00
fan
ab804e3b95 南京二号线状态调整 道岔长闪 2021-01-14 16:26:04 +08:00
joylink_cuiweidong
c4f6cde2c4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-14 16:04:03 +08:00
joylink_cuiweidong
28babc78f9 岔心 绘图调整 2021-01-14 16:03:48 +08:00
lVAL
2fc70489eb 修改南京2号线菜单皮肤 2021-01-14 15:44:56 +08:00
lVAL
51096d5ea1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-14 15:32:33 +08:00
lVAL
eb7fa1f5cb 修改实现南京2行调和现地界面操作 2021-01-14 15:32:17 +08:00
fan
ec87dc8eaf Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-14 14:43:03 +08:00
fan
9c7c0f674e 南京二号线状态调整 2021-01-14 14:42:53 +08:00
lVAL
44adeaf24a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-14 14:15:18 +08:00
lVAL
22403b198d 修改南京2号线菜单，以及样式 2021-01-14 14:15:02 +08:00
joylink_cuiweidong
845f10caf6 岔心绘图代码调整 
bug调整：新建完一个信号机 三个状态不发生改变
 2021-01-14 13:04:04 +08:00
joylink_cuiweidong
3be5df98e8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-13 18:33:21 +08:00
joylink_cuiweidong
becb6a03df 岔心代码调整 2021-01-13 18:33:07 +08:00
lVAL
1dfa8f5b19 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-13 18:08:02 +08:00
lVAL
37bc98d706 修改应答器 计算方式 2021-01-13 18:07:49 +08:00
joylink_cuiweidong
c42a184b7b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-13 17:54:11 +08:00
joylink_cuiweidong
7ac59f6006 岔心 绘图代码调整 2021-01-13 17:53:51 +08:00
lVAL
9f4155b70d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-13 17:45:49 +08:00
lVAL
15f94a7d1d 优化 应答器创建 选择关联区段类型 以及优化绘制显示位置 2021-01-13 17:45:38 +08:00
joylink_cuiweidong
752b4e9a26 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/config/skinCode/nanjing_02.js
#	src/jmapNew/utils/parser.js
 2021-01-13 17:43:15 +08:00
joylink_cuiweidong
99644039d3 新建车站以后 无法点击其他的东西 bug 调整 2021-01-13 17:34:57 +08:00
joylink_cuiweidong
7599458c8f 岔心 元素绘图代码调整 2021-01-13 17:01:53 +08:00
lVAL
fd3f82e7ba 修改炼精二号线 逻辑区段名称大小 2021-01-13 14:18:48 +08:00
lVAL
006d784178 修改应答器bug 2021-01-13 10:26:52 +08:00
joylink_cuiweidong
fbb8157ff1 代码调整 2021-01-12 20:20:56 +08:00
joylink_cuiweidong
12acee5bc7 代码调整 2021-01-12 18:06:52 +08:00
joylink_cuiweidong
b33e4b92ed 暂时 注释 西安二号线 未实现的 功能 2021-01-12 17:57:44 +08:00
joylink_cuiweidong
1e2e8c2609 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/config/skinCode/nanjing_02.js
#	src/jmapNew/shape/Responder/index.js
 2021-01-12 17:27:25 +08:00
joylink_cuiweidong
85a88a9431 岔心 绘图代码调整 2021-01-12 17:25:32 +08:00
lVAL
64df012fc3 设置应答器 绘图显示 仿真不显示 2021-01-12 11:32:39 +08:00
lVAL
8c261bb3a6 优化应答器 状态处理功能 2021-01-12 11:00:16 +08:00
lVAL
7bacd3c49f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-12 10:07:50 +08:00
lVAL
9bd12bb82e 增加应答器配置 2021-01-12 10:07:31 +08:00
fan
9a74d3ee39 成绩导出调整 2021-01-11 17:51:54 +08:00
fan
84354dde17 课程迁移问题调整&区段限速取消限速仅逻辑区段显示 2021-01-11 15:23:56 +08:00
fan
ec5b0e0a1e 西门子列车未实现操作注释 2021-01-11 11:04:14 +08:00
fan
682a47f730 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-08 17:27:36 +08:00
fan
0051560fff 课程迁移调整 2021-01-08 17:27:25 +08:00
zyy
bb22ed66ed 调整大屏预览显示流程 2021-01-08 16:50:50 +08:00
joylink_cuiweidong
18ff2dcd22 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-08 09:54:21 +08:00
joylink_cuiweidong
8145673f5d 成都三号线 代码调整 2021-01-08 09:54:04 +08:00
lVAL
d5f94f8539 修改 变量名称 2021-01-07 15:18:48 +08:00
lVAL
f5cfb5f787 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/config/skinCode/xian_01.js
 2021-01-07 15:16:34 +08:00
lVAL
1a0612020e 增加，信号机灯丝故障处理 2021-01-07 15:15:54 +08:00
joylink_cuiweidong
c266442842 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-06 18:15:34 +08:00
fan
e94ffd235a 故障模式快捷键&ISCS返回（退出）调整 2021-01-06 18:17:40 +08:00
joylink_cuiweidong
558ea5cc95 代码调整 2021-01-06 18:15:14 +08:00
joylink_cuiweidong
728ba4b47b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-06 11:28:11 +08:00
joylink_cuiweidong
6e3cdc6bd1 bug56 设置运行等级后，查询站台状态显示自动 代码调整 2021-01-06 11:27:55 +08:00
lVAL
0ad6925791 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-06 10:21:20 +08:00
lVAL
0e37349fcd 修改，站台设置跳停和取消跳停现地没有生成实训的配置问题 2021-01-06 10:21:11 +08:00
joylink_cuiweidong
923e3ba05c bug57 苏电院西门子仿真线路：进路控制模式显示有误，自动显示人工 修改 2021-01-06 09:32:27 +08:00
joylink_cuiweidong
411bde3aee bug 64 苏电院交控仿真线路：信号解封无效 调整 2021-01-05 18:19:02 +08:00
joylink_cuiweidong
dd0a0b2fdf bug70（在课程树创建课程章节时，创建二级章节后无法继续创建一级章节）修改 2021-01-05 17:31:03 +08:00
lVAL
42dd23b716 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/xian_02/menus/menuSignal.vue
 2021-01-05 16:05:52 +08:00
lVAL
cc2814f722 增加西安2号线实训配置 2021-01-05 16:05:13 +08:00
joylink_cuiweidong
c0a949eafa 更改 西安二号线 信号机解封 实训提示 2021-01-05 15:32:12 +08:00
lVAL
e8d1777703 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-05 15:08:08 +08:00
lVAL
ea7d29f520 增加 信号机解封实训配置 2021-01-05 15:07:54 +08:00
joylink_cuiweidong
9684fd6937 信号机 取消封锁 使能 操作代码调整 2021-01-05 14:45:10 +08:00
fan
0a9ca02ae9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-05 13:57:05 +08:00
fan
175d5b1810 代码调整 2021-01-05 13:56:51 +08:00
joylink_cuiweidong
dcfd22463b 西安二号线 指令操作调整 2021-01-05 13:45:29 +08:00
joylink_cuiweidong
40a367a005 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-05 13:00:25 +08:00
joylink_cuiweidong
50a2085052 西安二号线 绘图代码 调整 2021-01-05 11:33:18 +08:00
lVAL
f11ded27f7 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-05 11:30:34 +08:00
lVAL
f35628f130 修改道岔单锁实训流程问题 2021-01-05 11:30:25 +08:00
joylink_cuiweidong
bc791715f4 西安二号线 操作代码调整 2021-01-05 09:43:09 +08:00
lVAL
1c04595c38 补充 西安二号线 实训配置 2021-01-05 09:13:09 +08:00
lVAL
0d183d53ce Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-04 18:25:42 +08:00
lVAL
e9c3a49612 添加缺失的实训配置（未调整，未验证） 2021-01-04 18:25:33 +08:00
fan
d31c9c1da3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-04 17:52:52 +08:00
fan
43f039e5c6 浙大网新 发送请求提示调整 2021-01-04 17:52:38 +08:00
lVAL
7468e2edcb 注释掉，宁波三仿真操作功能无关的操作 2021-01-04 17:37:56 +08:00
joylink_cuiweidong
e3584dc2ea 西安二号线 紧急本地控制（紧急站控） 操作代码调整 2021-01-04 15:39:54 +08:00
fan
b71962d77c 浙大网新 扣车和取消扣车实训调整 2021-01-04 14:50:13 +08:00
joylink_cuiweidong
1a65264d64 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-04 14:48:28 +08:00
joylink_cuiweidong
4151680a6a 西安二号线 现地 控制权转移 代码调整 2021-01-04 14:48:09 +08:00
fan
3c7f96614d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-04 14:03:40 +08:00
fan
f73fcff33e 浙大网新 跳停和取消跳停 2021-01-04 14:03:26 +08:00
joylink_cuiweidong
ad2e6ed0f6 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-31 18:03:17 +08:00
joylink_cuiweidong
a024699e8f 西安二号线 控制模式 绘图调整 2020-12-31 18:02:55 +08:00
fan
c5fd6a97a8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-31 16:40:29 +08:00
fan
386cda6dba Bug54：苏电院交控仿真线路切换到车站一显示调整成员角色失败& 浙大网新部分实训调整 2020-12-31 16:40:13 +08:00
joylink_cuiweidong
5ec5d451d0 西安二号线 右键操作 代码调整 2020-12-31 14:57:53 +08:00
joylink_cuiweidong
2d831ca398 bug12（哈尔滨仿真线路里的交出控制功能逻辑问题）修改 2020-12-31 14:13:51 +08:00
fan
730b673da2 泰雷兹屏蔽门 2020-12-30 11:15:05 +08:00
fan
9a55afa779 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-29 11:04:17 +08:00
fan
72db8b3e94 紧急停车状态调整 2020-12-29 11:04:01 +08:00
joylink_cuiweidong
0bcdae70db 紧急停车代码调整 2020-12-29 10:59:55 +08:00
lVAL
da1fa87021 修改代码 2020-12-28 17:39:47 +08:00
lVAL
f97a98da21 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 16:59:57 +08:00
lVAL
44e42bf5e5 调整宁波3号线操作 2020-12-28 16:59:29 +08:00
fan
1d775c4529 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 16:41:56 +08:00
fan
b24e59bc9a 代码调整 2020-12-28 16:41:37 +08:00
joylink_cuiweidong
0b606fbc56 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 16:25:49 +08:00
joylink_cuiweidong
dbbd817aad 哈尔滨仿真线路里的交出控制功能逻辑问题 （bug12）代码调整 2020-12-28 16:25:29 +08:00
fan
908aa12c21 bug: 11 设置运行等级显示问题 2020-12-28 16:00:55 +08:00
fan
e9a0359b1f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 15:01:35 +08:00
fan
16206cd003 bug: 1 & 紧急停车调整 & bug: 10 2020-12-28 15:01:25 +08:00
joylink_cuiweidong
906e12d508 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-28 13:03:18 +08:00
joylink_cuiweidong
fc4d130675 宁波三号线 站台操作调整 2020-12-28 13:02:33 +08:00
fan
614f835701 成都一号线两个确认运行至前方站 2020-12-28 11:24:25 +08:00
joylink_cuiweidong
940f01a89e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-25 18:07:15 +08:00
joylink_cuiweidong
418e8b86a4 宁波三号线 行调操作代码调整 2020-12-25 18:06:08 +08:00
lVAL
d229e5ca59 调试 宁波3号线 指令 2020-12-25 18:05:49 +08:00
lVAL
ac3ee7cf7e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-25 14:24:59 +08:00
lVAL
d5315ef81b 增阿基指令分页的功能 2020-12-25 14:24:47 +08:00
joylink_cuiweidong
18a8b75a98 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-25 14:02:33 +08:00
joylink_cuiweidong
9dfc64ea0a 宁波三号线 真实运行图 导入代码调整 2020-12-25 14:02:03 +08:00
fan
ada7d199c8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-25 11:18:09 +08:00
fan
2aa6cb1f8f 哈尔滨操作调整&ibp调整 2020-12-25 11:17:56 +08:00
joylink_cuiweidong
1a7b0b0301 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-25 09:08:47 +08:00
joylink_cuiweidong
d74564f9b1 宁波三号线运行图导入代码调整 2020-12-25 09:08:31 +08:00
lVAL
c4aba14e1f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-24 18:35:45 +08:00
lVAL
0d8ff932a0 修改组件操作报错的问题 2020-12-24 18:35:26 +08:00
fan
4611c4b74b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-24 15:33:17 +08:00
fan
48e37e44f8 indexedDb调整 2020-12-24 15:33:06 +08:00
joylink_cuiweidong
31605db52e 成都三号线 实训定义调整 2020-12-23 16:39:53 +08:00
joylink_cuiweidong
8b04f92d7a 成都的三号线 信号封锁状态 绘图代码调整 2020-12-23 10:23:29 +08:00
joylink_cuiweidong
623cbd2143 北交大 客流 代码调整 2020-12-22 18:42:27 +08:00
joylink_cuiweidong
d5fcc4bd36 北交大 客流数据 代码调整 2020-12-22 18:26:31 +08:00
joylink_cuiweidong
7f23431ebd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 18:16:22 +08:00
joylink_cuiweidong
b5ebe1599d 成都三号线 现地工作站 指令操作代码调整 2020-12-22 18:16:06 +08:00
zyy
8c245127e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 17:08:19 +08:00
zyy
580c24e785 调整西安二号线操作 2020-12-22 17:08:05 +08:00
joylink_cuiweidong
59371074ca Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 15:18:58 +08:00
joylink_cuiweidong
b8fde7dd74 地图绘图代码调整 
成都三号线 行调工作站 指令代码调整
 2020-12-22 15:18:10 +08:00
zyy
3a5eaaa544 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 10:27:30 +08:00
zyy
912d80caec 调整ibp盘创建 保存 2020-12-22 10:27:14 +08:00
fan
bd775d7178 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 10:03:30 +08:00
fan
2c23ec76e9 ZC故障调整 2020-12-22 10:03:17 +08:00
zyy
97636fa64a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-22 09:03:57 +08:00
zyy
0abba7cdbc 调整实训操作 2020-12-22 09:03:42 +08:00
fan
4210e2fba7 哈尔滨 重启令解调整 2020-12-21 21:55:36 +08:00
fan
a00b5c0581 道岔名称 站台E灰显 2020-12-21 20:10:48 +08:00
fan
941a127216 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-21 18:33:39 +08:00
fan
01dc500acc 道岔名称 站台E灰显 2020-12-21 18:33:29 +08:00
joylink_cuiweidong
5d4422ca92 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-21 18:04:34 +08:00
joylink_cuiweidong
2f15b34293 代码调整 2020-12-21 18:04:21 +08:00
fan
87920cded9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-21 16:28:58 +08:00
fan
83f49ce487 道岔灰显 2020-12-21 16:28:32 +08:00
joylink_cuiweidong
f244f8696f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-21 16:18:58 +08:00
joylink_cuiweidong
c6293a8020 线段 站间分隔 绘图代码调整 2020-12-21 16:18:41 +08:00
fan
239da4d74b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-21 16:09:54 +08:00
fan
1bc7da3c53 哈尔滨 联锁机故障&重启令解 2020-12-21 16:09:43 +08:00
zyy
49a6fffdfc 调整宁波线路实操定义 2020-12-21 15:18:51 +08:00
joylink_cuiweidong
bde24b5190 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-21 13:53:02 +08:00
fan
7f38c06229 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-21 13:52:52 +08:00
joylink_cuiweidong
5f00a98526 箭头绘图代码调整 2020-12-21 13:52:45 +08:00
fan
01ed2bee99 信号机灯柱调整 2020-12-21 13:52:36 +08:00
joylink_cuiweidong
76167c0acb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-21 11:01:49 +08:00
joylink_cuiweidong
ffa572eb24 南铁院16站线路（西门子） 线路配置与绘图 代码调整 2020-12-21 11:01:33 +08:00
fan
b84b8cfd36 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-21 09:25:50 +08:00
fan
9d74937073 宁波二号线样式调整 2020-12-21 09:25:17 +08:00
joylink_fanyuhong
1915215083 取消越战 非安全命令 2020-12-18 21:18:57 +08:00
fan
e809765dd9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-18 17:20:27 +08:00
fan
9ba280bc03 南铁院专业版配置调整 2020-12-18 17:20:09 +08:00
joylink_cuiweidong
465e6a5d08 南京二号线 区段绘图 调整 2020-12-18 16:28:42 +08:00
joylink_cuiweidong
c8487b6e60 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-18 16:12:53 +08:00
joylink_cuiweidong
a3e8c7cecc 南京一号线 线路 样式调整 2020-12-18 16:12:39 +08:00
zyy
2884d0f02c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-18 15:37:53 +08:00
zyy
901fa60bc4 调整道岔生成流程 2020-12-18 15:37:35 +08:00
fan
31954a545d 哈尔滨操作调整 2020-12-18 14:10:25 +08:00
fan
2ddc94f7aa 南京二号线皮肤调整 2020-12-18 13:10:55 +08:00
joylink_cuiweidong
213d14b212 新增南京二号线 线路配置文件 2020-12-18 09:30:18 +08:00
joylink_cuiweidong
acd8c46a65 代码调整 2020-12-17 16:37:10 +08:00
joylink_cuiweidong
dd1783405e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-17 16:25:02 +08:00
joylink_cuiweidong
d6b58f5ffb 哈尔滨线路日志功能添加 2020-12-17 16:24:29 +08:00
zyy
54cf4b3f97 调整哈尔滨鼠标事件 2020-12-17 13:59:08 +08:00
zyy
3ec50678c5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-16 16:22:38 +08:00
zyy
24b95e3811 调整成都一报错 2020-12-16 16:22:24 +08:00
fan
68a0eadf9b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-16 16:05:55 +08:00
fan
7eec38fe65 车次窗前端状态重建后保留 2020-12-16 16:05:33 +08:00
zyy
34bff76eb5 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-16 15:37:22 +08:00
zyy
c2f6c3461b 调整宁波三，增加字段 2020-12-16 15:37:09 +08:00
joylink_cuiweidong
5a5193cde5 北交大客流 运行图代码调整 2020-12-16 11:14:35 +08:00
fan
1faa02cffa Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-15 18:16:04 +08:00
fan
19e9cb7948 缓存运行图数据 2020-12-15 18:15:48 +08:00
zyy
0c936bb0ce 调整宁波三控制权操作 2020-12-15 16:59:51 +08:00
zyy
249bef4802 调整道岔生成逻辑 2020-12-15 14:41:23 +08:00
fan
3c6047d4ad 打包调整 2020-12-15 11:18:15 +08:00
zyy
b85dcb41dc 调整道岔生成逻辑 2020-12-15 11:10:05 +08:00
fan
0364fa0f2d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-14 15:51:29 +08:00
fan
383287fe56 新窗口ibp展示添加退出按钮 2020-12-14 15:51:14 +08:00
fan
62cba757e6 绘图预览界面 现地行调显示调整 & ibp从发布地图创建调整 & 贵装备信息导入调整 2020-12-14 15:22:47 +08:00
zyy
02a6293d5d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-14 11:29:43 +08:00
zyy
0310ee6c57 调整地图流程 2020-12-14 11:29:26 +08:00
fan
a80b6c7fb0 一键领取权限 2020-12-11 19:28:38 +08:00
fan
97241040f6 调整宁波三号线站台样式 2020-12-11 16:38:13 +08:00
fan
f8876c452e Text调整 2020-12-11 16:33:51 +08:00
fan
f9d8bda8b0 宁波三号线延续保护添加箭头 2020-12-11 13:19:34 +08:00
joylink_cuiweidong
1b0ab87020 车站绘图代码调整（去除公里标名称必填） 
文字绘图代码调整（调整文字字体，与车站名称字体一致）
 2020-12-10 18:33:18 +08:00
fan
80ebd84062 宁波三号线调整 2020-12-10 17:34:13 +08:00
fan
aa4012b08f 宁波三号线操作 2020-12-10 14:50:43 +08:00
fan
9114578e22 宁波三号线操作 2020-12-10 14:40:41 +08:00
fan
c297594128 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-10 10:33:02 +08:00
fan
c118fccd3f 宁波三号线操作调整 2020-12-10 10:01:51 +08:00
zyy
1a093e6594 调整交控皮肤显示条件，增加自动折返进路显示 2020-12-09 17:08:36 +08:00
joylink_cuiweidong
1389c3dfb9 代码调整 2020-12-09 11:21:30 +08:00
joylink_cuiweidong
5287652d90 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-09 10:56:42 +08:00
joylink_cuiweidong
108ec9ef83 西安二号线列车 三角形位置绘图调整 2020-12-09 10:56:24 +08:00
zyy
e7d5a85b4f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-09 10:38:58 +08:00
zyy
a71217220a 调整mapDevice数据 2020-12-09 10:38:46 +08:00
fan
8f7caf199c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-08 18:44:06 +08:00
fan
a9b94c8e5d 国赛界面去掉截止日期&拦截器提示登出修复&宁波三号线 2020-12-08 18:43:55 +08:00
zyy
5feb81e1c1 调整计轴区段显示 2020-12-08 15:42:35 +08:00
zyy
d6dccd10d7 调整车站隐藏流程 2020-12-08 09:52:07 +08:00
zyy
84d140b639 调整车站绘制流程 2020-12-07 16:34:57 +08:00
zyy
6b53bc55d6 调整删除区段关联车次窗 2020-12-07 16:10:03 +08:00
joylink_cuiweidong
a0e3875e69 实训平台样式调整 2020-12-04 15:46:45 +08:00
fan
ac8f9bc978 哈尔滨限速调整 2020-12-04 10:07:55 +08:00
fan
817c5bdb9b 哈尔滨限速调整 2020-12-03 18:39:27 +08:00
fan
05f6324413 company update 2020-12-03 18:22:04 +08:00
fan
cdbd7a0d5c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-02 18:38:40 +08:00
fan
6cc64d7cfc 导入学生信息添加loading&哈尔滨日志 2020-12-02 18:38:28 +08:00
joylink_cuiweidong
b51ebde280 北交大客流仿真系统代码调整 2020-12-02 17:45:19 +08:00
joylink_cuiweidong
84d7d145c2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-02 14:25:40 +08:00
joylink_cuiweidong
caeb8aa457 福州一号线新版 配置文件调整 2020-12-02 14:25:20 +08:00
fan
d8f8acfe02 单位调整&哈尔滨区段限速调整 2020-12-02 14:22:26 +08:00
fan
9c06b3ed27 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-12-01 18:50:32 +08:00
fan
4ac37c5d18 单位调整 2020-12-01 18:50:23 +08:00
joylink_cuiweidong
941f57e02c 代码调整 2020-12-01 17:20:44 +08:00
zyy
900064a767 调整福州线路实训操作 2020-11-27 16:26:42 +08:00
zyy
eabb4b8782 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 14:15:32 +08:00
zyy
6b8bfffd21 调整限速实训流程 2020-11-27 14:15:19 +08:00
joylink_cuiweidong
90ec120603 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-27 14:05:28 +08:00
joylink_cuiweidong
c2cd9e73d5 考试系统代码调整 2020-11-27 14:05:10 +08:00
zyy
032c3036b8 调整国赛系统样式名称 2020-11-27 09:22:25 +08:00
joylink_cuiweidong
1f7c3f3bf7 宁波一号线 人解进路更换指令（之前为信号机取消引导，换为人解进路） 2020-11-26 18:52:53 +08:00
joylink_cuiweidong
3132506382 宁波一号线 取消进路 指令 换成 总取消 2020-11-26 18:21:57 +08:00
joylink_cuiweidong
2dad05d63f 福州一号线 西安三号线 实训定义代码调整 2020-11-26 17:22:49 +08:00
joylink_cuiweidong
00e60e877c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-26 16:43:23 +08:00
joylink_cuiweidong
d1eec65783 西安三号线 福州一号线 实训定义代码调整 2020-11-26 16:43:00 +08:00
fan
43c0de245d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-26 14:54:58 +08:00
fan
5abdfc9883 哈尔滨操作调整 2020-11-26 14:54:37 +08:00
joylink_cuiweidong
17e5f13202 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-26 14:39:15 +08:00
joylink_cuiweidong
5d02a56646 福州线路新版 操作调整 2020-11-26 14:37:48 +08:00
fan
b98ab0ae4b merge 2020-11-26 14:27:45 +08:00
fan
8b8b5bd028 哈尔滨操作调整 2020-11-26 14:26:35 +08:00
joylink_cuiweidong
e1ab504ddb 屏蔽门绘图调整 2020-11-26 11:15:25 +08:00
fan
10d8b674b4 哈尔滨操作调整 2020-11-25 18:41:35 +08:00
joylink_cuiweidong
10c007e9cf 福州一号线/西安三号线 实训定义调整 2020-11-25 17:32:07 +08:00
joylink_cuiweidong
275b44e056 北交大 客流仿真 提示添加 2020-11-24 18:07:09 +08:00
joylink_cuiweidong
872824dff1 绘图代码调整 2020-11-24 16:53:13 +08:00
fan
93f3e485fc 老旧接口调整 2020-11-23 18:00:12 +08:00
joylink_cuiweidong
dc1ccfe699 地图绘制代码调整 2020-11-23 13:41:19 +08:00
zyy
c65fe8dd37 调整指令错误提示 2020-11-23 10:43:52 +08:00
joylink_cuiweidong
c32dc326c4 北交大 客流站场仿真页面 订阅顺序调整 图例调整 2020-11-20 17:37:17 +08:00
joylink_cuiweidong
504f23e84f 代码调整 2020-11-20 15:36:28 +08:00
joylink_cuiweidong
fece30a51d 北交大 客流站场仿真界面 代码调整 2020-11-20 14:53:50 +08:00
joylink_cuiweidong
1010df5613 北交大 客流站场仿真界面 代码调整 2020-11-20 14:21:57 +08:00
zyy
648f38e68d 调整运行图间距 2020-11-19 09:40:03 +08:00
zyy
83e74cc53b 增加运行图客流量配置 2020-11-18 13:15:28 +08:00
fan
217ae8c2de Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-16 10:11:57 +08:00
fan
697dfdd365 样式调整 2020-11-16 10:11:07 +08:00
joylink_cuiweidong
e3b4e46f2e 车站绘图代码调整 2020-11-16 10:08:37 +08:00
zyy
a752dcd2e5 调整路径配置，删除多余配置 2020-11-13 17:05:10 +08:00
zyy
b68424c3db Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-13 14:20:47 +08:00
zyy
bbff820716 调整流程删除多余配置 2020-11-13 14:19:52 +08:00
joylink_cuiweidong
34db1f439f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/utils/baseUrl.js
 2020-11-13 10:23:25 +08:00
joylink_cuiweidong
f4c88f7939 车站绘图代码调整 2020-11-13 10:21:36 +08:00
fan
f258d9b0b4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-13 10:16:10 +08:00
fan
b597d4efea 列车重叠调整 2020-11-13 10:13:05 +08:00
joylink_cuiweidong
d0421ff9fe 代码调整 2020-11-12 14:06:13 +08:00
fan
ffbb56ce57 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-12 09:05:01 +08:00
fan
7e288934bc 张赛IP调整 2020-11-12 09:04:37 +08:00
joylink_cuiweidong
1a7a6e27c7 连挂操作代码调整 2020-11-11 18:49:32 +08:00
joylink_cuiweidong
b8f26007e4 设置连挂操作代码调整 2020-11-11 18:40:02 +08:00
zyy
d1a5c3670f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-11 15:34:38 +08:00
zyy
62a756f521 调整格式 2020-11-11 15:34:24 +08:00
fan
a0cf632380 排列进路调整 2020-11-11 13:31:46 +08:00
zyy
d34b528cd4 调整描述名称 2020-11-10 14:41:51 +08:00
zyy
81144131b8 调整右键区段操作 2020-11-10 13:55:49 +08:00
zyy
488a452bce Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-10 13:42:45 +08:00
zyy
2df4c56a10 调整国赛故障模式操作 2020-11-10 13:42:29 +08:00
joylink_cuiweidong
f62fc8bbb3 指令字典生成 代码调整 2020-11-10 11:07:20 +08:00
zyy
35b3d115fc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-09 18:25:08 +08:00
zyy
c6b03fa4ee 增加列车托管、连挂流程 2020-11-09 18:24:57 +08:00
lVAL
87b19773e3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-09 13:01:11 +08:00
lVAL
779f76d4ec 1.优化修改data中的model属性，其他计算data中设别列表没有更新的问题 
2.修改激活状态点击修改后，未重置激活态的问题。
 2020-11-09 13:01:00 +08:00
zyy
8f1e38ce29 调整剧本显示，菜单显示 2020-11-06 14:11:16 +08:00
zyy
f3162dfbd8 调整场景描述位置，调整列车清空逻辑 2020-11-06 13:41:33 +08:00
joylink_cuiweidong
58e5635a72 教学实训操作定义代码调整 
运行图代码调整
 2020-11-06 11:04:38 +08:00
joylink_cuiweidong
fc46f0b55e 运行图 车次号方向代码调整 2020-11-04 18:35:27 +08:00
fan
2c79a2bce0 merge 2020-11-04 16:42:29 +08:00
fan
08a306f373 剧本条件调整 2020-11-04 16:41:01 +08:00
joylink_cuiweidong
8ff03944ce 哈尔滨教学实训代码调整 2020-11-04 16:14:41 +08:00
joylink_cuiweidong
d8ae05cb06 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 16:38:01 +08:00
fan
5378a06f25 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 16:39:35 +08:00
fan
22192206c4 设置头码车调整参数 2020-11-03 16:39:24 +08:00
joylink_cuiweidong
b9f71f75d9 添加剧本删除动作接口 
修改剧本编制样式
 2020-11-03 16:37:47 +08:00
zyy
eef7ccfba3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-03 16:18:29 +08:00
zyy
4c00fa1a90 调整国赛运行图显示 2020-11-03 16:18:15 +08:00
joylink_cuiweidong
6fbfa0dc1a 各线路站台配置文件扣车参数调整 
哈尔滨线路 站台 添加 扣车/越站 设置按钮
竞赛实操 场景排序
竞赛页面 添加场景11 操作按钮
 2020-11-03 16:06:11 +08:00
joylink_cuiweidong
fb09155f34 接触网 绘图状态代码调整 2020-11-03 09:55:11 +08:00
joylink_cuiweidong
30c71d02fb 供电线故障代码调整 2020-11-02 18:51:53 +08:00
joylink_cuiweidong
cfdb7d3187 故障操作 添加手动开启屏蔽门 2020-11-02 17:54:25 +08:00
joylink_cuiweidong
dff3b6b105 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-02 16:53:59 +08:00
joylink_cuiweidong
d135c4cf10 成都三号线 菜单点击代码调整 
屏蔽门故障 添加 屏蔽门无法开启 故障
 2020-11-02 16:52:58 +08:00
fan
6ba55206cb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-02 16:32:19 +08:00
fan
96ecadce56 实训问题调整 2020-11-02 16:32:08 +08:00
joylink_cuiweidong
b26f3044dc Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-11-02 16:12:29 +08:00
joylink_cuiweidong
50ffb22566 考试系统 教学系统 试题提示栏 拖拽样式调整 2020-11-02 16:12:10 +08:00
fan
9ace3fc66f 绘图问题调整 2020-11-02 14:03:13 +08:00
zyy
e2fd8ea49e 调整菜单右键 2020-10-30 17:40:12 +08:00
joylink_cuiweidong
d58aa3b4f2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-30 15:07:46 +08:00
joylink_cuiweidong
06b0360aa1 剧本编制代码调整 2020-10-30 15:06:05 +08:00
fan
95e010d046 报警状态调整 2020-10-30 14:41:42 +08:00
fan
8a92b5e448 报警状态调整 2020-10-30 14:39:38 +08:00
fan
4f567c474a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-30 14:15:12 +08:00
fan
7425506054 报警状态调整 2020-10-30 14:15:00 +08:00
zyy
b8c320fa5a Merge branch 'test-runPlan' into test 
# Conflicts:
#	src/jmapNew/theme/fuzhou_01/planConvert.js
 2020-10-30 10:30:30 +08:00
fan
a402b72bb3 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2020-10-30 09:56:32 +08:00
fan
05a56d395b 个人信息展示单位&其他问题修复 2020-10-30 09:56:19 +08:00
zyy
dee76b4288 过滤空置 2020-10-29 18:37:51 +08:00