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/marks.js | 34 +++++++++++++++++++++-------------
1 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/src/utils/map/marks.js b/src/utils/map/marks.js
index ed0c807..a72dcdf 100644
--- a/src/utils/map/marks.js
+++ b/src/utils/map/marks.js
@@ -3,8 +3,6 @@
*/
import { map } from './index_old';
-import sector from './sector';
-import { DialogUtil } from './dialog';
import { useToolboxStore } from '@/stores/toolbox';
const toolboxStore = useToolboxStore();
@@ -21,10 +19,7 @@
if (!toolboxStore.dataMarkerStatus) {
return;
}
- if (_massMarks) {
- map.remove(_massMarks);
- _massMarks = undefined;
- }
+ this.clearMassMarks();
const lnglats = fDatas.lnglats_GD;
var data = [];
for (let i = 0; i < lnglats.length; i++) {
@@ -77,14 +72,27 @@
_massMarks = massMarks;
map.add(massMarks);
},
+ clearMassMarks() {
+ if (_massMarks) {
+ map.remove(_massMarks);
+ _massMarks = undefined;
+ }
+ },
- createLabelMarks(img, dataList) {
+ /**
+ * 鍒涘缓鏍囪鐐�
+ * @param {string | Array} img 鍥炬爣鎴栧浘鏍囨暟缁�
+ * @param {Array} dataList 鐩戞祴鏁版嵁
+ * @param {boolean} collision 鏍囨敞閬胯
+ * @returns
+ */
+ createLabelMarks(img, dataList, collision = true) {
// eslint-disable-next-line no-undef
const layer = new AMap.LabelsLayer({
zooms: [3, 20],
zIndex: 1000,
// 寮�鍚爣娉ㄩ伩璁╋紝榛樿涓哄紑鍚紝v1.4.15 鏂板灞炴��
- collision: true,
+ collision: collision,
// 寮�鍚爣娉ㄦ贰鍏ュ姩鐢伙紝榛樿涓哄紑鍚紝v1.4.15 鏂板灞炴��
animation: true
});
@@ -102,10 +110,10 @@
zIndex: 10,
icon: {
type: 'image',
- image: img,
+ image: typeof img === 'string' ? img : img[i],
// clipOrigin: [14, 92],
// clipSize: [50, 68],
- size: [24, 24],
+ size: [30, 30],
anchor: 'bottom-center',
angel: 0,
retina: true
@@ -115,12 +123,12 @@
direction: 'top',
offset: [0, -5],
style: {
- fontSize: 15,
+ fontSize: 16,
fontWeight: 'normal',
fillColor: '#fff',
strokeColor: '#333',
- strokeWidth: 2
- // backgroundColor: '#b1009b'
+ strokeWidth: 0,
+ backgroundColor: '#122b54a9'
}
}
};
--
Gitblit v1.9.3