diff --git a/package.json b/package.json index ffd4b0e..f0dc38e 100644 --- a/package.json +++ b/package.json @@ -35,13 +35,16 @@ "js-cookie": "2.2.0", "js-md5": "^0.7.3", "jszip": "^3.7.1", + "leaflet": "^1.9.4", "lottie-web": "^5.7.13", "mapbox-gl": "^2.6.1", + "mars2d": "^3.3.2", "moment": "^2.27.0", "mux.js": "^5.6.4", "normalize.css": "7.0.0", "nprogress": "0.2.0", "path-to-regexp": "2.4.0", + "proj4": "^2.16.2", "qs": "^6.9.4", "save": "^2.4.0", "swiper": "^7.2.0", diff --git a/src/views/privateOrder/ecosphere/components/componentCenter.vue b/src/views/privateOrder/ecosphere/components/componentCenter.vue index 3d19ab4..002167b 100644 --- a/src/views/privateOrder/ecosphere/components/componentCenter.vue +++ b/src/views/privateOrder/ecosphere/components/componentCenter.vue @@ -52,10 +52,10 @@ export default { // this.reportTotalCount = res.data.reportTotalCount // this.completedPercent = res.data.completedPercent // }) - screenreportmap().then(res => { - this.reportTotalCount = res.data.count - this.completedPercent = this.isInteger(res.data.rate) ? res.data.rate : res.data.rate.toFixed(2) - }); + // screenreportmap().then(res => { + // this.reportTotalCount = res.data.count + // this.completedPercent = this.isInteger(res.data.rate) ? res.data.rate : res.data.rate.toFixed(2) + // }); // console.log(data) } diff --git a/src/views/privateOrder/ecosphere/components/componentLeft.vue b/src/views/privateOrder/ecosphere/components/componentLeft.vue index 9e238e0..2f8dcb1 100644 --- a/src/views/privateOrder/ecosphere/components/componentLeft.vue +++ b/src/views/privateOrder/ecosphere/components/componentLeft.vue @@ -849,32 +849,7 @@ export default { ], }; // 定义苏州2000坐标系参数 - proj4.defs( - "EPSG:4527", - "+proj=tmerc +lat_0=0 +lon_0=120.75 +k=1 +x_0=500000 +y_0=0 +ellps=GRS80 +units=m +no_defs" - ); - function transformGeoJSON(geojson) { - // 深拷贝以避免修改原始数据 - const result = JSON.parse(JSON.stringify(geojson)); - // 处理多边形 - if (result.features) { - result.features.forEach((feature) => { - if (feature.geometry.type === "Polygon") { - feature.geometry.coordinates.forEach((ring) => { - for (let i = 0; i < ring.length; i++) { - const transformed = proj4("EPSG:4527", "EPSG:4326", ring[i]); - ring[i] = transformed; - } - }); - } - }); - } - - return result; - } - const transformedData = transformGeoJSON(originalGeoJSON.value); - console.log(transformedData); }, // 网络平台信息获取 diff --git a/src/views/privateOrder/ecosphere/components/componentmapbox copy.vue b/src/views/privateOrder/ecosphere/components/componentmapbox copy.vue index 1960b70..18baf32 100644 --- a/src/views/privateOrder/ecosphere/components/componentmapbox copy.vue +++ b/src/views/privateOrder/ecosphere/components/componentmapbox copy.vue @@ -1,6 +1,6 @@