ival
|
c161f19b1b
|
修改跑车
|
2019-07-26 17:13:03 +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 |
|
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
|
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 |
|
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 |
|
zyy
|
3afd5f8e61
|
修改代码
|
2019-07-25 14:03:26 +08:00 |
|
ival
|
a95bf7c338
|
修改代码
|
2019-07-25 13:24:40 +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
|
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
|
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 |
|
zyy
|
23117a8f1f
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/theme/batong.js
|
2019-07-22 17:20:31 +08:00 |
|
zyy
|
9c743e8bee
|
desc: 修改代码
|
2019-07-22 17:20:01 +08:00 |
|
ival
|
ee29e51779
|
修改代码
|
2019-07-22 17:16:27 +08:00 |
|
ival
|
bc9f244d5f
|
增加代码
|
2019-07-22 15:49:15 +08:00 |
|
ival
|
d7ed4c73ce
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/Switch/ESwCore.js
# src/jmap/shape/Switch/index.js
|
2019-07-22 15:46:28 +08:00 |
|
ival
|
2ca2c0f193
|
修改代码
|
2019-07-22 15:43:42 +08:00 |
|
zyy
|
dd32206ef0
|
修改道岔代码
|
2019-07-22 15:32:25 +08:00 |
|
zyy
|
e9b66e1cea
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-22 13:41:34 +08:00 |
|
zyy
|
274a48c33b
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/Switch/index.js
|
2019-07-22 13:41:12 +08:00 |
|
ival
|
fdc15d109e
|
增加文件
|
2019-07-22 13:40:15 +08:00 |
|
zyy
|
70599404bd
|
desc: 修改代码
|
2019-07-22 13:39:33 +08:00 |
|
ival
|
3dd126da3a
|
修改代码
|
2019-07-22 13:39:03 +08:00 |
|
zyy
|
e5748b0a6c
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-22 09:33:19 +08:00 |
|
zyy
|
4a0363ddc2
|
调整zlevel canvas 层级
|
2019-07-22 09:33:11 +08:00 |
|
ival
|
042ad9fe6b
|
修改代码
|
2019-07-22 09:14:56 +08:00 |
|
ival
|
62391acfd8
|
修改事件绑定
|
2019-07-21 21:22:49 +08:00 |
|
ival
|
7848448a95
|
修正代码
|
2019-07-21 20:20:41 +08:00 |
|
ival
|
389b9b13ed
|
修改代码
|
2019-07-21 18:59:42 +08:00 |
|
ival
|
23232fcf78
|
修改代码
|
2019-07-19 18:32:19 +08:00 |
|
ival
|
15ab35d5b9
|
修改代码
|
2019-07-19 18:05:43 +08:00 |
|
ival
|
fa02c97851
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/transformHandle.js
|
2019-07-19 18:02:22 +08:00 |
|
ival
|
a1a2b1d21e
|
修改代码
|
2019-07-19 18:01:42 +08:00 |
|
zyy
|
7e7723e9ef
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-19 17:53:15 +08:00 |
|
zyy
|
f42a3e2afc
|
修改代码
|
2019-07-19 17:53:06 +08:00 |
|
ival
|
80ef1f9ee3
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-19 17:51:50 +08:00 |
|
ival
|
8f3e466cf5
|
修改代码
|
2019-07-19 17:51:40 +08:00 |
|
zyy
|
046e603fe7
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-19 15:18:05 +08:00 |
|
zyy
|
058e688602
|
修改代码
|
2019-07-19 15:17:58 +08:00 |
|
ival
|
65e93a0a8e
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-19 15:16:02 +08:00 |
|
ival
|
561ab7521b
|
修改代码
|
2019-07-19 15:15:51 +08:00 |
|
zyy
|
c912074739
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/map.js
# src/jmap/shape/Signal/index.js
# src/views/jmap/index.vue
|
2019-07-19 14:31:45 +08:00 |
|
zyy
|
d99d1b9ecc
|
修改代码
|
2019-07-19 14:30:26 +08:00 |
|
ival
|
452c9fe7d7
|
修改代码
|
2019-07-19 13:54:23 +08:00 |
|
ival
|
9bdd8e15c5
|
修改代码
|
2019-07-19 11:11:34 +08:00 |
|
ival
|
fcd9f7dad4
|
修改代码
|
2019-07-19 09:40:22 +08:00 |
|
ival
|
e3341dcd04
|
修改代码
|
2019-07-19 09:23:56 +08:00 |
|
ival
|
8f534ce10a
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-18 18:27:48 +08:00 |
|
zyy
|
d8f0c74cbf
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/map.js
|
2019-07-18 18:27:10 +08:00 |
|
ival
|
c4cad61cb6
|
修改
|
2019-07-18 18:26:56 +08:00 |
|
zyy
|
a72feee896
|
修改代码
|
2019-07-18 18:25:57 +08:00 |
|
ival
|
ed840d2359
|
修改代码
|
2019-07-18 18:24:40 +08:00 |
|
ival
|
3a0e467221
|
修改代码
|
2019-07-18 17:21:18 +08:00 |
|
ival
|
257945d203
|
修改代码
|
2019-07-18 17:07:09 +08:00 |
|
ival
|
eb86ca65a5
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-18 17:02:07 +08:00 |
|
ival
|
892d8a5e9d
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/views/jmap/index.vue
|
2019-07-18 17:01:21 +08:00 |
|
zyy
|
2138dab1a6
|
修改代码
|
2019-07-18 16:11:48 +08:00 |
|