From 7b08b44e307d05c18d60687f039aaa196f75a745 Mon Sep 17 00:00:00 2001
From: qinbo <qinbo@shsening.com>
Date: 星期二, 07 十二月 2021 16:00:31 +0800
Subject: [PATCH] bug fix
---
widgetsTS/widget_detail/view.js | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/widgetsTS/widget_detail/view.js b/widgetsTS/widget_detail/view.js
index 9ca06cb..b0c7dbb 100644
--- a/widgetsTS/widget_detail/view.js
+++ b/widgetsTS/widget_detail/view.js
@@ -316,25 +316,21 @@
var tableData = data.data.result;
if (tableData != null && tableData.length > 0) {
var topObj = tableData[0];
- for (var key in topObj) {
- if (topObj[key] == null || topObj[key] == 'null' || topObj[key] == undefined || topObj[key] == 'undefined') {
- topObj[key] = "/";
- }
- }
- var _tr = "<tr onmouseover='over(this)' onmouseout='out(this)'><td>1</td><td>code</td><td>缂栫爜</td><td>" + topObj.code + "</td><td>/</td></tr>"
+ topObj = changeNullAndundefinedToEmpty(topObj);
+ var _tr = "<tr onmouseover='over(this)' onmouseout='out(this)'><td>1</td><td>缂栫爜</td><td>" + topObj.code + "</td><td>/</td></tr>"
$("#indexTb").append(_tr);
- _tr = "<tr onmouseover='over(this)' onmouseout='out(this)' ><td>2</td><td>name</td><td>鍚嶇О</td><td>" + topObj.name + "</td><td>/</td></tr>"
+ _tr = "<tr onmouseover='over(this)' onmouseout='out(this)' ><td>2</td><td>鍚嶇О</td><td>" + topObj.name + "</td><td>/</td></tr>"
$("#indexTb").append(_tr);
- _tr = "<tr onmouseover='over(this)' onmouseout='out(this)' ><td>3</td><td>datatime</td><td>鏃堕棿</td><td>" + topObj.datatime + "</td><td>/</td></tr>"
+ _tr = "<tr onmouseover='over(this)' onmouseout='out(this)' ><td>3</td><td>鏃堕棿</td><td>" + topObj.datatime + "</td><td>/</td></tr>"
$("#indexTb").append(_tr);
- _tr = "<tr onmouseover='over(this)' onmouseout='out(this)' ><td>4</td><td>lon</td><td>缁忓害</td><td>" + topObj.lon + "</td><td>/</td></tr>"
+ _tr = "<tr onmouseover='over(this)' onmouseout='out(this)' ><td>4</td><td>缁忓害</td><td>" + topObj.lon + "</td><td>/</td></tr>"
$("#indexTb").append(_tr);
- _tr = "<tr onmouseover='over(this)' onmouseout='out(this)' ><td>5</td><td>lat</td><td>绾害</td><td>" + topObj.lat + "</td><td>/</td></tr>"
+ _tr = "<tr onmouseover='over(this)' onmouseout='out(this)' ><td>5</td><td>绾害</td><td>" + topObj.lat + "</td><td>/</td></tr>"
$("#indexTb").append(_tr);
var tmp_index = 6;
for(var p in topObj){//閬嶅巻json瀵硅薄鐨勬瘡涓猭ey/value瀵�,p涓簁ey
if (p!=='code' && p!=='name' && p!=='datatime' && p!=='lon' && p!=='lat'){
- _tr = "<tr onmouseover='over(this)' onmouseout='out(this)' ><td>"+tmp_index+"</td><td>"+p+"</td><td>"+p+"</td><td>" + topObj[p] + "</td><td>"+getUnitByqindex(p)+"</td></tr>"
+ _tr = "<tr onmouseover='over(this)' onmouseout='out(this)' ><td>"+tmp_index+"</td><td>"+p+"</td><td>" + topObj[p] + "</td><td>"+getUnitByqindex(p)+"</td></tr>"
$("#indexTb").append(_tr);
tmp_index++;
}
@@ -369,11 +365,7 @@
for (var i = 0; length = tableData.length, i < length; i++) {
var j = i + 1;
var topObj = tableData[i];
- for (var key in topObj) {
- if (topObj[key] == null || topObj[key] == 'null' || topObj[key] == undefined || topObj[key] == 'undefined') {
- topObj[key] = "/";
- }
- }
+ topObj = changeNullAndundefinedToEmpty(topObj);
var _tr = "<tr onmouseover='over(this)' onmouseout='out(this)' ><td>" + j + "</td><td onclick='locateAndShowDetail(this)'>" + topObj.road_id + "</td><td>" + topObj.name + "</td><td>"+ topObj.pm25 + "</td><td>" + topObj.pm10 + "</td><td>" + topObj.no + "</td><td>" + topObj.nox + "</td><td>" + topObj.no2 + "</td><td>" + topObj.co +"</td></tr>"
$("#indexTb").append(_tr);
}
--
Gitblit v1.9.1