lVAL
|
62b5cea8fb
|
提交修改的接口文件
|
2021-02-24 11:30:57 +08:00 |
|
lVAL
|
8727f91638
|
修改 实训步骤接口
|
2021-02-24 11:23:59 +08:00 |
|
lVAL
|
9b8d3b72d6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-24 11:09:36 +08:00 |
|
lVAL
|
a31e6da5cf
|
问题：实训步骤参数增加order
|
2021-02-24 11:04:35 +08:00 |
|
joylink_cuiweidong
|
70d440b2b6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-24 10:43:32 +08:00 |
|
joylink_cuiweidong
|
b47cff956a
|
宁波三号线 控制权转移 代码调整
|
2021-02-24 10:43:07 +08:00 |
|
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 |
|
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 |
|
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
|
7483b1be46
|
调整综合演练现地设备显示
|
2021-02-20 13:28:11 +08:00 |
|
fan
|
37d44bf6d2
|
现地 设备显示调整
|
2021-02-20 10:42:25 +08:00 |
|
fan
|
8a2f3b02ac
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-20 09:28:34 +08:00 |
|
fan
|
7e80d34e50
|
宁波一 信号机封锁调整
|
2021-02-20 09:27:21 +08:00 |
|
lVAL
|
c6ecccc788
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 18:30:34 +08:00 |
|
lVAL
|
7583442a2f
|
优化，排列进路加载速度
|
2021-02-19 18:30:26 +08:00 |
|
fan
|
fdeebc9e60
|
添加线路配置参数
|
2021-02-19 18:27:26 +08:00 |
|
fan
|
14f8b05538
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 18:26:02 +08:00 |
|
fan
|
77af4b9288
|
宁波一： 操作流程调整
|
2021-02-19 18:25:51 +08:00 |
|
lVAL
|
1f438bb2ee
|
修改 宁波车次窗显示状态
|
2021-02-19 17:39:38 +08:00 |
|
lVAL
|
4a64a59ce4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 17:27:20 +08:00 |
|
lVAL
|
3b53548ba1
|
宁波1号线 鼠标选择高亮状态
|
2021-02-19 17:27:10 +08:00 |
|
fan
|
5fe0250639
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 14:47:32 +08:00 |
|
fan
|
d083f56a7e
|
宁波一： 操作流程调整
|
2021-02-19 14:47:23 +08:00 |
|
joylink_cuiweidong
|
7d3dfc2d31
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 13:28:53 +08:00 |
|
joylink_cuiweidong
|
414aa1a3ca
|
地图绘制 列车数据模型更改
|
2021-02-19 13:28:19 +08:00 |
|
fan
|
159cd4cdf0
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 11:06:20 +08:00 |
|
fan
|
2f8c2a3d42
|
宁波一： 设置扣车流程调整&区故解二次确认调整提示
|
2021-02-19 11:06:03 +08:00 |
|
lVAL
|
86a420d8ec
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 10:43:06 +08:00 |
|
lVAL
|
b7ea10b459
|
修改宁波3号线 操作中的部分bug
|
2021-02-19 10:42:58 +08:00 |
|
fan
|
b44011057c
|
宁波一： 取消进路流程调整
|
2021-02-19 10:10:53 +08:00 |
|
fan
|
10bef80096
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 09:32:01 +08:00 |
|
fan
|
b43537cf94
|
宁波一： 排列进路流程微调
|
2021-02-19 09:31:35 +08:00 |
|
lVAL
|
2aff2be8b4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 09:26:36 +08:00 |
|
lVAL
|
1030f13d37
|
修改宁波3号线，二次确认 锁闭标题问题；
修改西安2号线，定操、反操实训第一步描述错误。
|
2021-02-19 09:26:26 +08:00 |
|
fan
|
baa0ba70a3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-19 09:12:39 +08:00 |
|
fan
|
827e52e0f4
|
宁波一： 全站进路交自动控
|
2021-02-19 09:12:09 +08:00 |
|
joylink_cuiweidong
|
1aa597fa39
|
宁波一号线 区故解指令代码调整 计轴预复位报错调整
|
2021-02-18 18:23:33 +08:00 |
|
joylink_cuiweidong
|
8bd93ba1d7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-18 17:03:25 +08:00 |
|
joylink_cuiweidong
|
0e9454f890
|
宁波一号线 现地 设置进路报错提示调整
|
2021-02-18 17:03:08 +08:00 |
|
fan
|
b30ffd5635
|
宁波一 设置/取消全站自动通过进路
|
2021-02-18 16:58:35 +08:00 |
|
fan
|
c7e63a3d22
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-18 16:22:23 +08:00 |
|
fan
|
e2a36fdf92
|
宁波一 设置/取消全站自动通过进路
|
2021-02-18 16:22:15 +08:00 |
|
joylink_cuiweidong
|
c0c5356f8a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-18 15:50:32 +08:00 |
|
joylink_cuiweidong
|
5762399c6b
|
宁波一号线 菜单样式调整
|
2021-02-18 15:50:14 +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
|
22101f30c0
|
添加 baseUrl配置
|
2021-02-18 14:15:44 +08:00 |
|
lVAL
|
d85bf0424d
|
更新 .gitignore
|
2021-02-18 14:10:56 +08:00 |
|
lVAL
|
78fc1ca5e9
|
修改 gitignore配置
|
2021-02-18 13:39:43 +08:00 |
|
lVAL
|
f482a4cf71
|
问题：仿真系统添加“运行图编制工作站”的路由和操作
|
2021-02-18 13:37:54 +08:00 |
|
lVAL
|
88e0c99135
|
线路：宁波
问题：修改排列进路预览，选择性进路后，以左侧信号机左对齐设置显示偏移
|
2021-02-18 10:18:51 +08:00 |
|
lVAL
|
b0fe7b7755
|
线路：宁波1
问题：排列进路展开预览多次后，图不显示的问题
|
2021-02-18 09:57:31 +08:00 |
|
lVAL
|
c6fc85397a
|
修改排列进路的操作的问题
|
2021-02-18 09:55:15 +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 |
|
fan
|
3366718864
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-05 18:11:06 +08:00 |
|
fan
|
510b26c86c
|
宁波一新指令
|
2021-02-05 18:10:55 +08:00 |
|
lVAL
|
3475d573a6
|
修改代码
|
2021-02-05 18:07:35 +08:00 |
|
lVAL
|
a038ca7040
|
增加 宁波线处理
|
2021-02-05 18:01:16 +08:00 |
|
lVAL
|
d7c17d0935
|
修改道岔太短的问题
|
2021-02-05 18:00:06 +08:00 |
|
joylink_cuiweidong
|
70556faea6
|
北交大 客流系统 代码调整
|
2021-02-05 17:29:25 +08:00 |
|
joylink_cuiweidong
|
7a949cd5e2
|
北交大 客流系统 大客流策略 代码调整
|
2021-02-05 17:23:09 +08:00 |
|
joylink_cuiweidong
|
f94f3deadf
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-05 17:06:18 +08:00 |
|
joylink_cuiweidong
|
a429f53015
|
北交大 客流系统 大客流策略 页面代码调整
|
2021-02-05 17:05:42 +08:00 |
|
fan
|
b6550e6500
|
国赛取消注释 取消临时限速函数
|
2021-02-05 16:30:11 +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
|
62bf080515
|
成都三号线 引导总锁 实训代码调整
|
2021-02-05 14:55:55 +08:00 |
|
joylink_cuiweidong
|
871a04e441
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-05 11:01:41 +08:00 |
|
joylink_cuiweidong
|
9cdecca6bd
|
成都三号线 添加设置联锁控操作
成都三号线 添加设置 联锁控实训，引导总锁，取消引导总锁实训
|
2021-02-05 11:01:21 +08:00 |
|
fan
|
88683b3763
|
代码调整
|
2021-02-05 09:19:18 +08:00 |
|
fan
|
766059611c
|
国赛=》取消临时限速 取消注释
(cherry picked from commit 18b5688cdf)
|
2021-02-05 09:18:15 +08:00 |
|
joylink_cuiweidong
|
3233ce39f0
|
北交大 客流代码调整
|
2021-02-04 18:34:31 +08:00 |
|
joylink_cuiweidong
|
e0f2d0a288
|
北交大 客流 代码调整
|
2021-02-04 18:30:02 +08:00 |
|
joylink_cuiweidong
|
68d2ecd6db
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-04 17:18:25 +08:00 |
|
joylink_cuiweidong
|
61fb768bdc
|
北交大客流项目 大客流策略
|
2021-02-04 17:17:45 +08:00 |
|
lVAL
|
d0ce0a9132
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-04 13:30:03 +08:00 |
|
lVAL
|
c70a383e91
|
线路：宁波3
问题：增加宁波3 用户权限/转移控制/请求区域控制权|授权转移|下放站控|回收站控 菜单和实训配置。
|
2021-02-04 13:29:47 +08:00 |
|
sunzhenyu
|
f3e95ffccb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-04 13:28:00 +08:00 |
|
sunzhenyu
|
a96b8be0fa
|
修改三维客流列车车站订阅消息处理
|
2021-02-04 13:27:53 +08:00 |
|
fan
|
3bfa419bbe
|
宁波一 上电解锁调整
|
2021-02-04 13:23:42 +08:00 |
|
fan
|
3b87f7ef14
|
注释：执行关键操作测试
|
2021-02-04 13:10:24 +08:00 |
|
fan
|
e8de151360
|
宁波一操作实训策略调整&线路配置参数
|
2021-02-04 13:08:59 +08:00 |
|
sunzhenyu
|
8cb4ef4bdc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-04 11:03:57 +08:00 |
|
sunzhenyu
|
67d8c9467c
|
修改三维客流订阅连接，增加三维车站管理界面
|
2021-02-04 11:03:48 +08:00 |
|
lVAL
|
bb1c8eca45
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-03 17:07:23 +08:00 |
|
lVAL
|
ff7e32ec0d
|
线路：宁波1，成都3
问题：补充缺失部分实训，成都的全线取消扣车，宁波的设置折返
|
2021-02-03 17:07:05 +08:00 |
|
joylink_cuiweidong
|
2de373dd24
|
北交大 客流系统 退出系统 关闭其他窗口
|
2021-02-03 15:44:18 +08:00 |
|
joylink_cuiweidong
|
3a91ccfa0a
|
北交大 客流策略 代码调整
|
2021-02-03 14:08:58 +08:00 |
|
joylink_cuiweidong
|
acbbf14d1c
|
北交大 代码调整
|
2021-02-03 13:45:11 +08:00 |
|
joylink_cuiweidong
|
dd6f3cf7d3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-03 13:40:40 +08:00 |
|
joylink_cuiweidong
|
2968b1ddfb
|
北交大客流策略 添加
|
2021-02-03 13:40:11 +08:00 |
|
lVAL
|
7a10d0497a
|
线路：佛山，宁波3
问题：控制模式实训配置
|
2021-02-03 13:27:11 +08:00 |
|
lVAL
|
579858d02a
|
线路：南京2
问题：配置插芯的实训区段限制
|
2021-02-03 09:46:17 +08:00 |
|
lVAL
|
b7b90fe707
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 19:00:15 +08:00 |
|
fan
|
3e50519732
|
宁波一实训折返策略调整
|
2021-02-02 19:00:48 +08:00 |
|
lVAL
|
6dd4e305b3
|
修改实训配置
|
2021-02-02 19:00:03 +08:00 |
|
fan
|
f5e0539e6d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 18:55:42 +08:00 |
|
fan
|
83a1eecb40
|
宁波一实训折返策略调整
|
2021-02-02 18:55:33 +08:00 |
|
joylink_cuiweidong
|
eeb7e3afad
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/ningbo_03/menus/menuDialog/initializeSignalCanBlock.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/signalBlock.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/stationControl.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/switchActive.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/switchBlock.vue
|
2021-02-02 18:16:51 +08:00 |
|
joylink_cuiweidong
|
c149f33a99
|
删除无用的代码
|
2021-02-02 18:06:02 +08:00 |
|
fan
|
18dcc3b089
|
BUG 160: 宁波一：控制模式（按钮）处缺少紧急站控
|
2021-02-02 17:54:40 +08:00 |
|
fan
|
1729082bac
|
折返策略 宁波一实训
|
2021-02-02 17:28:56 +08:00 |
|
fan
|
8aaaf9f9df
|
国赛提交试卷后初始化结果
|
2021-02-02 17:23:29 +08:00 |
|
fan
|
ec32fb62ff
|
折返策略 宁波一实训
|
2021-02-02 17:13:05 +08:00 |
|
fan
|
264770d316
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 17:03:53 +08:00 |
|
fan
|
c7e0bdc1e7
|
国赛理论测试显示结果调整
|
2021-02-02 17:03:39 +08:00 |
|
lVAL
|
a6070c49f2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/theme/ningbo_03/menus/menuDialog/allocateTime.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/signalModel.vue
# src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue
|
2021-02-02 16:45:24 +08:00 |
|
lVAL
|
7d9803165c
|
修改，宁波线路，道岔状态更改，操作界面检测，不刷新页面的问题
|
2021-02-02 16:40:58 +08:00 |
|
fan
|
e7b47de9f6
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 16:35:06 +08:00 |
|
fan
|
7d60412e96
|
国赛试题调整
|
2021-02-02 16:34:55 +08:00 |
|
joylink_cuiweidong
|
efd8c86762
|
宁波一号线，南京二号线，哈尔滨一号线 删除不需要的代码
|
2021-02-02 16:28:03 +08:00 |
|
joylink_cuiweidong
|
e73d5d33d8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 15:22:28 +08:00 |
|
joylink_cuiweidong
|
14cd1948b3
|
福州一号线 佛山一号线 删除不需要的代码
|
2021-02-02 15:22:13 +08:00 |
|
fan
|
e4881b4efc
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 14:53:46 +08:00 |
|
fan
|
a431f17246
|
实训调整
|
2021-02-02 14:53:33 +08:00 |
|
joylink_cuiweidong
|
1abd14d7e9
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 14:10:06 +08:00 |
|
joylink_cuiweidong
|
2ddd9a0dc8
|
北京一号线/成都1，3号线 删除不需要的代码
|
2021-02-02 14:09:46 +08:00 |
|
fan
|
d594af49e2
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-02 11:03:24 +08:00 |
|
fan
|
f66e3e3cc0
|
实训代码调整
|
2021-02-02 11:03:11 +08:00 |
|
joylink_cuiweidong
|
2ca7c33966
|
宁波三号线 操作调整
|
2021-02-02 10:57:41 +08:00 |
|
lVAL
|
dbdfe26e86
|
修改宁波3 检测selected的方式
|
2021-02-02 10:49:25 +08:00 |
|
lVAL
|
3acdfc95fd
|
修改 action 引入state
|
2021-02-02 10:26:59 +08:00 |
|
lVAL
|
7c80fc77c6
|
修改代码
|
2021-02-02 10:25:21 +08:00 |
|
lVAL
|
7b11378443
|
修改 宁波 selected报错问题
|
2021-02-02 09:41:35 +08:00 |
|
lVAL
|
ef8066f9ef
|
修改分页查询 表单显示
|
2021-02-02 09:13:14 +08:00 |
|
lVAL
|
cb7ae5fe6b
|
线路：宁波3
问题：实训提示描述
|
2021-02-02 09:09:11 +08:00 |
|
lVAL
|
231898af92
|
增加指令产品类型展示。
|
2021-02-02 09:04:06 +08:00 |
|
lVAL
|
6be29c157b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-01 18:36:20 +08:00 |
|
lVAL
|
0a2f2b08b3
|
增加信号机和站台 显示
|
2021-02-01 18:36:07 +08:00 |
|
fan
|
07efc9ae51
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2021-02-01 18:31:23 +08:00 |
|