Commit Graph

9400 Commits

Author SHA1 Message Date
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
lVAL
b804f78dae Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test 2021-02-22 10:56:57 +08:00
lVAL
9b42af2dd6 优化提示问题 2021-02-22 10:56:50 +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
joylink_cuiweidong
1d41095b46 运行图 转换函数代码调整
宁波三号线 控制权转移 请求区域控制代码调整
2021-02-22 10:13:14 +08:00
lVAL
48b1bc9ae4 线路:宁波1
问题:
1.优化区域选择,点击应用后关闭弹窗;
2.修改控制模式的文字状态不发生变化。
2021-02-22 09:19:20 +08:00
lVAL
6d7abac8d8 线路: 北京1 宁波1
问题: 关于选择设备后,两次操作第二次操作中有时候无故高亮消失的问题
2021-02-20 18:23:26 +08:00
lVAL
faf2bc09a1 线路:宁波1
问题:修改代码中组件名称重复导致的错误
2021-02-20 17:24:49 +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
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
fan
871b9beb5d merge 2021-02-20 15:57:34 +08:00
fan
7413d131c3 区域选择 2021-02-20 15:55:53 +08:00
joylink_cuiweidong
f38c4fcb91 代码调整 2021-02-20 15:51:39 +08:00