From b87b2befa85bd085f40dc5aa7ea9bfbc17d807e5 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 10 一月 2025 17:15:02 +0800
Subject: [PATCH] 1. 调整了网格内文本的展示方式和样式； 2. 省去了单个网格4个顶点坐标的计算逻辑，交由后端完成；
---
src/views/satellitetelemetry/SatelliteProxy.js | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/src/views/satellitetelemetry/SatelliteProxy.js b/src/views/satellitetelemetry/SatelliteProxy.js
index f11cabe..7b7f8cf 100644
--- a/src/views/satellitetelemetry/SatelliteProxy.js
+++ b/src/views/satellitetelemetry/SatelliteProxy.js
@@ -23,9 +23,24 @@
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 gridPoints = gridMapUtil.parseGridPoint(points);
+ // console.log('gridPoints:', gridPoints);
+
+ const gridPoints = gridInfo.map((v) => {
+ return [
+ calculate.wgs84_To_Gcj02(v.point1Lon, v.point1Lat),
+ calculate.wgs84_To_Gcj02(v.point2Lon, v.point2Lat),
+ calculate.wgs84_To_Gcj02(v.point3Lon, v.point3Lat),
+ calculate.wgs84_To_Gcj02(v.point4Lon, v.point4Lat)
+ // [v.point1Lon, v.point1Lat],
+ // [v.point2Lon, v.point2Lat],
+ // [v.point3Lon, v.point3Lat],
+ // [v.point4Lon, v.point4Lat]
+ ];
+ });
const gridViews = gridMapUtil.drawPolylines(gridPoints);
return { gridViews, gridPoints, points };
}
@@ -35,10 +50,12 @@
const data = gridData.map((v, i) => {
return {
lnglat_GD: points[i],
- data: v.pm25 ? (v.pm25 + '渭g/m鲁') : ''
+ // data: v.pm25 ? (v.pm25 + '渭g/m鲁') : ''
+ data: v.pm25 ? v.pm25 : ''
};
});
- return gridMapUtil.drawGridTextLabel(data, textViews, labelsLayer, 'bottom');
+ // return gridMapUtil.drawGridTextLabel(data, textViews, labelsLayer, 'bottom');
+ return gridMapUtil.drawGridText(data, textViews, 'top-center', 'data');
}
// 缁樺埗鐩戞祴鏁版嵁鎺掑悕鏂囨湰
@@ -46,18 +63,24 @@
const data = gridData.map((v, i) => {
return {
lnglat_GD: points[i],
- data: v.pm25 ? ('鎺掑悕: ' + v.rank) : ''
+ // data: v.pm25 ? ('鎺掑悕: ' + v.rank) : ''
+ data: v.pm25 ? v.rank : ''
};
});
- return gridMapUtil.drawGridTextLabel(data, textViews, labelsLayer, 'top');
+ // return gridMapUtil.drawGridTextLabel(data, textViews, labelsLayer, 'top');
+ return gridMapUtil.drawGridText(data, textViews, 'bottom-center', 'rank');
}
// 缁樺埗鐩戞祴鏁版嵁鍊煎搴旂綉鏍奸鑹�
-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