From bb9fcf136d23b8624e44ed6458caaa605f72af91 Mon Sep 17 00:00:00 2001
From: Riku <risaku@163.com>
Date: 星期三, 01 一月 2025 20:24:20 +0800
Subject: [PATCH] 开始添加数据融合功能

---
 src/views/satellitetelemetry/SatelliteProxy.js |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/satellitetelemetry/SatelliteProxy.js b/src/views/satellitetelemetry/SatelliteProxy.js
index 9472516..f11cabe 100644
--- a/src/views/satellitetelemetry/SatelliteProxy.js
+++ b/src/views/satellitetelemetry/SatelliteProxy.js
@@ -31,25 +31,25 @@
 }
 
 // 缁樺埗鐩戞祴鏁版嵁鍊�
-function drawDataText(points, gridData, textViews) {
+function drawDataText(points, gridData, textViews, labelsLayer) {
   const data = gridData.map((v, i) => {
     return {
       lnglat_GD: points[i],
-      data: v.pm25
+      data: v.pm25 ? (v.pm25 + '渭g/m鲁') : ''
     };
   });
-  return gridMapUtil.drawGridText(data, textViews);
+  return gridMapUtil.drawGridTextLabel(data, textViews, labelsLayer, 'bottom');
 }
 
 // 缁樺埗鐩戞祴鏁版嵁鎺掑悕鏂囨湰
-function drawRankText(points, gridData) {
+function drawRankText(points, gridData, textViews, labelsLayer) {
   const data = gridData.map((v, i) => {
     return {
       lnglat_GD: points[i],
-      data: v.rank
+      data: v.pm25 ? ('鎺掑悕: ' + v.rank) : ''
     };
   });
-  return gridMapUtil.drawGridText(data);
+  return gridMapUtil.drawGridTextLabel(data, textViews, labelsLayer, 'top');
 }
 
 // 缁樺埗鐩戞祴鏁版嵁鍊煎搴旂綉鏍奸鑹�

--
Gitblit v1.9.3