Skip to content

Commit f53fc20

Browse files
chenxianhuiichenxianhuii
committed
[examples]修复示例
1 parent 33d95c9 commit f53fc20

File tree

10 files changed

+32
-20
lines changed

10 files changed

+32
-20
lines changed

‎examples/leaflet/echartsPie.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
attributeFilter: "NAME = '广州市' or NAME = '上海市'"
153153
}, {
154154
name: "Capital_P@China",
155-
attributeFilter: "NAME = '北京市'"
155+
attributeFilter: "Name = '北京市'"
156156
}]
157157
});
158158

@@ -167,7 +167,7 @@
167167
return latlng;
168168
}
169169
}).on('click', function (e) {
170-
var city = e.layer.feature.properties.NAME;
170+
var city = e.layer.feature.properties.NAME || e.layer.feature.properties.Name;
171171
chart.setOption({
172172
title: {
173173
text: city + resources.text_commoditySales

‎examples/leaflet/echartsScatter.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,10 +322,10 @@
322322
var param = new L.supermap.QueryBySQLParameters({
323323
queryParams: [{
324324
name: "ProvinceCapital_P@China",
325-
attributeFilter: "NAME = '广州市' or NAME = '上海市'"
325+
attributeFilter: "NAME = '广州市' or NAME = '上海市' or NAME = '北京市'"
326326
}, {
327327
name: "Capital_P@China",
328-
attributeFilter: "NAME = '北京市'"
328+
attributeFilter: "Name = '北京市'"
329329
}]
330330
});
331331

@@ -340,7 +340,7 @@
340340
return latlng;
341341
},
342342
}).on('click', function (e) {
343-
var city = e.layer.feature.properties.NAME;
343+
var city = e.layer.feature.properties.NAME || e.layer.feature.properties.Name;
344344
chart.setOption({
345345
color: [
346346
colorMap[city]

‎examples/mapboxgl/echarts_pie.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@
202202
},
203203
{
204204
name: 'Capital_P@China',
205-
attributeFilter: "NAME = '北京市'"
205+
attributeFilter: "Name = '北京市'"
206206
}
207207
]
208208
});
@@ -239,7 +239,7 @@
239239
.setDOMContent(div) // sets a popup on this marker
240240
.addTo(map);
241241

242-
var city = e.features[0].properties.NAME;
242+
var city = e.features[0].properties.NAME || e.features[0].properties.Name;
243243
chart.setOption({
244244
title: {
245245
text: city + resources.text_commoditySales

‎examples/mapboxgl/echarts_scatter.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@
357357
attributeFilter: "NAME = '广州市' or NAME = '上海市'"
358358
}, {
359359
name: "Capital_P@China",
360-
attributeFilter: "NAME = '北京市'"
360+
attributeFilter: "Name = '北京市'"
361361
}]
362362
});
363363

@@ -393,7 +393,7 @@
393393
.setDOMContent(div) // sets a popup on this marker
394394
.addTo(map);
395395

396-
var city = e.features[0].properties.NAME;
396+
var city = e.features[0].properties.NAME || e.features[0].properties.Name;
397397
chart.setOption({
398398
color: [
399399
colorMap[city]

‎examples/maplibregl/echarts_pie.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@
209209
},
210210
{
211211
name: 'Capital_P@China',
212-
attributeFilter: "NAME = '北京市'"
212+
attributeFilter: "Name = '北京市'"
213213
}
214214
]
215215
});
@@ -246,7 +246,7 @@
246246
.setDOMContent(div) // sets a popup on this marker
247247
.addTo(map);
248248

249-
var city = e.features[0].properties.NAME;
249+
var city = e.features[0].properties.NAME || e.features[0].properties.Name;
250250
chart.setOption({
251251
title: {
252252
text: city + resources.text_commoditySales

‎examples/maplibregl/echarts_scatter.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@
364364
attributeFilter: "NAME = '广州市' or NAME = '上海市'"
365365
}, {
366366
name: "Capital_P@China",
367-
attributeFilter: "NAME = '北京市'"
367+
attributeFilter: "Name = '北京市'"
368368
}]
369369
});
370370

@@ -401,7 +401,7 @@
401401
.setDOMContent(div) // sets a popup on this marker
402402
.addTo(map);
403403

