Skip to content

F
founder_vue
Commit 8e0bd372 by liyuhang19990520
Options

22

parent e8ee20c1
Showing with 43 additions and 35 deletions
package-lock.json
......@@ -3366,7 +3366,7 @@
},
"claygl": {
"version": "1.3.0",
"resolved": "https://registry.npmmirror.com/claygl/-/claygl-1.3.0.tgz",
"resolved": "https://registry.npmjs.org/claygl/-/claygl-1.3.0.tgz",
"integrity": "sha512-+gGtJjT6SSHD2l2yC3MCubW/sCV40tZuSs5opdtn79vFSGUgp/lH139RNEQ6Jy078/L0aV8odCw8RSrUcMfLaQ=="
},
"clean-css": {
......@@ -4739,24 +4739,24 @@
}
},
"echarts": {
"version": "5.4.1",
"resolved": "https://registry.npmmirror.com/echarts/-/echarts-5.4.1.tgz",
"integrity": "sha512-9ltS3M2JB0w2EhcYjCdmtrJ+6haZcW6acBolMGIuf01Hql1yrIV01L1aRj7jsaaIULJslEP9Z3vKlEmnJaWJVQ==",
"version": "5.4.2",
"resolved": "https://registry.npmjs.org/echarts/-/echarts-5.4.2.tgz",
"integrity": "sha512-2W3vw3oI2tWJdyAz+b8DuWS0nfXtSDqlDmqgin/lfzbkB01cuMEN66KWBlmur3YMp5nEDEEt5s23pllnAzB4EA==",
"requires": {
"tslib": "2.3.0",
"zrender": "5.4.1"
"zrender": "5.4.3"
},
"dependencies": {
"tslib": {
"version": "2.3.0",
"resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
"integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
}
}
},
"echarts-gl": {
"version": "2.0.9",
"resolved": "https://registry.npmmirror.com/echarts-gl/-/echarts-gl-2.0.9.tgz",
"resolved": "https://registry.npmjs.org/echarts-gl/-/echarts-gl-2.0.9.tgz",
"integrity": "sha512-oKeMdkkkpJGWOzjgZUsF41DOh6cMsyrGGXimbjK2l6Xeq/dBQu4ShG2w2Dzrs/1bD27b2pLTGSaUzouY191gzA==",
"requires": {
"claygl": "^1.2.1",
......@@ -12823,16 +12823,16 @@
}
},
"zrender": {
"version": "5.4.1",
"resolved": "https://registry.npmmirror.com/zrender/-/zrender-5.4.1.tgz",
"integrity": "sha512-M4Z05BHWtajY2241EmMPHglDQAJ1UyHQcYsxDNzD9XLSkPDqMq4bB28v9Pb4mvHnVQ0GxyTklZ/69xCFP6RXBA==",
"version": "5.4.3",
"resolved": "https://registry.npmjs.org/zrender/-/zrender-5.4.3.tgz",
"integrity": "sha512-DRUM4ZLnoaT0PBVvGBDO9oWIDBKFdAVieNWxWwK0niYzJCMwGchRk21/hsE+RKkIveH3XHCyvXcJDkgLVvfizQ==",
"requires": {
"tslib": "2.3.0"
},
"dependencies": {
"tslib": {
"version": "2.3.0",
"resolved": "https://registry.npmmirror.com/tslib/-/tslib-2.3.0.tgz",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz",
"integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg=="
}
}
......
public/JsonData/china2.json
This source diff could not be displayed because it is too large. You can view the blob instead.
public/JsonData/china3.json 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
public/map/china.json
This source diff could not be displayed because it is too large. You can view the blob instead.
public/map/china2.json
......@@ -2,7 +2,6 @@
"type": "FeatureCollection",
"features": [
{
"code": "200",
"type": "Feature",
"id": "710000",
"properties": {
......
src/views/dataJq/mapBox.vue
......@@ -7,8 +7,14 @@
element-loading-background="rgba(0, 0, 0, 0.8)"
>
<!-- 回退 -->
<div id="on-back" class="back" v-show="showBack" @click="goBack" title="回退">
<img src="@/assets/img/back.png" alt="" width="30px" height="30px">
<div
id="on-back"
class="back"
v-show="showBack"
@click="goBack"
title="回退"
>
<img src="@/assets/img/back.png" alt="" width="30px" height="30px" />
</div>
<div
id="myEacherForMap"
......@@ -50,7 +56,7 @@
<div
class="infoClass"
v-if="
fileName == 'china2' &&
fileName == 'china' &&
(!currentInfo || !Object.keys(currentInfo).length)
"
>
......@@ -79,8 +85,8 @@ export default {
loading: false,
mapDogNum: [],
currentInfo: {},
pianQuData: ["昆明片区", "沈阳片区", "南京片区", "南昌片区"],
fileName: "china2",
pianQuData: ["昆明片区", "沈阳片区", "南京片区", "南昌片区", "台湾"],
fileName: "china",
myChart: null,
colorDatas: [
"rgb(255, 84, 84)",
......@@ -139,7 +145,6 @@ export default {
},
},
},
],
itemStyle: {
areaColor: "#1b8cff",
......@@ -173,7 +178,7 @@ export default {
series: [],
},
log: ["china2"],
log: ["china"],
provinces: [],
dataArr: [],
};
......@@ -252,11 +257,13 @@ export default {
}
}
//;
if (features[j].geometry.encodeOffsets[0].constructor == String) {
if (
features[j].geometry?.encodeOffsets?.[0]?.constructor == String
) {
//合并encodeOffsets
polygonsEncodeOffsets.push(features[j].geometry.encodeOffsets);
} else if (
features[j].geometry.encodeOffsets[0].constructor == Array
features[j]?.geometry?.encodeOffsets?.[0]?.constructor == Array
) {
for (
var k = 0;
......@@ -322,7 +329,7 @@ export default {
this.loading = true;
$.getJSON(`/map/${this.fileName}.json`, (data) => {
if (data && data.features && data.features.length) {
if (this.fileName == "china2") {
if (this.fileName == "china") {
let params = {
names: [
[
......@@ -358,6 +365,7 @@ export default {
"江西",
"兵团",
],
["台湾"],
],
properties: {
//自定义大区的名字，要和上面的大区省份一一对应
......@@ -368,12 +376,12 @@ export default {
[115.24, 41.54], // 沈阳
[119.28, 31.13], // 南京
[92.2, 37.32], // 南昌
[121.009062, 23.9], // 台湾
],
},
};
this.mergeProvinces(data, params.names, params.properties);
}
this.loading = false;
this.$echarts.registerMap(this.fileName, data);
this.myChart = this.$echarts.init(
......@@ -423,19 +431,18 @@ export default {
});
this.myChart.setOption(this.options);
this.myChart.on("click", async (param) => {
if (this.fileName == "china2") {
if (this.fileName == "china") {
let curName = param.name;
if (curName === "沈阳片区") {
this.fileName = "P01";
}
if (curName === "南京片区") {
} else if (curName === "南京片区") {
this.fileName = "P02";
}
if (curName === "南昌片区") {
} else if (curName === "南昌片区") {
this.fileName = "P03";
}
if (curName === "昆明片区") {
} else if (curName === "昆明片区") {
this.fileName = "P04";
} else {
return;
}
}
if (param.componentType !== "geo" || levelFlag === "3") return;
......@@ -452,7 +459,7 @@ export default {
) {
this.currentInfo = {};
let e = this.provinces[i].key;
if (e === "china2") {
if (e === "china") {
this.showBack = false;
} else {
this.showBack = true;
......@@ -462,6 +469,8 @@ export default {
this.getDataArr(res.data.rows);
this.drawEcharts();
} else {
this.fileName = this.log[this.log.length - 1];
this.currentInfo = {};
this.$message.error("该区域没有数据，不支持地图下钻！");
this.loading = false;
}
......@@ -509,11 +518,11 @@ export default {
this.log.pop();
this.fileName = this.log[this.log.length - 1];
} else {
this.fileName = "china2";
this.log = ["china2"];
this.fileName = "china";
this.log = ["china"];
}
let res = await this.getMapData(
this.fileName === "china2" ? "" : this.fileName
this.fileName === "china" ? "" : this.fileName
);
if (
res.code === 200 &&
......@@ -525,7 +534,7 @@ export default {
let datas = res.data.rows;
this.getDataArr(datas);
if (this.fileName === "china2") {
if (this.fileName === "china") {
this.showBack = false;
} else {
this.showBack = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment