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 |
|
joylink_cuiweidong
|
9cdecca6bd
|
成都三号线 添加设置联锁控操作
成都三号线 添加设置 联锁控实训，引导总锁，取消引导总锁实训
|
2021-02-05 11:01:21 +08:00 |
|
lVAL
|
7a10d0497a
|
线路：佛山，宁波3
问题：控制模式实训配置
|
2021-02-03 13:27:11 +08:00 |
|
fan
|
39e7cb83b9
|
南京二选中区段调整
|
2021-01-29 17:17:41 +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
|
20a71051c7
|
线路：佛州
问题：设置限速和取消限速，配置逻辑区段生成实训
|
2021-01-29 11:08:03 +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
|
98342c2423
|
南京二号线遮盖信号机的颜色调整
|
2021-01-25 10:23:13 +08:00 |
|
fan
|
32f68ed895
|
道岔状态调整
|
2021-01-22 19:35:14 +08:00 |
|
fan
|
d2d854b0c0
|
预复位调整
|
2021-01-22 17:46:51 +08:00 |
|
fan
|
97d8a66ccb
|
道岔的故障和预复位的显示
|
2021-01-22 16:55:00 +08:00 |
|
joylink_cuiweidong
|
a9ea00c0c8
|
南京十一站 代码调整
|
2021-01-21 18:39:00 +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 |
|
fan
|
c6e9e1fe38
|
列车状态调整
|
2021-01-19 16:07:32 +08:00 |
|
fan
|
12be0c61cb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 13:26:05 +08:00 |
|
fan
|
daea6e1760
|
传输信号机选中状态
|
2021-01-19 13:25:53 +08:00 |
|
lVAL
|
5f80334433
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 13:04:06 +08:00 |
|
lVAL
|
696af622b7
|
调整南京2岔芯设置限速和设置封锁
|
2021-01-19 13:03:43 +08:00 |
|
fan
|
732c44fea0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-19 11:10:04 +08:00 |
|
fan
|
145259d3b5
|
传输信号机 && 佛山进路预览调整
|
2021-01-19 11:09:53 +08:00 |
|
joylink_cuiweidong
|
05a8c85d6b
|
代码调整
|
2021-01-19 09:20:37 +08:00 |
|
joylink_cuiweidong
|
4cbc3de4ea
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 18:06:23 +08:00 |
|
joylink_cuiweidong
|
ba80512efa
|
南京二号线 站台添加 月台 按钮
|
2021-01-18 18:06:08 +08:00 |
|
fan
|
f18c48ffa8
|
南京二号线初始获取车站调整&计轴占用状态调整
|
2021-01-18 17:24:00 +08:00 |
|
fan
|
1ba5d404b5
|
南京二号线进路锁闭封锁状态调整
|
2021-01-18 16:51:45 +08:00 |
|
fan
|
14091957d7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 15:41:43 +08:00 |
|
joylink_cuiweidong
|
d322aad5d4
|
南京二号线 站台安全门 通信正常开启状态 调整
|
2021-01-18 15:16:00 +08:00 |
|
fan
|
6aea2334e6
|
南京二号线 控制模式none 车站字体闪烁
|
2021-01-18 14:10:55 +08:00 |
|
joylink_cuiweidong
|
74b9c8cc7e
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-01-18 13:40:29 +08:00 |
|
joylink_cuiweidong
|
5687ffc5a8
|
南京二号线 区段 轨区设限 代码调整
|
2021-01-18 13:37:45 +08:00 |
|
fan
|
fa412d1079
|
南京二号线 状态调整
|
2021-01-18 10:52:06 +08:00 |
|
joylink_cuiweidong
|
69737a06f0
|
区段 颜色配置文件调整
|
2021-01-15 18:36:13 +08:00 |
|
joylink_cuiweidong
|
f61df9b1e8
|
岔心状态 绘图代码调整
|
2021-01-15 17:17:17 +08:00 |
|
lVAL
|
89dacd7deb
|
增加南京2号线 信号机配置
|
2021-01-15 16:40:23 +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 |
|
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 |
|
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
|
ec30635c02
|
修改应答器图层以及回车修改属性的问题
|
2021-01-15 10:59:58 +08:00 |
|
fan
|
15928a6248
|
道岔封锁状态调整
|
2021-01-15 09:42:19 +08:00 |
|
fan
|
ab804e3b95
|
南京二号线状态调整 道岔长闪
|
2021-01-14 16:26:04 +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 |
|
joylink_cuiweidong
|
845f10caf6
|
岔心绘图代码调整
bug调整：新建完一个信号机 三个状态不发生改变
|
2021-01-14 13:04:04 +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 |
|
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
|
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 |
|
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
|
a024699e8f
|
西安二号线 控制模式 绘图调整
|
2020-12-31 18:02:55 +08:00 |
|
fan
|
730b673da2
|
泰雷兹屏蔽门
|
2020-12-30 11:15:05 +08:00 |
|
fan
|
72db8b3e94
|
紧急停车状态调整
|
2020-12-29 11:04:01 +08:00 |
|
joylink_cuiweidong
|
8b04f92d7a
|
成都的三号线 信号封锁状态 绘图代码调整
|
2020-12-23 10:23:29 +08:00 |
|
fan
|
1bc7da3c53
|
哈尔滨 联锁机故障&重启令解
|
2020-12-21 16:09:43 +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
|
9d74937073
|
宁波二号线样式调整
|
2020-12-21 09:25:17 +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 |
|
fan
|
2ddc94f7aa
|
南京二号线皮肤调整
|
2020-12-18 13:10:55 +08:00 |
|
joylink_cuiweidong
|
213d14b212
|
新增南京二号线 线路配置文件
|
2020-12-18 09:30:18 +08:00 |
|
fan
|
80ebd84062
|
宁波三号线调整
|
2020-12-10 17:34:13 +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 |
|
fan
|
a9b94c8e5d
|
国赛界面去掉截止日期&拦截器提示登出修复&宁波三号线
|
2020-12-08 18:43:55 +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
|
4ac37c5d18
|
单位调整
|
2020-12-01 18:50:23 +08:00 |
|
joylink_cuiweidong
|
1010df5613
|
北交大 客流站场仿真界面 代码调整
|
2020-11-20 14:21:57 +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
|
b597d4efea
|
列车重叠调整
|
2020-11-13 10:13:05 +08:00 |
|
fan
|
08a306f373
|
剧本条件调整
|
2020-11-04 16:41:01 +08:00 |
|