From 7d02024c5351e620dcc2d49f36331e4a37228ea4 Mon Sep 17 00:00:00 2001
From: Riku <risaku@163.com>
Date: 星期四, 20 三月 2025 22:35:51 +0800
Subject: [PATCH] 走航融合（待完成）
---
src/model/SatelliteGrid.js | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/model/SatelliteGrid.js b/src/model/SatelliteGrid.js
index dad244c..0067b78 100644
--- a/src/model/SatelliteGrid.js
+++ b/src/model/SatelliteGrid.js
@@ -196,11 +196,7 @@
// 鏍规嵁缁樺埗棰滆壊鏂瑰紡缁樺埗缃戞牸
let resGridViews;
if (customColor) {
- resGridViews = gridMapUtil.drawGridColorCustom(
- res,
- gridDataDetail,
- style.opacity
- );
+ resGridViews = gridMapUtil.drawGridColorCustom(res, gridDataDetail);
} else {
resGridViews = gridMapUtil.drawGridColor(
res,
@@ -383,8 +379,7 @@
if (useCustomColor) {
gridMapUtil.drawGridColorCustom(
v.lastGridViews,
- lastGridDataDetail,
- { opacity, zIndex }
+ lastGridDataDetail
);
} else {
gridMapUtil.drawGridColor(
@@ -435,18 +430,19 @@
/**
* 灏嗗缁勭綉鏍艰繘琛岃瀺鍚�
* 閲嶅彔鐨勭綉鏍艰繘琛岀洃娴嬫暟鎹潎鍊艰绠楀苟閲嶆柊璁＄畻瀵瑰簲棰滆壊锛屽舰鎴愭柊鐨勪竴缁勮瀺鍚堢綉鏍�
- * @param {...String} tags 闇�瑕佽瀺鍚堢殑缃戞牸鏍囩锛屽綋涓虹┖鏃讹紝榛樿铻嶅悎鎵�鏈夌綉鏍�
+ * @param {Array} tags 闇�瑕佽瀺鍚堢殑缃戞牸鏍囩锛屽綋涓虹┖鏃讹紝榛樿铻嶅悎鎵�鏈夌綉鏍�
*/
- mixGrid(tags) {
+ mixGrid(tags, isMixGridHighlight) {
tags.sort((a, b) => {
return a < b ? -1 : 1;
});
const mixTag = tags.join('-');
if (this.mapViewsMap.has(mixTag)) {
this.changeVisibility({
- tag: mixTag,
+ tags: [mixTag],
showGridViews: true
});
+ this.changeGridColor({ tag: mixTag, isMixGridHighlight });
} else {
// const mixMapViews = this._createNewMapViews();
// 鏍规嵁鏍囩tag锛岃幏鍙栧搴斿缁勭綉鏍兼暟鎹�
@@ -501,11 +497,13 @@
data: resGridDataDetail,
grid: {
style: {
- isMixGridHighlight: true
+ isMixGridHighlight:
+ isMixGridHighlight == undefined ? true : isMixGridHighlight
}
},
extData: {
- name: `璧拌埅铻嶅悎 - ${mixTag}`
+ name: `璧拌埅铻嶅悎 - ${mixTag}`,
+ type: 1
}
});
}
@@ -513,6 +511,14 @@
return mixTag;
}
+ /**
+ * 缁樺埗鐑姏鍥剧綉鏍�
+ * @param {string} tag
+ */
+ drawHeatGrid(tag) {
+
+ }
+
_getMapViews(...tags) {
let _mapViewsList = [],
_gridDataDetailList = [];
--
Gitblit v1.9.3