ival
|
ed01ac7180
|
修改代码
|
2019-07-26 17:39:05 +08:00 |
|
ival
|
8f2712e3d8
|
修改代码
|
2019-07-26 17:35:58 +08:00 |
|
ival
|
ab86340524
|
修改列车跑车计算
|
2019-07-26 17:18:27 +08:00 |
|
ival
|
c161f19b1b
|
修改跑车
|
2019-07-26 17:13:03 +08:00 |
|
zyy
|
7be6ca66fc
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/views/map/mapdraft/mapedit/mapoperate/link.vue
|
2019-07-26 16:01:18 +08:00 |
|
zyy
|
1305046304
|
修改代码
|
2019-07-26 15:59:31 +08:00 |
|
ival
|
95d944b671
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/TrainWindow/index.js
|
2019-07-26 15:53:57 +08:00 |
|
ival
|
4dec6ac93d
|
调试仿真
|
2019-07-26 15:52:50 +08:00 |
|
fan
|
7a4fabcb69
|
调整：列车调整
|
2019-07-26 15:45:30 +08:00 |
|
ival
|
2192b1eea4
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-26 13:32:56 +08:00 |
|
ival
|
9f5130a4f2
|
代码移植
|
2019-07-26 13:32:43 +08:00 |
|
zyy
|
797f31f142
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/views/jlmap/index.vue
|
2019-07-26 12:18:40 +08:00 |
|
zyy
|
e04e0f1c67
|
desc: 修改代码
|
2019-07-26 12:17:53 +08:00 |
|
fan
|
fd4c9b8b91
|
调整：修改代码
|
2019-07-26 10:57:54 +08:00 |
|
ival
|
75be303baf
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-26 10:39:06 +08:00 |
|
ival
|
2a0aea6bfe
|
修改页面点击事件
|
2019-07-26 10:38:57 +08:00 |
|
fan
|
bca25edfff
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
|
2019-07-26 09:49:12 +08:00 |
|
fan
|
c17d600851
|
调整：修改代码
|
2019-07-26 09:38:45 +08:00 |
|
ival
|
a6ab80a816
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-25 18:25:16 +08:00 |
|
ival
|
58911eef1a
|
修改代码
|
2019-07-25 18:25:04 +08:00 |
|
fan
|
8a165e0bc6
|
调整：esLint调整
|
2019-07-25 17:59:51 +08:00 |
|
ival
|
06f45dd0cb
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-25 15:53:55 +08:00 |
|
ival
|
1873c3301f
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/theme/batong.js
# src/jmap/theme/bejing.js
# src/jmap/theme/chengdu.js
# src/jmap/theme/fuzhou.js
|
2019-07-25 15:53:42 +08:00 |
|
zyy
|
601d0e2d91
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-25 15:48:58 +08:00 |
|
zyy
|
e32ab592a4
|
desc: 修改代码
|
2019-07-25 15:48:51 +08:00 |
|
ival
|
eefa6cb62d
|
123123
|
2019-07-25 15:44:53 +08:00 |
|
ival
|
f28f5fc1cd
|
修改代码
|
2019-07-25 15:44:23 +08:00 |
|
fan
|
33b37f9e89
|
调整：代码修改
|
2019-07-25 15:42:40 +08:00 |
|
fan
|
0d878bcc6a
|
调整：esLint调整
|
2019-07-25 14:57:23 +08:00 |
|
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 |
|