From 3970cefa60ea7e5d899b7475345b65646c19c110 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 20 三月 2025 15:17:05 +0800
Subject: [PATCH] 走航融合（待完成）
---
src/utils/map/grid.js | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/utils/map/grid.js b/src/utils/map/grid.js
index cbd6e1c..64a4cdf 100644
--- a/src/utils/map/grid.js
+++ b/src/utils/map/grid.js
@@ -348,7 +348,8 @@
* @param {string} factorName 鐩戞祴鍥犲瓙鍚嶇О
* @param {number} opacity 閫忔槑搴�
*/
- drawGridColor(gridViews, gridDataDetail, factorName, opacity, zIndex) {
+ drawGridColor(gridViews, gridDataDetail, factorName, style) {
+ let { strokeWeight, strokeColor, opacity, zIndex } = style;
const res = [];
// 閬嶅巻鍗槦閬ユ祴鏁版嵁鏁扮粍
gridDataDetail.forEach((d, i) => {
@@ -365,11 +366,25 @@
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
+ ...style,
+ fillColor: _color, //澶氳竟褰㈠～鍏呴鑹�
+ fillOpacity: style.opacity ? style.opacity : color[3] == 0 ? 0 : 1,
+ 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 +393,9 @@
return res;
},
- drawGridColorCustom(gridViews, gridDataDetail, opacity) {
+ drawGridColorCustom(gridViews, gridDataDetail, style) {
+ const { strokeWeight, strokeColor, opacity, zIndex } = style;
+
var max, min;
gridDataDetail.forEach((t) => {
if (!t.pm25) return;
@@ -407,8 +424,9 @@
ratio
);
grid.setOptions({
- fillColor: _color,
- fillOpacity: opacity ? opacity : color[3] == 0 ? 0 : 0.7
+ ...style,
+ fillColor: _color, //澶氳竟褰㈠～鍏呴鑹�
+ fillOpacity: style.opacity ? style.opacity : color[3] == 0 ? 0 : 0.7
});
res.push(grid);
--
Gitblit v1.9.3