ival
|
38d5cc1b2e
|
修改代码
|
2019-07-17 11:19:08 +08:00 |
|
ival
|
22c1b93a40
|
111
|
2019-07-17 09:17:49 +08:00 |
|
ival
|
098b4c860e
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-17 09:12:16 +08:00 |
|
ival
|
9b3d3a97c8
|
修改代码
|
2019-07-17 09:12:05 +08:00 |
|
zyy
|
f8adc05375
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/element/ETextName.js
|
2019-07-17 09:09:00 +08:00 |
|
zyy
|
ddbf5edeb2
|
desc: 增加单个绘图元素
|
2019-07-17 09:08:23 +08:00 |
|
ival
|
0f669bfcbd
|
修改
|
2019-07-16 18:44:40 +08:00 |
|
ival
|
82fbb5240f
|
修改代码
|
2019-07-16 18:37:49 +08:00 |
|
ival
|
37310e6a3c
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/Section.js
# src/jmap/shape/factory.js
|
2019-07-16 16:31:04 +08:00 |
|
ival
|
25e6c8ceb8
|
修改代码
|
2019-07-16 16:29:31 +08:00 |
|
zyy
|
896438f51e
|
desc: 调整道岔显示位置
|
2019-07-16 16:19:01 +08:00 |
|
zyy
|
cecc0edf27
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-16 16:04:02 +08:00 |
|
zyy
|
f348e05074
|
desc: 分离区段单个元素
|
2019-07-16 16:03:56 +08:00 |
|
ival
|
dd21cc3294
|
修改代码
|
2019-07-16 13:43:37 +08:00 |
|
ival
|
ab934855d8
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/TrainWindow.js
|
2019-07-16 13:37:14 +08:00 |
|
ival
|
3f8c852087
|
修改代码
|
2019-07-16 13:35:39 +08:00 |
|
zyy
|
4d9884f425
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/deviceStyle.js
# src/jmap/shape/factory.js
|
2019-07-16 13:34:46 +08:00 |
|
zyy
|
301e0f7245
|
no message
|
2019-07-16 13:34:03 +08:00 |
|
ival
|
27fc58a23e
|
修改代码
|
2019-07-16 12:01:43 +08:00 |
|
ival
|
14d84a29c4
|
修改代码
|
2019-07-16 09:44:31 +08:00 |
|
ival
|
7a2cfbf752
|
修改缩进
|
2019-07-16 09:12:15 +08:00 |
|
ival
|
d3aed039bc
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-15 18:31:25 +08:00 |
|
ival
|
88e69b6093
|
修改代码
|
2019-07-15 18:31:13 +08:00 |
|
fan
|
d77ad0cf47
|
代码调整
|
2019-07-15 18:06:10 +08:00 |
|
fan
|
29456ac043
|
暂时注释掉列车鼠标事件
|
2019-07-15 18:02:10 +08:00 |
|
zyy
|
d50dc24121
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-15 16:04:10 +08:00 |
|
zyy
|
f1c1a9f90d
|
删除注释
|
2019-07-15 16:03:54 +08:00 |
|
fan
|
1b392a3832
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/deviceStyle.js
# src/jmap/config/deviceType.js
# src/jmap/shape/factory.js
# src/jmap/utils/parser.js
|
2019-07-15 16:03:23 +08:00 |
|
fan
|
4bc9a36974
|
Merge remote-tracking branch 'origin/master'
|
2019-07-15 16:01:38 +08:00 |
|
fan
|
b35470c513
|
Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/deviceStyle.js
# src/jmap/config/deviceType.js
# src/jmap/shape/factory.js
# src/jmap/utils/parser.js
|
2019-07-15 16:01:19 +08:00 |
|
ival
|
5372284ff8
|
修改代码
|
2019-07-15 15:58:09 +08:00 |
|
ival
|
d95554b0a8
|
修改代码
|
2019-07-15 15:56:41 +08:00 |
|
ival
|
175417026c
|
1223
|
2019-07-15 15:56:03 +08:00 |
|
ival
|
0ea864e96d
|
12312
|
2019-07-15 15:54:47 +08:00 |
|
ival
|
a2c9c69037
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/StationControl.js
# src/jmap/shape/station.js
|
2019-07-15 15:52:34 +08:00 |
|
ival
|
b7c982bad6
|
修改代码
|
2019-07-15 15:51:39 +08:00 |
|
zyy
|
493f9da4d1
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/shape/factory.js
|
2019-07-15 15:47:29 +08:00 |
|
zyy
|
95c5753c5f
|
desc: 增加zcList
|
2019-07-15 15:47:03 +08:00 |
|
ival
|
d54f3df88c
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
|
2019-07-15 15:33:28 +08:00 |
|
ival
|
86b35a411e
|
增加代码
|
2019-07-15 15:33:18 +08:00 |
|
zyy
|
46b3b843cd
|
Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient
# Conflicts:
# src/jmap/config/deviceRender.js
# src/jmap/config/deviceType.js
# src/jmap/shape/Signal.js
# src/jmap/shape/factory.js
# src/jmap/shape/section.js
# src/jmap/utils/parser.js
|
2019-07-15 15:32:32 +08:00 |
|
fan
|
db47956046
|
站台、车次窗、列车迁移
|
2019-07-15 15:30:59 +08:00 |
|
zyy
|
cf389a7381
|
desc: 增加lc,limiit,image 图层
|
2019-07-15 15:25:49 +08:00 |
|
ival
|
c89f2dec49
|
修改代码
|
2019-07-15 14:45:18 +08:00 |
|
ival
|
ecc5329924
|
修改代码
|
2019-07-15 14:14:44 +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 |
|