Commit Graph

8781 Commits

Author SHA1 Message Date
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