|
@@ -467,6 +467,8 @@ export default {
|
|
style = this.otherStyles
|
|
style = this.otherStyles
|
|
break
|
|
break
|
|
}
|
|
}
|
|
|
|
+ console.log(type)
|
|
|
|
+ console.log(type + ':' + style)
|
|
var feature = this.GeoJSON_to_Feature(geometry, style)
|
|
var feature = this.GeoJSON_to_Feature(geometry, style)
|
|
|
|
|
|
// 要素属性装载
|
|
// 要素属性装载
|
|
@@ -511,7 +513,6 @@ export default {
|
|
console.log('printFromGeoJSON 所输入的GeoJSON不符合规范')
|
|
console.log('printFromGeoJSON 所输入的GeoJSON不符合规范')
|
|
return
|
|
return
|
|
}
|
|
}
|
|
-
|
|
|
|
var feature = null
|
|
var feature = null
|
|
// 按geometry.type类型创建要素并赋予样式
|
|
// 按geometry.type类型创建要素并赋予样式
|
|
switch (geometry.type) {
|
|
switch (geometry.type) {
|
|
@@ -661,9 +662,9 @@ export default {
|
|
.post('/others/all')
|
|
.post('/others/all')
|
|
.then(res => {
|
|
.then(res => {
|
|
res.data.forEach(e => {
|
|
res.data.forEach(e => {
|
|
- that.printFeature('otherLayer', e, 'other')
|
|
|
|
|
|
+ that.printFeature('otherLayer', e, 'others')
|
|
})
|
|
})
|
|
- this.addCluster('otherLayer', this.otherStyles.Point)
|
|
|
|
|
|
+ that.addCluster('otherLayer', that.otherStyles.Point)
|
|
})
|
|
})
|
|
},
|
|
},
|
|
|
|
|
|
@@ -809,7 +810,7 @@ export default {
|
|
id: id
|
|
id: id
|
|
})
|
|
})
|
|
.then(response => {
|
|
.then(response => {
|
|
- response.data.content = response.data.content.join('')
|
|
|
|
|
|
+ // response.data.content = response.data.content.join('')
|
|
that.popupData.info = response.data
|
|
that.popupData.info = response.data
|
|
that.popupData.type = '文化设施'
|
|
that.popupData.type = '文化设施'
|
|
|
|
|
|
@@ -1048,8 +1049,8 @@ export default {
|
|
map.removeLayer(that.getLayerByTitle('markLayer'))
|
|
map.removeLayer(that.getLayerByTitle('markLayer'))
|
|
that.loadOthers()
|
|
that.loadOthers()
|
|
that.loadCulture()
|
|
that.loadCulture()
|
|
- that.loadRecentReports(7)
|
|
|
|
- that.loadRecentNotices(7)
|
|
|
|
|
|
+ that.loadRecentReports(365)
|
|
|
|
+ that.loadRecentNotices(365)
|
|
that.closePopup()
|
|
that.closePopup()
|
|
})
|
|
})
|
|
|
|
|