Commit Graph

485 Commits

Author SHA1 Message Date
joylink_cuiweidong
ad03a0a2bf 信号机代码调整 2021-04-16 10:56:36 +08:00
ival
14f718ec1a 增加指示器显示 2021-04-15 18:15:12 +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
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
joylink_cuiweidong
de4691da44 代码调整 2021-04-13 15:40:35 +08:00
fan
0bb06fd142 大铁调整 2021-04-13 13:52:39 +08:00
fan
34859f8f51 大铁调整 2021-04-13 13:50:24 +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
d9d2e9b6cd 道岔计轴添加关联岔芯参数&宁波三排列进路到 2021-03-10 17:18:35 +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
lVAL
461d64afe1 线路:南京2,哈尔滨
问题:
1.绘制哈尔滨传输信号机
2.处理传输信号机的逻辑处理问题
2021-02-24 18:52:38 +08:00
joylink_cuiweidong
93b7e782d4 宁波三号线控制权 状态 代码调整 2021-02-23 17:45:54 +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
f016e0f6bf 线路:宁波1
问题:设置道岔操作时,岔芯蓝色高亮设置
2021-02-22 16:29:45 +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
1d41095b46 运行图 转换函数代码调整
宁波三号线 控制权转移 请求区域控制代码调整
2021-02-22 10:13:14 +08:00
lVAL
48b1bc9ae4 线路:宁波1
问题:
1.优化区域选择,点击应用后关闭弹窗;
2.修改控制模式的文字状态不发生变化。
2021-02-22 09:19:20 +08:00
fan
efcb9ff262 冲掉代码回补 2021-02-20 17:13:27 +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
fan
7e80d34e50 宁波一 信号机封锁调整 2021-02-20 09:27:21 +08:00
lVAL
1f438bb2ee 修改 宁波车次窗显示状态 2021-02-19 17:39:38 +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
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