| @@ -97,9 +97,9 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function | |||||
| } | } | ||||
| let features = []; | let features = []; | ||||
| content.forEach(item => { | content.forEach(item => { | ||||
| if (item.theGeomJson != null && item.theGeomJson !== '') { | |||||
| if (item.theGeom != null && item.theGeom !== '') { | |||||
| const iconFeature = new ol.Feature({ | const iconFeature = new ol.Feature({ | ||||
| geometry: new ol.geom.MultiPolygon(JSON.parse(item.theGeomJson).coordinates), | |||||
| geometry: new ol.geom.MultiPolygon(JSON.parse(item.theGeom).coordinates), | |||||
| // name: item.centerName, | // name: item.centerName, | ||||
| // centerDeptId: item.deptId, | // centerDeptId: item.deptId, | ||||
| level: 'resource', | level: 'resource', | ||||
| @@ -74,10 +74,10 @@ define(['jquery', "template", "Tools", "paging", 'dateTime', 'swiper'], function | |||||
| })*/ | })*/ | ||||
| }); | }); | ||||
| if (module.data.propertyDetail && module.data.propertyDetail.theGeomJson) { | |||||
| if (module.data.propertyDetail && module.data.propertyDetail.theGeom) { | |||||
| const resourceDetail = new ol.layer.Vector({ | const resourceDetail = new ol.layer.Vector({ | ||||
| source: new ol.source.Vector({ | source: new ol.source.Vector({ | ||||
| features: new ol.format.GeoJSON().readFeatures(module.data.propertyDetail.theGeomJson), | |||||
| features: new ol.format.GeoJSON().readFeatures(module.data.propertyDetail.theGeom), | |||||
| }), | }), | ||||
| name: 'resourceDetail', | name: 'resourceDetail', | ||||
| style: new ol.style.Style({ | style: new ol.style.Style({ | ||||