zyy
|
00dc541830
|
调整配置代码
|
2019-07-29 15:23:55 +08:00 |
|
zyy
|
9e8e5afe41
|
修改配置文件代码
|
2019-07-29 10:59:02 +08:00 |
|
zyy
|
c2400c07e1
|
desc: 增加区段配置
|
2019-07-29 10:20:18 +08:00 |
|
ival
|
21fd4ec516
|
修改区段状态变化
|
2019-07-29 09:27:33 +08:00 |
|
ival
|
a74053360d
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-26 18:54:52 +08:00 |
|
ival
|
02bd1e9d40
|
调试跑车
|
2019-07-26 18:54:42 +08:00 |
|
zyy
|
a9127022fd
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-26 18:53:51 +08:00 |
|
zyy
|
06c5c60364
|
desc: 增加section配置
|
2019-07-26 18:53:44 +08:00 |
|
ival
|
8f2712e3d8
|
修改代码
|
2019-07-26 17:35:58 +08:00 |
|
ival
|
ab86340524
|
修改列车跑车计算
|
2019-07-26 17:18:27 +08:00 |
|
zyy
|
7be6ca66fc
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/views/map/mapdraft/mapedit/mapoperate/link.vue
|
2019-07-26 16:01:18 +08:00 |
|
zyy
|
1305046304
|
修改代码
|
2019-07-26 15:59:31 +08:00 |
|
ival
|
4dec6ac93d
|
调试仿真
|
2019-07-26 15:52:50 +08:00 |
|
ival
|
2192b1eea4
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-26 13:32:56 +08:00 |
|
ival
|
9f5130a4f2
|
代码移植
|
2019-07-26 13:32:43 +08:00 |
|
zyy
|
797f31f142
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/views/jlmap/index.vue
|
2019-07-26 12:18:40 +08:00 |
|
zyy
|
e04e0f1c67
|
desc: 修改代码
|
2019-07-26 12:17:53 +08:00 |
|
ival
|
2a0aea6bfe
|
修改页面点击事件
|
2019-07-26 10:38:57 +08:00 |
|
ival
|
58911eef1a
|
修改代码
|
2019-07-25 18:25:04 +08:00 |
|
ival
|
06f45dd0cb
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-25 15:53:55 +08:00 |
|
zyy
|
601d0e2d91
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-25 15:48:58 +08:00 |
|
zyy
|
e32ab592a4
|
desc: 修改代码
|
2019-07-25 15:48:51 +08:00 |
|
ival
|
f28f5fc1cd
|
修改代码
|
2019-07-25 15:44:23 +08:00 |
|
ival
|
9acdab0b5b
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-25 14:20:03 +08:00 |
|
ival
|
5d6a7fd637
|
修改代码
|
2019-07-25 14:19:55 +08:00 |
|
zyy
|
3afd5f8e61
|
修改代码
|
2019-07-25 14:03:26 +08:00 |
|
zyy
|
61564dfdbf
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/views/jlmap/index.vue
|
2019-07-25 13:35:58 +08:00 |
|
zyy
|
d22823bccc
|
修改代码
|
2019-07-25 13:26:20 +08:00 |
|
ival
|
1828c5d27b
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-25 13:24:48 +08:00 |
|
ival
|
a95bf7c338
|
修改代码
|
2019-07-25 13:24:40 +08:00 |
|
zyy
|
e14460f1ef
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-25 11:08:23 +08:00 |
|
zyy
|
40425777c2
|
修改代码
|
2019-07-25 11:08:16 +08:00 |
|
ival
|
83c6fccfc9
|
修改代码
|
2019-07-25 11:07:32 +08:00 |
|
ival
|
a3c6e75448
|
修改代码
|
2019-07-25 10:58:17 +08:00 |
|
zyy
|
cf0cabadaf
|
调整代码
|
2019-07-25 10:55:31 +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
|
2b8afd0010
|
修改代码
|
2019-07-24 13:02:19 +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 |
|
zyy
|
ffe150a351
|
修改代码
|
2019-07-23 18:05:26 +08:00 |
|
zyy
|
af6e9fe3c9
|
修改代码
|
2019-07-22 17:27:09 +08:00 |
|
zyy
|
9c743e8bee
|
desc: 修改代码
|
2019-07-22 17:20:01 +08:00 |
|
zyy
|
274a48c33b
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/Switch/index.js
|
2019-07-22 13:41:12 +08:00 |
|
zyy
|
fc75783d94
|
修改代码
|
2019-07-22 13:40:14 +08:00 |
|
ival
|
3dd126da3a
|
修改代码
|
2019-07-22 13:39:03 +08:00 |
|
ival
|
042ad9fe6b
|
修改代码
|
2019-07-22 09:14:56 +08:00 |
|
ival
|
7848448a95
|
修正代码
|
2019-07-21 20:20:41 +08:00 |
|
ival
|
23232fcf78
|
修改代码
|
2019-07-19 18:32:19 +08:00 |
|
ival
|
15ab35d5b9
|
修改代码
|
2019-07-19 18:05:43 +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
|
9bdd8e15c5
|
修改代码
|
2019-07-19 11:11:34 +08:00 |
|
ival
|
fcd9f7dad4
|
修改代码
|
2019-07-19 09:40:22 +08:00 |
|
ival
|
e3341dcd04
|
修改代码
|
2019-07-19 09:23:56 +08:00 |
|
ival
|
c4cad61cb6
|
修改
|
2019-07-18 18:26:56 +08:00 |
|
ival
|
257945d203
|
修改代码
|
2019-07-18 17:07:09 +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
|
e1219c9908
|
修改代码
|
2019-07-18 15:28:19 +08:00 |
|
zyy
|
c51ca002ed
|
desc: 修改代码
|
2019-07-18 10:17:42 +08:00 |
|
zyy
|
bc9e02144e
|
desc: 修改代码
|
2019-07-17 18:18:28 +08:00 |
|
ival
|
cac49ad418
|
修改代码
|
2019-07-17 15:53:13 +08:00 |
|
ival
|
38d5cc1b2e
|
修改代码
|
2019-07-17 11:19:08 +08:00 |
|
zyy
|
301e0f7245
|
no message
|
2019-07-16 13:34:03 +08:00 |
|
ival
|
ecc5329924
|
修改代码
|
2019-07-15 14:14:44 +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
|
9aa0121c62
|
修改代码
|
2019-07-15 09:38:35 +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
|
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
|
a0dcff598b
|
修改代理代码
|
2019-07-07 22:56:09 +08:00 |
|
ival
|
e816f72d83
|
修改代码
|
2019-07-05 00:40:53 +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 |
|
ival
|
3780ebefad
|
增加nclient工程
|
2019-07-02 16:29:52 +08:00 |
|