Commit Graph

9320 Commits

Author SHA1 Message Date
fan
68cbbbab99 宁波一:区域选择限制控制权 2021-02-24 10:21:29 +08:00
fan
0ac7e5f8b5 成都工业登录页面调整 2021-02-24 09:44:43 +08:00
fan
4b0320061e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 18:17:23 +08:00
fan
f0cd6ff07c 问题调整 2021-02-23 18:17:15 +08:00
joylink_cuiweidong
180ee94bde Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 18:12:31 +08:00
joylink_cuiweidong
908cf9dddf 宁波三号线 控制权 状态调整 2021-02-23 18:12:12 +08:00
lVAL
460b48cd7e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 18:11:11 +08:00
lVAL
52b12d3442 线路:成都3
问题:引导信号机排列进路和未排列进路情况下执行指令的问题
2021-02-23 18:10:59 +08:00
joylink_cuiweidong
5bbfaec42e Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 17:46:08 +08:00
joylink_cuiweidong
93b7e782d4 宁波三号线控制权 状态 代码调整 2021-02-23 17:45:54 +08:00
lVAL
1c67b07706 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 16:57:51 +08:00
lVAL
d77b866da4 线路:成都3
问题:人解进路
2021-02-23 16:57:40 +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
lVAL
d7d3fee044 线路:成都3,佛山1,西安2
问题:
a.成都3实训描述问题
b.佛山引导实训不提示的问题
c.西安2引导实训不生成的问题
2021-02-23 16:32:42 +08:00
lVAL
cb8d4f9f03 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 14:54:24 +08:00
lVAL
a8a3a8a5cc 线路:南京2,宁波1,宁波3
问题:增加引导的实训
2021-02-23 14:54:14 +08:00
fan
1eb5dd05c3 问题调整 2021-02-23 14:20:05 +08:00
fan
6068ea00ef 添加线路配置stationPreResetBeforeAxlePreReset 2021-02-23 13:43:09 +08:00
fan
195de40008 车站计轴复位状态调整 2021-02-23 13:34:42 +08:00
fan
85a50338f4 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 13:04:43 +08:00
fan
069c1b7203 ibp盘计轴复位 2021-02-23 13:04:29 +08:00
lVAL
420f67693d Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 12:17:04 +08:00
lVAL
cf912b7834 线路:宁波3
问题:增加设置跳停的操作
2021-02-23 12:16:54 +08:00
joylink_cuiweidong
f0a3e0005d 删除 宁波三号线 暂时不用的文件 2021-02-23 09:27:50 +08:00
joylink_cuiweidong
914b710e43 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-23 09:18:03 +08:00
joylink_cuiweidong
b1353c6d69 宁波三号线 控制权转移 下放控制 收回控制 代码调整 2021-02-23 09:17:44 +08:00
lVAL
0f492cfbe2 修改配置描述 2021-02-23 08:59:39 +08:00
lVAL
e52242773c Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 18:56:49 +08:00
lVAL
dafe484a0a 修改为人解列车进路 2021-02-22 18:56:39 +08:00
fan
a432cfc632 实训调整 2021-02-22 18:51:24 +08:00
fan
33c76f6098 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 18:48:31 +08:00
fan
8adadc5858 区域控制权在实训中不生效 2021-02-22 18:48:24 +08:00
lVAL
867d09cd4a Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 18:47:00 +08:00
lVAL
7110d2f06f 修改菜单列表 2021-02-22 18:46:52 +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
23385f1718 修改实训名称 2021-02-22 18:38:24 +08:00
lVAL
20ba9fbc15 优化代码 没有参数e 报错的问题 2021-02-22 18:13:55 +08:00
lVAL
e5cba385b1 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 17:50:54 +08:00
lVAL
08de82a230 线路:宁波1
问题:站台部分操作完成后,深蓝色高亮未清除干净
2021-02-22 17:49:55 +08:00
fan
6f91ee4b28 区域控制权在实训中不生效 2021-02-22 17:17:54 +08:00
fan
0f5805addc 线路配置添加参数 2021-02-22 17:07:59 +08:00
fan
6501a68a1c merge 2021-02-22 16:43:01 +08:00
fan
04efafeb5c 宁波一 根据区域选择控制权 限制菜单 2021-02-22 16:41:30 +08:00
lVAL
07b38833fd 线路:宁波1
问题:mouseEvent.mouseout 报错问题
2021-02-22 16:34:56 +08:00
lVAL
609d34b8fb Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 16:29:55 +08:00
lVAL
f016e0f6bf 线路:宁波1
问题:设置道岔操作时,岔芯蓝色高亮设置
2021-02-22 16:29:45 +08:00
fan
33dc1ea677 Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 16:17:04 +08:00
fan
63a37caed3 宁波一 区域选择 2021-02-22 16:16:54 +08:00