Commit Graph

9 Commits

Author SHA1 Message Date
ival
3f8c852087 修改代码 2019-07-16 13:35:39 +08:00
ival
27fc58a23e 修改代码 2019-07-16 12:01:43 +08:00
ival
b7c982bad6 修改代码 2019-07-15 15:51:39 +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
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
10faac5e81 修改代码 2019-07-15 14:01:57 +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
ival
dcdf45f0b3 修改代码 2019-07-15 10:06:07 +08:00