fan
|
9466f7f399
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-12 10:51:16 +08:00 |
|
fan
|
429fe6d6a7
|
跳停上下行取值调整&列车识别号显示调整
|
2020-06-12 10:51:06 +08:00 |
|
zyy
|
f7c6f6ee64
|
调整区段配置
|
2020-06-12 09:55:53 +08:00 |
|
fan
|
9294c582f8
|
domId调整
|
2020-06-12 09:41:16 +08:00 |
|
fan
|
c8b2f4cfa7
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 18:36:25 +08:00 |
|
fan
|
9de92f7106
|
宁波一号线列车设置计划车、人工车、头码车
|
2020-06-11 18:36:15 +08:00 |
|
joylink_cuiweidong
|
9126397070
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 18:33:49 +08:00 |
|
joylink_cuiweidong
|
b341735a8c
|
剧本代码调整
|
2020-06-11 18:32:26 +08:00 |
|
program-walker
|
3d3bca02a8
|
Merge remote-tracking branch 'origin/test'
|
2020-06-11 17:56:00 +08:00 |
|
zyy
|
6402e6312b
|
调整逻辑区段 名称偏移量
|
2020-06-11 17:53:35 +08:00 |
|
zyy
|
547c7efe5a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 17:39:46 +08:00 |
|
zyy
|
9c0d69e81e
|
删除逻辑对应车次窗
|
2020-06-11 17:39:33 +08:00 |
|
fan
|
979f116f3a
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 17:28:25 +08:00 |
|
fan
|
434d7fdbbe
|
信号机批量设置灯位类型
|
2020-06-11 17:28:15 +08:00 |
|
program-walker
|
a140c47f32
|
Merge remote-tracking branch 'origin/test'
|
2020-06-11 17:19:38 +08:00 |
|
zyy
|
e9713fc471
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 17:07:14 +08:00 |
|
fan
|
0f1ae1e8a8
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 17:06:49 +08:00 |
|
fan
|
fb570eb522
|
sics调整
|
2020-06-11 17:06:37 +08:00 |
|
zyy
|
3e9835ff15
|
调整字段显示
|
2020-06-11 17:06:29 +08:00 |
|
zyy
|
ffd5fc79bd
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 14:48:54 +08:00 |
|
zyy
|
24acb1ba86
|
调整配置，增加综合监控数据
|
2020-06-11 14:48:40 +08:00 |
|
joylink_cuiweidong
|
f03880e59e
|
仿真聊天代码调整
|
2020-06-11 13:43:58 +08:00 |
|
joylink_cuiweidong
|
285749f3eb
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 13:29:31 +08:00 |
|
joylink_cuiweidong
|
dda8f39adf
|
新版地图右键操作 弹窗代码调整
|
2020-06-11 13:29:06 +08:00 |
|
fan
|
d16cd89fe4
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 11:26:48 +08:00 |
|
fan
|
7d7583a7e2
|
时间表管理&添加通用配置项
|
2020-06-11 11:26:41 +08:00 |
|
zyy
|
bee7b64e8d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 11:12:02 +08:00 |
|
zyy
|
0a58b253e1
|
调整绘图元素皮肤，调整大屏高度
|
2020-06-11 11:11:47 +08:00 |
|
sunzhenyu
|
4cdda87372
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-11 10:48:15 +08:00 |
|
sunzhenyu
|
52437f157f
|
修改三维驾驶换端车门动画变化bug
|
2020-06-11 10:48:04 +08:00 |
|
program-walker
|
9d5e7f0d6f
|
Merge remote-tracking branch 'origin/test'
|
2020-06-11 09:47:18 +08:00 |
|
joylink_cuiweidong
|
3e6da59b3b
|
代码调整
|
2020-06-11 09:44:56 +08:00 |
|
joylink_cuiweidong
|
cb3663722f
|
代码调整
|
2020-06-11 09:43:02 +08:00 |
|
joylink_cuiweidong
|
8f2e7f974e
|
代码调整
|
2020-06-10 18:38:50 +08:00 |
|
joylink_cuiweidong
|
7a7b442a89
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-10 18:03:10 +08:00 |
|
joylink_cuiweidong
|
95715a9f12
|
代码调整
|
2020-06-10 18:02:46 +08:00 |
|
zyy
|
7f5d99b48f
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-10 18:00:11 +08:00 |
|
zyy
|
e688625887
|
调整大屏高度计算
|
2020-06-10 17:59:51 +08:00 |
|
fan
|
3352b94149
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-10 17:58:35 +08:00 |
|
fan
|
1d2619cd28
|
menu-bar显示条件调整
|
2020-06-10 17:58:20 +08:00 |
|
zyy
|
ce87a96db3
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
# Conflicts:
# src/jmapNew/map.js
|
2020-06-10 17:04:12 +08:00 |
|
zyy
|
75e9db45fa
|
调整右键菜单
|
2020-06-10 17:02:39 +08:00 |
|
fan
|
9b489d088b
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-10 16:57:04 +08:00 |
|
fan
|
139066d66f
|
综合演练非管理员同步计时&综合演练切大屏&iscs机电时间表管理
|
2020-06-10 16:56:52 +08:00 |
|
sunzhenyu
|
4cec1efc09
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-10 16:30:58 +08:00 |
|
sunzhenyu
|
763e0841c0
|
注释
|
2020-06-10 16:30:48 +08:00 |
|
sunzhenyu
|
365cd7de44
|
增加列车开关门操作
|
2020-06-10 16:30:23 +08:00 |
|
joylink_cuiweidong
|
c953d98ffa
|
佛山线路 现地信号机 操作调整
|
2020-06-10 14:37:43 +08:00 |
|
joylink_cuiweidong
|
4118eb7a32
|
线路配置添加参数 列车控制模式/级别
|
2020-06-10 13:42:06 +08:00 |
|
joylink_cuiweidong
|
c73769f90d
|
Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test
|
2020-06-10 13:24:27 +08:00 |
|