From c40500d288339cd9b2200f8f909e3cd5471c0c22 Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期五, 30 八月 2024 17:38:29 +0800 Subject: [PATCH] 1. 优化3D动画中风向的变化逻辑; 2. 修复折线图切换因子时,数据直接跳转至起始处的问题; 3. 折线图和表格加回风向因子; 4. 优化风向的均值计算为矢量计算,同时最大最小值不显示; 5. 新增表格数据导出功能; --- src/utils/map/marks.js | 74 ++++++++++++++++++++++++++++++++++--- 1 files changed, 68 insertions(+), 6 deletions(-) diff --git a/src/utils/map/marks.js b/src/utils/map/marks.js index 0d3c21d..ba31891 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++) { @@ -76,5 +71,72 @@ }); _massMarks = massMarks; map.add(massMarks); + }, + clearMassMarks() { + if (_massMarks) { + map.remove(_massMarks); + _massMarks = undefined; + } + }, + + createLabelMarks(img, dataList) { + // eslint-disable-next-line no-undef + const layer = new AMap.LabelsLayer({ + zooms: [3, 20], + zIndex: 1000, + // 寮�鍚爣娉ㄩ伩璁╋紝榛樿涓哄紑鍚紝v1.4.15 鏂板灞炴�� + collision: true, + // 寮�鍚爣娉ㄦ贰鍏ュ姩鐢伙紝榛樿涓哄紑鍚紝v1.4.15 鏂板灞炴�� + animation: true + }); + + map.add(layer); + + // var markers = []; + for (var i = 0; i < dataList.length; i++) { + const data = dataList[i]; + var curData = { + name: data.name, + position: [data.longitude, data.latitude], + zooms: [10, 20], + opacity: 1, + zIndex: 10, + icon: { + type: 'image', + image: img, + // clipOrigin: [14, 92], + // clipSize: [50, 68], + size: [30, 30], + anchor: 'bottom-center', + angel: 0, + retina: true + }, + text: { + content: data.name, + direction: 'top', + offset: [0, -5], + style: { + fontSize: 16, + fontWeight: 'normal', + fillColor: '#fff', + strokeColor: '#333', + strokeWidth: 0, + backgroundColor: '#122b54a9' + } + } + }; + curData.extData = { + index: i + }; + + // eslint-disable-next-line no-undef + var labelMarker = new AMap.LabelMarker(curData); + + // markers.push(labelMarker); + + layer.add(labelMarker); + } + + return layer; } }; -- Gitblit v1.9.3