From ce1867b7f074df69f0c30112f988cb1590b50128 Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期六, 04 十二月 2021 14:59:51 +0800
Subject: [PATCH] Merge branch 'master' of http://www.shsening.com:10000/r/template/shanghai
---
img/tuglie/other_pm10.png | 0
img/tuglie/other_pm2.5.png | 0
img/tuglie/other_no2.png | 0
img/tuglie/other_nox.png | 0
widgetsTS/taxiRouteReplay/widget.js | 16 +++++++++++-----
img/tuglie/gk_no2.png | 0
6 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/img/tuglie/gk_no2.png b/img/tuglie/gk_no2.png
index 7dfc92f..b3ccedf 100644
--- a/img/tuglie/gk_no2.png
+++ b/img/tuglie/gk_no2.png
Binary files differ
diff --git a/img/tuglie/other_no2.png b/img/tuglie/other_no2.png
index 8e51b3c..34175e3 100644
--- a/img/tuglie/other_no2.png
+++ b/img/tuglie/other_no2.png
Binary files differ
diff --git a/img/tuglie/other_nox.png b/img/tuglie/other_nox.png
index 9ef7550..cb41331 100644
--- a/img/tuglie/other_nox.png
+++ b/img/tuglie/other_nox.png
Binary files differ
diff --git a/img/tuglie/other_pm10.png b/img/tuglie/other_pm10.png
index 982411f..59352c0 100644
--- a/img/tuglie/other_pm10.png
+++ b/img/tuglie/other_pm10.png
Binary files differ
diff --git a/img/tuglie/other_pm2.5.png b/img/tuglie/other_pm2.5.png
index 39f7237..794fdb3 100644
--- a/img/tuglie/other_pm2.5.png
+++ b/img/tuglie/other_pm2.5.png
Binary files differ
diff --git a/widgetsTS/taxiRouteReplay/widget.js b/widgetsTS/taxiRouteReplay/widget.js
index a5b88ab..0ec3a9c 100644
--- a/widgetsTS/taxiRouteReplay/widget.js
+++ b/widgetsTS/taxiRouteReplay/widget.js
@@ -83,11 +83,17 @@
if (lng && lat) {
position = Cesium.Cartesian3.fromDegrees(lng, lat);
}
- var PointEntity = new mars3d.graphic.PointEntity({
+ var CircleEntity = new mars3d.graphic.CircleEntity({
position: position,
style: {
- pixelSize: 6,
- color: this.viewWindow.getLayerPointColorByQindexandValue(1004,this.qindex, item[this.qindex]),
+ radius: 8.0,
+ diffHeight: this.qindex == "co" ? 20 * item[this.qindex] : item[this.qindex], //楂樺害
+ color:this.viewWindow.getLayerPointColorByQindexandValue(1004,this.qindex, item[this.qindex]),
+ opacity: 0.5,
+ rotationDegree: 45,
+ highlight: {
+ opacity: 1
+ }
},
item: item,
popup:"缂栧彿锛�" +
@@ -105,9 +111,9 @@
"<tr><td>CO锛�</td><td align= right>" + item["co"] + ' ' + "</td><td>mg/m鲁</td></tr>" +
"</table>"
});
- this.routeLayer.addGraphic(PointEntity);
- this.routeLayer.flyTo();
+ this.routeLayer.addGraphic(CircleEntity);
}
+ this.routeLayer.flyTo();
}
setSingleTaxiReplayData(datas) {
--
Gitblit v1.9.1