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

1031 Commits

Author SHA1 Message Date
fan
006b9762e1 merge 2021-05-14 15:07:00 +08:00
fan
ddfddfa292 代码调整 2021-05-14 15:05:57 +08:00
joylink_cuiweidong
f4cd046f1a 大铁项目 根据车站值班员 显示绘图 2021-05-13 13:55:02 +08:00
joylink_cuiweidong
d52a5837b4 宁波三 列车绘图代码调整 2021-05-12 14:17:14 +08:00
fan
2849342be6 大铁线路操作调整 2021-04-29 16:26:08 +08:00
fan
ae5df5de5b 大铁线路操作调整 2021-04-29 13:25:48 +08:00
fan
5678d8dfad 信号机坐标编辑显示 2021-04-28 18:46:04 +08:00
fan
823c30118c 大铁仿真操作调整 2021-04-28 16:58:29 +08:00
fan
6ec82c158f 大铁仿真操作调整 2021-04-28 13:36:58 +08:00
fan
83eddd42d3 大铁仿真操作调整 2021-04-27 15:52:39 +08:00
fan
b107ae58d6 大铁仿真操作调整 2021-04-27 14:40:17 +08:00
fan
09781774c7 大铁线路操作调整 2021-04-26 17:59:23 +08:00
fan
d917ccce3d 大铁线路操作调整 2021-04-25 18:13:47 +08:00
fan
b26d17f607 信号机状态调整 2021-04-23 18:11:07 +08:00
fan
4fcaffae50 大铁仿真调整 2021-04-23 10:24:05 +08:00
fan
16fb67127b 信号按钮名称显示调整 2021-04-21 10:44:15 +08:00
fan
3ba2f8ac5b merge 2021-04-20 17:29:32 +08:00
fan
0226042942 宁波三Bug调整 2021-04-20 17:25:27 +08:00
joylink_cuiweidong
852d53f4a4 代码调整 2021-04-19 17:54:13 +08:00
joylink_cuiweidong
dfb80a8eb2 代码调整 2021-04-19 09:31:07 +08:00
joylink_cuiweidong
48c91eb1a9 信号机按钮绘图代码调整 2021-04-16 18:06:12 +08:00
joylink_cuiweidong
84169141ab 大铁 指示灯 代码调整 2021-04-16 14:22:29 +08:00
joylink_cuiweidong
ad03a0a2bf 信号机代码调整 2021-04-16 10:56:36 +08:00
ival
14f718ec1a 增加指示器显示 2021-04-15 18:15:12 +08:00
ival
b75483ded0 删除无用打印 2021-04-15 16:30:28 +08:00
ival
d903ce7fb7 增加区段的脱轨其设备 2021-04-15 16:26:12 +08:00
ival
86ad53cfe9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-14 13:55:30 +08:00
ival
22ddd9f722 修改代码 2021-04-14 13:55:16 +08:00
joylink_cuiweidong
eadb7a5748 大铁线路 车站绘图元素添加 2021-04-14 10:24:57 +08:00
joylink_cuiweidong
6b4bdbc8fd Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-13 18:24:59 +08:00
joylink_cuiweidong
ea834dc86a 大铁项目 区段状态代码调整 2021-04-13 18:24:41 +08:00
fan
8575de2bd9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-13 18:09:52 +08:00
fan
0b5cc8e15d 信号按钮调整 2021-04-13 18:09:37 +08:00
ival
821d0b28e2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-04-13 17:37:48 +08:00
ival
693938a367 调整 打铁 道岔状态皮肤配置 2021-04-13 17:37:40 +08:00
joylink_cuiweidong
bc83661f1f 大铁线路 区段状态代码调整 2021-04-13 17:23:12 +08:00
joylink_cuiweidong
58d7f9233e 大铁 区段状态代码调整 2021-04-13 17:06:13 +08:00
fan
8a363c068a 大铁调整 2021-04-13 14:10:20 +08:00
fan
7901886d3b 宁波三操作调整 2021-04-12 18:19:52 +08:00
fan
51d2d32979 宁波三号线操作调整 2021-04-09 17:49:46 +08:00
fan
8e9afa9c9b 宁波三号线操作调整 2021-04-09 13:18:51 +08:00
fan
17995e2f40 取消mfa等故障状态add 2021-04-06 15:05:54 +08:00
fan
924e6154a3 南京十一站屏蔽门开启影响站停时间显示调整 2021-04-06 09:43:45 +08:00
joylink_cuiweidong
f8bebd192e 南京二号线 封锁岔心 状态代码跳转 2021-04-01 17:31:19 +08:00
joylink_cuiweidong
866b661c4f 南京二号线 岔心 绘图 代码调整 2021-03-12 13:45:14 +08:00
joylink_cuiweidong
29a4dfac76 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-11 15:01:28 +08:00
joylink_cuiweidong
05ff67f546 南京二号线 岔心 通信车占用状态/非通信车占用状态 代码调整 2021-03-11 15:00:52 +08:00
fan
8631b66be9 岔芯预复位报错调整 2021-03-11 09:17:57 +08:00
fan
d9d2e9b6cd 道岔计轴添加关联岔芯参数&宁波三排列进路到 2021-03-10 17:18:35 +08:00
joylink_cuiweidong
2146b28b9a 宁波三号线 运行线 代码调整 2021-03-10 10:25:05 +08:00
joylink_cuiweidong
5352671383 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/views/planMonitor/editTool/menus/addTask.vue
 2021-03-09 10:34:16 +08:00
ival
2fe27a3c47 问题：运行图编辑问题 
1：交路设置 ，转换轨<——>折返轨    或者   折返轨 <——>折返轨
2：高亮问题处理
 2021-03-04 13:45:25 +08:00
joylink_cuiweidong
759d62b52a 西安二号线 下令停车 取消停车命令添加 列车绘图状态调整 2021-03-02 18:50:58 +08:00
joylink_cuiweidong
398e813490 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-03-02 15:47:12 +08:00
joylink_cuiweidong
972ab3006d 宁波三号线 运行线 绘图与操作页面 代码调整 2021-03-02 15:45:48 +08:00
ival
e48543d5ee 线路：西安2 
问题：
1.扣车和跳停互斥的问题；
2.为获取控制权时，没有限制排列进路的问题
3.修改车站AU/MN LA 的绘图处理
 2021-03-02 15:06:40 +08:00
ival
5278c2308a 线路：宁波1号线 
问题：调试 全线取消限速、设置电灯实训过程
 2021-03-01 18:36:33 +08:00
ival
eac7f13784 修改南京2，操作车站的部分问题 2021-03-01 10:29:39 +08:00
lVAL
1580a89770 线路：宁波一，南京2 
问题：
a.南京2现地实训进入后，视图有的站没有拆分成两列
b.修改宁波一，设置通过dialog的title提示
c.恢复showStationContent函数的加入位置
d.删除代码中的一些无用注释代码
 2021-02-26 16:23:16 +08:00
lVAL
7df00e6d64 线路：福州 
问题：福州线路双灯引导后的始端信号机为一红一黄，前状态未处理。
 2021-02-25 13:40:23 +08:00
lVAL
52b1a87e9c 线路：成都3 
问题：现地第一次加载，引导按钮没有显示的问题
 2021-02-25 11:18:59 +08:00
lVAL
979d38053f Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-24 18:53:07 +08:00
lVAL
461d64afe1 线路：南京2，哈尔滨 
问题：
1.绘制哈尔滨传输信号机
2.处理传输信号机的逻辑处理问题
 2021-02-24 18:52:38 +08:00
joylink_cuiweidong
7da97340b6 宁波三号线 控制权转换 代码调整 2021-02-24 18:11:50 +08:00
joylink_cuiweidong
c40fae43ad 宁波三号线 控制权转移 代码调整 2021-02-24 14:57:23 +08:00
joylink_cuiweidong
b47cff956a 宁波三号线 控制权转移 代码调整 2021-02-24 10:43:07 +08:00
joylink_cuiweidong
908cf9dddf 宁波三号线 控制权 状态调整 2021-02-23 18:12:12 +08:00
joylink_cuiweidong
93b7e782d4 宁波三号线控制权 状态 代码调整 2021-02-23 17:45:54 +08:00
joylink_cuiweidong
6bcdc9993d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/shape/Station/index.js
 2021-02-23 16:39:48 +08:00
