diff --git a/test/dataset-charts.html b/test/dataset-charts.html index a060fd27e0..cecb1a99fd 100644 --- a/test/dataset-charts.html +++ b/test/dataset-charts.html @@ -128,59 +128,59 @@ // No 北京 上海 江苏 var nameValueGeo0 = [ - {name: '天津', value: 514}, - {name: '上海', value: 863}, - {name: '重庆', value: 224}, - {name: '河北', value: 671}, - {name: '河南', value: 888}, - {name: '云南', value: 992}, - {name: '辽宁', value: 136}, - {name: '黑龙江', value: 406}, - {name: '湖南', value: 101}, - {name: '安徽', value: 885}, - {name: '新疆', value: 187}, - {name: '浙江', value: 1}, - {name: '江西', value: 138}, - {name: '湖北', value: 337}, - {name: '广西', value: 410}, - {name: '甘肃', value: 22}, - {name: '山西', value: 814}, - {name: '内蒙古', value: 449}, - {name: '陕西', value: 324}, - {name: '吉林', value: 429}, - {name: '福建', value: 377}, - {name: '贵州', value: 811}, - {name: '广东', value: 954}, - {name: '青海', value: 653}, - {name: '西藏', value: 297}, - {name: '四川', value: 981}, - {name: '宁夏', value: 66}, - {name: '海南', value: 667}, - {name: '台湾', value: 345}, - {name: '香港', value: 970}, - {name: '澳门', value: 683} + {name: '天津市', value: 514}, + {name: '上海市', value: 863}, + {name: '重庆市', value: 224}, + {name: '河北省', value: 671}, + {name: '河南省', value: 888}, + {name: '云南省', value: 992}, + {name: '辽宁省', value: 136}, + {name: '黑龙江省', value: 406}, + {name: '湖南省', value: 101}, + {name: '安徽省', value: 885}, + {name: '新疆维吾尔自治区', value: 187}, + {name: '浙江省', value: 1}, + {name: '江西省', value: 138}, + {name: '湖北省', value: 337}, + {name: '广西壮族自治区', value: 410}, + {name: '甘肃省', value: 22}, + {name: '山西省', value: 814}, + {name: '内蒙古自治区', value: 449}, + {name: '陕西省', value: 324}, + {name: '吉林省', value: 429}, + {name: '福建省', value: 377}, + {name: '贵州省', value: 811}, + {name: '广东省', value: 954}, + {name: '青海省', value: 653}, + {name: '西藏自治区', value: 297}, + {name: '四川省', value: 981}, + {name: '宁夏回族自治区', value: 66}, + {name: '海南省', value: 667}, + {name: '台湾省', value: 345}, + {name: '香港特别行政区', value: 970}, + {name: '澳门特别行政区', value: 683} ]; var nameValueGeo1 = [ - {name: '北京', value: 507}, - {name: '天津', value: 263}, - {name: '上海', value: 732}, - {name: '重庆', value: 976}, - {name: '河北', value: 299}, - {name: '安徽', value: 465}, - {name: '新疆', value: 259}, - {name: '浙江', value: 822}, - {name: '江西', value: 922}, - {name: '山西', value: 379}, - {name: '内蒙古', value: 544}, - {name: '吉林', value: 190}, - {name: '福建', value: 66}, - {name: '广东', value: 842}, - {name: '西藏', value: 827}, - {name: '四川', value: 71}, - {name: '宁夏', value: 428}, - {name: '香港', value: 466}, - {name: '澳门', value: 119} + {name: '北京市', value: 507}, + {name: '天津市', value: 263}, + {name: '上海市', value: 732}, + {name: '重庆市', value: 976}, + {name: '河北省', value: 299}, + {name: '安徽省', value: 465}, + {name: '新疆维吾尔自治区', value: 259}, + {name: '浙江省', value: 822}, + {name: '江西省', value: 922}, + {name: '山西省', value: 379}, + {name: '内蒙古自治区', value: 544}, + {name: '吉林省', value: 190}, + {name: '福建省', value: 66}, + {name: '广东省', value: 842}, + {name: '西藏自治区', value: 827}, + {name: '四川省', value: 71}, + {name: '宁夏回族自治区', value: 428}, + {name: '香港特别行政区', value: 466}, + {name: '澳门特别行政区', value: 119} ] @@ -919,4 +919,4 @@ - \ No newline at end of file + diff --git a/test/geo-map.html b/test/geo-map.html index de4d765a24..2a5ed886dc 100644 --- a/test/geo-map.html +++ b/test/geo-map.html @@ -533,40 +533,40 @@ }] }, data:[ - {name: '北京',value: Math.round(Math.random()*1000), select: {disabled: true}}, - {name: '天津',value: Math.round(Math.random()*1000)}, - {name: '上海',value: Math.round(Math.random()*1000)}, - {name: '重庆',value: Math.round(Math.random()*1000)}, - {name: '河北',value: Math.round(Math.random()*1000)}, - {name: '河南',value: Math.round(Math.random()*1000)}, - {name: '云南',value: Math.round(Math.random()*1000)}, - {name: '辽宁',value: Math.round(Math.random()*1000)}, - {name: '黑龙江',value: Math.round(Math.random()*1000), select: {disabled: true}}, - {name: '湖南',value: Math.round(Math.random()*1000)}, - {name: '安徽',value: Math.round(Math.random()*1000)}, - {name: '山东',value: Math.round(Math.random()*1000)}, - {name: '新疆',value: Math.round(Math.random()*1000)}, - {name: '江苏',value: Math.round(Math.random()*1000)}, - {name: '浙江',value: Math.round(Math.random()*1000)}, - {name: '江西',value: Math.round(Math.random()*1000)}, - {name: '湖北',value: Math.round(Math.random()*1000)}, - {name: '广西',value: Math.round(Math.random()*1000)}, - {name: '甘肃',value: Math.round(Math.random()*1000)}, - {name: '山西',value: Math.round(Math.random()*1000)}, - {name: '内蒙古',value: Math.round(Math.random()*1000), select: {disabled: true}}, - {name: '陕西',value: Math.round(Math.random()*1000)}, - {name: '吉林',value: Math.round(Math.random()*1000)}, - {name: '福建',value: Math.round(Math.random()*1000)}, - {name: '贵州',value: Math.round(Math.random()*1000)}, - {name: '广东',value: Math.round(Math.random()*1000)}, - {name: '青海',value: Math.round(Math.random()*1000)}, - {name: '西藏',value: Math.round(Math.random()*1000)}, - {name: '四川',value: Math.round(Math.random()*1000)}, - {name: '宁夏',value: Math.round(Math.random()*1000)}, - {name: '海南',value: Math.round(Math.random()*1000)}, - {name: '台湾',value: Math.round(Math.random()*1000)}, - {name: '香港',value: Math.round(Math.random()*1000)}, - {name: '澳门',value: Math.round(Math.random()*1000)} + {name: '北京市',value: Math.round(Math.random()*1000), select: {disabled: true}}, + {name: '天津市',value: Math.round(Math.random()*1000)}, + {name: '上海市',value: Math.round(Math.random()*1000)}, + {name: '重庆市',value: Math.round(Math.random()*1000)}, + {name: '河北省',value: Math.round(Math.random()*1000)}, + {name: '河南省',value: Math.round(Math.random()*1000)}, + {name: '云南省',value: Math.round(Math.random()*1000)}, + {name: '辽宁省',value: Math.round(Math.random()*1000)}, + {name: '黑龙江省',value: Math.round(Math.random()*1000), select: {disabled: true}}, + {name: '湖南省',value: Math.round(Math.random()*1000)}, + {name: '安徽省',value: Math.round(Math.random()*1000)}, + {name: '山东省',value: Math.round(Math.random()*1000)}, + {name: '新疆维吾尔自治区',value: Math.round(Math.random()*1000)}, + {name: '江苏省',value: Math.round(Math.random()*1000)}, + {name: '浙江省',value: Math.round(Math.random()*1000)}, + {name: '江西省',value: Math.round(Math.random()*1000)}, + {name: '湖北省',value: Math.round(Math.random()*1000)}, + {name: '广西壮族自治区',value: Math.round(Math.random()*1000)}, + {name: '甘肃省',value: Math.round(Math.random()*1000)}, + {name: '山西省',value: Math.round(Math.random()*1000)}, + {name: '内蒙古自治区',value: Math.round(Math.random()*1000), select: {disabled: true}}, + {name: '陕西省',value: Math.round(Math.random()*1000)}, + {name: '吉林省',value: Math.round(Math.random()*1000)}, + {name: '福建省',value: Math.round(Math.random()*1000)}, + {name: '贵州省',value: Math.round(Math.random()*1000)}, + {name: '广东省',value: Math.round(Math.random()*1000)}, + {name: '青海省',value: Math.round(Math.random()*1000)}, + {name: '西藏自治区',value: Math.round(Math.random()*1000)}, + {name: '四川省',value: Math.round(Math.random()*1000)}, + {name: '宁夏回族自治区',value: Math.round(Math.random()*1000)}, + {name: '海南省',value: Math.round(Math.random()*1000)}, + {name: '台湾省',value: Math.round(Math.random()*1000)}, + {name: '香港特别行政区',value: Math.round(Math.random()*1000)}, + {name: '澳门特别行政区',value: Math.round(Math.random()*1000)} ] }, { @@ -574,25 +574,25 @@ type: 'map', geoIndex: 0, data:[ - {name: '北京',value: Math.round(Math.random()*1000)}, - {name: '天津',value: Math.round(Math.random()*1000)}, - {name: '上海',value: Math.round(Math.random()*1000)}, - {name: '重庆',value: Math.round(Math.random()*1000)}, - {name: '河北',value: Math.round(Math.random()*1000)}, - {name: '安徽',value: Math.round(Math.random()*1000)}, - {name: '新疆',value: Math.round(Math.random()*1000)}, - {name: '浙江',value: Math.round(Math.random()*1000)}, - {name: '江西',value: Math.round(Math.random()*1000)}, - {name: '山西',value: Math.round(Math.random()*1000)}, - {name: '内蒙古',value: Math.round(Math.random()*1000)}, - {name: '吉林',value: Math.round(Math.random()*1000)}, - {name: '福建',value: Math.round(Math.random()*1000)}, - {name: '广东',value: Math.round(Math.random()*1000)}, - {name: '西藏',value: Math.round(Math.random()*1000)}, - {name: '四川',value: Math.round(Math.random()*1000)}, - {name: '宁夏',value: Math.round(Math.random()*1000)}, - {name: '香港',value: Math.round(Math.random()*1000)}, - {name: '澳门',value: Math.round(Math.random()*1000)} + {name: '北京市',value: Math.round(Math.random()*1000)}, + {name: '天津市',value: Math.round(Math.random()*1000)}, + {name: '上海市',value: Math.round(Math.random()*1000)}, + {name: '重庆市',value: Math.round(Math.random()*1000)}, + {name: '河北省',value: Math.round(Math.random()*1000)}, + {name: '安徽省',value: Math.round(Math.random()*1000)}, + {name: '新疆维吾尔自治区',value: Math.round(Math.random()*1000)}, + {name: '浙江省',value: Math.round(Math.random()*1000)}, + {name: '江西省',value: Math.round(Math.random()*1000)}, + {name: '山西省',value: Math.round(Math.random()*1000)}, + {name: '内蒙古自治区',value: Math.round(Math.random()*1000)}, + {name: '吉林省',value: Math.round(Math.random()*1000)}, + {name: '福建省',value: Math.round(Math.random()*1000)}, + {name: '广东省',value: Math.round(Math.random()*1000)}, + {name: '西藏自治区',value: Math.round(Math.random()*1000)}, + {name: '四川省',value: Math.round(Math.random()*1000)}, + {name: '宁夏回族自治区',value: Math.round(Math.random()*1000)}, + {name: '香港特别行政区',value: Math.round(Math.random()*1000)}, + {name: '澳门特别行政区',value: Math.round(Math.random()*1000)} ] }, { @@ -600,13 +600,13 @@ type: 'map', geoIndex: 0, data:[ - {name: '北京',value: Math.round(Math.random()*1000)}, - {name: '天津',value: Math.round(Math.random()*1000)}, - {name: '上海',value: Math.round(Math.random()*1000)}, - {name: '广东',value: Math.round(Math.random()*1000)}, - {name: '台湾',value: Math.round(Math.random()*1000)}, - {name: '香港',value: Math.round(Math.random()*1000)}, - {name: '澳门',value: Math.round(Math.random()*1000)} + {name: '北京市',value: Math.round(Math.random()*1000)}, + {name: '天津市',value: Math.round(Math.random()*1000)}, + {name: '上海市',value: Math.round(Math.random()*1000)}, + {name: '广东省',value: Math.round(Math.random()*1000)}, + {name: '台湾省',value: Math.round(Math.random()*1000)}, + {name: '香港特别行政区',value: Math.round(Math.random()*1000)}, + {name: '澳门特别行政区',value: Math.round(Math.random()*1000)} ] } ] diff --git a/test/map.html b/test/map.html index 79fe995966..cfba7f13ec 100644 --- a/test/map.html +++ b/test/map.html @@ -428,13 +428,13 @@ 'map/js/china' ], function (echarts) { var locations = [{ - name: '上海', + name: '上海市', coord: [121.472644, 31.231706] }, { - name: '北京', + name: '北京市', coord: [116.405285, 39.904989] }, { - name: '广东', + name: '广东省', coord: [113.280637, 23.839463714285714] }]; option = { @@ -497,4 +497,4 @@ - \ No newline at end of file +