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/sector.js | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/utils/map/sector.js b/src/utils/map/sector.js
index de4a8b5..25ae2d5 100644
--- a/src/utils/map/sector.js
+++ b/src/utils/map/sector.js
@@ -109,7 +109,7 @@
function drawSectorMesh(sDeg, eDeg, lnglat, distance, distance2) {
if (distance == 0 || distance2 == 0) {
- return;
+ return false;
}
// eslint-disable-next-line no-undef
var sector = new AMap.Object3D.Mesh();
@@ -167,6 +167,7 @@
}
object3Dlayer.add(sector);
_sector = sector;
+ return true;
}
function drawTextMaker(list, list2, distance, distance2) {
@@ -240,6 +241,7 @@
object3Dlayer.remove(_sector);
}
},
+ sectorParams: sectorParams,
/**
* 缁樺埗鎵囧舰
* @param {FactorDatas} fDatas
@@ -247,13 +249,14 @@
* @returns 鏁版嵁鍧愭爣鐐瑰拰鎵囧舰鏈�澶у崐寰�
*/
drawSector(fDatas, i) {
- if (_sector != undefined) {
- this.clearSector();
- }
+ this.clearSector();
const { sDeg, eDeg, lnglat, distance, distance2, list, list2 } =
sectorParams(fDatas, i);
- drawSectorMesh(sDeg, eDeg, lnglat, distance, distance2);
- drawElasticMarker(list, list2, distance, distance2);
+ if (drawSectorMesh(sDeg, eDeg, lnglat, distance, distance2)) {
+ // 褰撻閫熷ぇ浜�0缁樺埗浜嗘墖褰㈡椂锛屾墠缁樺埗瀵瑰簲鐨勮窛绂荤瓑鏂囨湰鏍囪
+ // drawElasticMarker(list, list2, distance, distance2);
+ drawTextMaker(list, list2, distance, distance2);
+ }
return { p: lnglat, r: distance };
},
@@ -266,7 +269,8 @@
this.clearSectorMesh();
const { sDeg, eDeg, lnglat, distance, distance2, list, list2 } =
sectorParams(fDatas, i);
- drawSectorMesh(sDeg, eDeg, lnglat, distance, distance2);
- drawTextMaker(list, list2, distance, distance2);
+ if (drawSectorMesh(sDeg, eDeg, lnglat, distance, distance2)) {
+ drawTextMaker(list, list2, distance, distance2);
+ }
}
};
--
Gitblit v1.9.3