zyy
|
7bba3d49d6
|
desc: 修改代码
|
2019-07-31 19:09:45 +08:00 |
|
zyy
|
5af196522e
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-31 18:46:51 +08:00 |
|
zyy
|
99bcfa56ac
|
修改代码
|
2019-07-31 18:46:37 +08:00 |
|
fan
|
0d379faf11
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/LcControl/index.js
# src/jmap/shape/LimitControl/index.js
# src/jmap/shape/StationControl/index.js
# src/jmap/shape/ZcControl/index.js
|
2019-07-31 18:39:08 +08:00 |
|
fan
|
a03798a748
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/LcControl/index.js
# src/jmap/shape/LimitControl/index.js
# src/jmap/shape/StationControl/index.js
# src/jmap/shape/ZcControl/index.js
|
2019-07-31 18:38:29 +08:00 |
|
fan
|
0fc306714b
|
调整：control增加悬浮移出事件
|
2019-07-31 18:24:28 +08:00 |
|
zyy
|
cfbb21b9bb
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/Section/index.js
# src/jmap/shape/Switch/index.js
|
2019-07-31 18:20:39 +08:00 |
|
zyy
|
1a44bfb002
|
修改代码
|
2019-07-31 18:19:15 +08:00 |
|
ival
|
871a9fbbe2
|
修改代码
|
2019-07-31 15:54:20 +08:00 |
|
ival
|
3042cf229d
|
修改代码
|
2019-07-31 14:59:38 +08:00 |
|
fan
|
1d18028d41
|
调整：福州列车从左往右不显示
|
2019-07-31 13:56:44 +08:00 |
|
ival
|
5270c0bc2a
|
删除无用代码，增加信号机和站台鼠标代码
|
2019-07-31 11:06:14 +08:00 |
|
ival
|
0157f32fc0
|
修改加载代码
|
2019-07-31 09:13:37 +08:00 |
|
zyy
|
851c0a4a6a
|
desc: 修改代码
|
2019-07-30 18:45:32 +08:00 |
|
zyy
|
deccfc537a
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-30 18:03:04 +08:00 |
|
zyy
|
09285fb326
|
修改代码
|
2019-07-30 18:02:58 +08:00 |
|
fan
|
2919ae5a15
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-07-30 17:27:39 +08:00 |
|
fan
|
dd4d83f02b
|
调整：代码调整
|
2019-07-30 17:27:29 +08:00 |
|
ival
|
b00bb22a8c
|
修改菜单状态控制
|
2019-07-30 16:57:08 +08:00 |
|
ival
|
7a71fc42ae
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-30 16:47:22 +08:00 |
|
ival
|
276f68e7bc
|
修改优化代码
|
2019-07-30 16:47:11 +08:00 |
|
zyy
|
82c49c97e2
|
调整代码
|
2019-07-30 15:52:30 +08:00 |
|
zyy
|
2099c6f8ba
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/map.js
|
2019-07-30 13:30:33 +08:00 |
|
zyy
|
d65f7fb334
|
desc: 修改代码
|
2019-07-30 13:29:54 +08:00 |
|
ival
|
66b2406d91
|
修改回拉设置bug
|
2019-07-30 12:44:51 +08:00 |
|
ival
|
9152b6a55e
|
增加 Line 和 Text 设备移植，以及调试代码
|
2019-07-30 12:37:31 +08:00 |
|
ival
|
5b4cbba9eb
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-30 09:48:23 +08:00 |
|
ival
|
ce82f25422
|
修改代码
|
2019-07-30 09:48:14 +08:00 |
|
fan
|
d580c31e58
|
调整：table页form表头不生效
|
2019-07-30 09:45:52 +08:00 |
|
ival
|
0742f9b633
|
修改操作
|
2019-07-30 09:35:00 +08:00 |
|
ival
|
a59d579d57
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/Signal/index.js
|
2019-07-30 09:19:18 +08:00 |
|
ival
|
ca433c2eb6
|
修改设备结构
|
2019-07-30 09:18:24 +08:00 |
|
fan
|
4b69c12542
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-07-29 18:15:11 +08:00 |
|
fan
|
42caa08fc2
|
调整：跑图调整
|
2019-07-29 18:11:33 +08:00 |
|
ival
|
33e6b6ab43
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/store/modules/map.js
|
2019-07-29 17:57:55 +08:00 |
|
ival
|
c4a6b076da
|
修改菜单处理
|
2019-07-29 17:57:00 +08:00 |
|
zyy
|
5517f5a467
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-29 17:10:37 +08:00 |
|
zyy
|
264eea1d78
|
修改 车站 道岔地图绘制 配置
|
2019-07-29 17:10:30 +08:00 |
|
ival
|
cdccd7b41f
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-29 16:03:27 +08:00 |
|
ival
|
05c90f1079
|
修改代码
|
2019-07-29 16:03:14 +08:00 |
|
zyy
|
4da098c1fd
|
desc: 调整绘图数据
|
2019-07-29 15:49:28 +08:00 |
|
zyy
|
c05db4daed
|
调整格式
|
2019-07-29 15:30:11 +08:00 |
|
zyy
|
d5e5f3b644
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-29 15:24:04 +08:00 |
|
zyy
|
00dc541830
|
调整配置代码
|
2019-07-29 15:23:55 +08:00 |
|
ival
|
9693c2a2f9
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-29 13:45:53 +08:00 |
|
ival
|
69ed6c5eea
|
处理菜单
|
2019-07-29 13:45:38 +08:00 |
|
fan
|
1eb577a2ed
|
调整：代码修改
|
2019-07-29 13:38:02 +08:00 |
|
fan
|
b50fd1aae3
|
调整：代码修改
|
2019-07-29 13:29:30 +08:00 |
|
ival
|
ca01e0aeb7
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/Section/index.js
# src/jmap/shape/Switch/index.js
|
2019-07-29 11:20:20 +08:00 |
|
ival
|
33442905be
|
修改道岔状态变化
|
2019-07-29 11:18:50 +08:00 |
|