From 9707e3f2b23cacaa6d219f7a000865cda4ecb99c Mon Sep 17 00:00:00 2001
From: wangzhibo <wangzhibo@shsening.com>
Date: 星期五, 17 十二月 2021 16:46:53 +0800
Subject: [PATCH] Merge branch 'master' of http://www.shsening.com:10000/r/template/shanghai

---
 widgetsTS/widget_summary/view.js |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/widgetsTS/widget_summary/view.js b/widgetsTS/widget_summary/view.js
index f3d03c2..454f9c0 100644
--- a/widgetsTS/widget_summary/view.js
+++ b/widgetsTS/widget_summary/view.js
@@ -116,13 +116,9 @@
                 for (var i = 0; length = tmpTopListQueryResult.length, i < length; i++) {
                     var j = i + 1;
                     var topObj = tmpTopListQueryResult[i];
-                    for (var key in topObj) {
-                        if (topObj[key] == null || topObj[key] == 'null' || topObj[key] == undefined || topObj[key] == 'undefined') {
-                            topObj[key] = "/";
-                        }
-                      }
-                        var _tr = "<tr _siteid='" + topObj.code + "' _lon='" + topObj.lon + "' _lat='" + topObj.lat + "' onmouseover='over(this)' onmouseout='out(this)' ><td><input type='checkbox' name='selectedItem' value='" + j + "' /></td><td>" + j + "</td><td onclick='locateAndShowDetail(this)'>" + topObj.code + "</td><td onclick='locateAndShowDetail(this)'>" + topObj.name + "</td><td><font color='" + getLayerPointColorByQindexandValue(current_selected_monitor_type, current_selected_monitor_qindex, topObj[current_selected_monitor_qindex]) + "'>" + topObj[current_selected_monitor_qindex] + "</font></td></tr>"
-                        $("#top10Tb").append(_tr);
+                    topObj = changeNullAndundefinedToEmpty(topObj);
+                    var _tr = "<tr _siteid='" + topObj.code + "' _lon='" + topObj.lon + "' _lat='" + topObj.lat + "' onmouseover='over(this)' onmouseout='out(this)' ><td><input type='checkbox' name='selectedItem' value='" + j + "' /></td><td>" + j + "</td><td onclick='locateAndShowDetail(this)'>" + topObj.code + "</td><td onclick='locateAndShowDetail(this)'>" + topObj.name + "</td><td><font color='" + getLayerPointColorByQindexandValue(current_selected_monitor_type, current_selected_monitor_qindex, topObj[current_selected_monitor_qindex]) + "'>" + topObj[current_selected_monitor_qindex] + "</font></td></tr>"
+                    $("#top10Tb").append(_tr);
                 }
             } else {
                 haoutil.msg("鏌ヨ鏃犳暟鎹紝璇锋洿鎹㈡煡璇㈡潯浠讹紒");

--
Gitblit v1.9.1