joylink_cuiweidong
2ffc9e0781 宁波三号线 控制权状态 代码处理 2021-02-23 16:37:42 +08:00
fan
1eb5dd05c3 问题调整 2021-02-23 14:20:05 +08:00
fan
195de40008 车站计轴复位状态调整 2021-02-23 13:34:42 +08:00
joylink_cuiweidong
dbf1006f8a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 18:38:55 +08:00
joylink_cuiweidong
1a0e2a1c84 宁波三号线 控制权转移 下放站控 请求区域控制 代码调整 2021-02-22 18:38:38 +08:00
lVAL
20ba9fbc15 优化代码 没有参数e 报错的问题 2021-02-22 18:13:55 +08:00
lVAL
08de82a230 线路：宁波1 
问题：站台部分操作完成后，深蓝色高亮未清除干净
 2021-02-22 17:49:55 +08:00
lVAL
f016e0f6bf 线路：宁波1 
问题：设置道岔操作时，岔芯蓝色高亮设置
 2021-02-22 16:29:45 +08:00
fan
e6814f4def merge 2021-02-22 10:31:30 +08:00
fan
dc3e3d7b7e 宁波一 计轴复位按钮操作 2021-02-22 10:27:32 +08:00
joylink_cuiweidong
61be91ed77 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 10:15:11 +08:00
joylink_cuiweidong
4b8782cf05 代码调整 2021-02-22 10:15:01 +08:00
lVAL
a4b55d303b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-20 17:14:59 +08:00
lVAL
36364f9f26 线路：宁波1 
问题：道岔和区段 选择设备后高亮在菜单出来后消失的问题
 2021-02-20 17:14:52 +08:00
fan
2e385e7fe2 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-20 17:11:02 +08:00
fan
fdf63db248 车站计轴复位（未完） 2021-02-20 17:10:10 +08:00
lVAL
17057cc014 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/config/skinCode/ningbo_01.js
 2021-02-20 17:03:45 +08:00
lVAL
69f5379356 调整福州1号线实训 2021-02-20 17:02:40 +08:00
joylink_cuiweidong
466d57b4be Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-20 15:05:36 +08:00
joylink_cuiweidong
86ac34e899 泰雷兹 宁波三号线 控制权转移代码调整 2021-02-20 15:05:25 +08:00
joylink_cuiweidong
858c7dd7a7 宁波三号线（泰雷兹线路） 系统扣车设置/取消 操作添加 2021-02-20 15:03:44 +08:00
fan
7e80d34e50 宁波一 信号机封锁调整 2021-02-20 09:27:21 +08:00
lVAL
3b53548ba1 宁波1号线 鼠标选择高亮状态 2021-02-19 17:27:10 +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
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
lVAL
a038ca7040 增加 宁波线处理 2021-02-05 18:01:16 +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
9cdecca6bd 成都三号线 添加设置联锁控操作 
成都三号线 添加设置 联锁控实训，引导总锁，取消引导总锁实训
 2021-02-05 11:01:21 +08:00
fan
88683b3763 代码调整 2021-02-05 09:19:18 +08:00
fan
83a1eecb40 宁波一实训折返策略调整 2021-02-02 18:55:33 +08:00
joylink_cuiweidong
7818a149c4 福州一号线 道岔计轴预复位 操作定义调整 2021-02-01 11:23:37 +08:00
lVAL
fa5b6027d3 删除无用打印 2021-01-29 16:21:19 +08:00
lVAL
20a71051c7 线路：佛州 
问题：设置限速和取消限速，配置逻辑区段生成实训
 2021-01-29 11:08:03 +08:00
