From 85aaea41c338dd77286ab7877f25a5d37fdb8d4b Mon Sep 17 00:00:00 2001
From: qinbo <qinbo@shsening.com>
Date: 星期四, 28 十月 2021 12:19:02 +0800
Subject: [PATCH] 详情局部查询 bug fix
---
data/getLayerListByUserid.json | 4 ++--
widgetsTS/widget_detail/view.js | 26 +++++++++++++++++---------
widgetsTS/widget_detail/widget.js | 21 +++++++++++++++++----
3 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/data/getLayerListByUserid.json b/data/getLayerListByUserid.json
index 9f22aab..0d529e1 100644
--- a/data/getLayerListByUserid.json
+++ b/data/getLayerListByUserid.json
@@ -9,7 +9,7 @@
"style_prefix":"",
"style_selected":"pm25",
"styleoptions": ["pm25", "pm10", "no2", "co"],
- "show":true
+ "show":false
},
{
@@ -45,7 +45,7 @@
"style_prefix":"",
"style_selected":"pm25",
"styleoptions": ["pm25", "pm10", "no", "no2", "nox", "co"],
- "show":true
+ "show":false
},
{
"id": 1005,
diff --git a/widgetsTS/widget_detail/view.js b/widgetsTS/widget_detail/view.js
index a6dd7c5..fd8d2bb 100644
--- a/widgetsTS/widget_detail/view.js
+++ b/widgetsTS/widget_detail/view.js
@@ -5,7 +5,6 @@
//褰撳墠椤甸潰涓氬姟
function initWidgetView(_thisWidget) {
thisWidget = _thisWidget;
- console.log(thisWidget)
DatePicker("#appDateHourStart", '#appDateHourEnd');
$("#appDateHourStart").datetimepicker("setDate", new Date(thisWidget.appDateHourStart));
$('#appDateHourEnd').datetimepicker('setDate', new Date(thisWidget.appDateHourEnd));
@@ -207,10 +206,9 @@
}
-// 鏌ヨ
-// function resetStartQueryHistoryText(code) {
-// $("#startQueryHistory").text("鏌ヨ");
-// }
+function resetStartQueryHistoryText() {
+ $("#startQueryHistoryText").text("鏌ヨ");
+ }
function DatePicker(beginSelector, endSelector) {
$(beginSelector).datetimepicker(
@@ -281,10 +279,21 @@
$("#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>"
$("#indexTb").append(_tr);
- var tmp_index = 4;
+ _tr = "<tr onmouseover='over(this)' onmouseout='out(this)' ><td>4</td><td>lon</td><td>缁忓害</td><td>" + topObj.lon + "</td><td>/</td></tr>"
+ if (topObj.lon == undefined){
+ $("#indexTb").append("<tr onmouseover='over(this)' onmouseout='out(this)' ><td>5</td><td>lat</td><td>缁忓害</td><td>" + '/' + "</td><td>/</td></tr>");
+ }else{
+ $("#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>"
+ if (topObj.lat == undefined){
+ $("#indexTb").append("<tr onmouseover='over(this)' onmouseout='out(this)' ><td>5</td><td>lat</td><td>绾害</td><td>" + '/' + "</td><td>/</td></tr>");
+ }else{
+ $("#indexTb").append(_tr);
+ }
+ var tmp_index = 6;
for(var p in topObj){//閬嶅巻json瀵硅薄鐨勬瘡涓猭ey/value瀵�,p涓簁ey
-
- if (p!=='code' && p!=='name' && p!=='datatime' ){
+ 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>"
$("#indexTb").append(_tr);
tmp_index++;
@@ -363,7 +372,6 @@
async: false,//鍚屾
url: backend_url,
success: function (data) {
- console.log(data);
var tableData = data.data.result;
if (tableData != null && tableData.length > 0) {
var seriesObj = {};
diff --git a/widgetsTS/widget_detail/widget.js b/widgetsTS/widget_detail/widget.js
index 2a06c7c..e85a527 100644
--- a/widgetsTS/widget_detail/widget.js
+++ b/widgetsTS/widget_detail/widget.js
@@ -25,19 +25,32 @@
reloadData(params) {
this.winPage.reloadData(params);
- // this.appDateHourStart = mars3d.global_variables.queryDataTEnd01;
- // this.appDateHourEnd = mars3d.global_variables.queryDataTStart;
+ this.viewWindow.resetStartQueryHistoryText(params.siteid);
+ this.config.params.siteid = params.siteid;
+
+ this.viewWindow.resetStartQueryHistoryText(params.layerid);
+ this.config.params.layerid = params.layerid;
+
+
+ this.appDateHourStart = mars3d.global_variables.queryDataTStart;
+ this.appDateHourEnd = mars3d.global_variables.queryDataTEnd;
}
//姣忎釜绐楀彛鍒涘缓瀹屾垚鍚庤皟鐢�
winCreateOK(opt, result) {
- this.winPage = result;
+ this.winPage = result;
this.nodejs_url_predix = mars3d.global_variables.nodejs_url_predix;
this.winPage.reloadData(this.config.params);
+ this.viewWindow = result;
+ this.config.params.siteid = this.config.params.siteid;
+ this.viewWindow.resetStartQueryHistoryText(this.config.params.siteid);
+ this.config.params.layerid = this.config.params.layerid;
+ this.viewWindow.resetStartQueryHistoryText(this.config.params.layerid);
+
this.appDateHourStart = mars3d.global_variables.queryDataTStart;
- this.appDateHourEnd = mars3d.global_variables.queryDataTEnd01;
+ this.appDateHourEnd = mars3d.global_variables.queryDataTEnd;
}
//鎵撳紑婵�娲�
activate() {
--
Gitblit v1.9.1