From 4f1fb28dad6a4df83752dc9b60f504764f8e3dcb Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期五, 03 一月 2025 10:08:54 +0800
Subject: [PATCH] 完善数据融合功能（未完成）
---
src/views/satellitetelemetry/SatelliteProxy.js | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/views/satellitetelemetry/SatelliteProxy.js b/src/views/satellitetelemetry/SatelliteProxy.js
index bc6be57..34657a1 100644
--- a/src/views/satellitetelemetry/SatelliteProxy.js
+++ b/src/views/satellitetelemetry/SatelliteProxy.js
@@ -23,7 +23,8 @@
function drawPolyline(gridInfo) {
// 缁樺埗缃戞牸
const points = gridInfo.map((v) => {
- return calculate.wgs84_To_Gcj02(v.longitude, v.latitude);
+ // return calculate.wgs84_To_Gcj02(v.longitude, v.latitude);
+ return [v.longitude, v.latitude]
});
const gridPoints = gridMapUtil.parseGridPoint(points);
const gridViews = gridMapUtil.drawPolylines(gridPoints);
@@ -35,7 +36,8 @@
const data = gridData.map((v, i) => {
return {
lnglat_GD: points[i],
- data: v.pm25
+ // data: v.pm25 ? (v.pm25 + '渭g/m鲁') : ''
+ data: v.pm25 ? (v.pm25) : ''
};
});
return gridMapUtil.drawGridTextLabel(data, textViews, labelsLayer, 'bottom');
@@ -46,18 +48,23 @@
const data = gridData.map((v, i) => {
return {
lnglat_GD: points[i],
- data: v.rank
+ // data: v.pm25 ? ('鎺掑悕: ' + v.rank) : ''
+ data: v.pm25 ? (v.rank) : ''
};
});
return gridMapUtil.drawGridTextLabel(data, textViews, labelsLayer, 'top');
}
// 缁樺埗鐩戞祴鏁版嵁鍊煎搴旂綉鏍奸鑹�
-function drawColor(gridViews, gridData) {
+function drawColor(gridViews, gridData, customColor) {
const pm25Data = gridData.map((v) => {
return v.pm25;
});
- gridMapUtil.drawGridColor(gridViews, pm25Data, 'PM25');
+ if (customColor) {
+ gridMapUtil.drawGridColorCustom(gridViews, pm25Data);
+ } else {
+ gridMapUtil.drawGridColor(gridViews, pm25Data, 'PM25');
+ }
}
export default {
--
Gitblit v1.9.3