lVAL
ba5de90773 配置 南京2实训 2021-01-27 18:32:16 +08:00
joylink_cuiweidong
b2adbb8eda 删除不需要的文件 2021-01-27 13:06:24 +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
f92e017f1b 调整南京二号线岔区设限显示 2021-01-26 18:19:04 +08:00
fan
abed3ef7c1 BUG108: 浙大网新仿真：道岔单解时出现字母“E”后，右键点击出现“使能”，此时不点击使能，而点击空白处，再点击字母E，没有反应，并且初始化后E还在闪烁 && 南京二排列进路后封锁区段显示调整 2021-01-26 16:19:29 +08:00
joylink_cuiweidong
bd9917c0ca 道岔区段 切除闪烁绘图代码调整 2021-01-26 14:04:17 +08:00
joylink_cuiweidong
194b31094d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 17:48:00 +08:00
joylink_cuiweidong
6b0d8cf772 代码调整 2021-01-25 17:47:49 +08:00
fan
f4db53df3f 调整南京二号线显示问题 2021-01-25 17:42:01 +08:00
joylink_cuiweidong
e49cce6b8a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-25 13:51:23 +08:00
joylink_cuiweidong
41447e97dc 代码调整 2021-01-25 13:51:13 +08:00
joylink_cuiweidong
d3546c5de2 岔心鼠标事件 绘图代码调整 2021-01-25 13:48:37 +08:00
fan
98342c2423 南京二号线遮盖信号机的颜色调整 2021-01-25 10:23:13 +08:00
fan
a55f69a3cb 南京二号线 延时解锁 2021-01-22 21:28:30 +08:00
fan
32f68ed895 道岔状态调整 2021-01-22 19:35:14 +08:00
fan
97d8a66ccb 道岔的故障和预复位的显示 2021-01-22 16:55:00 +08:00
fan
e0fe554699 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-22 13:59:42 +08:00
fan
4a0c7e1e95 逻辑区段实际长度设置调整 2021-01-22 13:59:32 +08:00
joylink_cuiweidong
5d7810b6f9 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 19:19:41 +08:00
joylink_cuiweidong
3e6da71787 代码调整 2021-01-21 19:19:20 +08:00
fan
2cdbc1ee78 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 19:12:17 +08:00
fan
258796555e 车队进路调整 2021-01-21 19:11:50 +08:00
joylink_cuiweidong
2b6e1ca117 岔心 代码调整 2021-01-21 19:02:28 +08:00
joylink_cuiweidong
a9ea00c0c8 南京十一站 代码调整 2021-01-21 18:39:00 +08:00
fan
45fd2d348b Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 16:32:22 +08:00
fan
5b69262124 南京二好像长闪短闪调整 2021-01-21 16:32:11 +08:00
lVAL
5bf71f2d7a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 15:28:32 +08:00
lVAL
c3c3548574 修改，西安2 删除现地 信号机封锁解封配置 2021-01-21 15:28:21 +08:00
joylink_cuiweidong
be9e15567e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 14:15:18 +08:00
joylink_cuiweidong
16f255fcae bug136 南铁院11站：现地仿真里岔心设置限速后不显示数字 调整 2021-01-21 14:15:00 +08:00
fan
e71fe4cea8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-21 13:45:32 +08:00
fan
6df9350155 卡斯柯实训调整&南京二号线封锁调整 2021-01-21 13:45:20 +08:00
joylink_cuiweidong
1d32bd66b4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 
# Conflicts:
#	src/jmapNew/theme/foshan_01/operationConfig.js
 2021-01-21 11:04:25 +08:00
fan
89700f2245 卡斯柯调整 2021-01-21 10:05:59 +08:00
fan
5a36ce69fe 添加线路配置项 signalHumanControlBeforeSetAtsControlOrCIAutoTrigger、cancelAtsControlOfAllRoutesWhenCancelRoute 2021-01-20 16:26:32 +08:00
fan
2e4cdc698e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 16:07:37 +08:00
fan
70045c8f87 现地行调条件显示调整 2021-01-20 16:07:10 +08:00
lVAL
5764a103c8 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-20 15:53:51 +08:00
lVAL
c8e2b30271 增加 成都3 中控、站控、紧急站控、扣车、设置跳停、取消跳停实训 2021-01-20 15:53:36 +08:00
fan
34aca8de12 现地行调条件显示调整 2021-01-20 15:53:13 +08:00
lVAL
332aa9b61a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-19 18:22:14 +08:00
lVAL
35a98a6e00 修改 nameAlone 报错的优化 2021-01-19 18:22:04 +08:00
joylink_cuiweidong
10ed69f5ec 代码调整 2021-01-19 17:44:18 +08:00
joylink_cuiweidong
745dbd6859 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-01-19 17:15:07 +08:00
joylink_cuiweidong
df6ede1e4b 南京二号线 站台操作调整 2021-01-19 17:14:47 +08:00