From 87e19b5a396ac8fed6a551828b87d263f6425c31 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 16 十月 2025 10:26:12 +0800
Subject: [PATCH] 2025.10.16 修改季度报告生成逻辑
---
src/utils/map/3dLayer.js | 82 ++++++++++++++++++++++++++--------------
1 files changed, 53 insertions(+), 29 deletions(-)
diff --git a/src/utils/map/3dLayer.js b/src/utils/map/3dLayer.js
index 5f8c16f..6a7c0c8 100644
--- a/src/utils/map/3dLayer.js
+++ b/src/utils/map/3dLayer.js
@@ -30,6 +30,16 @@
const fDatas = _factorDatas;
const factor = _factor;
drawMesh(fDatas, factor);
+
+ if (_polFactorDatasList.length > 0) {
+ _polCylinderList.forEach((p) => {
+ object3Dlayer.remove(p);
+ });
+ _polCylinderList = [];
+ _polFactorDatasList.forEach((e, i) => {
+ drawHighLight3DLayer(e, _polFactorList[i]);
+ });
+ }
// console.log(map.getZoom());
}
@@ -106,12 +116,20 @@
var geometry = cylinder.geometry;
- const scale = _getScale(_minH, _maxH);
+ var minH = heights[0];
+ var maxH = heights[0];
+ for (let i = 0; i < heights.length; i++) {
+ const h = heights[i];
+ minH = Math.min(minH, h);
+ maxH = Math.max(maxH, h);
+ }
+
+ const scale = _getScale(minH, maxH);
for (let i = 0; i < coors.length; i++) {
var r = lnglats_GD[i];
var lastP = lnglats_GD[i - 1];
var p = coors[i];
- var h = (heights[i] - _minH) * scale + _minHeight;
+ var h = (heights[i] - minH) * scale + _minHeight;
if (heights[i] == -1) {
h = -1;
}
@@ -169,16 +187,12 @@
/**
* 缁樺埗楂樹寒鐨勬薄鏌撳尯鍩�3D绔嬮潰
*/
-var _polCylinder = undefined;
-var _polFactorDatas = {
- lnglats: [],
- heights: [],
- type: ''
- },
+var _polCylinderList = [];
+var _polFactorDatasList = [],
//褰撳墠閫変腑鐨勭洃娴嬪洜瀛愭暟鎹�
- _polFactor = {};
+ _polFactorList = [];
function drawHighLight3DLayer(fDatas, factor) {
- const offsetH = 40;
+ const offsetH = 100;
const lnglats_GD = fDatas.lnglats_GD;
const coors = fDatas.coors_GD;
@@ -221,21 +235,23 @@
}
}
- // const color = [1, 1, 1, 0.75]
- const color = [1, 0, 0, 0.75];
+ const color = [1, 1, 1, 1];
+ // const color = [1, 0, 0, 0.75];
geometry.vertexColors.push.apply(geometry.vertexColors, color); //搴曢儴椤剁偣棰滆壊
geometry.vertexColors.push.apply(geometry.vertexColors, color); //椤堕儴椤剁偣棰滆壊
}
// 7.鏍规嵁鍚堝苟閫夐」閲嶇疆鎴栨柊澧炲綋鍓嶇紦瀛樻暟鎹�
- _polFactorDatas = fDatas;
- _polFactor = factor;
- if (_polCylinder != undefined) {
- object3Dlayer.remove(_polCylinder);
- }
+ _polFactorDatasList.push(fDatas);
+ _polFactorList.push(factor);
+ // if (_polCylinderList.length > 0) {
+ // _polCylinderList.forEach((p) => {
+ // object3Dlayer.remove(p);
+ // });
+ // }
object3Dlayer.add(cylinder);
- _polCylinder = cylinder;
+ _polCylinderList.push(cylinder);
}
export default {
@@ -244,6 +260,14 @@
if (_cylinder != undefined) {
object3Dlayer.remove(_cylinder);
}
+ if (_polCylinderList.length > 0) {
+ _polCylinderList.forEach((p) => {
+ object3Dlayer.remove(p);
+ });
+ _polCylinderList = [];
+ }
+ _polFactorDatasList = [];
+ _polFactorList = [];
},
drawMesh: drawMesh,
@@ -261,17 +285,17 @@
map.off('zoomend', onMapZoom);
// 2.璁＄畻缁樺浘楂樺害鐨勮竟鐣屽��
- if (merge != true) {
- var minH = _minH < 0 ? heights[0] : _minH;
- var maxH = _maxH < 0 ? heights[0] : _maxH;
- for (let i = 0; i < heights.length; i++) {
- const h = heights[i];
- minH = Math.min(minH, h);
- maxH = Math.max(maxH, h);
- }
- _minH = minH;
- _maxH = maxH;
- }
+ // if (merge != true) {
+ // var minH = _minH < 0 ? heights[0] : _minH;
+ // var maxH = _maxH < 0 ? heights[0] : _maxH;
+ // for (let i = 0; i < heights.length; i++) {
+ // const h = heights[i];
+ // minH = Math.min(minH, h);
+ // maxH = Math.max(maxH, h);
+ // }
+ // _minH = minH;
+ // _maxH = maxH;
+ // }
// 5.缁樺埗3D鍥惧舰
this.drawMesh(fDatas, factor, merge);
--
Gitblit v1.9.3