|
|
@@ -137,16 +137,16 @@ export default {
|
|
|
console.log(this.chooseMenu);
|
|
|
if (this.chooseMenu === 0) {
|
|
|
this.initBaidu();
|
|
|
- } else if (this.chooseMenu === 2 || this.chooseMenu === 5 || this.chooseMenu === 3) {
|
|
|
+ } else if (this.chooseMenu === 2 || this.chooseMenu === 4 || this.chooseMenu === 3) {
|
|
|
this.initScatter();
|
|
|
- } else if (this.chooseMenu === 4 || this.chooseMenu === 6) {
|
|
|
+ } else if (this.chooseMenu === 5 || this.chooseMenu === 6) {
|
|
|
this.showLables =
|
|
|
this.chooseMenu === 6
|
|
|
? ['初级示范区', '高级示范区', '重点示范区']
|
|
|
: ['高新基地', '高级高新基地', '重点高新基地'];
|
|
|
this.initScatter('more');
|
|
|
} else if (this.chooseMenu === 1) {
|
|
|
- this.initHeatmap();
|
|
|
+ this.initScatter();
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
@@ -341,7 +341,7 @@ export default {
|
|
|
zAxis3D: {
|
|
|
type: 'value',
|
|
|
min: 0,
|
|
|
- max: 40,
|
|
|
+ max: 9000000,
|
|
|
},
|
|
|
series: [
|
|
|
{
|
|
|
@@ -462,12 +462,19 @@ export default {
|
|
|
}),
|
|
|
symbolSize: function (val) {
|
|
|
let size = val[2];
|
|
|
+
|
|
|
+ if (size > 10000) {
|
|
|
+ size = Math.floor(size / 1000);
|
|
|
+ }
|
|
|
if (size > 100) {
|
|
|
size = Math.floor(size / 5);
|
|
|
}
|
|
|
if (size > 100) {
|
|
|
size = Math.floor(size / 20);
|
|
|
}
|
|
|
+ if (size > 100) {
|
|
|
+ size = Math.floor(size / 10);
|
|
|
+ }
|
|
|
return size;
|
|
|
},
|
|
|
encode: {
|
panhui