Commit Graph

126 Commits

Author SHA1 Message Date
ival
9152b6a55e 增加 Line 和 Text 设备移植,以及调试代码 2019-07-30 12:37:31 +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
00dc541830 调整配置代码 2019-07-29 15:23:55 +08:00
zyy
9e8e5afe41 修改配置文件代码 2019-07-29 10:59:02 +08:00
zyy
c2400c07e1 desc: 增加区段配置 2019-07-29 10:20:18 +08:00
zyy
06c5c60364 desc: 增加section配置 2019-07-26 18:53:44 +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
4dec6ac93d 调试仿真 2019-07-26 15:52:50 +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
ival
2a0aea6bfe 修改页面点击事件 2019-07-26 10:38:57 +08:00
ival
06f45dd0cb Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-07-25 15:53:55 +08:00
zyy
e32ab592a4 desc: 修改代码 2019-07-25 15:48:51 +08:00
ival
f28f5fc1cd 修改代码 2019-07-25 15:44:23 +08:00
zyy
40425777c2 修改代码 2019-07-25 11:08:16 +08:00
zyy
75e3162d68 修改代码 2019-07-25 10:30:30 +08:00