404-
var city = e.features[0].properties.NAME;
404+
var city = e.features[0].properties.NAME || e.features[0].properties.Name;
405405
chart.setOption({
406406
color: [
407407
colorMap[city]

‎examples/maplibregl/multiphaseplay.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
}
150150

151151
function addTimeLine() {
152-
var allTime = allFeatures.map(feature => feature.time.split('/')[0]);
152+
var allTime = ['2009', '2010', '2011', '2012', '2013', '2014', '2015', '2016'];
153153
myChart = echarts.init(document.getElementById('timeline'));
154154
var option = {
155155
timeline: {

‎examples/openlayers/echartsLineMarker.html‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@
185185
attributeFilter: "NAME = '广州市' or NAME = '上海市'"
186186
}, {
187187
name: "Capital_P@China",
188-
attributeFilter: "NAME = '北京市'"
188+
attributeFilter: "Name = '北京市'"
189189
}]
190190
});
191191
queryService.queryBySQL(param, function (serviceResult) {
@@ -195,6 +195,9 @@
195195
dataProjection: 'EPSG:3857',
196196
featureProjection: 'EPSG:4326'
197197
});
198+
temp.forEach(function(feature, idx) {
199+
feature.setId('feature_' + i + '_' + idx);
200+
});
198201
features = features.concat(temp);
199202
}
200203
resultLayer = new ol.layer.Vector({
@@ -210,7 +213,8 @@
210213
map.addInteraction(select);
211214
select.on('select', function (e) {
212215
if (this.getFeatures().getLength() > 0) {
213-
var city = this.getFeatures().item(0).getProperties().NAME;
216+
const props = this.getFeatures().item(0).getProperties();
217+
var city = props.NAME || props.Name;
214218
var data1 = [];
215219
var data2 = [];
216220
for (var i = 0; i < 7; i++) {

‎examples/openlayers/echartsPie.html‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@
235235
attributeFilter: "NAME = '广州市' or NAME = '上海市'"
236236
}, {
237237
name: "Capital_P@China",
238-
attributeFilter: "NAME = '北京市'"
238+
attributeFilter: "Name = '北京市'"
239239
}]
240240
});
241241
queryService.queryBySQL(param, function (serviceResult) {
@@ -245,6 +245,9 @@
245245
dataProjection: 'EPSG:3857',
246246
featureProjection: 'EPSG:4326'
247247
});
248+
temp.forEach(function(feature, idx) {
249+
feature.setId('feature_' + i + '_' + idx);
250+
});
248251
features = features.concat(temp);
249252
}
250253
resultLayer = new ol.layer.Vector({
@@ -258,7 +261,8 @@
258261
map.addInteraction(select);
259262
select.on('select', function (e) {
260263
if (this.getFeatures().getLength() > 0) {
261-
var city = this.getFeatures().item(0).getProperties().NAME;
264+
const props = this.getFeatures().item(0).getProperties();
265+
var city = props.NAME || props.Name;
262266
var data1 = [];
263267
var data2 = [];
264268
for (var i = 0; i < 7; i++) {

‎examples/openlayers/echartsScatter.html‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@
366366
attributeFilter: "NAME = '广州市' or NAME = '上海市'"
367367
}, {
368368
name: "Capital_P@China",
369-
attributeFilter: "NAME = '北京市'"
369+
attributeFilter: "Name = '北京市'"
370370
}]
371371
});
372372
queryService.queryBySQL(param, function (serviceResult) {
@@ -376,6 +376,9 @@
376376
dataProjection: 'EPSG:3857',
377377
featureProjection: 'EPSG:4326'
378378
});
379+
temp.forEach(function(feature, idx) {
380+
feature.setId('feature_' + i + '_' + idx);
381+
});
379382
features = features.concat(temp);
380383
}
381384
resultLayer = new ol.layer.Vector({
@@ -391,7 +394,8 @@
391394
map.addInteraction(select);
392395
select.on('select', function (e) {
393396
if (this.getFeatures().getLength() > 0) {
394-
var city = this.getFeatures().item(0).getProperties().NAME;
397+
const props = this.getFeatures().item(0).getProperties();
398+
var city = props.NAME || props.Name;
395399
var data1 = [];
396400
var data2 = [];
397401
for (var i = 0; i < 7; i++) {

0 commit comments

Comments
 (0)