Commit Graph

39 Commits

Author SHA1 Message Date
zyy
99bcfa56ac 修改代码 2019-07-31 18:46:37 +08:00
zyy
1a44bfb002 修改代码 2019-07-31 18:19:15 +08:00
zyy
851c0a4a6a desc: 修改代码 2019-07-30 18:45:32 +08:00
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
ival
9152b6a55e 增加 Line 和 Text 设备移植,以及调试代码 2019-07-30 12:37:31 +08:00
ival
ca433c2eb6 修改设备结构 2019-07-30 09:18:24 +08:00
ival
69ed6c5eea 处理菜单 2019-07-29 13:45:38 +08:00
ival
33442905be 修改道岔状态变化 2019-07-29 11:18:50 +08:00
ival
21fd4ec516 修改区段状态变化 2019-07-29 09:27:33 +08:00
ival
02bd1e9d40 调试跑车 2019-07-26 18:54:42 +08:00
ival
4dec6ac93d 调试仿真 2019-07-26 15:52:50 +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
zyy
ffe150a351 修改代码 2019-07-23 18:05:26 +08:00
ival
2ca2c0f193 修改代码 2019-07-22 15:43:42 +08:00
ival
7848448a95 修正代码 2019-07-21 20:20:41 +08:00
ival
23232fcf78 修改代码 2019-07-19 18:32:19 +08:00
ival
257945d203 修改代码 2019-07-18 17:07:09 +08:00
zyy
301e0f7245 no message 2019-07-16 13:34:03 +08:00
zyy
f1c1a9f90d 删除注释 2019-07-15 16:03:54 +08:00
zyy
95c5753c5f desc: 增加zcList 2019-07-15 15:47:03 +08:00
ival
10faac5e81 修改代码 2019-07-15 14:01:57 +08:00
ival
6a9939ab6c 增加设备配置 2019-07-15 13:01:03 +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
zyy
fec5d79341 desc: 增加section皮肤,图形渲染 2019-07-15 10:07:04 +08:00
ival
dcdf45f0b3 修改代码 2019-07-15 10:06:07 +08:00
zyy
18fb4818f0 desc: 增加皮肤配置流程 2019-07-15 08:58:54 +08:00
zyy
c81094877d desc: 增加注释 2019-07-11 17:58:58 +08:00
ival
76fef48d87 修改代码 2019-07-10 16:04:17 +08:00
ival
548714dbca 修改 2019-07-10 13:19:21 +08:00
ival
0360b10a79 增加鼠标处理 2019-07-09 19:04:45 +08:00
ival
266ea1a44a 修正格式 2019-07-08 09:38:39 +08:00
ival
eb305c146b 修改代码 2019-07-04 18:39:30 +08:00
zyy
d4191832fb desc: 修改eslint 配置 保存 2019-07-04 10:59:40 +08:00
ival
06003c8068 修改代码 2019-07-03 18:41:00 +08:00
ival
544c9cacef 修改代码 2019-07-03 14:29:09 +08:00