fan
|
41493fff28
|
调整：esLint+车次窗
|
2019-07-25 14:48:55 +08:00 |
|
ival
|
9acdab0b5b
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-25 14:20:03 +08:00 |
|
ival
|
5d6a7fd637
|
修改代码
|
2019-07-25 14:19:55 +08:00 |
|
zyy
|
3afd5f8e61
|
修改代码
|
2019-07-25 14:03:26 +08:00 |
|
zyy
|
61564dfdbf
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/views/jlmap/index.vue
|
2019-07-25 13:35:58 +08:00 |
|
zyy
|
d22823bccc
|
修改代码
|
2019-07-25 13:26:20 +08:00 |
|
ival
|
1828c5d27b
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-25 13:24:48 +08:00 |
|
ival
|
a95bf7c338
|
修改代码
|
2019-07-25 13:24:40 +08:00 |
|
zyy
|
e14460f1ef
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-25 11:08:23 +08:00 |
|
zyy
|
40425777c2
|
修改代码
|
2019-07-25 11:08:16 +08:00 |
|
ival
|
83c6fccfc9
|
修改代码
|
2019-07-25 11:07:32 +08:00 |
|
ival
|
1c980c5613
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/views/jlmap/index.vue
|
2019-07-25 10:59:21 +08:00 |
|
ival
|
a3c6e75448
|
修改代码
|
2019-07-25 10:58:17 +08:00 |
|
zyy
|
cf0cabadaf
|
调整代码
|
2019-07-25 10:55:31 +08:00 |
|
ival
|
8b46424116
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/router/index.js
# src/store/index.js
# src/store/modules/config.js
# src/views/components/progressBar/index.vue
# src/views/jlmap/index.vue
# src/views/jlmap/zoom/zoom.vue
# src/views/mapsystem/common/index.vue
# src/views/mapsystem/index.vue
|
2019-07-25 10:35:10 +08:00 |
|
ival
|
b11ba5369e
|
移植jlmap
|
2019-07-25 10:32:29 +08:00 |
|
zyy
|
987030db35
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/theme/bejing.js
|
2019-07-25 10:31:20 +08:00 |
|
zyy
|
75e3162d68
|
修改代码
|
2019-07-25 10:30:30 +08:00 |
|
fan
|
83bcfceb7d
|
调整：列车皮肤调整
|
2019-07-25 08:59:25 +08:00 |
|
fan
|
0b9ca8cade
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/jmap/config/defaultSkin.js
# src/jmap/shape/Train/index.js
# src/jmap/theme/bejing.js
|
2019-07-25 08:56:56 +08:00 |
|
fan
|
557f98f4b4
|
调整：列车抽象
|
2019-07-25 08:50:07 +08:00 |
|
zyy
|
42ae0b4a0d
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-24 14:33:56 +08:00 |
|
zyy
|
59933cf4b9
|
修改代码
|
2019-07-24 14:33:50 +08:00 |
|
ival
|
dfd337e93f
|
修改字体设置
|
2019-07-24 13:50:37 +08:00 |
|
ival
|
2b8afd0010
|
修改代码
|
2019-07-24 13:02:19 +08:00 |
|
ival
|
2d43350ff6
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-24 11:24:30 +08:00 |
|
ival
|
e8dad49c5f
|
修改代码
|
2019-07-24 11:24:13 +08:00 |
|
zyy
|
886c51259d
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-24 11:12:21 +08:00 |
|
zyy
|
e06411df1c
|
desc: 修改section代码
|
2019-07-24 11:12:15 +08:00 |
|
ival
|
8a4239a865
|
修改代码
|
2019-07-24 10:13:01 +08:00 |
|
ival
|
7609233eb5
|
修改代码
|
2019-07-24 10:02:07 +08:00 |
|
ival
|
aa89b91153
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-24 09:23:21 +08:00 |
|
ival
|
540dc4e346
|
修改代码
|
2019-07-24 09:23:08 +08:00 |
|
zyy
|
627a7d86c8
|
修改代码
|
2019-07-24 09:21:10 +08:00 |
|
ival
|
bdf42ae492
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/Signal/ESigLamp.js
# src/jmap/shape/Signal/index.js
|
2019-07-24 09:10:45 +08:00 |
|
ival
|
68d83c2a88
|
修改代码
|
2019-07-23 18:49:54 +08:00 |
|
zyy
|
1e5dbf8105
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/Signal/index.js
|
2019-07-23 18:46:42 +08:00 |
|
zyy
|
d26085b8a5
|
修改代码
|
2019-07-23 18:33:30 +08:00 |
|
ival
|
a5528542cc
|
修改代码
|
2019-07-23 18:30:08 +08:00 |
|
ival
|
b2da416325
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/Signal/ESigAuto.js
# src/jmap/shape/Signal/ESigButton.js
# src/jmap/shape/Signal/ESigLmap.js
# src/jmap/shape/Signal/ESigPost.js
# src/jmap/shape/Signal/ESigRoute.js
# src/jmap/shape/Signal/index.js
# src/jmap/theme/fuzhou.js
|
2019-07-23 18:24:05 +08:00 |
|
ival
|
b9132cb29f
|
修改
|
2019-07-23 18:22:05 +08:00 |
|
ival
|
1bab212c05
|
修改代码
|
2019-07-23 18:21:49 +08:00 |
|
zyy
|
b938022cbf
|
Merge branch 'dev'
|
2019-07-23 18:15:25 +08:00 |
|
zyy
|
2604b12120
|
修改代码
|
2019-07-23 18:13:50 +08:00 |
|
zyy
|
9115574bc0
|
修改代码
|
2019-07-23 18:10:42 +08:00 |
|
ival
|
e334901490
|
Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev
# Conflicts:
# src/jmap/shape/Signal/index.js
|
2019-07-23 18:07:18 +08:00 |
|
ival
|
39af264196
|
修改代码
|
2019-07-23 18:06:13 +08:00 |
|
zyy
|
ffe150a351
|
修改代码
|
2019-07-23 18:05:26 +08:00 |
|
zyy
|
b2482467fe
|
修改代码
|
2019-07-23 13:40:55 +08:00 |
|
zyy
|
af6e9fe3c9
|
修改代码
|
2019-07-22 17:27:09 +08:00 |
|