Commit Graph

18 Commits

Author SHA1 Message Date
ival
dfd337e93f 修改字体设置 2019-07-24 13:50:37 +08:00
ival
e8dad49c5f 修改代码 2019-07-24 11:24:13 +08:00
ival
7609233eb5 修改代码 2019-07-24 10:02:07 +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
1bab212c05 修改代码 2019-07-23 18:21:49 +08:00
ival
39af264196 修改代码 2019-07-23 18:06:13 +08:00
ival
2ca2c0f193 修改代码 2019-07-22 15:43:42 +08:00
ival
3dd126da3a 修改代码 2019-07-22 13:39:03 +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
e3341dcd04 修改代码 2019-07-19 09:23:56 +08:00
ival
ed840d2359 修改代码 2019-07-18 18:24:40 +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
ival
47171b872e 修改代码 2019-07-18 10:05:16 +08:00