ival
|
dd5218dae5
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/views/jlmap/index.vue
# src/views/map/runplan/manage/operateMenu.vue
|
2019-08-02 14:19:06 +08:00 |
|
ival
|
60aa181598
|
修改皮肤配置
|
2019-08-02 14:17:43 +08:00 |
|
zyy
|
4ff4d812a9
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-08-02 10:58:34 +08:00 |
|
zyy
|
a010f71252
|
调整运行图加载， eventbus代码调整
|
2019-08-02 10:58:28 +08:00 |
|
fan
|
7162f5ce42
|
调整：stationControl调整
|
2019-08-02 10:39:59 +08:00 |
|
zyy
|
04e13a7a73
|
调整代码
|
2019-08-02 10:36:17 +08:00 |
|
zyy
|
ff9e69585d
|
desc: 调整剧本加载，删除城市注释
|
2019-08-01 15:19:24 +08:00 |
|
fan
|
4be4c87327
|
调整：福州control调整
|
2019-08-01 09:57:29 +08:00 |
|
fan
|
cba988e5d3
|
调整：仿真管理地图列表页调整
|
2019-08-01 08:50:24 +08:00 |
|
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 |
|
zyy
|
9e8e5afe41
|
修改配置文件代码
|
2019-07-29 10:59:02 +08:00 |
|
zyy
|
c2400c07e1
|
desc: 增加区段配置
|
2019-07-29 10:20:18 +08:00 |
|
ival
|
10cd98fe6f
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-29 09:27:49 +08:00 |
|
ival
|
21fd4ec516
|
修改区段状态变化
|
2019-07-29 09:27:33 +08:00 |
|
fan
|
9241e91364
|
调整：列车问题调整
|
2019-07-29 08:46:29 +08:00 |
|
ival
|
a74053360d
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-26 18:54:52 +08:00 |
|
ival
|
02bd1e9d40
|
调试跑车
|
2019-07-26 18:54:42 +08:00 |
|
zyy
|
a9127022fd
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-26 18:53:51 +08:00 |
|
zyy
|
06c5c60364
|
desc: 增加section配置
|
2019-07-26 18:53:44 +08:00 |
|
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
|
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
|
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
|
fc75783d94
|
修改代码
|
2019-07-22 13:40:14 +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 |
|
ival
|
e1219c9908
|
修改代码
|
2019-07-18 15:28:19 +08:00 |
|
zyy
|
e82c7fb5af
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-18 10:17:49 +08:00 |
|
zyy
|
c51ca002ed
|
desc: 修改代码
|
2019-07-18 10:17:42 +08:00 |
|
ival
|
4692405b68
|
修改代码
|
2019-07-18 10:16:53 +08:00 |
|
ival
|
57dd676c4a
|
修改代码
|
2019-07-18 10:08:26 +08:00 |
|
ival
|
47171b872e
|
修改代码
|
2019-07-18 10:05:16 +08:00 |
|
ival
|
6774d555bf
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/theme/fuzhou.js
|
2019-07-18 08:57:09 +08:00 |
|
ival
|
dcd977e161
|
修改
|
2019-07-18 08:56:17 +08:00 |
|
zyy
|
02cef2dc8c
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-17 18:18:42 +08:00 |
|
zyy
|
bc9e02144e
|
desc: 修改代码
|
2019-07-17 18:18:28 +08:00 |
|
ival
|
73e847aa55
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-17 18:17:02 +08:00 |
|
ival
|
74bc2653d1
|
修改代码
|
2019-07-17 18:16:52 +08:00 |
|
zyy
|
ea23e6c817
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/theme/bejing.js
|
2019-07-17 15:54:31 +08:00 |
|
zyy
|
c5c5a4c9f9
|
desc: 修改代码
|
2019-07-17 15:54:01 +08:00 |
|
ival
|
cac49ad418
|
修改代码
|
2019-07-17 15:53:13 +08:00 |
|
ival
|
f2651e5844
|
修改代码
|
2019-07-17 12:17:41 +08:00 |
|
ival
|
38d5cc1b2e
|
修改代码
|
2019-07-17 11:19:08 +08:00 |
|
ival
|
22c1b93a40
|
111
|
2019-07-17 09:17:49 +08:00 |
|
ival
|
098b4c860e
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-17 09:12:16 +08:00 |
|
ival
|
9b3d3a97c8
|
修改代码
|
2019-07-17 09:12:05 +08:00 |
|
zyy
|
f8adc05375
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/element/ETextName.js
|
2019-07-17 09:09:00 +08:00 |
|
zyy
|
ddbf5edeb2
|
desc: 增加单个绘图元素
|
2019-07-17 09:08:23 +08:00 |
|
ival
|
0f669bfcbd
|
修改
|
2019-07-16 18:44:40 +08:00 |
|
ival
|
82fbb5240f
|
修改代码
|
2019-07-16 18:37:49 +08:00 |
|
ival
|
37310e6a3c
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/Section.js
# src/jmap/shape/factory.js
|
2019-07-16 16:31:04 +08:00 |
|
ival
|
25e6c8ceb8
|
修改代码
|
2019-07-16 16:29:31 +08:00 |
|
zyy
|
896438f51e
|
desc: 调整道岔显示位置
|
2019-07-16 16:19:01 +08:00 |
|
zyy
|
cecc0edf27
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-16 16:04:02 +08:00 |
|
zyy
|
f348e05074
|
desc: 分离区段单个元素
|
2019-07-16 16:03:56 +08:00 |
|
ival
|
dd21cc3294
|
修改代码
|
2019-07-16 13:43:37 +08:00 |
|
ival
|
ab934855d8
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/TrainWindow.js
|
2019-07-16 13:37:14 +08:00 |
|
ival
|
3f8c852087
|
修改代码
|
2019-07-16 13:35:39 +08:00 |
|
zyy
|
4d9884f425
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/deviceStyle.js
# src/jmap/shape/factory.js
|
2019-07-16 13:34:46 +08:00 |
|
zyy
|
301e0f7245
|
no message
|
2019-07-16 13:34:03 +08:00 |
|
ival
|
27fc58a23e
|
修改代码
|
2019-07-16 12:01:43 +08:00 |
|
ival
|
14d84a29c4
|
修改代码
|
2019-07-16 09:44:31 +08:00 |
|
ival
|
7a2cfbf752
|
修改缩进
|
2019-07-16 09:12:15 +08:00 |
|
ival
|
d3aed039bc
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-15 18:31:25 +08:00 |
|
ival
|
88e69b6093
|
修改代码
|
2019-07-15 18:31:13 +08:00 |
|
fan
|
d77ad0cf47
|
代码调整
|
2019-07-15 18:06:10 +08:00 |
|
fan
|
29456ac043
|
暂时注释掉列车鼠标事件
|
2019-07-15 18:02:10 +08:00 |
|
zyy
|
d50dc24121
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-15 16:04:10 +08:00 |
|
zyy
|
f1c1a9f90d
|
删除注释
|
2019-07-15 16:03:54 +08:00 |
|
fan
|
1b392a3832
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/deviceStyle.js
# src/jmap/config/deviceType.js
# src/jmap/shape/factory.js
# src/jmap/utils/parser.js
|
2019-07-15 16:03:23 +08:00 |
|
fan
|
4bc9a36974
|
Merge remote-tracking branch 'origin/master'
|
2019-07-15 16:01:38 +08:00 |
|
fan
|
b35470c513
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/deviceStyle.js
# src/jmap/config/deviceType.js
# src/jmap/shape/factory.js
# src/jmap/utils/parser.js
|
2019-07-15 16:01:19 +08:00 |
|
ival
|
5372284ff8
|
修改代码
|
2019-07-15 15:58:09 +08:00 |
|
ival
|
d95554b0a8
|
修改代码
|
2019-07-15 15:56:41 +08:00 |
|
ival
|
175417026c
|
1223
|
2019-07-15 15:56:03 +08:00 |
|
ival
|
0ea864e96d
|
12312
|
2019-07-15 15:54:47 +08:00 |
|
ival
|
a2c9c69037
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/StationControl.js
# src/jmap/shape/station.js
|
2019-07-15 15:52:34 +08:00 |
|
ival
|
b7c982bad6
|
修改代码
|
2019-07-15 15:51:39 +08:00 |
|
zyy
|
493f9da4d1
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/factory.js
|
2019-07-15 15:47:29 +08:00 |
|
zyy
|
95c5753c5f
|
desc: 增加zcList
|
2019-07-15 15:47:03 +08:00 |
|
ival
|
d54f3df88c
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-15 15:33:28 +08:00 |
|
ival
|
86b35a411e
|
增加代码
|
2019-07-15 15:33:18 +08:00 |
|
zyy
|
46b3b843cd
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/deviceRender.js
# src/jmap/config/deviceType.js
# src/jmap/shape/Signal.js
# src/jmap/shape/factory.js
# src/jmap/shape/section.js
# src/jmap/utils/parser.js
|
2019-07-15 15:32:32 +08:00 |
|
fan
|
db47956046
|
站台、车次窗、列车迁移
|
2019-07-15 15:30:59 +08:00 |
|
zyy
|
cf389a7381
|
desc: 增加lc,limiit,image 图层
|
2019-07-15 15:25:49 +08:00 |
|
ival
|
c89f2dec49
|
修改代码
|
2019-07-15 14:45:18 +08:00 |
|
ival
|
ecc5329924
|
修改代码
|
2019-07-15 14:14:44 +08:00 |
|
ival
|
10faac5e81
|
修改代码
|
2019-07-15 14:01:57 +08:00 |
|
ival
|
6a9939ab6c
|
增加设备配置
|
2019-07-15 13:01:03 +08:00 |
|
zyy
|
1a3c9ca500
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/deviceStyle.js
# src/jmap/map.js
# src/jmap/shape/factory.js
# src/jmap/utils/parser.js
# src/views/jmap/index.vue
|
2019-07-15 10:58:31 +08:00 |
|
zyy
|
fec5d79341
|
desc: 增加section皮肤，图形渲染
|
2019-07-15 10:07:04 +08:00 |
|
ival
|
dcdf45f0b3
|
修改代码
|
2019-07-15 10:06:07 +08:00 |
|
ival
|
9aa0121c62
|
修改代码
|
2019-07-15 09:38:35 +08:00 |
|
ival
|
359b902dfc
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/views/jmap/index.vue
|
2019-07-15 09:02:47 +08:00 |
|
ival
|
ed56f48f74
|
修改代码
|
2019-07-15 09:02:04 +08:00 |
|
zyy
|
ff58614606
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/deviceStyle.js
# src/jmap/utils/parser.js
# src/views/jmap/index.vue
|
2019-07-15 09:00:37 +08:00 |
|
zyy
|
18fb4818f0
|
desc: 增加皮肤配置流程
|
2019-07-15 08:58:54 +08:00 |
|
ival
|
c67737c5c9
|
修改代码
|
2019-07-13 23:45:49 +08:00 |
|
zyy
|
c81094877d
|
desc: 增加注释
|
2019-07-11 17:58:58 +08:00 |
|
ival
|
d8e5fe8f2b
|
修改代码
|
2019-07-10 16:29:07 +08:00 |
|
ival
|
76fef48d87
|
修改代码
|
2019-07-10 16:04:17 +08:00 |
|
ival
|
d13bf6876b
|
修改参数
|
2019-07-10 13:24:03 +08:00 |
|
ival
|
548714dbca
|
修改
|
2019-07-10 13:19:21 +08:00 |
|
ival
|
816c070595
|
修改变量命名
|
2019-07-10 13:17:12 +08:00 |
|
ival
|
d5d449c9c5
|
增加鼠标事件以及回调事件
|
2019-07-10 12:02:02 +08:00 |
|
ival
|
0360b10a79
|
增加鼠标处理
|
2019-07-09 19:04:45 +08:00 |
|
ival
|
7441b41a51
|
添加操作
|
2019-07-09 09:24:54 +08:00 |
|
ival
|
2796ef8342
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/transformController.js
# src/views/jmap/index.vue
|
2019-07-08 09:40:07 +08:00 |
|
ival
|
266ea1a44a
|
修正格式
|
2019-07-08 09:38:39 +08:00 |
|
ival
|
a0dcff598b
|
修改代理代码
|
2019-07-07 22:56:09 +08:00 |
|
ival
|
4e6d971797
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-05 10:18:28 +08:00 |
|
ival
|
74d599bb1f
|
修改指令
|
2019-07-05 10:18:17 +08:00 |
|
ival
|
e816f72d83
|
修改代码
|
2019-07-05 00:40:53 +08:00 |
|
ival
|
eb305c146b
|
修改代码
|
2019-07-04 18:39:30 +08:00 |
|
zyy
|
9fbba9b5a0
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/map.js
# src/jmap/painter.js
# src/jmap/proxyHandle.js
|
2019-07-04 11:00:52 +08:00 |
|
zyy
|
d4191832fb
|
desc: 修改eslint 配置 保存
|
2019-07-04 10:59:40 +08:00 |
|
ival
|
73278b68d3
|
修改结构
|
2019-07-04 09:20:51 +08:00 |
|
ival
|
06003c8068
|
修改代码
|
2019-07-03 18:41:00 +08:00 |
|
ival
|
544c9cacef
|
修改代码
|
2019-07-03 14:29:09 +08:00 |
|
ival
|
3780ebefad
|
增加nclient工程
|
2019-07-02 16:29:52 +08:00 |
|