From b284d078f196af80a105dc3bcb610d8ed37d9251 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Fri, 08 Nov 2019 11:49:29 +0800
Subject: [PATCH] update

---
 src/main/webapp/view/pollutionsource.jsp |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/view/pollutionsource.jsp b/src/main/webapp/view/pollutionsource.jsp
index e32ce19..b9a9f7b 100644
--- a/src/main/webapp/view/pollutionsource.jsp
+++ b/src/main/webapp/view/pollutionsource.jsp
@@ -162,10 +162,10 @@
     var marker = new BMap.Marker(point, {icon: icon, offset: new BMap.Size(0, -20)});
     map.addOverlay(marker);
     map.centerAndZoom(point, 16);
-    if (!$.isEmptyObject(dirPoint) && !$.isEmptyObject(getPollutionSourceData) && typeof (getPollutionSourceData["e6"]) != "undefined" && typeof (getPollutionSourceData["e7"]) != "undefined" && typeof (getPollutionSourceData["e18"]) != "undefined" && typeof (getPollutionSourceData["e23"]) != "undefined" && getPollutionSourceData["e18"] > 0.03) {
+    if (!$.isEmptyObject(dirPoint) && !$.isEmptyObject(getPollutionSourceData) && typeof (getPollutionSourceData["e6"]) != "undefined" && typeof (getPollutionSourceData["e7"]) != "undefined" && typeof (getPollutionSourceData["e18"]) != "undefined" && typeof (getPollutionSourceData["e23"]) != "undefined") {
         var windSpeed = parseFloat(getPollutionSourceData["e18"]);
         var windDir = parseFloat(getPollutionSourceData["e23"]);
-        var distance = windSpeed * 3600;
+        var distance = windSpeed * 3600>108? windSpeed * 3600:108;
         var winDirStart = 255 - windDir;
         var winDirEnd = 285 - windDir;
         var marker1 = new BMap.Marker(EOffsetBearing(dirPoint, distance * 0.15, winDirStart), {
@@ -192,7 +192,7 @@
 
     $("#show").one('click', function () {
         setTimeout(function () {
-            if ($.isEmptyObject(dirPoint) || $.isEmptyObject(getPollutionSourceData) || typeof (getPollutionSourceData["e6"]) == "undefined" || typeof (getPollutionSourceData["e7"]) == "undefined" || typeof (getPollutionSourceData["e18"]) == "undefined" || typeof (getPollutionSourceData["e23"]) == "undefined" || getPollutionSourceData["e18"] <= 0.03) {
+            if ($.isEmptyObject(dirPoint) || $.isEmptyObject(getPollutionSourceData) || typeof (getPollutionSourceData["e6"]) == "undefined" || typeof (getPollutionSourceData["e7"]) == "undefined" || typeof (getPollutionSourceData["e18"]) == "undefined" || typeof (getPollutionSourceData["e23"]) == "undefined") {
                 showNoData();
             } else {
                 var humidity = parseFloat(getPollutionSourceData["e6"]);
@@ -213,7 +213,7 @@
                 });
                 map.addOverlay(lab);
 
-                var distance = windSpeed * 3600;
+                var distance = windSpeed * 3600>108? windSpeed * 3600:108;
                 var winDirStartLeft = 240 - windDir;
                 var winDirEndLeft = 250 - windDir;
                 var winDirStartMiddle = 250 - windDir;
@@ -318,8 +318,8 @@
                 var winfowTextSource;
                 var supplement;
                 if (selectSensorKey == "������") {
-                    winfowTextCause = "<p style='height: 44px;line-height: 22px'>������������������������������������������������������������������������������������������������������������������������������������������������������</p>";
-                    winfowTextSource = "<p style='height: 22px;line-height: 22px'>Nox������VOCs������������</p>";
+                    winfowTextCause = "<p style='height: 44px;line-height: 22px'>���������������������������������������������������������������������������������������������������������������������������������������������</p>";
+                    winfowTextSource = "<p style='height: 22px;line-height: 22px'>NOx������VOCs������������</p>";
                 } else {
                     if (month == 12 || month == 1 || month == 2) {
                         if (windSpeed >= 3.4) {

--
Gitblit v1.8.0