From c7a16ca1b6fbcb0b82a4a09c2e75014624082e37 Mon Sep 17 00:00:00 2001
From: Riku <risaku@163.com>
Date: 星期四, 27 三月 2025 22:45:48 +0800
Subject: [PATCH] 修复走航融合功能bug
---
src/utils/map/grid.js | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/src/utils/map/grid.js b/src/utils/map/grid.js
index cbd6e1c..235b390 100644
--- a/src/utils/map/grid.js
+++ b/src/utils/map/grid.js
@@ -264,7 +264,8 @@
strokeWeight: 1, //绾挎潯瀹藉害锛岄粯璁や负 2
strokeColor: 'white', //绾挎潯棰滆壊
fillOpacity: 0,
- extData: p.extData
+ extData: p.extData,
+ zIndex: 11
});
if (typeof event === 'function') {
@@ -348,7 +349,13 @@
* @param {string} factorName 鐩戞祴鍥犲瓙鍚嶇О
* @param {number} opacity 閫忔槑搴�
*/
- drawGridColor(gridViews, gridDataDetail, factorName, opacity, zIndex) {
+ drawGridColor(gridViews, gridDataDetail, factorName, style) {
+ let {
+ strokeWeight = 1,
+ strokeColor = 'white',
+ opacity = 1,
+ zIndex = 11
+ } = style;
const res = [];
// 閬嶅巻鍗槦閬ユ祴鏁版嵁鏁扮粍
gridDataDetail.forEach((d, i) => {
@@ -365,11 +372,27 @@
nextColor.map((v) => v * 255),
ratio
);
+
+ const _extData = grid.getExtData();
grid.setOptions({
- zIndex: zIndex ? zIndex : 10,
- fillColor: _color,
- fillOpacity: opacity ? opacity : color[3] == 0 ? 0 : 0.7
+ strokeWeight,
+ strokeColor,
+ zIndex,
+ fillColor: _color, //澶氳竟褰㈠～鍏呴鑹�
+ fillOpacity: opacity,
+ extData: {
+ ..._extData,
+ gridData: d
+ }
});
+ if (d.gridStyle && style.isMixGridHighlight) {
+ const _strokeWeight = d.gridStyle.strokeWeight;
+ const _strokeColor = d.gridStyle.strokeColor;
+ grid.setOptions({
+ strokeWeight: _strokeWeight, //绾挎潯瀹藉害锛岄粯璁や负 1
+ strokeColor: _strokeColor //绾挎潯棰滆壊
+ });
+ }
res.push(grid);
}
@@ -378,7 +401,8 @@
return res;
},
- drawGridColorCustom(gridViews, gridDataDetail, opacity) {
+ drawGridColorCustom(gridViews, gridDataDetail) {
+
var max, min;
gridDataDetail.forEach((t) => {
if (!t.pm25) return;
@@ -407,8 +431,8 @@
ratio
);
grid.setOptions({
- fillColor: _color,
- fillOpacity: opacity ? opacity : color[3] == 0 ? 0 : 0.7
+ fillColor: _color, //澶氳竟褰㈠～鍏呴鑹�
+ // fillOpacity: style.opacity ? style.opacity : color[3] == 0 ? 0 : 1
});
res.push(grid);
--
Gitblit v1.9.3