From 3832a82fb79d4cec4cca5e2854e54953f2095ef8 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 06 九月 2024 16:55:08 +0800
Subject: [PATCH] 1. 添加溯源清单功能 2. 修复切换至走航监测界面后，之前正在加载的历史数据依旧展示至地图的问题 3. 添加折线图下载图片功能； 4. 添加数据导出功能； 5. 添加设备管理功能； 6. 添加数据弹框和溯源清单开关功能； 7. 优化3D里面的颜色展示逻辑，底部颜色由原来的因子最小值颜色改为当前量级的上一个量级对应的颜色
---
src/utils/map/3dLayer.js | 31 +++++++------------------------
1 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/src/utils/map/3dLayer.js b/src/utils/map/3dLayer.js
index 251ce09..5bf559a 100644
--- a/src/utils/map/3dLayer.js
+++ b/src/utils/map/3dLayer.js
@@ -30,6 +30,7 @@
const fDatas = _factorDatas;
const factor = _factor;
drawMesh(fDatas, factor);
+ // console.log(map.getZoom());
}
var _maxHeight = 1000,
@@ -90,15 +91,13 @@
/**
* 缁樺浘
*/
-function drawMesh(fDatas, factor, center, merge) {
+function drawMesh(fDatas, factor, merge) {
const lnglats_GD = fDatas.lnglats_GD;
const coors = fDatas.coors_GD;
const heights = factor.heights;
const colors = factor.colors;
const bColor = factor.bottomColor;
- if (center) {
- map.setZoomAndCenter(16, center);
- }
+ const bColors = factor.bottomColors;
// eslint-disable-next-line no-undef
var cylinder = new AMap.Object3D.Mesh();
@@ -135,10 +134,8 @@
}
}
- // var bColor = bColor
- var tColor = colors[i];
- geometry.vertexColors.push.apply(geometry.vertexColors, bColor); //搴曢儴椤剁偣棰滆壊
- geometry.vertexColors.push.apply(geometry.vertexColors, tColor); //椤堕儴椤剁偣棰滆壊
+ geometry.vertexColors.push.apply(geometry.vertexColors, bColors[i]); //搴曢儴椤剁偣棰滆壊
+ geometry.vertexColors.push.apply(geometry.vertexColors, colors[i]); //椤堕儴椤剁偣棰滆壊
}
// 7.鏍规嵁鍚堝苟閫夐」閲嶇疆鎴栨柊澧炲綋鍓嶇紦瀛樻暟鎹�
@@ -170,6 +167,7 @@
}
export default {
+ drawMesh: drawMesh,
/**
* 缁樺埗3D璧拌璺嚎鍥�
* @param fDatas 瀹屾暣鐩戞祴鏁版嵁
@@ -197,23 +195,8 @@
_maxH = maxH;
}
- // 3.纭畾瀹氫綅鍧愭爣鐐�
- var center;
- if (setCenter && lnglats_GD.length > 0) {
- var p = lnglats_GD[0];
- for (let i = 0; i < lnglats_GD.length; i++) {
- const e = lnglats_GD[i];
- if (e[0] != 0) {
- p = e;
- break;
- }
- }
- // eslint-disable-next-line no-undef
- center = new AMap.LngLat(...p);
- }
-
// 5.缁樺埗3D鍥惧舰
- drawMesh(fDatas, factor, center, merge);
+ this.drawMesh(fDatas, factor, merge);
// 缂╂斁鍦板浘鍒板悎閫傜殑瑙嗛噹绾у埆
// map.setFitView()
--
Gitblit v1.9.3