Merge remote-tracking branch 'origin/dev' into test
This commit is contained in:
commit
5f3bc54a2a
@ -516,8 +516,8 @@ const map = {
|
|||||||
if (map && map.skinVO) {
|
if (map && map.skinVO) {
|
||||||
state.map = map;
|
state.map = map;
|
||||||
let showConfig = {};
|
let showConfig = {};
|
||||||
if (Vue.prototype.$jlmap) {
|
if (Vue.prototype.$jlmap && ( typeof(Vue.prototype.$jlmap.getShowConfig) === 'function')) {
|
||||||
showConfig = Vue.prototype.$jlmap.getShowConfig();
|
showConfig = Vue.prototype.$jlmap.getShowConfig();
|
||||||
}
|
}
|
||||||
state.mapDevice = parser(map, map.skinVO.code, showConfig);
|
state.mapDevice = parser(map, map.skinVO.code, showConfig);
|
||||||
Vue.prototype.$jlmap && Vue.prototype.$jlmap.setMapDevice(state.mapDevice);
|
Vue.prototype.$jlmap && Vue.prototype.$jlmap.setMapDevice(state.mapDevice);
|
||||||
|
Loading…
Reference in New Issue
Block a user