Commit Graph

425 Commits

Author SHA1 Message Date
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
ce82f25422 修改代码 2019-07-30 09:48:14 +08:00
ival
0742f9b633 修改操作 2019-07-30 09:35:00 +08:00
ival
c4a6b076da 修改菜单处理 2019-07-29 17:57:00 +08:00
zyy
00dc541830 调整配置代码 2019-07-29 15:23:55 +08:00
ival
21fd4ec516 修改区段状态变化 2019-07-29 09:27:33 +08:00
ival
02bd1e9d40 调试跑车 2019-07-26 18:54:42 +08:00
ival
ed01ac7180 修改代码 2019-07-26 17:39:05 +08:00
ival
c161f19b1b 修改跑车 2019-07-26 17:13:03 +08:00
ival
4dec6ac93d 调试仿真 2019-07-26 15:52:50 +08:00
ival
9f5130a4f2 代码移植 2019-07-26 13:32:43 +08:00
ival
2a0aea6bfe 修改页面点击事件 2019-07-26 10:38:57 +08:00
ival
f28f5fc1cd 修改代码 2019-07-25 15:44:23 +08:00
zyy
3afd5f8e61 修改代码 2019-07-25 14:03:26 +08:00
ival
a95bf7c338 修改代码 2019-07-25 13:24:40 +08:00
ival
83c6fccfc9 修改代码 2019-07-25 11:07:32 +08:00
ival
a3c6e75448 修改代码 2019-07-25 10:58:17 +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
75e3162d68 修改代码 2019-07-25 10:30:30 +08:00
ival
3780ebefad 增加nclient工程 2019-07-02 16:29:52 +08:00